diff --git a/flake.lock b/flake.lock index a9513bc..30a2884 100644 --- a/flake.lock +++ b/flake.lock @@ -21,73 +21,6 @@ "type": "github" } }, - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -110,22 +43,6 @@ "type": "github" } }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -163,60 +80,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "48.2", - "repo": "gnome-shell", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -307,16 +170,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", - "owner": "NixOS", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2007595", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -337,31 +200,6 @@ "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": [ - "stylix", - "flake-parts" - ], - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", - "owner": "nix-community", - "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "nvf": { "inputs": { "flake-compat": "flake-compat", @@ -390,42 +228,7 @@ "home-manager": "home-manager_2", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", - "nvf": "nvf", - "stylix": "stylix" - } - }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-helix": "base16-helix", - "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_2", - "gnome-shell": "gnome-shell", - "nixpkgs": [ - "nixpkgs" - ], - "nur": "nur", - "systems": "systems_3", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-schemes": "tinted-schemes", - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" - }, - "locked": { - "lastModified": 1756811338, - "narHash": "sha256-fwgklhY9kJSTDMGuwHJUVBCuJDVvxxljjGOLhxC84ko=", - "owner": "danth", - "repo": "stylix", - "rev": "989312ab49e6eb1d076f9d194d43f9f9c513087e", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" + "nvf": "nvf" } }, "systems": { @@ -457,102 +260,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "type": "github" - } - }, - "tinted-schemes": { - "flake": false, - "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", - "owner": "tinted-theming", - "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "schemes", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a4cd993..af3506c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,7 @@ description = "Smayzy's nixos config (probably a violation of the geneva convention but who cares)"; inputs = { - # https://github.com/nix-community/stylix/issues/1865 - # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/2007595"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -14,11 +12,6 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; - stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nvf.url = "github:notashelf/nvf"; }; @@ -35,7 +28,6 @@ sharedModules = [ inputs.nix-flatpak.nixosModules.nix-flatpak - inputs.stylix.nixosModules.stylix inputs.nvf.nixosModules.default inputs.agenix.nixosModules.default ]; diff --git a/hosts/common/home.nix b/hosts/common/home.nix index 698f299..4dee751 100644 --- a/hosts/common/home.nix +++ b/hosts/common/home.nix @@ -44,8 +44,6 @@ }; }; - stylix.autoEnable = false; - programs.zoxide.enable = true; programs.home-manager.enable = true; diff --git a/modules/nix/base-cli/nvf.nix b/modules/nix/base-cli/nvf.nix index acbdac0..51efccb 100644 --- a/modules/nix/base-cli/nvf.nix +++ b/modules/nix/base-cli/nvf.nix @@ -35,7 +35,7 @@ in }; theme = { enable = true; - name = lib.mkDefault "dracula"; + name = lib.mkForce "dracula"; }; treesitter.enable = true; statusline.lualine.enable = true; diff --git a/modules/nix/browser/default.nix b/modules/nix/browser/default.nix index cade6c8..a2e34d7 100644 --- a/modules/nix/browser/default.nix +++ b/modules/nix/browser/default.nix @@ -2,7 +2,6 @@ { imports = [ ./firefox.nix - ./floorp.nix ./librewolf.nix ./chromium.nix ]; diff --git a/modules/nix/browser/floorp.nix b/modules/nix/browser/floorp.nix deleted file mode 100644 index 36fceb4..0000000 --- a/modules/nix/browser/floorp.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -let - inherit (lib) mkIf mkOption types; -in -{ - options.smayzy.floorp.enable = mkOption { - type = types.bool; - default = false; - description = "floorp"; - }; - - config = mkIf config.smayzy.floorp.enable { - environment.systemPackages = with pkgs; [ floorp ]; - }; -} diff --git a/modules/nix/default.nix b/modules/nix/default.nix index b4c3c19..e8e1e6b 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -21,7 +21,6 @@ ./networking ./notif ./office - ./rice ./shell ./terminal ./utilities diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index 29416bd..d1ec135 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -16,9 +16,7 @@ in steam.enable = true; prism.enable = true; firefox.enable = true; - floorp.enable = true; librewolf.enable = true; - stylix.enable = true; audio.enable = true; office.enable = true; element.enable = true; diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index a8355de..b60ce54 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -17,8 +17,6 @@ in prism.enable = true; firefox.enable = true; librewolf.enable = true; - floorp.enable = true; - stylix.enable = true; audio.enable = true; office.enable = true; webcord.enable = true; diff --git a/modules/nix/groups/server.nix b/modules/nix/groups/server.nix index d70db24..8913ac7 100644 --- a/modules/nix/groups/server.nix +++ b/modules/nix/groups/server.nix @@ -14,7 +14,6 @@ in grub.disable = true; base = true; power = "desktop"; - stylix.enable = true; openssh.enable = true; }; }; diff --git a/modules/nix/office/kdenlive.nix b/modules/nix/office/kdenlive.nix index b7d00d7..d3da9ee 100644 --- a/modules/nix/office/kdenlive.nix +++ b/modules/nix/office/kdenlive.nix @@ -16,7 +16,7 @@ in config = mkIf config.smayzy.kdenlive.enable { environment.systemPackages = with pkgs; [ - libsForQt5.kdenlive + kdePackages.kdenlive ]; }; } diff --git a/modules/nix/rice/default.nix b/modules/nix/rice/default.nix deleted file mode 100644 index 6ceb207..0000000 --- a/modules/nix/rice/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - imports = [ - ./stylix.nix - ]; -} diff --git a/modules/nix/rice/stylix.nix b/modules/nix/rice/stylix.nix deleted file mode 100644 index 1f57a55..0000000 --- a/modules/nix/rice/stylix.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -let - inherit (lib) mkIf mkOption types; -in -{ - options.smayzy.stylix.enable = mkOption { - type = types.bool; - default = false; - description = "stylix"; - }; - - config = mkIf config.smayzy.stylix.enable { - stylix.enable = true; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; - environment.systemPackages = with pkgs; [ base16-schemes ]; - }; -}