diff --git a/README.md b/README.md index 4c310cf..49db21a 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ | [prismlauncher](https://github.com/PrismLauncher/PrismLauncher) | Fuckm all my homies plays this shit man | | [vesktop](https://github.com/Vencord/Vesktop) | Wayland Discord client | | [qbittorrent](https://github.com/qbittorrent/qBittorrent) | Torrents))))) hahah)))) | -| [ayugram](https://github.com/AyuGram/AyuGramDesktop) | IDK just modified tgram client lol | +| [64gram](https://github.com/TDesktop-x64/tdesktop) | IDK just modified tgram client lol | | [ayugram](https://github.com/AyuGram/AyuGramDesktop) | Telegram client with ghost mode | | [file-Roller](https://gitlab.gnome.org/GNOME/file-roller) | Archiver | | [mpv](https://github.com/mpv-player/mpv) | Simplest video player | diff --git a/flake.lock b/flake.lock index 2c5ba37..d35073b 100644 --- a/flake.lock +++ b/flake.lock @@ -610,22 +610,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1730958623, @@ -689,26 +673,6 @@ "type": "github" } }, - "nypkgs": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726657437, - "narHash": "sha256-eBeVOFceQkYfWHAwdQ+aM8vLAbsuuWUgek2f6dFBTl0=", - "owner": "yunfachi", - "repo": "nypkgs", - "rev": "698ab4159dc38affee2fc5886468af139de8d95e", - "type": "github" - }, - "original": { - "owner": "yunfachi", - "repo": "nypkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -743,9 +707,7 @@ "nix-gaming": "nix-gaming", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", - "nypkgs": "nypkgs", "spicetify-nix": "spicetify-nix", "stylix": "stylix", "walls": "walls", @@ -911,11 +873,11 @@ "walls": { "flake": false, "locked": { - "lastModified": 1732099728, - "narHash": "sha256-UYWN12WMXGMj73phfN3vu3t0bXZZFFkmyPQAphTu5/M=", + "lastModified": 1732272835, + "narHash": "sha256-ze9MtewNai+O/R+ZyG3VKNXZcxftJFti/YFoAZvQIWE=", "owner": "~neverness", "repo": "wallpapers", - "rev": "f8d6552d521b6ed4075a0d3e427a1263749ef78f", + "rev": "46c39fe7cc5b6d6f1e59a520755ab8afe845e3d7", "type": "sourcehut" }, "original": { diff --git a/flake.nix b/flake.nix index 7456fee..c9f3705 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,9 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # UNSTABLE - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; # STABLE nur.url = "github:nix-community/NUR"; # NUR nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # HARDWARE - # impermanence.url = "github:nix-community/impermanence"; # IMPERMAN flake-parts.url = "github:hercules-ci/flake-parts"; # PARTS nix-gaming.url = "github:fufexan/nix-gaming"; # GAMING hyprland.url = "github:hyprwm/Hyprland"; # HYPRLAND @@ -19,10 +17,6 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - nypkgs = { - url = "github:yunfachi/nypkgs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; zen-browser = { url = "github:ch4og/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/colors.nix b/modules/colors.nix new file mode 100644 index 0000000..b795d32 --- /dev/null +++ b/modules/colors.nix @@ -0,0 +1,64 @@ +{ pkgs, config, ... }: { + stylix = let + theme = config.module.themes.stylix.theme; + tinted = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; + # eighties + # helios + # horizon-terminal-dark + # tokyo-city-terminal-dark + paradise = { + base00 = "#151515"; + base01 = "#1F1F1F"; + base02 = "#2E2E2E"; + base03 = "#424242"; + base04 = "#BBB6B6"; + base05 = "#E8E3E3"; + base06 = "#E8E3E3"; + base07 = "#E8E3E3"; + base08 = "#B66467"; + base09 = "#D9BC8C"; + base0A = "#D9BC8C"; + base0B = "#8C977D"; + base0C = "#8AA6A2"; + base0D = "#8DA3B9"; + base0E = "#A988B0"; + base0F = "#BBB6B6"; + }; + daone = { + base00 = "181818"; + base01 = "282828"; + base02 = "585858"; + base03 = "888888"; + base04 = "c8c8c8"; + base05 = "ffffff"; + base06 = "ffffff"; + base07 = "ffffff"; + base08 = "fa7883"; + base09 = "ffc387"; + base0A = "ff9470"; + base0B = "98c379"; + base0C = "8af5ff"; + base0D = "6bb8ff"; + base0E = "e799ff"; + base0F = "b3684f"; + }; + sweetpastel = { + base00 = "#1B1F23"; + base01 = "#25292d"; + base02 = "#2f3337"; + base03 = "#393d41"; + base04 = "#43474b"; + base05 = "#FDE5E6"; + base06 = "#DEE2E6"; + base07 = "#F8F9FA"; + base08 = "#e5a3a1"; + base09 = "#F1C192"; + base0A = "#ECE3B1"; + base0B = "#B4E3AD"; + base0C = "#F8B3CC"; + base0D = "#A3CBE7"; + base0E = "#CEACE8"; + base0F = "#e5a3a1"; + }; + in { base16Scheme = paradise; }; +} diff --git a/modules/home/programs/cli/yazi/binds.nix b/modules/home/programs/cli/yazi/binds.nix index b510186..3a52490 100644 --- a/modules/home/programs/cli/yazi/binds.nix +++ b/modules/home/programs/cli/yazi/binds.nix @@ -109,7 +109,7 @@ # RENAME { on = [ "r" "r" ]; - run = "rename"; + run = "rename --cursor=end"; desc = "Rename"; } { diff --git a/modules/home/programs/cli/yazi/lua.nix b/modules/home/programs/cli/yazi/lua.nix index ca79111..5e70a02 100644 --- a/modules/home/programs/cli/yazi/lua.nix +++ b/modules/home/programs/cli/yazi/lua.nix @@ -58,8 +58,7 @@ left = { section_a = { {type = "string", custom = false, name = "tab_mode"}, }, section_b = { {type = "string", custom = false, name = "hovered_size"}, }, - section_c = { {type = "string", custom = false, name = "hovered_name"}, - {type = "coloreds", custom = false, name = "count"}, } + section_c = { {type = "coloreds", custom = false, name = "count"}, } }, right = { section_a = { {type = "string", custom = false, name = "date", params = {"%d/%m/%Y"}}, }, diff --git a/modules/home/shells/starship.nix b/modules/home/shells/starship.nix index 63d5fa2..fe72e4f 100644 --- a/modules/home/shells/starship.nix +++ b/modules/home/shells/starship.nix @@ -17,6 +17,7 @@ in { "$directory" "$git_branch" "$git_metrics" + "$cmd_duration" "$line_break" "$character" ]; diff --git a/modules/home/themes/stylix/colors.nix b/modules/home/themes/stylix/colors.nix deleted file mode 100644 index af1d142..0000000 --- a/modules/home/themes/stylix/colors.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - stylix.base16Scheme = { - base00 = "#151515"; # BLACK - base01 = "#1F1F1F"; # DARK BLACK - base02 = "#2E2E2E"; # DARK GRAY - base03 = "#424242"; # GRAY - base04 = "#BBB6B6"; # LIGHT-GRAY - base05 = "#E8E3E3"; # WHITE - base06 = "#E8E3E3"; # WHITE? - base07 = "#E8E3E3"; # WHITE?? - base08 = "#B66467"; # RED - base09 = "#D9BC8C"; # YELLOW - base0A = "#D9BC8C"; # ORANGE (TRULY YELLOW) - base0B = "#8C977D"; # GREEN - base0C = "#8AA6A2"; # TEAL - base0D = "#8DA3B9"; # BLUE - base0E = "#A988B0"; # PURPLE - base0F = "#BBB6B6"; # IDK WHITE MAYBE - }; -} - -# base00 - Default Background -# base01 - Lighter Background (Used for status bars) -# base02 - Selection Background -# base03 - Comments, Invisibles, Line Highlighting -# base04 - Dark Foreground (Used for status bars) -# base05 - Default Foreground, Caret, Delimiters, Operators -# base06 - Light Foreground (Not often used) -# base07 - Light Background (Not often used) -# base08 - Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted -# base09 - Integers, Boolean, Constants, XML Attributes, Markup Link Url -# base0A - Classes, Markup Bold, Search Text Background -# base0B - Strings, Inherited Class, Markup Code, Diff Inserted -# base0C - Support, Regular Expressions, Escape Characters, Markup Quotes -# base0D - Functions, Methods, Attribute IDs, Headings -# base0E - Keywords, Storage, Selector, Markup Italic, Diff Changed -# base0F - Deprecated, Opening/Closing Embedded Language Tags, e.g. diff --git a/modules/home/themes/stylix/default.nix b/modules/home/themes/stylix/default.nix index 47bee63..937ab11 100644 --- a/modules/home/themes/stylix/default.nix +++ b/modules/home/themes/stylix/default.nix @@ -16,7 +16,7 @@ in { }; }; - imports = [ inputs.stylix.homeManagerModules.stylix ./colors.nix ]; + imports = [ inputs.stylix.homeManagerModules.stylix ../../../colors.nix ]; config = mkIf cfg.enable { stylix = with pkgs; True // { diff --git a/modules/home/themes/stylix/image.nix b/modules/home/themes/stylix/image.nix new file mode 100644 index 0000000..ab834c9 --- /dev/null +++ b/modules/home/themes/stylix/image.nix @@ -0,0 +1,34 @@ +{ pkgs, config, ... }: { + # THIS MODULE NEED FOR GET AN WALLPAPER + # TROUGH LUTGEN WITH YOUR COLORSCHEME + stylix = with pkgs; { + image = let + img = let cfg = config.module.themes.stylix; + in fetchurl { + url = cfg.image; + sha256 = cfg.hash; + }; + in runCommand "output.png" { } '' + ${lutgen}/bin/lutgen apply ${img} -o $out -- ${ + builtins.concatStringsSep " " (with config.lib.stylix.colors; [ + base00 + base01 + base02 + base03 + base04 + base05 + base06 + base07 + base08 + base09 + base0A + base0B + base0C + base0D + base0E + base0F + ]) + } + ''; + }; +} diff --git a/modules/home/wm/hyprland/default.nix b/modules/home/wm/hyprland/default.nix index 85d83fc..fc5f634 100644 --- a/modules/home/wm/hyprland/default.nix +++ b/modules/home/wm/hyprland/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, inputs, True, ... }: +{ pkgs, inputs, lib, config, True, ... }: with lib; diff --git a/modules/home/wm/hyprland/plugins.nix b/modules/home/wm/hyprland/plugins.nix index 461f4ee..f43deff 100644 --- a/modules/home/wm/hyprland/plugins.nix +++ b/modules/home/wm/hyprland/plugins.nix @@ -1,41 +1,23 @@ -{ pkgs, inputs, ... }: { +{ pkgs, ... }: { wayland.windowManager.hyprland = { - plugins = with inputs; [ hyprfocus.packages.${pkgs.system}.default ]; - settings.plugin = { - # FOCUS - hyprfocus = let - in_bezier = "realsmooth"; - out_bezier = "realsmooth"; - in { - enabled = "yes"; - animate_floating = "yes"; - animate_workspacechange = "yes"; - focus_animation = "focus"; - # ANIMATIONS STYLE - bezier = [ - "bezIn, 0.5, 0.0, 1.0, 0.5 " - "bezOut, 0.0, 0.5, 0.5, 1.0 " - "overshot, 0.05, 0.9, 0.1, 1.05 " - "smoothOut, 0.36, 0, 0.66, -0.56" - "smoothIn, 0.25, 1, 0.5, 1 " - "realsmooth, 0.28, 0.29, .69, 1.08 " - ]; - # FLASH MODE - flash = { - inherit in_bezier out_bezier; - flash_opacity = 0.95; - in_speed = 0.5; - out_speed = 3; + plugins = with pkgs.hyprlandPlugins; [ hypr-dynamic-cursors ]; + settings.plugin = let + dynamic-cursors = { + enabled = true; + mode = "stretch"; + threshold = 2; + stretch = { + limit = 3000; + function = "quadratic"; }; - # SHRINK MODE - shrink = { - inherit in_bezier out_bezier; - shrink_percentage = 0.95; - in_speed = 1; - out_speed = 2; + hyprcursor = { + nearest = false; + enabled = true; + resolution = "-1"; + fallback = "clientside"; }; }; - }; + in { inherit dynamic-cursors; }; }; } diff --git a/modules/nixos/hardware/amd/default.nix b/modules/nixos/hardware/amd/default.nix index 65bbe7b..1e8f17b 100644 --- a/modules/nixos/hardware/amd/default.nix +++ b/modules/nixos/hardware/amd/default.nix @@ -8,11 +8,9 @@ in { config = mkIf cfg.enable { hardware = { - graphics = True // { # GPU - enable32Bit = true; - extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; - }; + graphics = True // { enable32Bit = true; }; amdgpu = { # GPU ENABLE + initrd = True; amdvlk = True // { support32Bit = True; supportExperimental = True; diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix index b9831db..0b7a1a3 100644 --- a/modules/nixos/programs/default.nix +++ b/modules/nixos/programs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, inputs, flakeDir, True, False, ... }: +{ pkgs, lib, config, flakeDir, True, False, ... }: with lib; @@ -12,7 +12,7 @@ in { steam.enable = mkEnableOption ""; torrserver.enable = mkEnableOption ""; pkgs = mkOption { - type = lib.types.listOf lib.types.package; + type = types.listOf types.package; default = null; }; }; @@ -36,17 +36,17 @@ in { }; }) (mkIf cfg.hyprland.enable { - programs = with pkgs; - let h = inputs.hyprland.packages.${system}; - in { - hyprland = True // { + programs = { + hyprland = with pkgs; + let h = inputs.hyprland.packages.${system}; + in True // { package = h.hyprland; portalPackage = h.xdg-desktop-portal-hyprland; }; - }; + }; }) (mkIf cfg.sway.enable { - programs = with pkgs; { sway = True // { package = swayfx; }; }; + programs = { sway = True // { package = pkgs.swayfx; }; }; }) (mkIf cfg.steam.enable { hardware.xone = True; diff --git a/modules/nixos/theme/colors.nix b/modules/nixos/theme/colors.nix deleted file mode 100644 index b072838..0000000 --- a/modules/nixos/theme/colors.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - stylix = { - base16Scheme = { - base00 = "#151515"; - base01 = "#1F1F1F"; - base02 = "#2E2E2E"; - base03 = "#424242"; - base04 = "#BBB6B6"; - base05 = "#E8E3E3"; - base06 = "#E8E3E3"; - base07 = "#E8E3E3"; - base08 = "#B66467"; - base09 = "#D9BC8C"; - base0A = "#D9BC8C"; - base0B = "#8C977D"; - base0C = "#8AA6A2"; - base0D = "#8DA3B9"; - base0E = "#A988B0"; - base0F = "#BBB6B6"; - }; - }; -} diff --git a/modules/nixos/theme/default.nix b/modules/nixos/theme/default.nix index f921e0d..22ea0b5 100644 --- a/modules/nixos/theme/default.nix +++ b/modules/nixos/theme/default.nix @@ -2,11 +2,11 @@ with lib; -let cfg = config.module.theme.stylix; +let cfg = config.module.themes.stylix; in { - options = { module.theme.stylix = { enable = mkEnableOption ""; }; }; + options = { module.themes.stylix = { enable = mkEnableOption ""; }; }; - imports = [ inputs.stylix.nixosModules.stylix ./colors.nix ]; + imports = [ inputs.stylix.nixosModules.stylix ../../colors.nix ]; config = mkIf cfg.enable { stylix = True // { # COLORIZE !!! autoEnable = false; diff --git a/workst/home/default.nix b/workst/home/default.nix index 90883aa..866f33f 100644 --- a/workst/home/default.nix +++ b/workst/home/default.nix @@ -1,4 +1,4 @@ -{ flakeDir, True, False, ... }: { +{ lib, flakeDir, True, False, ... }: { imports = [ ./parts ../../modules/home ]; module = { programs = { # PROGRAMS @@ -46,7 +46,7 @@ icon = "adwaita"; }; qt = True; # QT APPS - stylix = True // { image = "ocean"; }; + stylix = True // { image = "train"; }; }; wm = { # WINDOW MANAGER hyprland = True; diff --git a/workst/host/default.nix b/workst/host/default.nix index 766179a..c8df807 100644 --- a/workst/host/default.nix +++ b/workst/host/default.nix @@ -1,7 +1,7 @@ { lib, stateVersion, True, False, ... }: { imports = [ ./parts ../../modules/nixos ]; module = { - theme.stylix = True; + themes.stylix = True // { theme = "helios"; }; # HARDWARE MODULES hardware = { amd = True;