diff --git a/flake.lock b/flake.lock index 502fc74..a8f5b4f 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1705535278, - "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", + "lastModified": 1705823474, + "narHash": "sha256-2C4uRe9/U3QwSPC4dYKM1/njgCQk0Mltezy4VcjAqa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", + "rev": "928f2528f9ee952ba0a47bbb1ece8d93ed66e784", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1705476964, - "narHash": "sha256-W5OK1fnj4qdn1HWOlxV2S3YiUvfaVjQM5ldWVpGV1fs=", + "lastModified": 1705659542, + "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "85c3b600f660abd86e94cbcd1c46733943197a07", + "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "type": "github" }, "original": { @@ -147,11 +147,11 @@ ] }, "locked": { - "lastModified": 1705487282, - "narHash": "sha256-eX/0O2ybmFKD/MzYO8gDlr4tAurekDbJQa7olAFFbRo=", + "lastModified": 1705667791, + "narHash": "sha256-J0JYfA6eFdHluLnROVDkrqbYacWcJXYKXeJAFayDiAE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a00331e522b9a732f876cf707174ce37ae702762", + "rev": "330b7a78fcba967f2273ae71fb3c4bfb03b5dd21", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1704403850, - "narHash": "sha256-VYa/EvYY0xjuK/oei2hOgE2fJIv+yZgFw0WgoBuzwBc=", + "lastModified": 1705758212, + "narHash": "sha256-96kbUcT7hvFPhs5vHqSLAQOCwsRojlmWa0+VpR6lrrE=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "f43640ecb03e9e008076932a87987cf5c16d8cf9", + "rev": "09d2dd72de3b9a7ef71f3013a15d34c649b83277", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1705282324, - "narHash": "sha256-LnURMA7yCM5t7et9O2+2YfGQh0FKAfE5GyahNDDzJVM=", + "lastModified": 1705806513, + "narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "49aaeecf41ae0a0944e2c627cb515bcde428a1d1", + "rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7", "type": "github" }, "original": { @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1705282324, - "narHash": "sha256-LnURMA7yCM5t7et9O2+2YfGQh0FKAfE5GyahNDDzJVM=", + "lastModified": 1705806513, + "narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "49aaeecf41ae0a0944e2c627cb515bcde428a1d1", + "rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs-raw": { "locked": { - "lastModified": 1705331948, - "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", + "lastModified": 1705641746, + "narHash": "sha256-D6c2aH8HQbWc7ZWSV0BUpFpd94ImFyCP8jFIsKQ4Slg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", + "rev": "d2003f2223cbb8cd95134e4a0541beea215c1073", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs-unstable-raw": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1705677747, + "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", "type": "github" }, "original": { @@ -379,11 +379,11 @@ ] }, "locked": { - "lastModified": 1705540888, - "narHash": "sha256-lDuq8dgVV6+FOO9rvl62+yOXPycf9XqHhqgDgTLd/mE=", + "lastModified": 1705800393, + "narHash": "sha256-/aO8yu7r4fw+YFq/PWa0VErBDVVK9iDt1cqmLd/c7Lo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "e792da69b3af0431a2c33907866648198d59515f", + "rev": "1823c666b159fec04d9c2bafc37b8f190e885e01", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5a0c8f1..064a49d 100644 --- a/flake.nix +++ b/flake.nix @@ -73,7 +73,6 @@ name = "patched-nixpkgs-unstable"; src = nixpkgs-unstable-raw; patches = [ - ./nixpkgs-patches/pr280779.patch ./nixpkgs-patches/pr281207.patch ]; }; diff --git a/nixpkgs-patches/pr280779.patch b/nixpkgs-patches/pr280779.patch deleted file mode 100644 index f404304..0000000 --- a/nixpkgs-patches/pr280779.patch +++ /dev/null @@ -1,46 +0,0 @@ -From cf1dfaa32a0201cc14801ebb93b5ef865d42522a Mon Sep 17 00:00:00 2001 -From: Toast <39011842+toast003@users.noreply.github.com> -Date: Sat, 13 Jan 2024 18:41:51 +0100 -Subject: [PATCH] catppuccin: add starship theme - ---- - pkgs/data/themes/catppuccin/default.nix | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/pkgs/data/themes/catppuccin/default.nix b/pkgs/data/themes/catppuccin/default.nix -index c9a51ba241d482..25794c9e67d7cd 100644 ---- a/pkgs/data/themes/catppuccin/default.nix -+++ b/pkgs/data/themes/catppuccin/default.nix -@@ -1,5 +1,5 @@ - let -- validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "qt5ct" "refind" "rofi" "waybar" ]; -+ validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "qt5ct" "refind" "rofi" "starship" "waybar" ]; - in - { fetchFromGitHub - , lib -@@ -112,6 +112,14 @@ let - hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; - }; - -+ starship = fetchFromGitHub { -+ name = "starship"; -+ owner = "catppuccin"; -+ repo = "starship"; -+ rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; -+ hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; -+ }; -+ - waybar = fetchFromGitHub { - name = "waybar"; - owner = "catppuccin"; -@@ -195,6 +203,10 @@ stdenvNoCC.mkDerivation { - cp ${sources.refind}/${variant}.conf $out/refind/ - cp -r ${sources.refind}/assets/${variant} $out/refind/assets/ - -+ '' + lib.optionalString (lib.elem "starship" themeList) '' -+ mkdir -p $out/starship -+ cp ${sources.starship}/palettes/${variant}.toml $out/starship/ -+ - '' + lib.optionalString (lib.elem "waybar" themeList) '' - mkdir -p $out/waybar - cp ${sources.waybar}/${variant}.css $out/waybar/ diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index b47b5a4..8586528 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -97,6 +97,8 @@ in cursorTheme = "Breeze_Snow"; iconTheme = "breeze-dark"; lookAndFeel = "Catppuccin-Mocha-Mauve"; + theme = "default"; + colorScheme = "CatppuccinMochaMauve"; }; kwin = { titlebarButtons = { @@ -136,6 +138,7 @@ in }; "TabBox"."LayoutName" = "thumbnail_grid"; }; + "kdeglobals"."General"."AccentColor" = null; "auroraerc"."CatppuccinMocha-Classic"."ButtonSize" = 0; "plasmanotifyrc"."Notifications"."NormalAlwaysOnTop" = true; };