diff --git a/flake.lock b/flake.lock index 547ca88..f74a156 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747400548, - "narHash": "sha256-zvBGXYkd8pZKkBXlLdcw0/nxSoGJOkwGbc6dz9NS4G8=", + "lastModified": 1748055643, + "narHash": "sha256-xBYbcGW5VcH7TLFO1X5wR/BBCOOrPAX9Ty+lIhXUuc8=", "ref": "refs/heads/main", - "rev": "56f3fd0a454635d0449330e6848a98bab6da020e", - "revCount": 6979, + "rev": "5f10f5712ea5de857e5846efcde7c5730ac721eb", + "revCount": 7169, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1747329636, - "narHash": "sha256-mmyx5trq5ZQp6uShbHNfqgSxdg9OeArcZGdZKtHjhqw=", - "rev": "7afcd6f322b9839699f6f31d5bed884c6dd412c4", + "lastModified": 1747612895, + "narHash": "sha256-6niXZ5gTe456bq6udlP6QWe7MJgNybqCHqMzhkFf2gA=", + "rev": "54989ab33b3b5ff5e21e89ce11f0b72b3979ffd6", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/7afcd6f322b9839699f6f31d5bed884c6dd412c4.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/54989ab33b3b5ff5e21e89ce11f0b72b3979ffd6.tar.gz" }, "original": { "type": "tarball", @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1747274630, - "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1747274630, - "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "ec7c109a4f794fce09aad87239eab7f66540b888", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -167,6 +167,43 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": [ + "ignis", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gvc": { + "flake": false, + "locked": { + "lastModified": 1735384240, + "narHash": "sha256-ikF9EzFlsRH8i4+SVUHETF4Jk1ob2JX1RLsuMdzrQOQ=", + "owner": "linkfrg", + "repo": "libgnome-volume-control-wheel", + "rev": "2d1cb33dacdae43127bb843a48b159ea7b8925d0", + "type": "github" + }, + "original": { + "owner": "linkfrg", + "repo": "libgnome-volume-control-wheel", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -195,11 +232,11 @@ ] }, "locked": { - "lastModified": 1747374689, - "narHash": "sha256-JT/aBZqmK1LbExzwT9cPkvxKc0IC4i6tZKOPjsSWFbI=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2263ce5f4c251c0f7608330e8fdb7d1f01f0667", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -208,6 +245,29 @@ "type": "github" } }, + "ignis": { + "inputs": { + "flake-utils": "flake-utils", + "gvc": "gvc", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1748238399, + "narHash": "sha256-U81PS8omY1FrR2qHkiCPblFABCaqwkcvq/1TQHVHWN8=", + "owner": "linkfrg", + "repo": "ignis", + "rev": "9be1c66f41a02d9ff6ab7197929e41f713186a22", + "type": "github" + }, + "original": { + "owner": "linkfrg", + "repo": "ignis", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -231,11 +291,11 @@ ] }, "locked": { - "lastModified": 1747365160, - "narHash": "sha256-4ZVr0x+ry6ybym/VhVYACj0HlJo44YxAaPGOxiS88Hg=", + "lastModified": 1747752313, + "narHash": "sha256-Z5OnPIZ3/ijo5xLCOpWoVbUE5JNnGxSHGhnJ3u9f2GE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "8817b00b0011750381d0d44bb94d61087349b6ba", + "rev": "9ed53ae9abb5b125e453f37e475da5b8c368e676", "type": "github" }, "original": { @@ -293,11 +353,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", + "lastModified": 1747663185, + "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", + "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", "type": "github" }, "original": { @@ -308,11 +368,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -340,11 +400,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -360,6 +420,7 @@ "clan-core": "clan-core", "disko": "disko_2", "home-manager": "home-manager_2", + "ignis": "ignis", "impermanence": "impermanence", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", @@ -374,11 +435,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -417,6 +478,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -425,11 +501,11 @@ ] }, "locked": { - "lastModified": 1747299117, - "narHash": "sha256-JGjCVbxS+9t3tZ2IlPQ7sdqSM4c+KmIJOXVJPfWmVOU=", + "lastModified": 1747469671, + "narHash": "sha256-bo1ptiFoNqm6m1B2iAhJmWCBmqveLVvxom6xKmtuzjg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e758f27436367c23bcd63cd973fa5e39254b530e", + "rev": "ab0378b61b0d85e73a8ab05d5c6029b5bd58c9fb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d1af54a..9b4ff19 100644 --- a/flake.nix +++ b/flake.nix @@ -123,6 +123,10 @@ url = "git+https://git.clan.lol/clan/clan-core"; inputs.nixpkgs.follows = "nixpkgs"; }; + ignis = { + url = "github:linkfrg/ignis"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; nixConfig = { diff --git a/home/desktop/niri.nix b/home/desktop/niri.nix index 73c1ac5..678569f 100644 --- a/home/desktop/niri.nix +++ b/home/desktop/niri.nix @@ -1,5 +1,4 @@ { config, ... }: { - xdg.configFile."i3bar-river".source = "${config.dotfiles.path}/.config/i3bar-river"; xdg.configFile."niri".source = "${config.dotfiles.path}/.config/niri"; } diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix index d0dbc91..7fb12ef 100644 --- a/home/desktop/sway.nix +++ b/home/desktop/sway.nix @@ -5,7 +5,6 @@ ghostty tofi i3status-rust - mako wlsunset kanshi grim diff --git a/machines/haze/niri.nix b/machines/haze/niri.nix index 61e2cdb..b760f5b 100644 --- a/machines/haze/niri.nix +++ b/machines/haze/niri.nix @@ -1,11 +1,9 @@ -{ pkgs, ... }: +{ inputs, pkgs, ... }: { programs.niri.enable = true; environment.systemPackages = with pkgs; [ brightnessctl - i3bar-river - mako pavucontrol playerctl swaybg @@ -13,6 +11,7 @@ tofi wl-gammarelay-rs xwayland-satellite + inputs.ignis.packages.${pkgs.system}.ignis ]; environment.sessionVariables.NIXOS_OZONE_WL = "1";