diff --git a/assets/startup.wav b/assets/startup.wav new file mode 100755 index 0000000..ad7f0c2 Binary files /dev/null and b/assets/startup.wav differ diff --git a/common/auth.nix b/common/auth.nix new file mode 100644 index 0000000..db97c36 --- /dev/null +++ b/common/auth.nix @@ -0,0 +1,41 @@ +{ + lib, + inputs, + getFlakePkg, + ... +}: +{ + environment.shellAliases = { + #make run0 use aliases + run0 = "run0 --background='' "; + s = "run0"; + }; + services.dbus.implementation = "broker"; + security = { + sudo.enable = false; + polkit = { + enable = true; + extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.policykit.exec") { + return polkit.Result.AUTH_ADMIN_KEEP; + } + }); + + polkit.addRule(function(action, subject) { + if (action.id.indexOf("org.freedesktop.systemd1.") == 0) { + return polkit.Result.AUTH_ADMIN_KEEP; + } + }); + ''; + }; + }; + environment.etc."polkit-1/polkitd.conf".text = '' + [Polkitd] + ExpirationSeconds=60 + ''; + imports = [ inputs.run0-shim.nixosModules.default ]; + environment.systemPackages = [ (getFlakePkg inputs.run0-shim) ]; + security.soteria.enable = true; + systemd.user.services.niri-flake-polkit = lib.mkForce { }; +} diff --git a/common/binfmts.nix b/common/binfmts.nix new file mode 100644 index 0000000..116225e --- /dev/null +++ b/common/binfmts.nix @@ -0,0 +1 @@ +{ inputs, scope, ... }: scope "imports" <| [ inputs.qstn.nixosModules.default ] diff --git a/common/cli.nix b/common/cli.nix index 837b622..0715ed7 100644 --- a/common/cli.nix +++ b/common/cli.nix @@ -1,6 +1,5 @@ { pkgs, - localPkgs, getPkgs, ... }: @@ -17,6 +16,7 @@ ouch ; }; + user.packages = getPkgs { inherit (pkgs) lazygit diff --git a/common/debloat.nix b/common/debloat.nix index 86874da..3063953 100644 --- a/common/debloat.nix +++ b/common/debloat.nix @@ -2,7 +2,6 @@ { system.disableInstallerTools = true; programs.less.lessopen = null; - programs.command-not-found.enable = false; boot.enableContainers = false; boot.loader.grub.enable = false; environment.defaultPackages = lib.mkDefault [ ]; diff --git a/common/nix/gc.nix b/common/nix/gc.nix index dcd3e98..5a02bbe 100644 --- a/common/nix/gc.nix +++ b/common/nix/gc.nix @@ -1,7 +1,5 @@ { inputs, - getFlakePkg, - getFlakePkg', ... }: { @@ -18,10 +16,7 @@ services.angrr = { enable = true; - enableNixGcIntegration = true; - period = "2weeks"; - package = getFlakePkg inputs.angrr; + period = "7d"; }; - programs.direnv.angrr.package = getFlakePkg' inputs.angrr "angrr-direnv"; } diff --git a/common/nix/settings.nix b/common/nix/settings.nix index a38ee72..5b1902d 100644 --- a/common/nix/settings.nix +++ b/common/nix/settings.nix @@ -6,7 +6,6 @@ }: { nix = { - package = pkgs.nixVersions.latest; settings = { experimental-features = [ "nix-command" diff --git a/common/nix/substituters.nix b/common/nix/substituters.nix index aca2681..28b2139 100644 --- a/common/nix/substituters.nix +++ b/common/nix/substituters.nix @@ -6,13 +6,19 @@ scope "nix.settings" { substituters = [ "https://nix-community.cachix.org" "https://anmonteiro.nix-cache.workers.dev" - "https://cache.atagen.co" + "https://cache.lobotomise.me" + # "https://cache.atagen.co" # "https://cache.privatevoid.net" + "https://cache.flox.dev" + "https://cache.amaanq.com" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY=" - "cache.atagen.co:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw=" + "cache.lobotomise.me:oF5s/f/RDfVuMH7hl0q/Cby4V/KbPCrZJn8SjKOf/bk=" + # "cache.atagen.co:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw=" # "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" + "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" + "cache.amaanq.com:3qm0ZOxlHr7UQqj0G3MKlAn1votV9/3KjHGU2GQ9rEM=" ]; } diff --git a/common/nix/tools.nix b/common/nix/tools.nix index 2dd56bd..e9c269c 100644 --- a/common/nix/tools.nix +++ b/common/nix/tools.nix @@ -2,15 +2,18 @@ pkgs, inputs, getPkgs, + getFlakePkg, ... }: { - environment.systemPackages = getPkgs { - inherit (pkgs) - nixfmt-rfc-style - nil - ; - }; + environment.systemPackages = + getPkgs { + inherit (pkgs) + nixfmt + nil + ; + } + ++ [ (getFlakePkg inputs.yoke) ]; imports = [ inputs.nix-index-database.nixosModules.nix-index ]; diff --git a/common/terminal.nix b/common/terminal.nix index 75a34f4..80c68fb 100644 --- a/common/terminal.nix +++ b/common/terminal.nix @@ -6,7 +6,7 @@ ... }: let - inherit (pkgs) fish; + inherit (pkgs) fish nushell; in { imports = [ @@ -36,6 +36,7 @@ in "la" = "eza -lg --icons=always --colour=always $argv | culr"; "p" = "ps $argv | culr"; "mnt" = "mount | culr"; + "fresh" = "clear; ${./rice/header.sh}; echo"; }; interactiveShellInit = let @@ -62,8 +63,12 @@ in }; environment.systemPackages = [ fish + nushell + ]; + environment.shells = [ + fish + nushell ]; - environment.shells = [ fish ]; users.defaultUserShell = fish; console.font = "Lat2-Terminus16"; diff --git a/flake.lock b/flake.lock index 217e6ed..df06467 100644 --- a/flake.lock +++ b/flake.lock @@ -20,15 +20,16 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", + "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763137208, - "narHash": "sha256-Hw/kNatFL05nuiFhWdME91cfJ9DfTR1XdC2n+BpTmpo=", + "lastModified": 1771000778, + "narHash": "sha256-Co3VdFeXl7abbNGEHEkjS9raX6P3yhigu162Mg6DV14=", "owner": "linyinfeng", "repo": "angrr", - "rev": "4b2ea844e9a8264d4c40eff1ef56fb05be845692", + "rev": "6bea47aa18c2fb33aa9a363e452c037228893453", "type": "github" }, "original": { @@ -45,11 +46,26 @@ "rev": "cc1e2613fbbb0ed98bb4ce0d52c6e99bb8f98055", "revCount": 9, "type": "git", - "url": "https://git.atagen.co/atagen/arbys" + "url": "https://git.lobotomise.me/atagen/arbys" }, "original": { "type": "git", - "url": "https://git.atagen.co/atagen/arbys" + "url": "https://git.lobotomise.me/atagen/arbys" + } + }, + "bunker": { + "locked": { + "lastModified": 1771074280, + "narHash": "sha256-rLxr0/0BpGzVUxdnieSMicdDq6gUy013cxr+f7Y6xGc=", + "owner": "amaanq", + "repo": "bunker-patches", + "rev": "f6d6745428c97a4ab4ae4055619c8bb1efffd12e", + "type": "github" + }, + "original": { + "owner": "amaanq", + "repo": "bunker-patches", + "type": "github" } }, "culr": { @@ -58,17 +74,17 @@ "systems": "systems" }, "locked": { - "lastModified": 1751299055, - "narHash": "sha256-OLM1Qf4smkreQut+c+UVOE1CT+rbe0tul3oW05E+1Uw=", + "lastModified": 1769663733, + "narHash": "sha256-wXko1Dptg1eof0MQMy/3oXt2QLjUVaQVSY5nIOcOiks=", "ref": "refs/heads/master", - "rev": "5c8e3fdedca1234a04fda46b2da0aabf431f0153", - "revCount": 70, + "rev": "bf1e3adeeba5534db64d8ba6b7aa3abb036c2c01", + "revCount": 71, "type": "git", - "url": "https://git.atagen.co/atagen/culr" + "url": "https://git.lobotomise.me/atagen/culr" }, "original": { "type": "git", - "url": "https://git.atagen.co/atagen/culr" + "url": "https://git.lobotomise.me/atagen/culr" } }, "fenix": { @@ -97,11 +113,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -111,21 +127,6 @@ } }, "flake-compat_2": { - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -140,18 +141,18 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -164,11 +165,11 @@ ] }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -182,11 +183,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -197,14 +198,17 @@ }, "flake-parts_3": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": [ + "nix-rice", + "nixpkgs-lib" + ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -218,11 +222,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -231,32 +235,39 @@ "type": "github" } }, - "flake-schemas": { + "flake-utils": { + "inputs": { + "systems": "systems_6" + }, "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } }, "git-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_11" + "nixpkgs": [ + "nix-rice", + "nixpkgs" + ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -287,19 +298,39 @@ "type": "github" } }, + "helix": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1771001199, + "narHash": "sha256-q/ZyGZIfALlPW3AxZMjfsT01daTU232JGNVkQ/eiFsE=", + "owner": "helix-editor", + "repo": "helix", + "rev": "d12a48a51e2409e876a18baf3cae1e838a9dddc3", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "hjem": { "inputs": { + "nix-darwin": "nix-darwin_2", "nixpkgs": [ "nixpkgs" ], "smfh": "smfh" }, "locked": { - "lastModified": 1762758514, - "narHash": "sha256-KYaXX2se/TvDMulDmISeKLKmEVunp3aMe279zKzcIxA=", + "lastModified": 1769053318, + "narHash": "sha256-cKETEBrseo7Iz+bOzflwy1xTpDuUj3QaLA+P49yJw8k=", "owner": "feel-co", "repo": "hjem", - "rev": "65c39c7aeb96742aa5866005842b3a95446d210c", + "rev": "9d0c8d4b44f661910595b07e6480557644c1431c", "type": "github" }, "original": { @@ -318,11 +349,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1762503209, - "narHash": "sha256-FVkHGsJfy54SHp1XYKbcRXcN+4FwcZhlYNOV4Iw/ihY=", + "lastModified": 1766394058, + "narHash": "sha256-P+59TbVusYqdx2Jt2liwvQ+hslUzU6M1ezRDy6c66Tc=", "owner": "snugnug", "repo": "hjem-rum", - "rev": "e4505437f99685584909f994cf1527b697923234", + "rev": "edac54b7d57ad72cc4b124da2f44e7b2e584f3c6", "type": "github" }, "original": { @@ -353,76 +384,14 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nyx", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hudcore": { - "inputs": { - "nix-systems": "nix-systems", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1746619291, - "narHash": "sha256-ovf7GLXUACHPw48TJJMJfRrva3go+RHvHYmiqwTeYXs=", - "ref": "refs/heads/main", - "rev": "8a627ef8b08b6ec5b1f0b4a09f6b4d3ef8233a1f", - "revCount": 1, - "type": "git", - "url": "https://git.atagen.co/atagen/hudcore-plymouth.git" - }, - "original": { - "type": "git", - "url": "https://git.atagen.co/atagen/hudcore-plymouth.git" - } - }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nyx", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762951919, - "narHash": "sha256-ma/xMEGf4J6n/RdZFdxXBJUQhP53HVEPQOC6Dp2TrkQ=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "3d248f6e8f877218dd2573fef8925ac997889922", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "kitty-themes-src": { "flake": false, "locked": { - "lastModified": 1747968735, - "narHash": "sha256-QQiRdyOL8svPxQ3/D0CjstBMDJ5Xapm6zfDSoo31GME=", + "lastModified": 1768000027, + "narHash": "sha256-jefF6MzFbKDz6Grsdh5fyi/hrZI72mNkp5iUvelIhDs=", "owner": "kovidgoyal", "repo": "kitty-themes", - "rev": "e23ccc1b1f23d404950bc3a0900ee4856448c111", + "rev": "0da136b4d31ab1c0dc49306bbf2ba8b819dafed8", "type": "github" }, "original": { @@ -433,35 +402,35 @@ }, "meat": { "inputs": { - "nix-systems": "nix-systems_2", - "nixpkgs": "nixpkgs_4", + "nix-systems": "nix-systems", + "nixpkgs": "nixpkgs_5", "unf": "unf" }, "locked": { - "lastModified": 1757896194, - "narHash": "sha256-WYNN/J1TtF7Kv6Fe+VlPnwHNIEbgwBZshwNDCm+BulA=", + "lastModified": 1769663912, + "narHash": "sha256-2d5M0GNFksdr00OasiobVph2iIxc6qegoqyGGXP627Y=", "ref": "refs/heads/master", - "rev": "07776960903da8567ea365fde5bdd461ba5b4cc5", - "revCount": 40, + "rev": "0fc93545ce334099b8ced66c5eb8533273bc4cb8", + "revCount": 41, "type": "git", - "url": "https://git.atagen.co/atagen/meat" + "url": "https://git.lobotomise.me/atagen/meat" }, "original": { "type": "git", - "url": "https://git.atagen.co/atagen/meat" + "url": "https://git.lobotomise.me/atagen/meat" } }, "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1752689277, - "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=", + "lastModified": 1768908532, + "narHash": "sha256-HIdLXEFaUVE8FiaCPJbCfBMsnF+mVtDub8Jwj2BD+mk=", "owner": "nix-community", "repo": "naersk", - "rev": "0e72363d0938b0208d6c646d10649164c43f4d64", + "rev": "8d97452673640eb7fabe428e8b6a425bc355008b", "type": "github" }, "original": { @@ -472,32 +441,28 @@ }, "ndg": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "hjem-rum", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1758017058, - "narHash": "sha256-kj0AsPNRuW/nA+ck/mqE/auRrla3Tjb7mv4Kml+6PP0=", + "lastModified": 1766342086, + "narHash": "sha256-vKuCSU8BCUxG8S2/EyOXrCbIQjmY07Jb5Cq3ehnLsnY=", "owner": "feel-co", "repo": "ndg", - "rev": "5b16cb2a4b4233af289355b9ecf76af9f05f8be1", + "rev": "696647a8f0ea1451c02de21b6bdf2a2c9f238d85", "type": "github" }, "original": { "owner": "feel-co", + "ref": "v2.5.1", "repo": "ndg", "type": "github" } }, "ndg_2": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5" + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1748103964, @@ -517,17 +482,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763126448, - "narHash": "sha256-LVYJJObvkWwR8QB/Srr6Rks+Fw2lYvnRNOH0etV9DM8=", + "lastModified": 1771099995, + "narHash": "sha256-d9jSUIJa5MX+Y7+OMB6FgeHxS2YHT88IUl7HA5hK8FU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "add7bcf2925547e180cc2fe6d5f4b5e7c579d086", + "rev": "3f765c47870861fafe4c6ed2e631c052aa1e1660", "type": "github" }, "original": { @@ -536,6 +501,21 @@ "type": "github" } }, + "niri-s76": { + "locked": { + "lastModified": 1771162707, + "narHash": "sha256-UicMzXYy2XE5jr2J7IO6pZTXUNPndPrGHSIIN6+fB1E=", + "ref": "refs/heads/main", + "rev": "e3afb85f23c0e59b2a818094ee7b391ca2f3504d", + "revCount": 2, + "type": "git", + "url": "https://git.lobotomise.me/atagen/niri-s76-bridge" + }, + "original": { + "type": "git", + "url": "https://git.lobotomise.me/atagen/niri-s76-bridge" + } + }, "niri-stable": { "flake": false, "locked": { @@ -557,31 +537,31 @@ "inputs": { "naersk": "naersk", "niri": "niri_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "systems": "systems_4" }, "locked": { - "lastModified": 1755582059, - "narHash": "sha256-fDyhFfRazK2SvPQVGi6tcMTpOAu6CoUhZSyaaE2edtE=", + "lastModified": 1769059921, + "narHash": "sha256-/crneSsO81LVDzRMRDezpxu55a9Wxjl2HUlofB9HzKs=", "ref": "refs/heads/main", - "rev": "0c1a104cea3de07c3416edb0d16db324daf5f61f", - "revCount": 37, + "rev": "30662edfe8bac80b356324e642a188f505429d80", + "revCount": 41, "type": "git", - "url": "https://git.atagen.co/atagen/niri-tag" + "url": "https://git.lobotomise.me/atagen/niri-tag" }, "original": { "type": "git", - "url": "https://git.atagen.co/atagen/niri-tag" + "url": "https://git.lobotomise.me/atagen/niri-tag" } }, "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763014447, - "narHash": "sha256-nmu7S8J9IJKLQyIkSU8QWYHygrfw76NHGTkcr+bXMX0=", + "lastModified": 1771048216, + "narHash": "sha256-g7HP0MMezWKT3R+3uQzUe3BJ68YMRZjmhNMzKTR3Sus=", "owner": "YaLTeR", "repo": "niri", - "rev": "a52df533c4694b5ed0a04140af60fd26146df911", + "rev": "8e3e93b6240dc9dbc702f0b44f20177c2ce737cf", "type": "github" }, "original": { @@ -593,11 +573,11 @@ "niri_2": { "flake": false, "locked": { - "lastModified": 1755539138, - "narHash": "sha256-8LoWAwBqHFOM1Je3b+XCs6gM5LbJlMfZtSpJvTe3sQk=", + "lastModified": 1768678265, + "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", "owner": "YaLTeR", "repo": "niri", - "rev": "43a2648e579fc81366fc81b15f834c9c9dff119b", + "rev": "d7184a04b904e07113f4623610775ae78d32394c", "type": "github" }, "original": { @@ -606,39 +586,79 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "angrr", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770922915, + "narHash": "sha256-6J/JoK9iL7sHvKJcGW2KId2agaKv1OGypsa7kN+ZBD4=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "6c5a56295d2a24e43bcd8af838def1b9a95746b2", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-darwin_2": { + "inputs": { + "nixpkgs": [ + "hjem", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765065051, + "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ - "nyx", - "jovian", + "run0-shim", "nixpkgs" ] }, "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", + "owner": "nix-community", "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", "type": "github" }, "original": { - "owner": "zhaofengli", - "ref": "matrix-name", + "owner": "nix-community", "repo": "nix-github-actions", "type": "github" } }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1763265660, - "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "469ef53571ea80890c9497952787920c79c1ee6e", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -649,19 +669,19 @@ }, "nix-rice": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", "nixpkgs": "nixpkgs_12", - "nixpkgs-lib": "nixpkgs-lib_4", + "nixpkgs-lib": "nixpkgs-lib_2", "systems": "systems_5" }, "locked": { - "lastModified": 1748538518, - "narHash": "sha256-fEUmBnAD9hRKM2RtwKq6whMme1uQQngrXp7aMPKMAl4=", + "lastModified": 1768817933, + "narHash": "sha256-nt/xmuXaJB/vWlRJ4wpdlYQCIgCzFR6QJwlRyhfNn5o=", "owner": "bertof", "repo": "nix-rice", - "rev": "3a31c56b1bcd48a894442631b056e8aaeaf76834", + "rev": "98b16b0f649bb41db9a1c3b32191bccb9a1ec271", "type": "github" }, "original": { @@ -685,28 +705,13 @@ "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": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "type": "github" }, "original": { @@ -718,11 +723,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "type": "github" }, "original": { @@ -733,11 +738,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1768699094, + "narHash": "sha256-uapeGJTPPbmqjdo5zlrWFEIys1XIOQ66sKP3A5UNEOk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "78975aaec5a67ea502e15836919b89d7df96ac27", "type": "github" }, "original": { @@ -748,26 +753,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_4": { - "locked": { - "lastModified": 1748135671, - "narHash": "sha256-PIkcBpddXRAGWstWV7zTwRZ9EAPqgzFNssux17p1NTg=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "6194ba204e5b188965da97ebb16e05191e560427", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -778,43 +768,59 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1771043024, + "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1760258180, - "narHash": "sha256-Lz6L4+6e/Uz9hGGs6mwvvXserYM3TjdDK5qmyHB7QXo=", + "lastModified": 1771043024, + "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c5c52ca2d2cc1692bb74c873965cc1d9fa31d3", + "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-25.11", "repo": "nixpkgs", - "rev": "22c5c52ca2d2cc1692bb74c873965cc1d9fa31d3", "type": "github" } }, "nixpkgs_10": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1768875095, + "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -824,29 +830,13 @@ "type": "github" } }, - "nixpkgs_11": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_12": { "locked": { - "lastModified": 1748538152, - "narHash": "sha256-lqAVR6FhqjdY9XpBs+cpIbHJpHxQaEFTeJMu/nkA9s0=", + "lastModified": 1768810879, + "narHash": "sha256-6RrqzfHu3e4vvRaDRY0muyl/BkFzCEPfwXmYY8iRjSw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "966f441f64a65ff4590233e8c45e4f05197b3bfc", + "rev": "0ef1c5b62bec8b182affa76ff079d80a2ba026ba", "type": "github" }, "original": { @@ -857,11 +847,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -873,20 +863,36 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", - "owner": "NixOS", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_15": { + "locked": { + "lastModified": 1761656231, + "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1733935885, @@ -905,21 +911,37 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746397377, - "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed30f8aba41605e3ab46421e3dcb4510ec560ff8", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { + "locked": { + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1748217807, "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", @@ -935,7 +957,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1745930157, "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", @@ -951,7 +973,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1748217807, "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", @@ -967,13 +989,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -983,7 +1005,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -999,43 +1021,24 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1755268003, - "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nyx": { + "qstn": { "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "jovian": "jovian", - "nixpkgs": "nixpkgs_14", - "rust-overlay": "rust-overlay_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1763246168, - "narHash": "sha256-gUDJZGSOg5syHtQvLImOKL6Eaw4e1ybz4o5pid66kQg=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "6476fbdd52621b4a532309d982d468dc08204151", - "type": "github" + "lastModified": 1767007132, + "narHash": "sha256-0tMAB3gHKG32A4z/hM7aWNU2t+jh1zT4dpoamcHucog=", + "ref": "refs/heads/main", + "rev": "e6570c79145f3190ff93cb2036ae963a8643445f", + "revCount": 2, + "type": "git", + "url": "https://git.lobotomise.me/atagen/qstn" }, "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" + "type": "git", + "url": "https://git.lobotomise.me/atagen/qstn" } }, "root": { @@ -1043,18 +1046,47 @@ "__flake-compat": "__flake-compat", "angrr": "angrr", "arbys": "arbys", + "bunker": "bunker", "culr": "culr", + "helix": "helix", "hjem": "hjem", "hjem-rum": "hjem-rum", - "hudcore": "hudcore", "meat": "meat", "niri": "niri", + "niri-s76": "niri-s76", "niri-tag": "niri-tag", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", "nixpkgs": "nixpkgs_13", "nixpkgs-stable": "nixpkgs-stable_2", - "nyx": "nyx" + "qstn": "qstn", + "run0-shim": "run0-shim", + "stasis": "stasis", + "yoke": "yoke" + } + }, + "run0-shim": { + "inputs": { + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4", + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1769894065, + "narHash": "sha256-u8hioiUsIxUsjHhgA59ADaYWKNf5PcFAlY6/T0G1JtE=", + "owner": "lordgrimmauld", + "repo": "run0-sudo-shim", + "rev": "8b2946a8c150766648ec89d5df780822b888775e", + "type": "github" + }, + "original": { + "owner": "lordgrimmauld", + "repo": "run0-sudo-shim", + "type": "github" } }, "rust-analyzer-src": { @@ -1077,17 +1109,16 @@ "rust-overlay": { "inputs": { "nixpkgs": [ - "hjem", - "smfh", + "helix", "nixpkgs" ] }, "locked": { - "lastModified": 1759113356, - "narHash": "sha256-xm4kEUcV2jk6u15aHazFP4YsMwhq+PczA+Ul/4FDKWI=", + "lastModified": 1759631821, + "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "be3b8843a2be2411500f6c052876119485e957a2", + "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", "type": "github" }, "original": { @@ -1097,6 +1128,28 @@ } }, "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "hjem", + "smfh", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763347184, + "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "08895cce80433978d5bfd668efa41c5e24578cbd", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "nixpkgs": [ "hjem-rum", @@ -1119,19 +1172,19 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_4": { "inputs": { "nixpkgs": [ - "nyx", + "run0-shim", "nixpkgs" ] }, "locked": { - "lastModified": 1763087910, - "narHash": "sha256-eB9Z1mWd1U6N61+F8qwDggX0ihM55s4E0CluwNukJRU=", + "lastModified": 1766371695, + "narHash": "sha256-W7CX9vy7H2Jj3E8NI4djHyF8iHSxKpb2c/7uNQ/vGFU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf4a68749733d45c0420726596367acd708eb2e8", + "rev": "d81285ba8199b00dc31847258cae3c655b605e8c", "type": "github" }, "original": { @@ -1146,15 +1199,15 @@ "hjem", "nixpkgs" ], - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "systems": "systems_2" }, "locked": { - "lastModified": 1760525934, - "narHash": "sha256-1HtxuA45R/jExzE9iuimuECHWbV2c+CBdJmr/RtluaI=", + "lastModified": 1763430012, + "narHash": "sha256-06G7pXUdpMnUqR0JWWvV7sA8oNGOZU1cSLqQS1GMf7Y=", "owner": "feel-co", "repo": "smfh", - "rev": "7123a00cc3c3e90ba703a37ca8d997be95c62d99", + "rev": "eddda76e3dd4c6deaea5f819f174fc16dbe70f90", "type": "github" }, "original": { @@ -1170,7 +1223,7 @@ "hjem", "nixpkgs" ], - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay_3", "systems": "systems_3" }, "locked": { @@ -1187,6 +1240,25 @@ "type": "github" } }, + "stasis": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_14" + }, + "locked": { + "lastModified": 1770955222, + "narHash": "sha256-XK7e2x1Q5xxyofswmrqc7pz7WA0EmrT5aWnaHaFy5hg=", + "owner": "saltnpepper97", + "repo": "stasis", + "rev": "02086d0f96871e75444a0f202703380a46aa5b61", + "type": "github" + }, + "original": { + "owner": "saltnpepper97", + "repo": "stasis", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -1262,6 +1334,36 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { + "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": [ @@ -1270,11 +1372,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { @@ -1304,10 +1406,31 @@ "type": "github" } }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "run0-shim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "unf": { "inputs": { "ndg": "ndg_2", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1748163740, @@ -1343,11 +1466,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1770583271, + "narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", "type": "github" }, "original": { @@ -1355,6 +1478,25 @@ "repo": "xwayland-satellite", "type": "github" } + }, + "yoke": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "systems": "systems_7" + }, + "locked": { + "lastModified": 1769664021, + "narHash": "sha256-6B99PvFbUW5ca0ucvpI6eWF2wSAUts/5LPZUQvErEkg=", + "ref": "refs/heads/main", + "rev": "c53377a5046f70493ac268aedb5824add94c4ba1", + "revCount": 11, + "type": "git", + "url": "https://git.lobotomise.me/atagen/yoke" + }, + "original": { + "type": "git", + "url": "https://git.lobotomise.me/atagen/yoke" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6930da5..90d9cf9 100644 --- a/flake.nix +++ b/flake.nix @@ -5,17 +5,17 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/22c5c52ca2d2cc1692bb74c873965cc1d9fa31d3"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; - # helix.url = "github:helix-editor/helix"; + helix.url = "github:helix-editor/helix"; nix-index-database.url = "github:Mic92/nix-index-database"; nix-rice.url = "github:bertof/nix-rice"; - meat.url = "git+https://git.atagen.co/atagen/meat"; + meat.url = "git+https://git.lobotomise.me/atagen/meat"; - culr.url = "git+https://git.atagen.co/atagen/culr"; + culr.url = "git+https://git.lobotomise.me/atagen/culr"; niri.url = "github:sodiboo/niri-flake"; @@ -29,22 +29,36 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hudcore.url = "git+https://git.atagen.co/atagen/hudcore-plymouth.git"; + # hudcore.url = "git+https://git.lobotomise.me/atagen/hudcore-plymouth.git"; - 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"; + niri-tag.url = "git+https://git.lobotomise.me/atagen/niri-tag"; angrr.url = "github:linyinfeng/angrr"; - arbys.url = "git+https://git.atagen.co/atagen/arbys"; + arbys.url = "git+https://git.lobotomise.me/atagen/arbys"; + qstn = { + url = "git+https://git.lobotomise.me/atagen/qstn"; + inputs.nixpkgs.follows = "nixpkgs"; + }; __flake-compat = { url = "git+https://git.lix.systems/lix-project/flake-compat.git"; flake = false; }; + + yoke.url = "git+https://git.lobotomise.me/atagen/yoke"; + + run0-shim = { + url = "github:lordgrimmauld/run0-sudo-shim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + bunker.url = "github:amaanq/bunker-patches"; + + stasis.url = "github:saltnpepper97/stasis"; + + niri-s76.url = "git+https://git.lobotomise.me/atagen/niri-s76-bridge"; + }; } diff --git a/graphical/browser.nix b/graphical/browser.nix index 76bc08b..47ecff6 100644 --- a/graphical/browser.nix +++ b/graphical/browser.nix @@ -22,8 +22,7 @@ let Status = "locked"; }; in -(scope "apps.browser" <| pkgs.firefox) -// scope "programs.firefox" { +scope "programs.firefox" { enable = true; policies = { @@ -93,4 +92,3 @@ in # }; } // (scope "apps.browser" <| pkgs.firefox) -# ) diff --git a/graphical/desktop/quickshell/shell.qml b/graphical/desktop/quickshell/shell.qml index 1873519..f70eda6 100644 --- a/graphical/desktop/quickshell/shell.qml +++ b/graphical/desktop/quickshell/shell.qml @@ -162,7 +162,7 @@ ShellRoot { } implicitHeight: 22 - implicitWidth: Tags.keys.length * 13 + 24 + implicitWidth: (Tags.keys.length !== undefined) ? Tags.keys.length * 13 + 24 : 37; // implicitWidth:.width + 24 color: "transparent" diff --git a/graphical/desktop/shell.nix b/graphical/desktop/shell.nix index 0243c5a..87c6696 100644 --- a/graphical/desktop/shell.nix +++ b/graphical/desktop/shell.nix @@ -4,35 +4,24 @@ inputs, mainUser, getPkgs, - getFlakePkg', ... }: let - inherit (lib) getExe getExe'; - stable = inputs.nixpkgs-stable; - inherit (stable.legacyPackages.x86_64-linux) quickshell; + inherit (lib) getExe; in { user.packages = getPkgs { # quickshell stuff inherit (pkgs.kdePackages) qtbase qtdeclarative; - inherit (pkgs) wl-clipboard; - inherit quickshell; + inherit (pkgs) wl-clipboard quickshell; }; + imports = [ inputs.stasis.nixosModules.default ]; + services.stasis.enable = true; + quick.services = { swaync = "${getExe pkgs.swaynotificationcenter}"; - quickshell = "${getExe quickshell}"; - swayidle = - let - niri = getFlakePkg' inputs.niri "niri-unstable"; - systemctl = getExe' pkgs.systemd "systemctl"; - in - '' - ${lib.getExe pkgs.swayidle} -w \ - timeout 1800 '${systemctl} suspend' \ - timeout 600 '${niri} msg action power-off-monitors' - ''; + quickshell = "${getExe pkgs.quickshell}"; }; environment.files."/home/${mainUser}/.config/quickshell" = { diff --git a/graphical/desktop/wm.nix b/graphical/desktop/wm.nix index 5a16647..bdf85af 100644 --- a/graphical/desktop/wm.nix +++ b/graphical/desktop/wm.nix @@ -15,7 +15,9 @@ in imports = [ inputs.niri.nixosModules.niri inputs.niri-tag.nixosModules.niri-tag + inputs.niri-s76.nixosModules.default ]; + user.desktops.niri = { enable = true; config = @@ -70,5 +72,6 @@ in package = niri; }; services.niri-tag.enable = true; + services.niri-s76-bridge.enable = true; } diff --git a/graphical/dev.nix b/graphical/dev.nix index 7de3eba..0f12b7c 100644 --- a/graphical/dev.nix +++ b/graphical/dev.nix @@ -24,7 +24,7 @@ scope "user" { }; url = { "https://github.com/".insteadOf = "github:"; - "https://git.atagen.co/atagen/".insteadOf = "atagen:"; + "https://git.lobotomise.me/atagen/".insteadOf = "atagen:"; "https://codeberg.org/".insteadOf = "codeberg:"; }; credential.helper = "rbw"; @@ -35,8 +35,4 @@ scope "user" { }; }; - packages = [ - localPkgs.rbw-helper - (getFlakePkg' inputs.angrr "angrr-direnv") - ]; } diff --git a/graphical/input.nix b/graphical/input.nix index 0b93d8c..dde7f1d 100644 --- a/graphical/input.nix +++ b/graphical/input.nix @@ -1,5 +1,4 @@ _: { services.libinput.enable = true; console.useXkbConfig = true; - services.xserver.xkb.options = "caps:swapescape"; } diff --git a/graphical/kernel.nix b/graphical/kernel.nix index 0a44f72..0f1d863 100644 --- a/graphical/kernel.nix +++ b/graphical/kernel.nix @@ -1,12 +1,37 @@ -{ pkgs, inputs, ... }: +{ inputs, ... }: { + imports = [ - inputs.nyx.nixosModules.default + inputs.bunker.nixosModules.default ]; + + services.system76-scheduler.enable = true; + + bunker.kernel = { + enable = true; + hardened = false; + cpuArch = "MZEN3"; + version = "6.18"; + lto = "none"; + trimmed = true; + }; + services.scx = { enable = true; scheduler = "scx_bpfland"; }; - # boot.kernelPackages = pkgs.linuxPackages_cachyos-gcc; - boot.kernelPackages = pkgs.linuxPackages_xanmod; + + # nixpkgs.overlays = [ + # (final: prev: { + # nvidia-open = prev.nvidia-open.override { + # patches = [ + # (pkgs.fetchpatch { + # url = "https://github.com/CachyOS/CachyOS-PKGBUILDS/raw/refs/heads/master/nvidia/nvidia-utils/kernel-6.19.patch"; + # hash = ""; + # }) + # ]; + # }; + # }) + # ]; + } diff --git a/graphical/password-manager.nix b/graphical/password-manager.nix index edcd3d6..80c2763 100644 --- a/graphical/password-manager.nix +++ b/graphical/password-manager.nix @@ -4,8 +4,8 @@ generator = lib.generators.toJSON { }; value = { email = "boss@atagen.co"; - pinentry = lib.getExe pkgs.pinentry-qt; - base_url = "https://vault.atagen.co"; + pinentry = lib.getExe pkgs.pinentry-qt; # TODO this is fugly + base_url = "https://vault.lobotomise.me"; }; }; diff --git a/graphical/platform-themes.nix b/graphical/platform-themes.nix index 3f99fc9..a9091dc 100644 --- a/graphical/platform-themes.nix +++ b/graphical/platform-themes.nix @@ -6,7 +6,7 @@ qt = { enable = true; - style = "adwaita-dark"; + # style = "adwaita-dark"; # platformTheme = "gnome"; # broken in unstable ? }; diff --git a/graphical/rice.nix b/graphical/rice.nix index 6ed8bce..60a9108 100644 --- a/graphical/rice.nix +++ b/graphical/rice.nix @@ -59,10 +59,11 @@ }; plymouth = { - theme = "starship"; + theme = "colorful_loop"; font = "${config.rice.fonts.sans.package}/share/fonts/truetype/MSW98UI-Regular.ttf"; themePackages = [ - (getFlakePkg inputs.hudcore) + pkgs.adi1090x-plymouth-themes + # (getFlakePkg inputs.hudcore) ]; }; }; diff --git a/graphical/startup.nix b/graphical/startup.nix new file mode 100644 index 0000000..ea0c310 --- /dev/null +++ b/graphical/startup.nix @@ -0,0 +1,5 @@ +{ pkgs, lib, ... }: +{ + quick.services.startup-sound = "${lib.getExe' pkgs.alsa-utils "aplay"} " + ../assets/startup.wav; + # FIXME broken , maybe use niri exec-once .. +} diff --git a/hosts/adrift/hw.nix b/hosts/adrift/hw.nix index 3720cce..02a36a8 100644 --- a/hosts/adrift/hw.nix +++ b/hosts/adrift/hw.nix @@ -2,4 +2,5 @@ { hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; services.xserver.videoDrivers = [ "i915" ]; + services.xserver.xkb.options = "caps:escape"; } diff --git a/hosts/adrift/id.nix b/hosts/adrift/id.nix index fef976d..c3fc0f1 100644 --- a/hosts/adrift/id.nix +++ b/hosts/adrift/id.nix @@ -1,9 +1,7 @@ -{ ... }: -{ - networking.hostName = "adrift"; # Define your hostname. +_: { + networking.hostName = "adrift"; time.timeZone = "Australia/Sydney"; time.hardwareClockInLocalTime = false; i18n.defaultLocale = "en_AU.UTF-8"; i18n.supportedLocales = [ "en_AU.UTF-8/UTF-8" ]; - nixpkgs.hostPlatform.system = "x86_64-linux"; } diff --git a/hosts/quiver/hw.nix b/hosts/quiver/hw.nix index c16caa2..c582078 100644 --- a/hosts/quiver/hw.nix +++ b/hosts/quiver/hw.nix @@ -11,12 +11,12 @@ hardware.cpu.amd.updateMicrocode = true; hardware.graphics.enable = true; - hardware.graphics.enable32Bit = true; services.xserver.videoDrivers = [ "nvidia" ]; - nixpkgs.config.cudaSupport = true; + # temporarily disabled bc firefox + nixpkgs.config.cudaSupport = false; hardware.nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.latest; + package = config.boot.kernelPackages.nvidiaPackages.beta; modesetting.enable = true; powerManagement.enable = true; open = true; diff --git a/hosts/quiver/id.nix b/hosts/quiver/id.nix index 25e683c..da38065 100644 --- a/hosts/quiver/id.nix +++ b/hosts/quiver/id.nix @@ -4,5 +4,4 @@ _: { time.hardwareClockInLocalTime = false; i18n.defaultLocale = "en_AU.UTF-8"; i18n.supportedLocales = [ "en_AU.UTF-8/UTF-8" ]; - nixpkgs.hostPlatform.system = "x86_64-linux"; } diff --git a/hosts/quiver/outputs.nix b/hosts/quiver/outputs.nix deleted file mode 100644 index 855068b..0000000 --- a/hosts/quiver/outputs.nix +++ /dev/null @@ -1,14 +0,0 @@ -# TODO replace with hjem-rum config -# -# { scope, ... }: -# scope "hm.programs.niri.settings.outputs" { -# "DP-1" = { -# transform.rotation = 90; -# scale = 1; -# }; -# "DP-2" = { -# variable-refresh-rate = true; -# scale = 1; -# }; -# } -_: { } diff --git a/lib/create.nix b/lib/create.nix index 86aa304..7f77d3c 100644 --- a/lib/create.nix +++ b/lib/create.nix @@ -25,6 +25,7 @@ in stdenv.hostPlatform = info.system; }; modules = [ + { nixpkgs.hostPlatform.system = info.system; } inputs.arbys.nixosModules.arbys inputs.hjem.nixosModules.hjem ( diff --git a/pkgs/rbw-helper.nix b/pkgs/rbw-helper.nix deleted file mode 100644 index 46a9fb5..0000000 --- a/pkgs/rbw-helper.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ pkgs, ... }: -pkgs.writeTextFile { - name = "rbw-helper"; - text = '' - declare -A params - - if [ "x$1" == "xget" ]; then - read line - while [ -n "$line" ]; do - key=$\{line%%=*} - value=$\{line#*=} - params[$key]=$value - read line - done - - if [ "x$\{params['protocol']}" != "xhttps" ]; then - exit - fi - - if [ -z "$\{params["host"]}" ]; then - exit - fi - - rbw ls > /dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "Please login to rbw to use git credential helper" > /dev/stderr - exit - fi - - user=`rbw get --folder Git --full $\{params["host"]} | grep "Username:" | cut -d' ' -f2-` - pass=`rbw get --folder Git $\{params["host"]}` - - if [ "x$user" == "x" ] || [ "x$pass" == "x" ]; then - echo "Couldn't find host in rbw DB." > /dev/stderr - exit - fi - - echo username=$user - echo password=$pass - fi - ''; - executable = true; - destination = "/bin/git-credential-rbw"; -}