diff --git a/flake.lock b/flake.lock index 8a62490e..af246944 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1715128602, - "narHash": "sha256-KmIgXJ5fZmYsb+QeGZcauZIX7eN7PyTJI+t2LzuSLnU=", + "lastModified": 1715210854, + "narHash": "sha256-88jxvd+LIP/XwlvJ3+QPbGCFMChmBfIbUNp1mEP9DJY=", "owner": "catppuccin", "repo": "nix", - "rev": "eaa6e281f144a5ac90510d9a07d74bf5e9a4459f", + "rev": "e5322f7b4001aa8aab38ca5a0f42cafc590f42b6", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1715174576, - "narHash": "sha256-s4WD4WdzOZBH2k8fussEeT2iq/+kVMrG07ul+f+qLqU=", + "lastModified": 1715191753, + "narHash": "sha256-XtFdfNws433grs4Yi70Wyu/hHGwJSAlJqiqkyi0PcLs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "beae02203f1e218aa42b0df67cadfc0e55cc9cdc", + "rev": "986bdd8abf617176a67a463c81c4d18d2bc7913f", "type": "github" }, "original": { @@ -298,11 +298,11 @@ ] }, "locked": { - "lastModified": 1715070411, - "narHash": "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90=", + "lastModified": 1715217706, + "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=", "owner": "nix-community", "repo": "disko", - "rev": "4677f6c53482a8b01ee93957e3bdd569d51261d6", + "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1715141030, - "narHash": "sha256-EokxcPP89Lb+MGQnWJ96wKBuyTE6gGPMHBRdRzsIhh8=", + "lastModified": 1715249989, + "narHash": "sha256-Hkjxf0m1N5gg6etIUqx7W3/PT7egRJ8RJ+viDWhMEQA=", "owner": "garuda-linux", "repo": "garuda-nix-subsystem", - "rev": "148ea922cbd1f9aa97081b6a99f71ae754505689", + "rev": "fe27301424893a85a9da0544c5c2924146456b2e", "type": "gitlab" }, "original": { @@ -739,11 +739,11 @@ ] }, "locked": { - "lastModified": 1715038983, - "narHash": "sha256-DCZbFoNM8sx6YhEtu/xkNZfRwEt7RucJr3zuVVkugIw=", + "lastModified": 1715202703, + "narHash": "sha256-khZE2rZ4MAVI51ZhQxZRTzl+ym8KVUYMfUrFbWUfgzE=", "ref": "refs/heads/main", - "rev": "aaf759cd93d1946336247808e7551df714cfd332", - "revCount": 70, + "rev": "d15ff50703ea83b595249eb3e67d2e668235d5a6", + "revCount": 73, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -910,11 +910,11 @@ ] }, "locked": { - "lastModified": 1715130402, - "narHash": "sha256-Ozg3yDLm5mBj8QX2vOLZUuYF+QEwYPnAN2ZPWQKLmY4=", + "lastModified": 1715217605, + "narHash": "sha256-gX0Fdx6S2gcgVchI2FjCi2ZyDzYeTbzZieP/fKXrR4I=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "13614c0995a1b56f2a29ca37175d2dcd39cdabed", + "rev": "190e89258b9a9bca018427ce04a48109dd1c610b", "type": "github" }, "original": { @@ -1024,11 +1024,11 @@ ] }, "locked": { - "lastModified": 1715114695, - "narHash": "sha256-Pw81Wkm8RhCZr17ltsDabFpat1lRltRAszkppBmmdaI=", + "lastModified": 1715237610, + "narHash": "sha256-/ZeWQ4mL3DfHsbTZYc80qMrL4vBfENP0RiGv2KrCrEo=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "19c7ae9034389f5a7bbc6b17a7b72289c1c52272", + "rev": "61fe33f4194bbbc48c090a2e79f4eb61b47c9b75", "type": "github" }, "original": { @@ -1039,12 +1039,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", - "revCount": 621993, + "lastModified": 1715087517, + "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "revCount": 622847, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.621993%2Brev-25865a40d14b3f9cf19f19b924e2ab4069b09588/018f4c66-6d02-7cdf-be60-465b0f46742e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.622847%2Brev-b211b392b8486ee79df6cdfb1157ad2133427a29/018f5910-ccf6-75c7-8f5a-744aa31ab69c/source.tar.gz" }, "original": { "type": "tarball", @@ -1290,11 +1290,11 @@ ] }, "locked": { - "lastModified": 1715035358, - "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=", + "lastModified": 1715244550, + "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1", + "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f", "type": "github" }, "original": { diff --git a/nixos/modules/apps.nix b/nixos/modules/apps.nix index a5487655..c05ecdfa 100644 --- a/nixos/modules/apps.nix +++ b/nixos/modules/apps.nix @@ -25,7 +25,6 @@ in { mosh nettools nmap - nom nvd python3 sops diff --git a/nixos/modules/boot.nix b/nixos/modules/boot.nix index 852dce10..1f8b6886 100644 --- a/nixos/modules/boot.nix +++ b/nixos/modules/boot.nix @@ -99,10 +99,6 @@ in { enable = true; }; }; - plymouth = { - theme = lib.mkForce "catppuccin-mocha"; - themePackages = [(pkgs.catppuccin-plymouth.override {variant = "mocha";})]; - }; }; # Make plymouth work with sleep diff --git a/nixos/modules/desktops.nix b/nixos/modules/desktops.nix index e5b7fd4b..43abf7c2 100644 --- a/nixos/modules/desktops.nix +++ b/nixos/modules/desktops.nix @@ -39,7 +39,7 @@ in { # Fancy themed, enhanced Spotify programs.spicetify = { - colorScheme = "mocha"; + colorScheme = "catppuccin-mocha"; enable = true; enabledCustomApps = with spicePkgs.apps; [ lyrics-plus @@ -59,7 +59,7 @@ in { seekSong songStats ]; - theme = spicePkgs.themes.catppuccin; + theme = spicePkgs.themes.Comfy; injectCss = true; overwriteAssets = true; replaceColors = true; diff --git a/nixos/modules/impermanence.nix b/nixos/modules/impermanence.nix index 867e5dd8..93a35131 100644 --- a/nixos/modules/impermanence.nix +++ b/nixos/modules/impermanence.nix @@ -225,6 +225,7 @@ "Videos" "VirtualBox VMs" # Cache stuff, not actual user data + ".cache/JetBrains" ".cache/bookmarksrunner" ".cache/chromium" ".cache/containers" diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index ef1fe3b1..19105acf 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -192,6 +192,7 @@ in { "remb" = "sudo nixos-rebuild switch -v --builders ssh://${cfgRemote.host} --flake"; }; }; + nh.flake = /home/nico/Documents/misc/dr460nixed; }; }; }