diff --git a/flake.lock b/flake.lock index 361ce3ac..a6da1c90 100644 --- a/flake.lock +++ b/flake.lock @@ -24,134 +24,6 @@ "type": "github" } }, - "catppuccin-bat": { - "flake": false, - "locked": { - "lastModified": 1668065083, - "narHash": "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=", - "owner": "catppuccin", - "repo": "bat", - "rev": "ba4d16880d63e656acced2b7d4e034e4a93f74b1", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "bat", - "type": "github" - } - }, - "catppuccin-fcitx5": { - "flake": false, - "locked": { - "lastModified": 1664946380, - "narHash": "sha256-uFaCbyrEjv4oiKUzLVFzw+UY54/h7wh2cntqeyYwGps=", - "owner": "catppuccin", - "repo": "fcitx5", - "rev": "ce244cfdf43a648d984719fdfd1d60aab09f5c97", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "fcitx5", - "type": "github" - } - }, - "catppuccin-fish": { - "flake": false, - "locked": { - "lastModified": 1682585691, - "narHash": "sha256-l9V7YMfJWhKDL65dNbxaddhaM6GJ0CFZ6z+4R6MJwBA=", - "owner": "catppuccin", - "repo": "fish", - "rev": "91e6d6721362be05a5c62e235ed8517d90c567c9", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "fish", - "type": "github" - } - }, - "catppuccin-gitui": { - "flake": false, - "locked": { - "lastModified": 1687370019, - "narHash": "sha256-m6Tjch6A2ZPZ3/muvb/9sEAQUZfjnWqcwyhNVeqPS2c=", - "owner": "catppuccin", - "repo": "gitui", - "rev": "3c97c7af7247b1e0f4366a4d8fab650bcce54100", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "gitui", - "type": "github" - } - }, - "catppuccin-grub": { - "flake": false, - "locked": { - "lastModified": 1672329233, - "narHash": "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=", - "owner": "catppuccin", - "repo": "grub", - "rev": "803c5df0e83aba61668777bb96d90ab8f6847106", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "grub", - "type": "github" - } - }, - "catppuccin-hyprland": { - "flake": false, - "locked": { - "lastModified": 1683122293, - "narHash": "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8=", - "owner": "catppuccin", - "repo": "hyprland", - "rev": "99a88fd21fac270bd999d4a26cf0f4a4222c58be", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "hyprland", - "type": "github" - } - }, - "catppuccin-starship": { - "flake": false, - "locked": { - "lastModified": 1689246850, - "narHash": "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=", - "owner": "catppuccin", - "repo": "starship", - "rev": "5629d2356f62a9f2f8efad3ff37476c19969bd4f", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "starship", - "type": "github" - } - }, - "catppuccin-waybar": { - "flake": false, - "locked": { - "lastModified": 1678438606, - "narHash": "sha256-WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=", - "owner": "catppuccin", - "repo": "waybar", - "rev": "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff", - "type": "github" - }, - "original": { - "owner": "catppuccin", - "repo": "waybar", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -724,14 +596,6 @@ "root": { "inputs": { "agenix": "agenix", - "catppuccin-bat": "catppuccin-bat", - "catppuccin-fcitx5": "catppuccin-fcitx5", - "catppuccin-fish": "catppuccin-fish", - "catppuccin-gitui": "catppuccin-gitui", - "catppuccin-grub": "catppuccin-grub", - "catppuccin-hyprland": "catppuccin-hyprland", - "catppuccin-starship": "catppuccin-starship", - "catppuccin-waybar": "catppuccin-waybar", "darwin": "darwin", "devenv": "devenv", "disko": "disko", @@ -746,7 +610,41 @@ "neovim": "neovim", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks_2", + "rose-pine-fcitx5": "rose-pine-fcitx5", + "rose-pine-fish": "rose-pine-fish" + } + }, + "rose-pine-fcitx5": { + "flake": false, + "locked": { + "lastModified": 1678215596, + "narHash": "sha256-SpQ5ylHSDF5KCwKttAlXgrte3GA1cCCy/0OKNT1a3D8=", + "owner": "rose-pine", + "repo": "fcitx5", + "rev": "148de09929c2e2f948376bb23bc25d72006403bc", + "type": "github" + }, + "original": { + "owner": "rose-pine", + "repo": "fcitx5", + "type": "github" + } + }, + "rose-pine-fish": { + "flake": false, + "locked": { + "lastModified": 1663356772, + "narHash": "sha256-bSGGksL/jBNqVV0cHZ8eJ03/8j3HfD9HXpDa8G/Cmi8=", + "owner": "rose-pine", + "repo": "fish", + "rev": "38aab5baabefea1bc7e560ba3fbdb53cb91a6186", + "type": "github" + }, + "original": { + "owner": "rose-pine", + "repo": "fish", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index ccb7290c..fa04ce7d 100644 --- a/flake.nix +++ b/flake.nix @@ -67,43 +67,13 @@ flake = false; }; - catppuccin-fish = { - url = "github:catppuccin/fish"; + rose-pine-fish = { + url = "github:rose-pine/fish"; flake = false; }; - catppuccin-gitui = { - url = "github:catppuccin/gitui"; - flake = false; - }; - - catppuccin-bat = { - url = "github:catppuccin/bat"; - flake = false; - }; - - catppuccin-hyprland = { - url = "github:catppuccin/hyprland"; - flake = false; - }; - - catppuccin-waybar = { - url = "github:catppuccin/waybar"; - flake = false; - }; - - catppuccin-starship = { - url = "github:catppuccin/starship"; - flake = false; - }; - - catppuccin-fcitx5 = { - url = "github:catppuccin/fcitx5"; - flake = false; - }; - - catppuccin-grub = { - url = "github:catppuccin/grub"; + rose-pine-fcitx5 = { + url = "github:rose-pine/fcitx5"; flake = false; }; }; diff --git a/home/features/bat.nix b/home/features/bat.nix index 5377447c..9c089b49 100644 --- a/home/features/bat.nix +++ b/home/features/bat.nix @@ -1,23 +1,11 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { programs.bat = { enable = true; config = { - theme = "Catppuccin-mocha"; style = "changes,header"; }; - themes = { - Catppuccin-mocha = { - src = inputs.catppuccin-bat; - file = "Catppuccin-mocha.tmTheme"; - }; - }; - extraPackages = with pkgs.bat-extras; [ batman ]; diff --git a/home/features/fcitx5.nix b/home/features/fcitx5.nix index c88d81e8..3262242d 100644 --- a/home/features/fcitx5.nix +++ b/home/features/fcitx5.nix @@ -1,8 +1,8 @@ {inputs, ...}: { - xdg.dataFile."fcitx5/themes/catppuccin-mocha" = { - source = inputs.catppuccin-fcitx5 + "/src/catppuccin-mocha"; + xdg.dataFile."fcitx5/themes/rose-pine-moon" = { + source = inputs.rose-pine-fcitx5 + "/rose-pine-moon"; }; xdg.configFile."fcitx5/conf/classicui.conf" = { - text = "Theme=catppuccin-mocha"; + text = "Theme=rose-pine-moon"; }; } diff --git a/home/features/fish.nix b/home/features/fish.nix index 2703d852..8e3cadc6 100644 --- a/home/features/fish.nix +++ b/home/features/fish.nix @@ -4,9 +4,9 @@ ... }: { xdg.configFile = { - "fish/themes/Catppuccin Mocha.theme" = { - text = builtins.readFile (inputs.catppuccin-fish + "/themes/Catppuccin Mocha.theme"); - onChange = "${pkgs.fish}/bin/fish -c 'yes | fish_config theme save \"Catppuccin Mocha\"'"; + "fish/themes/Rosé Pine Moon.theme" = { + text = builtins.readFile (inputs.rose-pine-fish + "/themes/Rosé Pine Moon.theme"); + onChange = "${pkgs.fish}/bin/fish -c 'yes | fish_config theme save \"Rosé Pine Moon\"'"; }; }; diff --git a/home/features/gitui.nix b/home/features/gitui.nix deleted file mode 100644 index 43962169..00000000 --- a/home/features/gitui.nix +++ /dev/null @@ -1,7 +0,0 @@ -{inputs, ...}: { - programs.gitui = { - enable = true; - - theme = builtins.readFile (inputs.catppuccin-gitui + "/theme/mocha.ron"); - }; -} diff --git a/home/features/hyprland.nix b/home/features/hyprland.nix index c4778109..4b5329fd 100644 --- a/home/features/hyprland.nix +++ b/home/features/hyprland.nix @@ -17,8 +17,6 @@ exec-once=${pkgs.waybar}/bin/waybar - source=${inputs.catppuccin-hyprland}/themes/mocha.conf - animations { enabled = true } diff --git a/home/features/starship.nix b/home/features/starship.nix index b654a151..d0c67d5d 100644 --- a/home/features/starship.nix +++ b/home/features/starship.nix @@ -1,14 +1,8 @@ -{inputs, ...}: { +{ programs.starship = { enable = true; enableFishIntegration = true; enableBashIntegration = true; enableZshIntegration = true; - - settings = - { - palette = "catppuccin_mocha"; - } - // builtins.fromTOML (builtins.readFile (inputs.catppuccin-starship + "/palettes/mocha.toml")); }; } diff --git a/home/features/waybar.nix b/home/features/waybar.nix index 894497fc..12a63562 100644 --- a/home/features/waybar.nix +++ b/home/features/waybar.nix @@ -1,14 +1,8 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { programs.waybar = { enable = true; # systemd.enable = true; - style = builtins.readFile (inputs.catppuccin-waybar + "/themes/mocha.css"); - settings = [ { module-left = [ diff --git a/home/features/wezterm/wezterm.lua b/home/features/wezterm/wezterm.lua index 191cb386..5021b19a 100644 --- a/home/features/wezterm/wezterm.lua +++ b/home/features/wezterm/wezterm.lua @@ -33,7 +33,7 @@ return { initial_rows = 24, -- window_background_opacity = 0.8, - color_scheme = "Catppuccin Mocha", + color_scheme = "Rosé Pine Moon (base16)", inactive_pane_hsb = { saturation = 0.8, diff --git a/home/users/sakuraba/QN63HFT2NY.nix b/home/users/sakuraba/QN63HFT2NY.nix index 3231d004..203b55a3 100644 --- a/home/users/sakuraba/QN63HFT2NY.nix +++ b/home/users/sakuraba/QN63HFT2NY.nix @@ -8,7 +8,6 @@ ../../features/fish.nix ../../features/fzf.nix ../../features/git.nix - ../../features/gitui.nix ../../features/starship.nix ../../features/xplr.nix ../../features/atuin.nix diff --git a/home/users/sakuraba/define7.nix b/home/users/sakuraba/define7.nix index 3a716d8d..4993de8c 100644 --- a/home/users/sakuraba/define7.nix +++ b/home/users/sakuraba/define7.nix @@ -9,7 +9,6 @@ ../../features/fish.nix ../../features/fzf.nix ../../features/git.nix - ../../features/gitui.nix ../../features/starship.nix ../../features/fcitx5.nix ../../features/xplr.nix diff --git a/home/users/sakuraba/vm.nix b/home/users/sakuraba/vm.nix index eb4cfe1c..872fb427 100644 --- a/home/users/sakuraba/vm.nix +++ b/home/users/sakuraba/vm.nix @@ -9,7 +9,6 @@ ../../features/fish.nix ../../features/fzf.nix ../../features/git.nix - ../../features/gitui.nix ../../features/starship.nix ]; diff --git a/home/users/sakuraba/xps.nix b/home/users/sakuraba/xps.nix index efb5e0ca..c337f43e 100644 --- a/home/users/sakuraba/xps.nix +++ b/home/users/sakuraba/xps.nix @@ -11,7 +11,6 @@ ../../features/fish.nix ../../features/fzf.nix ../../features/git.nix - ../../features/gitui.nix ../../features/starship.nix ../../features/hyprland.nix ../../features/waybar.nix diff --git a/nixos/common/optional/grub.nix b/nixos/common/optional/grub.nix index 537e62f4..358dfc5e 100644 --- a/nixos/common/optional/grub.nix +++ b/nixos/common/optional/grub.nix @@ -1,4 +1,4 @@ -{inputs, ...}: { +{ boot.binfmt.emulatedSystems = ["aarch64-linux"]; boot.loader = { @@ -21,7 +21,6 @@ chainloader /EFI/Microsoft/Boot/bootmgfw.efi } ''; - theme = inputs.catppuccin-grub + "/src/catppuccin-mocha-grub-theme"; }; }; }