diff --git a/flake.nix b/flake.nix index f71b4e0..d506101 100644 --- a/flake.nix +++ b/flake.nix @@ -47,18 +47,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - catppuccin = { - url = "github:catppuccin/nix"; - }; - }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, catppuccin, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. rec { nixosConfigurations = ( # NixOS configurations import ./hosts { # Imports ./hosts/default.nix inherit (nixpkgs) lib; - inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote catppuccin; # Also inherit home-manager so it does not need to be defined here. + inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote; # Also inherit home-manager so it does not need to be defined here. nix.allowedUsers = [ "@wheel" ]; security.sudo.execWheelOnly = true; } diff --git a/hosts/default.nix b/hosts/default.nix index 0ae8bbf..c7fe8ef 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -11,7 +11,7 @@ # └─ ./home.nix # -{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, catppuccin, ... }: +{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: let user = "kabbone"; @@ -33,7 +33,7 @@ in { hades = lib.nixosSystem { # Desktop profile inherit system; - specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote catppuccin; }; + specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote; }; modules = [ agenix.nixosModules.default microvm.nixosModules.host @@ -45,13 +45,12 @@ in nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-gpu-amd nixos-hardware.nixosModules.common-pc-ssd - catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user catppuccin; }; + home-manager.extraSpecialArgs = { inherit user; }; home-manager.users.${user} = { imports = [(import ./home.nix)] ++ [(import ./desktop/home.nix)]; }; @@ -61,7 +60,7 @@ in lifebook = lib.nixosSystem { # Laptop profile inherit system; - specialArgs = { inherit inputs user location nixos-hardware agenix lanzaboote catppuccin; }; + specialArgs = { inherit inputs user location nixos-hardware agenix lanzaboote; }; modules = [ agenix.nixosModules.default lanzaboote.nixosModules.lanzaboote @@ -70,12 +69,11 @@ in ../modules/hardware/hydraCache.nix nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-ssd - catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user catppuccin; }; + home-manager.extraSpecialArgs = { inherit user; }; home-manager.users.${user} = { imports = [(import ./home.nix)] ++ [(import ./lifebook/home.nix)]; }; @@ -85,7 +83,7 @@ in nbf5 = lib.nixosSystem { # Laptop profile inherit system; - specialArgs = { inherit inputs user location nixos-hardware agenix catppuccin; }; + specialArgs = { inherit inputs user location nixos-hardware agenix; }; modules = [ agenix.nixosModules.default ./nbf5 @@ -93,12 +91,11 @@ in ../modules/hardware/hydraCache.nix nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-ssd - catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user catppuccin; }; + home-manager.extraSpecialArgs = { inherit user; }; home-manager.users.${user} = { imports = [(import ./home.nix)] ++ [(import ./nbf5/home.nix)]; }; @@ -108,7 +105,7 @@ in steamdeck = nixpkgs-unstable.lib.nixosSystem { # steamdeck profile inherit system; - specialArgs = { inherit inputs user location nixos-hardware agenix jovian-nixos lanzaboote catppuccin; }; + specialArgs = { inherit inputs user location nixos-hardware agenix jovian-nixos lanzaboote; }; modules = [ agenix.nixosModules.default jovian-nixos.nixosModules.default @@ -116,12 +113,11 @@ in ./steamdeck ./configuration_desktop.nix ../modules/hardware/hydraCache.nix - catppuccin.nixosModules.catppuccin home-manager-unstable.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user catppuccin; }; + home-manager.extraSpecialArgs = { inherit user; }; home-manager.users.${user} = { imports = [(import ./home.nix)] ++ [(import ./steamdeck/home.nix)]; }; diff --git a/hosts/home.nix b/hosts/home.nix index e99da2d..822984b 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -15,12 +15,11 @@ # └─ default.nix # -{ config, lib, pkgs, user, catppuccin, ... }: +{ config, lib, pkgs, user, ... }: #{ config, lib, pkgs, user, ... }: { imports = - [ catppuccin.homeManagerModules.catppuccin ] ++ (import ../modules/editors) ++ (import ../modules/programs) ++ (import ../modules/programs/configs) ++ @@ -94,8 +93,6 @@ #ms-python.python ms-vscode.cpptools dracula-theme.theme-dracula - #catppuccin.catppuccin-vsc - #catppuccin.catppuccin-vsc-icons ]; }) @@ -114,47 +111,11 @@ stateVersion = "23.05"; }; - catppuccin = { - enable = false; - accent = "lavender"; - flavor = "mocha"; - pointerCursor.enable = true; - }; - - gtk.catppuccin = { - enable = true; - accent = "lavender"; - flavor = "mocha"; - icon = { - enable = true; - accent = "lavender"; - flavor = "mocha"; - }; - }; - - qt.style.catppuccin = { - enable = true; - accent = "lavender"; - flavor = "mocha"; - apply = true; - }; - programs = { home-manager.enable = true; alacritty = { settings.font.size = 11; - catppuccin = { - enable = true; - flavor = "mocha"; - }; }; - btop = { - catppuccin = { - enable = true; - flavor = "mocha"; - }; - }; - swaylock.catppuccin.enable = false; }; diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix index 25a4159..608f0f3 100644 --- a/modules/services/dunst.nix +++ b/modules/services/dunst.nix @@ -27,7 +27,6 @@ in services.dunst = { enable = true; - catppuccin.enable = true; settings = { global = { monitor = 0; diff --git a/modules/wm/sway/home.nix b/modules/wm/sway/home.nix index df93fde..5558466 100644 --- a/modules/wm/sway/home.nix +++ b/modules/wm/sway/home.nix @@ -18,7 +18,6 @@ wayland.windowManager.sway = { enable = true; - catppuccin.enable = true; checkConfig = false; config = rec { menu = "${pkgs.rofi}/bin/rofi -show combi -show-icons";