From 4250d3a66863e464495869d2c107bc3ee82fa245 Mon Sep 17 00:00:00 2001 From: atagen Date: Wed, 20 Aug 2025 17:04:47 +1000 Subject: [PATCH] revive laptop --- common/nix/settings.nix | 12 +- common/nix/tools.nix | 2 +- flake.lock | 437 +++++-------------------- flake.nix | 26 +- graphical/boot.nix | 41 +-- graphical/desktop/niri-config.kdl | 2 +- graphical/desktop/quickshell/shell.qml | 12 +- graphical/network.nix | 4 - graphical/shell.nix | 21 +- hosts/adrift/boot.nix | 10 +- hosts/quiver/boot.nix | 33 +- hosts/quiver/cisco.nix | 7 + 12 files changed, 159 insertions(+), 448 deletions(-) create mode 100644 hosts/quiver/cisco.nix diff --git a/common/nix/settings.nix b/common/nix/settings.nix index 1ac5bc8..5d0dd9c 100644 --- a/common/nix/settings.nix +++ b/common/nix/settings.nix @@ -1,10 +1,10 @@ -{ pkgs, inputs, ... }: { - imports = [ - inputs.lix-module.nixosModules.default - ]; - + pkgs, + inputs, + ... +}: { nix = { + package = pkgs.lixPackageSets.git.lix; settings = { experimental-features = [ "nix-command" @@ -20,7 +20,7 @@ optimise.automatic = true; }; - system.nixos.tags = [ "fatcock-xxl" ]; + system.nixos.tags = ["fatcock-xxl"]; hjem = { clobberByDefault = true; diff --git a/common/nix/tools.nix b/common/nix/tools.nix index 902b1bc..2dd56bd 100644 --- a/common/nix/tools.nix +++ b/common/nix/tools.nix @@ -8,8 +8,8 @@ environment.systemPackages = getPkgs { inherit (pkgs) nixfmt-rfc-style + nil ; - inherit (inputs.nil.packages.${pkgs.system}) nil; }; imports = [ inputs.nix-index-database.nixosModules.nix-index diff --git a/flake.lock b/flake.lock index f0320ef..fb62bba 100644 --- a/flake.lock +++ b/flake.lock @@ -276,44 +276,11 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, - "flake-utils": { - "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, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat_4", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1747372754, @@ -357,11 +324,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755523503, - "narHash": "sha256-BWjVjMSb+cVUf5o5R83+WMoeNfrHN8w+UKMhqic5/Ys=", + "lastModified": 1755641984, + "narHash": "sha256-0d8tolDnYHOMR/KnhuHuilhfqs8OgOPIpIgKzXGTkVk=", "owner": "helix-editor", "repo": "helix", - "rev": "9f34f8b5ff63af86f0fb9eac2c9b092cd479e1c3", + "rev": "74bb02ffe7b62d5f96f1a20ead70859c330eb849", "type": "github" }, "original": { @@ -378,11 +345,11 @@ "smfh": "smfh" }, "locked": { - "lastModified": 1755001052, - "narHash": "sha256-27YOZ6P8jRjeGydOK/EX/3e4d95eFouSpBSsS08Nryw=", + "lastModified": 1755630157, + "narHash": "sha256-4XnVeNej5FJLBavw3qxoHI01ojmryeNzT6Mk9Q0nDXQ=", "owner": "feel-co", "repo": "hjem", - "rev": "46c06ba2fc5f14772a3f64a6e6e4adbff17b1d9f", + "rev": "565a15366d7b5aa5483ebe101fbc0ea27f0516b7", "type": "github" }, "original": { @@ -438,26 +405,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755538029, - "narHash": "sha256-XVsragfuN8A/tMiPToejH7RofH15toeIGhlXraX+yBo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "bf450a0844e80e6aa22652d3f3728f20cd974527", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nyx", @@ -535,43 +482,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1755522522, - "narHash": "sha256-OiIIM+cvFWCyAn7sFqZQJK1/94EQ522ktlnzakZqM+M=", - "rev": "1f47ecef4ef5f67b34653b9c61d6d99b2720eb44", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1f47ecef4ef5f67b34653b9c61d6d99b2720eb44.tar.gz?rev=1f47ecef4ef5f67b34653b9c61d6d99b2720eb44" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751909859, - "narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=", - "rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz?rev=4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" - } - }, "meat": { "inputs": { "nix-systems": "nix-systems_2", @@ -595,7 +505,7 @@ "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1752689277, @@ -654,29 +564,11 @@ "type": "github" } }, - "nil": { - "inputs": { - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1754679101, - "narHash": "sha256-nFK2XhrDS5igmkDQWmyTcgiJsEr3KOcR31DaSy+Fy9s=", - "owner": "oxalica", - "repo": "nil", - "rev": "f80fe365cb441624d1608235e6e793e5dce47fb0", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "niri": { "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -695,29 +587,6 @@ "type": "github" } }, - "niri-flake": { - "inputs": { - "niri-stable": "niri-stable_2", - "niri-unstable": "niri-unstable_2", - "nixpkgs": "nixpkgs_11", - "nixpkgs-stable": "nixpkgs-stable_2", - "xwayland-satellite-stable": "xwayland-satellite-stable_2", - "xwayland-satellite-unstable": "xwayland-satellite-unstable_2" - }, - "locked": { - "lastModified": 1753374784, - "narHash": "sha256-R6vHaUJiehdXSnzZqCOxmtmAnHA4GBOpS/UKydzAI38=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "da95771a65821bc98118cf3478eb2fc6fbfe035a", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, "niri-stable": { "flake": false, "locked": { @@ -735,36 +604,19 @@ "type": "github" } }, - "niri-stable_2": { - "flake": false, - "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.05.1", - "repo": "niri", - "type": "github" - } - }, "niri-tag": { "inputs": { "naersk": "naersk", - "niri-flake": "niri-flake", - "nixpkgs": "nixpkgs_12", - "systems": "systems_5" + "niri": "niri_2", + "nixpkgs": "nixpkgs_10", + "systems": "systems_4" }, "locked": { - "lastModified": 1753421223, - "narHash": "sha256-SfZZvJCH1pGkhwMPxLjo+D0C6TWhrZzkgkyngxlk4os=", + "lastModified": 1755582059, + "narHash": "sha256-fDyhFfRazK2SvPQVGi6tcMTpOAu6CoUhZSyaaE2edtE=", "ref": "refs/heads/main", - "rev": "51c0486748face3d31784f92b2ee330e78740b32", - "revCount": 36, + "rev": "0c1a104cea3de07c3416edb0d16db324daf5f61f", + "revCount": 37, "type": "git", "url": "https://git.atagen.co/atagen/niri-tag" }, @@ -789,14 +641,14 @@ "type": "github" } }, - "niri-unstable_2": { + "niri_2": { "flake": false, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1755539138, + "narHash": "sha256-8LoWAwBqHFOM1Je3b+XCs6gM5LbJlMfZtSpJvTe3sQk=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "43a2648e579fc81366fc81b15f834c9c9dff119b", "type": "github" }, "original": { @@ -830,7 +682,7 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1755404379, @@ -851,9 +703,9 @@ "flake-parts": "flake-parts_4", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_13", "nixpkgs-lib": "nixpkgs-lib_4", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1748538518, @@ -992,22 +844,6 @@ } }, "nixpkgs-stable_2": { - "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1751274312, "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", @@ -1025,53 +861,21 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", - "owner": "NixOS", + "lastModified": 1755268003, + "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_11": { - "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1753369216, - "narHash": "sha256-Jx2i6loWL755GD+GlCXESMhIiO0aFc/pDo82N16fEiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b74a30dbc0a72e20df07d43109339f780b439291", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { "locked": { "lastModified": 1755186698, "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", @@ -1087,7 +891,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_12": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -1103,7 +907,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_13": { "locked": { "lastModified": 1748538152, "narHash": "sha256-lqAVR6FhqjdY9XpBs+cpIbHJpHxQaEFTeJMu/nkA9s0=", @@ -1118,39 +922,39 @@ "type": "github" } }, + "nixpkgs_14": { + "locked": { + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_15": { + "locked": { + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_16": { - "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_17": { - "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_18": { "locked": { "lastModified": 1754214453, "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", @@ -1263,22 +1067,6 @@ } }, "nixpkgs_8": { - "locked": { - "lastModified": 1749619289, - "narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f72be405a10668b8b00937b452f2145244103ebc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { "locked": { "lastModified": 1755186698, "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", @@ -1294,12 +1082,28 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nyx": { "inputs": { "flake-schemas": "flake-schemas", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_15", "rust-overlay": "rust-overlay_4" }, "locked": { @@ -1317,26 +1121,6 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753595452, - "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", - "ref": "refs/heads/master", - "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", - "revCount": 665, - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell.git" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell.git" - } - }, "root": { "inputs": { "__flake-compat": "__flake-compat", @@ -1346,20 +1130,15 @@ "helix": "helix", "hjem": "hjem", "hjem-rum": "hjem-rum", - "home-manager": "home-manager", "hudcore": "hudcore", - "lix": "lix", - "lix-module": "lix-module", "meat": "meat", - "nil": "nil", "niri": "niri", "niri-tag": "niri-tag", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", - "nixpkgs": "nixpkgs_16", - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs": "nixpkgs_14", + "nixpkgs-stable": "nixpkgs-stable_2", "nyx": "nyx", - "quickshell": "quickshell", "zedless": "zedless" } }, @@ -1560,21 +1339,6 @@ } }, "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1589,7 +1353,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1682,23 +1446,6 @@ "type": "github" } }, - "xwayland-satellite-stable_2": { - "flake": false, - "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.6", - "repo": "xwayland-satellite", - "type": "github" - } - }, "xwayland-satellite-unstable": { "flake": false, "locked": { @@ -1715,26 +1462,10 @@ "type": "github" } }, - "xwayland-satellite-unstable_2": { - "flake": false, - "locked": { - "lastModified": 1752338000, - "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "ba78881a68182ce338041846164cbfed0d70935c", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, "zedless": { "inputs": { "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1754831523, diff --git a/flake.nix b/flake.nix index 96a1987..0ad13ad 100644 --- a/flake.nix +++ b/flake.nix @@ -7,30 +7,12 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - helix.url = "github:helix-editor/helix"; nix-index-database.url = "github:Mic92/nix-index-database"; nix-rice.url = "github:bertof/nix-rice"; - nil.url = "github:oxalica/nil"; - - lix = { - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - flake = false; - }; - - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix.follows = "lix"; - }; - meat.url = "git+https://git.atagen.co/atagen/meat"; culr.url = "git+https://git.atagen.co/atagen/culr"; @@ -49,10 +31,10 @@ hudcore.url = "git+https://git.atagen.co/atagen/hudcore-plymouth.git"; - quickshell = { - url = "git+https://git.outfoxxed.me/quickshell/quickshell.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # quickshell = { + # url = "git+https://git.outfoxxed.me/quickshell/quickshell.git"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; diff --git a/graphical/boot.nix b/graphical/boot.nix index e18efcb..61b38de 100644 --- a/graphical/boot.nix +++ b/graphical/boot.nix @@ -1,40 +1,9 @@ -{ config, scope, ... }: -let - inherit (config) rice; -in +{ + config, + scope, + ... +}: scope "boot" { tmp.useTmpfs = true; - initrd.systemd.enable = true; - - loader.limine = { - enable = true; - style = - let - pal = rice.palette.shortHex; - in - { - wallpapers = [ rice.bg.src ]; - interface = { - brandingColor = 1; - branding = "welcome to quiver"; - }; - graphicalTerminal = - let - getPal = p: builtins.attrValues p |> builtins.concatStringsSep ";"; - in - { - palette = getPal pal.normal; - brightPalette = getPal pal.bright; - marginGradient = 0; - margin = 256; - foreground = pal.util.fg; - background = "20" + pal.util.bg; - brightForeground = pal.bright.yellow; - brightBackground = pal.util.bg; - }; - backdrop = pal.util.bg; - }; - maxGenerations = 5; - }; } diff --git a/graphical/desktop/niri-config.kdl b/graphical/desktop/niri-config.kdl index 80d8d16..b11e560 100755 --- a/graphical/desktop/niri-config.kdl +++ b/graphical/desktop/niri-config.kdl @@ -105,4 +105,4 @@ window-rule { geometry-corner-radius 0.000000 10.000000 0.000000 10.000000 clip-to-geometry true } -xwayland-satellite { path "/nix/store/dqljjf1m5h6jscfgvc7q9kkn00mx0myj-xwayland-satellite-unstable-2025-08-07-e0d1dad/bin/xwayland-satellite"; } +// xwayland-satellite { path "/nix/store/dqljjf1m5h6jscfgvc7q9kkn00mx0myj-xwayland-satellite-unstable-2025-08-07-e0d1dad/bin/xwayland-satellite"; } diff --git a/graphical/desktop/quickshell/shell.qml b/graphical/desktop/quickshell/shell.qml index ef7f7b9..1697888 100644 --- a/graphical/desktop/quickshell/shell.qml +++ b/graphical/desktop/quickshell/shell.qml @@ -15,7 +15,7 @@ ShellRoot { // bg Variants { - model: Quickshell.screens.filter(s => s.name == "DP-2") + model: Quickshell.screens delegate: PanelWindow { id: bg anchors { @@ -29,8 +29,8 @@ ShellRoot { Image { asynchronous: true - width: 2560 - height: 1440 + width: bg.width + height: bg.height source: "assets/pathway-m-rework.png" } } @@ -38,7 +38,7 @@ ShellRoot { // rhs main Variants { - model: Quickshell.screens.filter(s => s.name == "DP-2") + model: Quickshell.screens delegate: PanelWindow { id: bink property var modelData @@ -80,7 +80,7 @@ ShellRoot { // centre main Variants { - model: Quickshell.screens.filter(s => s.name == "DP-2") + model: Quickshell.screens delegate: PanelWindow { id: windowTitle property var modelData @@ -144,7 +144,7 @@ ShellRoot { // bottom middle main Variants { - model: Quickshell.screens.filter(s => s.name == "DP-2") + model: Quickshell.screens delegate: PanelWindow { id: tags property var modelData diff --git a/graphical/network.nix b/graphical/network.nix index a81f6eb..0be4ebe 100644 --- a/graphical/network.nix +++ b/graphical/network.nix @@ -13,8 +13,4 @@ }; services.mullvad-vpn.enable = true; - environment.systemPackages = [ pkgs.ciscoPacketTracer8 ]; - nixpkgs.config.permittedInsecurePackages = [ - "libxml2-2.13.8" - ]; } diff --git a/graphical/shell.nix b/graphical/shell.nix index 1c1aac8..30daf50 100644 --- a/graphical/shell.nix +++ b/graphical/shell.nix @@ -11,17 +11,10 @@ let in { # quickshell stuff - environment.systemPackages = - getPkgs { - inherit (pkgs.kdePackages) qtbase qtdeclarative; - inherit (pkgs) wl-clipboard; - } - ++ [ - (inputs.quickshell.packages.${pkgs.system}.default.override { - withHyprland = false; - withI3 = false; - }) - ]; + environment.systemPackages = getPkgs { + inherit (pkgs.kdePackages) qtbase qtdeclarative; + inherit (pkgs) wl-clipboard quickshell; + }; systemd.user.services.quickshell = { path = [ inputs.niri.packages.${pkgs.system}.niri-unstable ]; @@ -36,16 +29,14 @@ in ]; }; wantedBy = [ "graphical-session.target" ]; - serviceConfig.ExecStart = "${getExe' (inputs.quickshell.packages.${pkgs.system}.default.override { - withHyprland = false; - withI3 = false; - }) "qs"}"; + serviceConfig.ExecStart = "${getExe pkgs.quickshell}"; }; quick.services = { swaync = "${getExe pkgs.swaynotificationcenter}"; swayidle = let + # niri = pkgs.niri; niri = inputs.niri.packages.${pkgs.system}.niri-unstable; systemctl = getExe' pkgs.systemd "systemctl"; in diff --git a/hosts/adrift/boot.nix b/hosts/adrift/boot.nix index 1fb638a..81abe3a 100644 --- a/hosts/adrift/boot.nix +++ b/hosts/adrift/boot.nix @@ -1,4 +1,4 @@ -{ scope, ... }: +{scope, ...}: scope "boot" { kernelParams = [ "mitigations=off" @@ -15,11 +15,15 @@ scope "boot" { "sd_mod" "rtsx_pci_sdmmc" ]; - initrd.kernelModules = [ "dm-snapshot" ]; + initrd.kernelModules = ["dm-snapshot"]; kernelModules = [ "iwlwifi" "kvm-intel" ]; - loader.systemd-boot.configurationLimit = 2; + loader.systemd-boot = { + enable = true; + consoleMode = "max"; + configurationLimit = 2; + }; loader.efi.canTouchEfiVariables = true; } diff --git a/hosts/quiver/boot.nix b/hosts/quiver/boot.nix index 7c3243b..475ca5f 100644 --- a/hosts/quiver/boot.nix +++ b/hosts/quiver/boot.nix @@ -1,5 +1,36 @@ -{ scope, ... }: +{ scope, pkgs, config, ...}: scope "boot" { + loader.limine = { + enable = true; + style = + let + pal = config.rice.palette.shortHex; + in + { + wallpapers = [ config.rice.bg.src ]; + interface = { + brandingColor = 1; + branding = "welcome to quiver"; + }; + graphicalTerminal = + let + getPal = p: builtins.attrValues p |> builtins.concatStringsSep ";"; + in + { + palette = getPal pal.normal; + brightPalette = getPal pal.bright; + marginGradient = 0; + margin = 256; + foreground = pal.util.fg; + background = "20" + pal.util.bg; + brightForeground = pal.bright.yellow; + brightBackground = pal.util.bg; + }; + backdrop = pal.util.bg; + }; + maxGenerations = 5; + }; + initrd.availableKernelModules = [ "xhci_pci" "ahci" diff --git a/hosts/quiver/cisco.nix b/hosts/quiver/cisco.nix new file mode 100644 index 0000000..e31d486 --- /dev/null +++ b/hosts/quiver/cisco.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + environment.systemPackages = [ pkgs.ciscoPacketTracer8 ]; + nixpkgs.config.permittedInsecurePackages = [ + "libxml2-2.13.8" + ]; +}