diff --git a/flake.lock b/flake.lock index b5cd6cb..5989e68 100644 --- a/flake.lock +++ b/flake.lock @@ -116,9 +116,7 @@ "catppuccin-v1_2": "catppuccin-v1_2", "home-manager": "home-manager", "home-manager-stable": "home-manager-stable", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nuscht-search": "nuscht-search" }, @@ -666,16 +664,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", - "owner": "nixos", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.11", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -712,6 +710,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -791,7 +805,7 @@ "catppuccin": "catppuccin", "home-manager": "home-manager_2", "hyprpanel": "hyprpanel", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "spicetify-nix": "spicetify-nix", diff --git a/flake.nix b/flake.nix index dacb12e..d2bb9bf 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ catppuccin = { url = "github:catppuccin/nix"; - inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { url = "github:nix-community/home-manager/release-24.11"; diff --git a/home-manager/default.nix b/home-manager/default.nix index 2182bb2..c6d5bfa 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -16,6 +16,7 @@ in ./default-applications.nix ./fish.nix ./git.nix + ./gtk.nix ./mpv.nix ./nixvim ./rofi @@ -25,8 +26,6 @@ in ./yazi ]; - # Home Manager needs a bit of information about you and the - # paths it should manage. home = { username = username; homeDirectory = dir.home; diff --git a/home-manager/gtk.nix b/home-manager/gtk.nix new file mode 100644 index 0000000..4fe8509 --- /dev/null +++ b/home-manager/gtk.nix @@ -0,0 +1,13 @@ +let + theme = import ../theme.nix; +in +{ + gtk.enable = true; + catppuccin.gtk = { + enable = true; + flavor = theme.flavor; + icon.enable = true; + }; + + stylix.targets.gtk.enable = false; +} diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix index 3413ae1..618a8fc 100644 --- a/modules/gnome/default.nix +++ b/modules/gnome/default.nix @@ -6,7 +6,7 @@ ]; environment.systemPackages = with pkgs; [ - adw-gtk3 + # adw-gtk3 glib adwaita-icon-theme gnomeExtensions.appindicator