diff --git a/flake.lock b/flake.lock index 245124b..6fd741d 100644 --- a/flake.lock +++ b/flake.lock @@ -4,14 +4,14 @@ "locked": { "lastModified": 1713323853, "narHash": "sha256-EfUm65RRsoch0tpfHZtEyqo+iWIYhuSX39U/fi0/4WU=", - "owner": "catppuccin", - "repo": "nix", + "owner": "zackartz", + "repo": "nix-catppuccin", "rev": "372decb578f3187d7aad837885ed98e73e8abd60", "type": "github" }, "original": { - "owner": "catppuccin", - "repo": "nix", + "owner": "zackartz", + "repo": "nix-catppuccin", "type": "github" } }, @@ -479,16 +479,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1713368829, - "narHash": "sha256-EreStuOxwalGOy5seV5PGc3zDT1Ppqj/4Q3ByAOGMnY=", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "203fac824e2fdfed2e3a832b8123d9a64ee58b43", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 4ce216b..592a6ab 100644 --- a/flake.nix +++ b/flake.nix @@ -11,14 +11,14 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - catppuccin.url = "github:catppuccin/nix"; + catppuccin.url = "github:zackartz/nix-catppuccin"; hyprland = { url = "github:hyprwm/Hyprland/"; @@ -75,7 +75,6 @@ specialArgs = {inherit inputs;}; modules = [ ./hosts/earth/configuration.nix - # inputs.catppuccin.homeManagerModules.catppuccin inputs.home-manager.nixosModules.default ]; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 94dd749..fc97c9a 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -22,6 +22,8 @@ ../rice/rio.nix ../rice/wofi.nix ../shell + + inputs.catppuccin.homeManagerModules.catppuccin ]; nixpkgs = { @@ -34,12 +36,16 @@ ]; }; + gtk.catppuccin.cursor.enable = false; + nix.gc = { automatic = true; frequency = "weekly"; options = "--delete-older-than 30d"; }; + catppuccin.flavour = "macchiato"; + xdg.mimeApps.defaultApplications = { "text/html" = "firefox.desktop"; "x-scheme-handler/http" = "firefox.desktop"; diff --git a/modules/rice/gtk.nix b/modules/rice/gtk.nix index d299197..076d3e9 100644 --- a/modules/rice/gtk.nix +++ b/modules/rice/gtk.nix @@ -52,7 +52,7 @@ }; sessionVariables = { - XCURSOR_SIZE = "16"; + XCURSOR_SIZE = "32"; GTK_USE_PORTAL = "1"; }; }; diff --git a/modules/rice/kitty.nix b/modules/rice/kitty.nix index c643c42..150e2e1 100644 --- a/modules/rice/kitty.nix +++ b/modules/rice/kitty.nix @@ -6,7 +6,9 @@ size = 14; }; - # catppuccin.enable = true; + catppuccin.enable = true; + + # theme = "catppuccin"; settings = { window_padding_width = 8; @@ -41,6 +43,4 @@ # color15 = "#acb0d0"; }; }; - # theme = "rosepine"; - # }; }