diff --git a/flake.lock b/flake.lock index 0758ac4..3d4e925 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1783570805, - "narHash": "sha256-ptl5aRlCv9/uRSv2u8Hq8UFVFeZ6Q/bT049bpqNgc3w=", + "lastModified": 1782007937, + "narHash": "sha256-PbnJr+eB+9Czol3ReI83dUgEhcn0sDK6TSy6ODTQm88=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "5602ed62d638142c1ab31dccd01dfbfb28841225", + "rev": "981bd332015397fb1ca033fa982bd61635160c78", "type": "github" }, "original": { @@ -115,6 +115,20 @@ "type": "github" } }, + "flake-compat_2": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -239,11 +253,11 @@ ] }, "locked": { - "lastModified": 1785531816, - "narHash": "sha256-vkMnV0JIyw+g/NmcfoajlGaAO+9a0ezia+FZohQJrik=", + "lastModified": 1785168662, + "narHash": "sha256-kGJTc0oEUQuEwV66lSlMxYtOEtpk9N/HS43k+rFAvs8=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf9ce9fec78f95f374e8dd3b503863a3ec128ebe", + "rev": "cbb77679b3d992c8b62f884cd3a84af534a28621", "type": "github" }, "original": { @@ -298,19 +312,19 @@ }, "nixcord": { "inputs": { + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-nixcord": "nixpkgs-nixcord", - "treefmt-nix": "treefmt-nix" + "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1785866135, - "narHash": "sha256-ugvn1/SwNQDsYx8XM7FoAsPe9WL/ZMMjWgB/acoeeCs=", + "lastModified": 1785174508, + "narHash": "sha256-lnLPM02rSg8LxRwbNh0vfkB4OsBE5FYnVhy3dz2CPjI=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "6385c7caabc51e9818e2ad32bc68178b4608ecb1", + "rev": "3708bb6f9e6c0e65b10741eab6ac55e701c09625", "type": "github" }, "original": { @@ -321,11 +335,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785747939, - "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=", + "lastModified": 1785141334, + "narHash": "sha256-kh35kIx7el4Jk8Ki3BH9/Pn1eZYSYLJ6LMALos0zOy0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2", + "rev": "38a4887411571457d700c51c64a6e49ead2ed5ab", "type": "github" }, "original": { @@ -352,11 +366,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1785386831, - "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=", + "lastModified": 1784432872, + "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21ea275a7c46aef9d4d6ddc962e6d562e9d94183", + "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", "type": "github" }, "original": { @@ -389,11 +403,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1785763201, - "narHash": "sha256-wA373y/B9orM3HatLu9oS+Ke5lmdZyBl/bdjd2gLMq4=", + "lastModified": 1785001306, + "narHash": "sha256-xWqmquUtqKXLeDZ1oQUO+rV4sjA9TShIJhLL8M5Bozo=", "owner": "nix-community", "repo": "nixvim", - "rev": "c7be49306b23a952c0151cf4bbeacd944ed82f2a", + "rev": "48409beb41e8e28b64e8160ca82d8a93fb628963", "type": "github" }, "original": { @@ -414,11 +428,11 @@ ] }, "locked": { - "lastModified": 1785549842, - "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=", + "lastModified": 1783439237, + "narHash": "sha256-WUr8JF2v3n4Y30E5dxv4sAgNJXpVDBoCQNoQ/V4+n4o=", "owner": "nix-community", "repo": "NUR", - "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308", + "rev": "b70bb66c7bcd162642f3a609bc16843c7059f503", "type": "github" }, "original": { @@ -491,11 +505,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1785652745, - "narHash": "sha256-pD0VE/XwjQ3tLyxTzXKdm6JuIEWr/Jaote6xpXGZrXk=", + "lastModified": 1785048222, + "narHash": "sha256-LjFVfwxensz76SjnvofF1Jsw+xTLd8Qp31W0J6nh2XI=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "802040514e09bb8539237f52f68cf053b987c65e", + "rev": "17e524f330c282d31c32dfe076222d4a12277886", "type": "github" }, "original": { @@ -524,11 +538,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1785794750, - "narHash": "sha256-OqIrGVL7AX462ISyJFAqjbqTc1RZlBkVHCa4dwPEZU4=", + "lastModified": 1784676123, + "narHash": "sha256-ndyanKzw90yX2nUVFmTuYqXidUNymtMfgmIHyNdhht0=", "owner": "nix-community", "repo": "stylix", - "rev": "cb5eb3a7343faba61fd694fac8040a326485a339", + "rev": "66714e5ce44269ecc58c20d9196da8dbe1b27a31", "type": "github" }, "original": { @@ -570,16 +584,15 @@ }, "systems_3": { "locked": { - "lastModified": 1774449309, - "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", "repo": "default", - "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "ref": "future-26.11", "repo": "default", "type": "github" } @@ -603,11 +616,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1785153830, - "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=", + "lastModified": 1781968807, + "narHash": "sha256-yYO3Vw2M0y3TAUqt+9+Mj0zwP3XDTF5/PXcPhhFQ1ZM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8", + "rev": "2ccef2f4b22e3cab5a9292811f7133a07eeba4a7", "type": "github" }, "original": { @@ -619,11 +632,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1785031658, - "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=", + "lastModified": 1782012462, + "narHash": "sha256-2iDiD8DQLwS1lGuD9TS8WlvNyDoTs6krWntJbtB2zGo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257", + "rev": "8c4e750f738a742bd73377ee41d3dadedebedef4", "type": "github" }, "original": { @@ -635,11 +648,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1785030526, - "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=", + "lastModified": 1782009766, + "narHash": "sha256-VUhBjpGvWqHI7rWeyMYb/u87YJSXHKfVV6S+IelWeO8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02", + "rev": "5e8350bcd354e3241ab681a265fa6ef060c40be1", "type": "github" }, "original": { @@ -647,27 +660,6 @@ "repo": "base16-zed", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixcord", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1785360170, - "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/home-manager/home.nix b/home-manager/home.nix index cf88558..72b6b21 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,15 +1,8 @@ { - lib, - pkgs, - config, inputs, ... }: -let - palette = lib.strings.removePrefix "${pkgs.base16-schemes}/share/themes/" "${config.stylix.base16Scheme - }"; - cleanPalette = lib.strings.removeSuffix ".yaml" "${palette}"; -in + { imports = [ ./stylix.nix @@ -27,19 +20,4 @@ in home.username = "lucy"; home.homeDirectory = "/home/lucy"; home.stateVersion = "26.05"; - home.activation = { - wallpaper = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - ${lib.getExe pkgs.lutgen} apply ${config.stylix.image} -p ${cleanPalette} -o ~/.walls/a.png - ''; - reload-quickshell = - lib.hm.dag.entryAfter - [ - "writeBoundary" - ] - '' - ${lib.getExe pkgs.quickshell} ipc call config reload true - ${lib.getExe pkgs.quickshell} ipc call config setWall ~/.walls/a.png - - ''; - }; } diff --git a/nixos/stylix/stylix.nix b/nixos/stylix/stylix.nix index 0d6243d..43251e8 100644 --- a/nixos/stylix/stylix.nix +++ b/nixos/stylix/stylix.nix @@ -26,13 +26,6 @@ let map (n: "${dir}/${n}/${platform}.nix") ( builtins.filter (n: builtins.pathExists "${dir}/${n}/${platform}.nix") drop ); - palette = "gruvbox-dark-hard"; - stylixPalette = lib.strings.concatStrings [ - "${pkgs.base16-schemes}/share/themes/" - "${palette}" - ".yaml" - ]; - in { disabledModules = disable "nixos"; @@ -56,7 +49,7 @@ in stylix = { enable = true; autoEnable = false; - base16Scheme = stylixPalette; + base16Scheme = "${pkgs.base16-schemes}/share/themes/black-metal.yaml"; polarity = "dark"; image = ./wallpaper.png; targets = { diff --git a/nixos/stylix/wallpaper.png b/nixos/stylix/wallpaper.png index 0065798..8bd45d6 100644 Binary files a/nixos/stylix/wallpaper.png and b/nixos/stylix/wallpaper.png differ