diff options
| -rw-r--r-- | flake.lock | 24 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | parts/systems/profiles.nix | 1 | ||||
| -rw-r--r-- | parts/users/seth/default.nix | 1 | ||||
| -rw-r--r-- | parts/users/seth/programs/default.nix | 22 | ||||
| -rw-r--r-- | parts/users/seth/shell/default.nix | 31 | ||||
| -rw-r--r-- | parts/users/seth/shell/fish.nix | 15 |
7 files changed, 50 insertions, 52 deletions
@@ -55,6 +55,29 @@ "type": "github" } }, + "catppuccin": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698002908, + "narHash": "sha256-Bge0FHsAQx1SQZyzpFl0EdgLC/RaYEToU2YVUMDlFvw=", + "owner": "Stonks3141", + "repo": "ctp-nix", + "rev": "5713b478b10c5ef703fd921d96ca6a3057c457b5", + "type": "github" + }, + "original": { + "owner": "Stonks3141", + "repo": "ctp-nix", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -544,6 +567,7 @@ "inputs": { "agenix": "agenix", "arkenfox": "arkenfox", + "catppuccin": "catppuccin", "darwin": "darwin", "flake-compat": "flake-compat", "flake-utils": "flake-utils", @@ -38,6 +38,14 @@ }; }; + catppuccin = { + url = "github:Stonks3141/ctp-nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-compat.follows = "flake-compat"; + }; + }; + getchoo = { url = "github:getchoo/nix-exprs"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/parts/systems/profiles.nix b/parts/systems/profiles.nix index 277d3c1..eada9ac 100644 --- a/parts/systems/profiles.nix +++ b/parts/systems/profiles.nix @@ -12,6 +12,7 @@ in { modules = with inputs; [ agenix.nixosModules.default + catppuccin.nixosModules.catppuccin hm.nixosModules.home-manager nur.nixosModules.nur self.nixosModules.default diff --git a/parts/users/seth/default.nix b/parts/users/seth/default.nix index 997a6c3..123e20f 100644 --- a/parts/users/seth/default.nix +++ b/parts/users/seth/default.nix @@ -4,6 +4,7 @@ ./programs ./shell arkenfox.hmModules.arkenfox + catppuccin.homeManagerModules.catppuccin nix-index-database.hmModules.nix-index ]; diff --git a/parts/users/seth/programs/default.nix b/parts/users/seth/programs/default.nix index 93ba8f5..03dfa1b 100644 --- a/parts/users/seth/programs/default.nix +++ b/parts/users/seth/programs/default.nix @@ -29,8 +29,13 @@ in { restic ]; + catppuccin.flavour = mkDefault "mocha"; + programs = { - btop.enable = mkDefault true; + btop = { + enable = mkDefault true; + catppuccin.enable = mkDefault true; + }; direnv = { enable = mkDefault true; @@ -42,19 +47,6 @@ in { nix-index-database.comma.enable = mkDefault true; }; - xdg = - { - enable = mkDefault true; - } - // (mkIf config.programs.btop.enable { - configFile."btop/themes/catppuccin_mocha.theme".source = - pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "btop"; - rev = "ecb8562bb6181bb9f2285c360bbafeb383249ec3"; - sha256 = "sha256-ovVtupO5jWUw6cwA3xEzRe1juUB8ykfarMRVTglx3mk="; - } - + "/catppuccin_mocha.theme"; - }); + xdg.enable = mkDefault true; }; } diff --git a/parts/users/seth/shell/default.nix b/parts/users/seth/shell/default.nix index 5f7e24c..0b09bf6 100644 --- a/parts/users/seth/shell/default.nix +++ b/parts/users/seth/shell/default.nix @@ -2,10 +2,7 @@ config, pkgs, ... -}: let - inherit (builtins) fromTOML readFile; - inherit (pkgs) fetchFromGitHub; -in { +}: { imports = [ ./bash.nix ./fish.nix @@ -14,18 +11,7 @@ in { programs = { bat = { enable = true; - config = { - theme = "catppuccin"; - }; - themes = { - catppuccin = readFile (fetchFromGitHub { - owner = "catppuccin"; - repo = "bat"; - rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; - sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; - } - + "/Catppuccin-mocha.tmTheme"); - }; + catppuccin.enable = true; }; eza = { @@ -42,16 +28,15 @@ in { { format = "$all"; palette = "catppuccin_mocha"; - command_timeout = 50; + command_timeout = 250; } - // fromTOML (readFile ./starship.toml) - // fromTOML (readFile - (fetchFromGitHub - { + // fromTOML (builtins.readFile ./starship.toml) + // fromTOML (builtins.readFile + (pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "starship"; - rev = "3e3e54410c3189053f4da7a7043261361a1ed1bc"; - sha256 = "sha256-soEBVlq3ULeiZFAdQYMRFuswIIhI9bclIU8WXjxd7oY="; + rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; + hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; } + "/palettes/mocha.toml")); }; diff --git a/parts/users/seth/shell/fish.nix b/parts/users/seth/shell/fish.nix index 7488b40..fc241d0 100644 --- a/parts/users/seth/shell/fish.nix +++ b/parts/users/seth/shell/fish.nix @@ -3,21 +3,9 @@ pkgs, ... }: { - xdg.configFile."fish/themes" = { - recursive = true; - source = - pkgs.fetchFromGitHub - { - owner = "catppuccin"; - repo = "fish"; - rev = "b90966686068b5ebc9f80e5b90fdf8c02ee7a0ba"; - sha256 = "sha256-wQlYQyqklU/79K2OXRZXg5LvuIugK7vhHgpahpLFaOw="; - } - + "/themes"; - }; - programs.fish = { enable = true; + catppuccin.enable = true; interactiveShellInit = '' set -l nixfile ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.fish @@ -25,7 +13,6 @@ source $nixfile end - fish_config theme choose "Catppuccin Mocha" nix-your-shell fish | source abbr -a !! --position anywhere --function last_history_item |