diff --git a/.gitea/workflows/nix.yaml b/.gitea/workflows/nix.yaml new file mode 100644 index 0000000..b580de6 --- /dev/null +++ b/.gitea/workflows/nix.yaml @@ -0,0 +1,11 @@ +name: NixOS Build +on: [push] + +jobs: + build-config: + runs-on: [native] + name: build quiver nixos config + steps: + - uses: actions/checkout@v4 + - run: nix build --no-link .#nixosConfigurations.quiver.config.system.build.toplevel + diff --git a/.gitignore b/.gitignore index 9934212..334079b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ home/dots/qtile/.direnv mullvad/inactive +result +*.key +*.pub_key +hosts/ diff --git a/flake.lock b/flake.lock index a971962..8a625a6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,59 +1,5 @@ { "nodes": { - "comfyui": { - "inputs": { - "comfyui": "comfyui_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-D42CCiTeYTyVERflL0WkWrz0LmkoXmUIsGAd9RSZIW0=", - "path": "./flakes/comfyui", - "type": "path" - }, - "original": { - "path": "./flakes/comfyui", - "type": "path" - } - }, - "comfyui-plugins": { - "inputs": { - "gguf": "gguf", - "nixpkgs": [ - "nixpkgs" - ], - "openpose": "openpose", - "tensorrt": "tensorrt" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-q/vKhxywSAPm1cwYIMs+s6kcY8mUdhXMH//PwBP1k3s=", - "path": "./flakes/comfyui-plugins", - "type": "path" - }, - "original": { - "path": "./flakes/comfyui-plugins", - "type": "path" - } - }, - "comfyui_2": { - "flake": false, - "locked": { - "lastModified": 1739165060, - "narHash": "sha256-DLiv96ynd+p4lXgvNMqgSklWFciLX+l+nXlu5MYVrg8=", - "owner": "comfyanonymous", - "repo": "ComfyUI", - "rev": "4027466c802d174d76347726d74de73c39acedb3", - "type": "github" - }, - "original": { - "owner": "comfyanonymous", - "repo": "ComfyUI", - "type": "github" - } - }, "culr": { "inputs": { "flake-utils": "flake-utils", @@ -75,29 +21,22 @@ "url": "https://git.atagen.co/atagen/culr" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "nyx", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, + "flake-compat": { "locked": { - "lastModified": 1749623906, - "narHash": "sha256-QD7e5WNVj4aWS5mlJZZnLJ6Lg0h5RSyyEFo2I6xBUEQ=", - "owner": "nix-community", - "repo": "fenix", - "rev": "873cccc628f5e39407e319e6711f3b7d6d1f15cc", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "fenix", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, - "flake-compat": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -131,6 +70,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-schemas": { "locked": { "lastModified": 1721999734, @@ -164,24 +121,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -199,24 +138,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -232,27 +153,11 @@ "type": "github" } }, - "gguf": { - "flake": false, - "locked": { - "lastModified": 1736350217, - "narHash": "sha256-3RqFfvXdn9sCIlctqa14c2fvluSmJCR+llfZo/MV64o=", - "owner": "city96", - "repo": "ComfyUI-GGUF", - "rev": "5875c52f59baca3a9372d68c43a3775e21846fe0", - "type": "github" - }, - "original": { - "owner": "city96", - "repo": "ComfyUI-GGUF", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1747372754, @@ -296,11 +201,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1749738489, - "narHash": "sha256-qjal0TFAqArHqOVdf+Wicn1PIWOkOom+tonW0ou5cns=", + "lastModified": 1750857684, + "narHash": "sha256-pbF4oz+HZE/rXsm9YOOA9aV/QnwTvc0zHDTpkaHpYK4=", "owner": "helix-editor", "repo": "helix", - "rev": "62f270e5d2fb34a77dd30a3b2e6b4c9fb6f1cfe1", + "rev": "c3c4895179d4bc5a00e22fdf129d41c1af96226a", "type": "github" }, "original": { @@ -313,14 +218,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "smfh": "smfh" }, "locked": { - "lastModified": 1749346462, - "narHash": "sha256-bwHFWwfiAfk+jsvYlFqo55+R0cCgDu3ILIGqOhA/k5I=", + "lastModified": 1750342922, + "narHash": "sha256-TykbfwTCFBL9yk0/xYwOEbHWA83JIQt4ocunMBEyuJE=", "owner": "feel-co", "repo": "hjem", - "rev": "4dc5dc97ef052d563fe0b2f004b93d92748ae2d3", + "rev": "26c5ebaad2b2cfeaf6cf360952f5fe8876326c80", "type": "github" }, "original": { @@ -336,11 +242,11 @@ ] }, "locked": { - "lastModified": 1749657191, - "narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=", + "lastModified": 1750798083, + "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce", + "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", "type": "github" }, "original": { @@ -357,11 +263,11 @@ ] }, "locked": { - "lastModified": 1749649116, - "narHash": "sha256-pCuUfMkhlP+XqW+TXX5Tssk8IE4TpS3MbG7OQtvaQdM=", + "lastModified": 1750798083, + "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "02040b7777f65342b96c7f826a5c6aef95585057", + "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", "type": "github" }, "original": { @@ -398,11 +304,11 @@ ] }, "locked": { - "lastModified": 1749627191, - "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", + "lastModified": 1750403547, + "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", + "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", "type": "github" }, "original": { @@ -430,11 +336,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1749682763, - "narHash": "sha256-DDhns3NS6L5OlYR0mSX03I5D7uGLyyd3MZegd1wTCyc=", - "rev": "ee0655240270480d7f6063dcf12ec47f04d2ded6", + "lastModified": 1750867311, + "narHash": "sha256-ePRqzLiUc+duqBj5fdsEKqdir3pIySIv/aqotBP7fbg=", + "rev": "34696c65a241a2a16bcb1c97946e179ead6e41ea", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ee0655240270480d7f6063dcf12ec47f04d2ded6.tar.gz?rev=ee0655240270480d7f6063dcf12ec47f04d2ded6" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/34696c65a241a2a16bcb1c97946e179ead6e41ea.tar.gz?rev=34696c65a241a2a16bcb1c97946e179ead6e41ea" }, "original": { "type": "tarball", @@ -466,24 +372,18 @@ }, "meat": { "inputs": { - "flake-utils": "flake-utils_3", - "lix": [ - "lix" - ], - "lix-module": [ - "lix-module" - ], - "nh": "nh", + "nix-systems": "nix-systems_2", "nixpkgs": [ "nixpkgs" - ] + ], + "unf": "unf" }, "locked": { - "lastModified": 1738972856, - "narHash": "sha256-MsdhIWg/CgbgdJv9Zf8Be3uHr8sB/I2LGBmKQa1PWdA=", + "lastModified": 1750945243, + "narHash": "sha256-AhOhcaMNHQcFLA6oFQ4XhjaBhKDdQun+xIs0OwwfAp4=", "ref": "refs/heads/master", - "rev": "01aa149c2f5358fb54407678641ef7644056aa3a", - "revCount": 35, + "rev": "c8978534dc297e108c5fd214f3704421dfda97de", + "revCount": 34, "type": "git", "url": "https://git.atagen.co/atagen/meat" }, @@ -492,36 +392,54 @@ "url": "https://git.atagen.co/atagen/meat" } }, - "nh": { + "naersk": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1732089528, - "narHash": "sha256-+yXeJiSFn96pW6H/50DfCfZiOLSfZNGhK7R4f0aUvGY=", - "owner": "viperML", - "repo": "nh", - "rev": "cff51af0ebb09227070b0332c598c7a4b7f8175a", + "lastModified": 1745925850, + "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", + "owner": "nix-community", + "repo": "naersk", + "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", "type": "github" }, "original": { - "owner": "viperML", - "repo": "nh", + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "ndg": { + "inputs": { + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1748103964, + "narHash": "sha256-aRFl6I3x1aKzeOBaD/OJHYv+OQ+qE+3FR9uKhIvfW+A=", + "owner": "feel-co", + "repo": "ndg", + "rev": "c556c4cbcba61474bf8a342a31a2d94cbefd8986", + "type": "github" + }, + "original": { + "owner": "feel-co", + "repo": "ndg", "type": "github" } }, "nil": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4", - "rust-overlay": "rust-overlay_2" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1749715644, - "narHash": "sha256-qNWrlp36tozupgOeELQ9N5c0nm0iVqufOt21s5GBV5o=", + "lastModified": 1750558251, + "narHash": "sha256-wmb+kcqG05jQA2RPq+KZhOeCxSEOAgumgp/remOsczs=", "owner": "oxalica", "repo": "nil", - "rev": "58b7742777037fd76fc244e1192433131e05f21c", + "rev": "4e5ac6ec65c775fbc6adba1c6022b29c7eccde0f", "type": "github" }, "original": { @@ -534,17 +452,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749733665, - "narHash": "sha256-AwRmmdaFfkUm5R5pdxdf/AxAfRdlHmj4y6Vqr7lUd6Q=", + "lastModified": 1750920099, + "narHash": "sha256-Nt906asgI25vQ+/FFHpZ2VeS8N3EMxRBlt9o7F2+Ib8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "343436b057c744f0df61eccfe9224a66fc9376eb", + "rev": "151cff5b067b51384cf88d5bd5a4ec74b5984c7c", "type": "github" }, "original": { @@ -556,28 +474,53 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1740117926, - "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "lastModified": 1748151941, + "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", "owner": "YaLTeR", "repo": "niri", - "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.02", + "ref": "v25.05.1", "repo": "niri", "type": "github" } }, + "niri-tag": { + "inputs": { + "naersk": "naersk", + "niri-flake": [ + "niri" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_4" + }, + "locked": { + "lastModified": 1750918709, + "narHash": "sha256-82oOscM5vJFN6Mb120HlwFq9f+LCYfhy6jPgVZwtPAA=", + "ref": "refs/heads/main", + "rev": "9c275d05280d48294527c02f5f598353997892f9", + "revCount": 29, + "type": "git", + "url": "https://git.atagen.co/atagen/niri-tag" + }, + "original": { + "type": "git", + "url": "https://git.atagen.co/atagen/niri-tag" + } + }, "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749731089, - "narHash": "sha256-zUNOAc4riq7mQgRVcrO7EyyhBqNdD6b7B9OHCFuGUT4=", + "lastModified": 1750791124, + "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", "owner": "YaLTeR", "repo": "niri", - "rev": "a23ce10311d2be91777099b90d8ca755a6b636e9", + "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", "type": "github" }, "original": { @@ -611,14 +554,14 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1749355504, - "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", + "lastModified": 1750565152, + "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", + "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", "type": "github" }, "original": { @@ -629,11 +572,11 @@ }, "nix-rice": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", - "nixpkgs": "nixpkgs_8", - "nixpkgs-lib": "nixpkgs-lib_2", + "nixpkgs": "nixpkgs_10", + "nixpkgs-lib": "nixpkgs-lib_3", "systems": "systems_5" }, "locked": { @@ -665,6 +608,21 @@ "type": "github" } }, + "nix-systems_2": { + "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" + } + }, "nixpkgs": { "locked": { "lastModified": 1740560979, @@ -697,6 +655,21 @@ } }, "nixpkgs-lib_2": { + "locked": { + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_3": { "locked": { "lastModified": 1748135671, "narHash": "sha256-PIkcBpddXRAGWstWV7zTwRZ9EAPqgzFNssux17p1NTg=", @@ -713,11 +686,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749494155, - "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", + "lastModified": 1750838302, + "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88331c17ba434359491e8d5889cce872464052c2", + "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", "type": "github" }, "original": { @@ -729,11 +702,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1749488106, - "narHash": "sha256-b9GIWdF/8jKpCC5JIMgDLZgwe8cEbty2fyTyo1eDFfI=", + "lastModified": 1750646418, + "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8fe3e32e7f210522377c3bcff80931a3284ace6a", + "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", "type": "github" }, "original": { @@ -745,11 +718,42 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1748538152, + "narHash": "sha256-lqAVR6FhqjdY9XpBs+cpIbHJpHxQaEFTeJMu/nkA9s0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "966f441f64a65ff4590233e8c45e4f05197b3bfc", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1750741721, + "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4b1164c3215f018c4442463a27689d973cffd750", "type": "github" }, "original": { @@ -777,27 +781,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1749619289, - "narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=", + "lastModified": 1748217807, + "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f72be405a10668b8b00937b452f2145244103ebc", + "rev": "3108eaa516ae22c2360928589731a4f1581526ef", "type": "github" }, "original": { @@ -809,27 +813,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1749619289, + "narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "f72be405a10668b8b00937b452f2145244103ebc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -840,6 +844,38 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1749871736, + "narHash": "sha256-K9yBph93OLTNw02Q6e9CYFGrUhvEXnh45vrZqIRWfvQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6afe187897bef7933475e6af374c893f4c84a293", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -855,51 +891,20 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1748538152, - "narHash": "sha256-lqAVR6FhqjdY9XpBs+cpIbHJpHxQaEFTeJMu/nkA9s0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "966f441f64a65ff4590233e8c45e4f05197b3bfc", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nyx": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_12", + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1749736391, - "narHash": "sha256-DgdlYhBPzw87gKaBc19tPRydfatyOlyEnM5Bl5G2GKQ=", + "lastModified": 1750891659, + "narHash": "sha256-BjNHNxJvzS9KIcTGfomKBYXYqNxKGSMJeY1dm6gl3ks=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f8a2f1bd99ab7a8d5fd0a94ab57d3bd0be72124e", + "rev": "a680a0f729cf94828348db53dd26599bfc52beb2", "type": "github" }, "original": { @@ -909,22 +914,6 @@ "type": "github" } }, - "openpose": { - "flake": false, - "locked": { - "lastModified": 1685841563, - "narHash": "sha256-GUjs8mIUFAbjJEVL+EsT44HG42mAiumKOBlBas1xxrM=", - "owner": "space-nuko", - "repo": "ComfyUI-OpenPose-Editor", - "rev": "4d8fe730acdb11ab2fcd592129d91d338d270adf", - "type": "github" - }, - "original": { - "owner": "space-nuko", - "repo": "ComfyUI-OpenPose-Editor", - "type": "github" - } - }, "quickshell": { "inputs": { "nixpkgs": [ @@ -932,11 +921,11 @@ ] }, "locked": { - "lastModified": 1749729711, - "narHash": "sha256-AehIzIDy134s3XlXyXnRAhLTh9V4Px4VcWnU74bbV2M=", + "lastModified": 1750880040, + "narHash": "sha256-ZwQH4akrZf5BxOfXx9Skjw7UpWAj1/ITVRDZsS/AYLA=", "ref": "refs/heads/master", - "rev": "0fb809b1493cee321a51e5bb78b7a5f9f455c772", - "revCount": 575, + "rev": "d949f913479445e4f0ca3a95a183ee45d98dc359", + "revCount": 596, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, @@ -947,8 +936,6 @@ }, "root": { "inputs": { - "comfyui": "comfyui", - "comfyui-plugins": "comfyui-plugins", "culr": "culr", "helix": "helix", "hjem": "hjem", @@ -959,31 +946,15 @@ "meat": "meat", "nil": "nil", "niri": "niri", + "niri-tag": "niri-tag", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_11", "nixpkgs-stable": "nixpkgs-stable_2", "nyx": "nyx", "quickshell": "quickshell" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1749558764, - "narHash": "sha256-R9vQiqez6Gm0ARJKgbsAeLyX493vwIaexOUAz0vDhak=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "9c3476d225ccc90c081280c2a20e9f7d8a200325", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1008,16 +979,17 @@ "rust-overlay_2": { "inputs": { "nixpkgs": [ - "nil", + "hjem", + "smfh", "nixpkgs" ] }, "locked": { - "lastModified": 1749695868, - "narHash": "sha256-debjTLOyqqsYOUuUGQsAHskFXH5+Kx2t3dOo/FCoNRA=", + "lastModified": 1747622321, + "narHash": "sha256-W0dYIWgsUu6rvOJRtKLhKskkv0VhQhJYGNIq+gGUc8g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "55f914d5228b5c8120e9e0f9698ed5b7214d09cd", + "rev": "bd030fd9983f7fddf87be1c64aa3064c8afa24c4", "type": "github" }, "original": { @@ -1026,6 +998,50 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "nyx", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750819193, + "narHash": "sha256-XvkupGPZqD54HuKhN/2WhbKjAHeTl1UEnWspzUzRFfA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "1ba3b9c59b68a4b00156827ad46393127b51b808", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "smfh": { + "inputs": { + "nixpkgs": [ + "hjem", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1749547788, + "narHash": "sha256-n6fd0pb7zd6fVstSzNUEm7qc3NJdPkmDLulGtARQkCI=", + "owner": "Gerg-L", + "repo": "smfh", + "rev": "c2dfd2c142a80d9f4ef3b22b65ba1cc6b6d5d40c", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "smfh", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -1073,16 +1089,16 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1101,35 +1117,38 @@ "type": "github" } }, - "tensorrt": { - "flake": false, + "unf": { + "inputs": { + "ndg": "ndg", + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1728519788, - "narHash": "sha256-tqiodF60IVlmvJknYxEwL0U7GIrrfl49k6Tg+8jGRVU=", - "owner": "comfyanonymous", - "repo": "ComfyUI_TensorRT", - "rev": "5bcc3f1e5c2424bb20bcb586e340c25ebe4a954f", - "type": "github" + "lastModified": 1748163740, + "narHash": "sha256-WOK9w5gtdpy4RefaiRtr6YqFaPxR0OrmI2PleZnn4O4=", + "ref": "refs/heads/main", + "rev": "4d711e5002bd22adbe6d786560be0fde6cbcf81e", + "revCount": 1, + "type": "git", + "url": "https://git.atagen.co/atagen/unf" }, "original": { - "owner": "comfyanonymous", - "repo": "ComfyUI_TensorRT", - "type": "github" + "type": "git", + "url": "https://git.atagen.co/atagen/unf" } }, "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "lastModified": 1748488455, + "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.5.1", + "ref": "v0.6", "repo": "xwayland-satellite", "type": "github" } @@ -1137,11 +1156,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1749315541, - "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=", + "lastModified": 1750821680, + "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba", + "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2506572..0aa908d 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,8 @@ culr meat niri + niri-tag + lix-module # smooooth ]) ++ [ @@ -64,8 +66,6 @@ meat = { url = "git+https://git.atagen.co/atagen/meat"; - inputs.lix.follows = "lix"; - inputs.lix-module.follows = "lix-module"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -74,15 +74,15 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - comfyui = { - url = "path:./flakes/comfyui"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # comfyui = { + # url = "path:./flakes/comfyui"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; - comfyui-plugins = { - url = "path:./flakes/comfyui-plugins"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # comfyui-plugins = { + # url = "path:./flakes/comfyui-plugins"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; niri.url = "github:sodiboo/niri-flake"; @@ -101,6 +101,12 @@ nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; # smooooth.url = "path:/home/bolt/code/smooooth"; + + niri-tag = { + url = "git+https://git.atagen.co/atagen/niri-tag"; + inputs.niri-flake.follows = "niri"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/flakes/niri-session-manager/result b/flakes/niri-session-manager/result deleted file mode 120000 index 5b7a63e..0000000 --- a/flakes/niri-session-manager/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/731lnc1qjhq5gcrvmqycbm41r2ga3dqa-niri-session-manager-git-e8732380991bd629a7e6c3fb5ea50317084fb1eb \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index bb1aaa5..a03b98c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -51,13 +51,12 @@ home.packages = let inherit (rice) icons fonts cursor; - inherit (pkgs) tauon; in fonts.pkgs ++ icons.pkgs ++ [ cursor.package - tauon + pkgs.tauon ]; systemd.user.targets.tray = { diff --git a/home/modules/niri.nix b/home/modules/niri.nix index 0e81098..3265e6d 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -4,7 +4,6 @@ config, rice, inputs, - mainUser, ... }: let @@ -37,7 +36,7 @@ let [ { name = "swaybg"; - value = "${lib.getExe swaybg} -m fill -i /home/${mainUser}/.nix/wallpaper.jpg"; + value = "${lib.getExe swaybg} -m fill -i ${rice.bg.src}"; } { name = "avizo-service"; @@ -69,7 +68,12 @@ in ); programs.niri.settings = let - inherit (lib) range nameValuePair mapAttrs'; + inherit (lib) + range + nameValuePair + mapAttrs' + mergeAttrs + ; inherit (builtins) listToAttrs replaceStrings; inherit (config.lib.niri) actions; in @@ -100,7 +104,22 @@ in value = { action."${cmd}" = num; }; - }) (range 0 6) + }) (range 1 6) + ); + tagctl = lib.getExe' inputs.niri-tag.packages.${pkgs.system}.unstable "tagctl"; + makeTagBind = + mods: cmd: + listToAttrs ( + map (num: { + name = "${mods}+${builtins.toString num}"; + value = { + action.spawn = [ + tagctl + cmd + (builtins.toString num) + ]; + }; + }) (range 1 6) ); in { @@ -152,14 +171,18 @@ in ]; "Mod+Space".action = actions.toggle-window-floating; } - // makeDirBind "Mod" "focus-window-or-workspace-$DIR" vBinds + # // makeDirBind "Mod" "focus-window-or-workspace-$DIR" vBinds // makeDirBind "Mod" "focus-column-or-monitor-$DIR" hBinds - // makeDirBind "Mod+Shift" "move-window-to-workspace-$DIR" vBinds + # // makeDirBind "Mod+Shift" "move-window-to-workspace-$DIR" vBinds // makeDirBind "Mod+Shift" "move-column-$DIR-or-to-monitor-$DIR" hBinds // makeDirBind "Mod+Ctrl" "consume-or-expel-window-$DIR" hBinds // makeDirBind "Mod+Ctrl" "move-window-$DIR" vBinds - // makeWsBind "Mod" "focus-workspace" - // makeWsBind "Mod+Shift" "move-window-to-workspace"; + // makeTagBind "Mod" "toggle-tag" + // makeTagBind "Mod+Shift" "toggle" + // makeTagBind "Mod+Ctrl" "exclusive-tag" + # // makeWsBind "Mod" "focus-workspace" + # // makeWsBind "Mod+Shift" "move-window-to-workspace"; + ; outputs = { # "Unknown-1".enable = false; "DP-1" = { @@ -172,7 +195,7 @@ in }; }; input = { - warp-mouse-to-focus = true; + warp-mouse-to-focus.enable = true; }; cursor = { hide-after-inactive-ms = 5000; diff --git a/rice/default.nix b/rice/default.nix index 9baaf24..2e6c4ce 100644 --- a/rice/default.nix +++ b/rice/default.nix @@ -91,8 +91,6 @@ rec { name = "Papirus-Dark"; pkgs = [ package - # material-icons - # material-design-icons ]; }; @@ -108,18 +106,19 @@ rec { gaps_out = 72; }; - bg = { + bg = rec { + src = + let + name = "wallpaper.jpg"; + in + builtins.path { + inherit name; + path = ./${name}; + sha256 = "2db3f9d0397fbd4746ada297bd14c0c7d3e22c7d4e894968fcfece90bbfb902a"; + }; image = pkgs.callPackage ./wallpaper.nix { } { palette = toRGBShortHex palette; - wallpaper = - let - name = "wallpaper.jpg"; - in - builtins.path { - inherit name; - path = ./${name}; - sha256 = "2db3f9d0397fbd4746ada297bd14c0c7d3e22c7d4e894968fcfece90bbfb902a"; - }; + wallpaper = src; }; }; diff --git a/system/modules/bootloader.nix b/system/modules/bootloader.nix index 99bca2a..3bbf4f3 100644 --- a/system/modules/bootloader.nix +++ b/system/modules/bootloader.nix @@ -10,7 +10,7 @@ pal = rice.palette.shortHex; in { - wallpapers = [ rice.bg.image ]; + wallpapers = [ rice.bg.src ]; interface = { brandingColor = 1; branding = "welcome to quiver"; diff --git a/system/modules/wm.nix b/system/modules/wm.nix index e4a9a01..63486a8 100644 --- a/system/modules/wm.nix +++ b/system/modules/wm.nix @@ -24,4 +24,5 @@ enable = true; package = inputs.niri.packages.${pkgs.system}.niri-unstable; }; + services.niri-tag.enable = true; } diff --git a/system/substituters.nix b/system/substituters.nix index 2703699..bea6410 100644 --- a/system/substituters.nix +++ b/system/substituters.nix @@ -9,6 +9,7 @@ "https://helix.cachix.org" "https://walker-git.cachix.org" "https://anmonteiro.nix-cache.workers.dev" + "https://cache.atagen.co" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" @@ -16,6 +17,7 @@ "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM=" "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY=" + "cache.atagen.co:aw7n3q/HD/kJ5cZSjK+BUE3Ics8e0OuaXO5EkV7GCeI=" ]; }; }