From b2d69d270e508781d7ba1f8df36f977b3d6c03d1 Mon Sep 17 00:00:00 2001 From: atagen Date: Fri, 21 Nov 2025 17:25:05 +1100 Subject: [PATCH] big cleanup --- common/cli.nix | 1 - common/editor.nix | 4 +- common/nix/settings.nix | 6 +- common/nix/substituters.nix | 10 +- flake.lock | 386 ++++++------------ flake.nix | 4 +- graphical/binds.nix | 10 + graphical/boot.nix | 4 +- graphical/cisco.nix | 7 - .../desktop/quickshell/logout/Logout.qml | 6 +- graphical/editor.nix | 15 +- graphical/kernel.nix | 3 +- graphical/network.nix | 41 +- graphical/password-manager.nix | 4 + graphical/rice.nix | 3 +- hosts/adrift/id.nix | 2 +- hosts/quiver/id.nix | 2 +- hosts/quiver/llm.nix | 2 +- lib/create.nix | 2 +- 19 files changed, 198 insertions(+), 314 deletions(-) delete mode 100644 graphical/cisco.nix diff --git a/common/cli.nix b/common/cli.nix index 9e4b288..837b622 100644 --- a/common/cli.nix +++ b/common/cli.nix @@ -16,7 +16,6 @@ fd ouch ; - inherit (localPkgs) hush; }; user.packages = getPkgs { inherit (pkgs) diff --git a/common/editor.nix b/common/editor.nix index e746b3c..3119aa3 100644 --- a/common/editor.nix +++ b/common/editor.nix @@ -1,12 +1,12 @@ { inputs, - pkgs, scope, + getFlakePkg, ... }: scope "user.programs.helix" { enable = true; - package = inputs.helix.packages.${pkgs.system}.helix; + # package = getFlakePkg inputs.helix; settings = { theme = "nix-rice"; editor = { diff --git a/common/nix/settings.nix b/common/nix/settings.nix index 52677ef..a38ee72 100644 --- a/common/nix/settings.nix +++ b/common/nix/settings.nix @@ -2,23 +2,23 @@ pkgs, inputs, getFlakePkg', - mainUser, ... }: { nix = { - package = pkgs.lixPackageSets.git.lix; + package = pkgs.nixVersions.latest; settings = { experimental-features = [ "nix-command" "flakes" - "pipe-operator" + "pipe-operators" ]; substitute = true; }; extraOptions = '' keep-outputs = true keep-derivations = true + allow-import-from-derivation = false ''; optimise.automatic = true; }; diff --git a/common/nix/substituters.nix b/common/nix/substituters.nix index 4a9637c..aca2681 100644 --- a/common/nix/substituters.nix +++ b/common/nix/substituters.nix @@ -4,21 +4,15 @@ }: scope "nix.settings" { substituters = [ - "https://cache.nixos.org" "https://nix-community.cachix.org" - "https://helix.cachix.org" - "https://walker-git.cachix.org" "https://anmonteiro.nix-cache.workers.dev" "https://cache.atagen.co" - "https://cache.privatevoid.net" + # "https://cache.privatevoid.net" ]; trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "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:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw=" - "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" + # "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" ]; } diff --git a/flake.lock b/flake.lock index 4c6f637..217e6ed 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1761322733, - "narHash": "sha256-1HFzjtfTuyYof1Mga39aUMuMwDvtghMrTRadMdXojkM=", + "lastModified": 1763137208, + "narHash": "sha256-Hw/kNatFL05nuiFhWdME91cfJ9DfTR1XdC2n+BpTmpo=", "owner": "linyinfeng", "repo": "angrr", - "rev": "fe06dd2d5d3ea5b0924908e4e21afbc59ab41a8c", + "rev": "4b2ea844e9a8264d4c40eff1ef56fb05be845692", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -126,21 +126,6 @@ } }, "flake-compat_3": { - "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_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -155,7 +140,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -171,21 +156,6 @@ "type": "github" } }, - "flake-compat_6": { - "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -194,11 +164,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -277,9 +247,9 @@ }, "git-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1747372754, @@ -317,39 +287,19 @@ "type": "github" } }, - "helix": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1761757466, - "narHash": "sha256-O9TAPvjILerwD2cxkNpMtUBinDXNt+sZo7jBINY8kGw=", - "owner": "helix-editor", - "repo": "helix", - "rev": "d752d907c9b2760c01c5ea2a700b5e8a2fe90f13", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, "hjem": { "inputs": { - "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], "smfh": "smfh" }, "locked": { - "lastModified": 1761789347, - "narHash": "sha256-HLoZMumCNn/8wubRFFxHWcXFrQOx3rr++w+Puqt0w6Y=", + "lastModified": 1762758514, + "narHash": "sha256-KYaXX2se/TvDMulDmISeKLKmEVunp3aMe279zKzcIxA=", "owner": "feel-co", "repo": "hjem", - "rev": "6e144632e3d8cfa7d7cfcc9504e10a032837f22a", + "rev": "65c39c7aeb96742aa5866005842b3a95446d210c", "type": "github" }, "original": { @@ -361,18 +311,18 @@ "hjem-rum": { "inputs": { "hjem": "hjem_2", - "ndg": "ndg_2", + "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1761734185, - "narHash": "sha256-xyrKDPq8S++k5QYyXmmu1P42vJw5l9kLQDTMmif5KR0=", + "lastModified": 1762503209, + "narHash": "sha256-FVkHGsJfy54SHp1XYKbcRXcN+4FwcZhlYNOV4Iw/ihY=", "owner": "snugnug", "repo": "hjem-rum", - "rev": "baf1e9ab542f78bac2326ebb4c03c9a99b9ec42f", + "rev": "e4505437f99685584909f994cf1527b697923234", "type": "github" }, "original": { @@ -411,11 +361,11 @@ ] }, "locked": { - "lastModified": 1761513701, - "narHash": "sha256-w7qOcQb1FSMZASvWe01r99QqZ5LnHO0k3rgs5ryyig0=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "255b6a0ef2f488a2fad051361699cc67db57338c", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -427,7 +377,7 @@ "hudcore": { "inputs": { "nix-systems": "nix-systems", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1746619291, @@ -452,11 +402,11 @@ ] }, "locked": { - "lastModified": 1761376732, - "narHash": "sha256-wavx9gROyuRZKSvPCCBh78gOur7o88ndRi545njNRrM=", + "lastModified": 1762951919, + "narHash": "sha256-ma/xMEGf4J6n/RdZFdxXBJUQhP53HVEPQOC6Dp2TrkQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8bef482d65425d0cff6b20c11a5f054f85569a38", + "rev": "3d248f6e8f877218dd2573fef8925ac997889922", "type": "github" }, "original": { @@ -484,7 +434,7 @@ "meat": { "inputs": { "nix-systems": "nix-systems_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "unf": "unf" }, "locked": { @@ -504,7 +454,7 @@ "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1752689277, @@ -523,28 +473,6 @@ "ndg": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": [ - "hjem", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760777965, - "narHash": "sha256-PHmDh1GxoBixpgtRCrBCvXJee/tCb6T57MLbwKfIURg=", - "owner": "feel-co", - "repo": "ndg", - "rev": "30b955582f0cd869a86007f491252bbffde48f8b", - "type": "github" - }, - "original": { - "owner": "feel-co", - "repo": "ndg", - "type": "github" - } - }, - "ndg_2": { - "inputs": { - "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "nixpkgs": [ "hjem-rum", @@ -565,11 +493,11 @@ "type": "github" } }, - "ndg_3": { + "ndg_2": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1748103964, @@ -589,17 +517,17 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761724527, - "narHash": "sha256-nB500dSUaNBtOsu5JI1PDNmjuFD6Kdbkh648q0FoaIY=", + "lastModified": 1763126448, + "narHash": "sha256-LVYJJObvkWwR8QB/Srr6Rks+Fw2lYvnRNOH0etV9DM8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1ff74954f559bb2da63e28b3fcffd3b09ec32842", + "rev": "add7bcf2925547e180cc2fe6d5f4b5e7c579d086", "type": "github" }, "original": { @@ -629,7 +557,7 @@ "inputs": { "naersk": "naersk", "niri": "niri_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "systems": "systems_4" }, "locked": { @@ -649,11 +577,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1761721311, - "narHash": "sha256-fXBALdA4CKAYslcuamjzQZLUTCNBIKWybj+/2rwe3Z0=", + "lastModified": 1763014447, + "narHash": "sha256-nmu7S8J9IJKLQyIkSU8QWYHygrfw76NHGTkcr+bXMX0=", "owner": "YaLTeR", "repo": "niri", - "rev": "6e8fd153395036c2daa7c214695ed9baf2409a2e", + "rev": "a52df533c4694b5ed0a04140af60fd26146df911", "type": "github" }, "original": { @@ -703,14 +631,14 @@ }, "nix-index-database": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1761451000, - "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", + "lastModified": 1763265660, + "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", + "rev": "469ef53571ea80890c9497952787920c79c1ee6e", "type": "github" }, "original": { @@ -724,7 +652,7 @@ "flake-parts": "flake-parts_4", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "nixpkgs-lib": "nixpkgs-lib_4", "systems": "systems_5" }, @@ -774,11 +702,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -850,11 +778,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1761468971, - "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { @@ -882,27 +810,11 @@ }, "nixpkgs_10": { "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" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -912,7 +824,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -928,7 +840,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1748538152, "narHash": "sha256-lqAVR6FhqjdY9XpBs+cpIbHJpHxQaEFTeJMu/nkA9s0=", @@ -943,45 +855,29 @@ "type": "github" } }, + "nixpkgs_13": { + "locked": { + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_14": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_16": { - "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -1008,22 +904,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1746397377, "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", @@ -1039,7 +919,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1748217807, "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", @@ -1055,7 +935,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1745930157, "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", @@ -1071,7 +951,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1748217807, "narHash": "sha256-P3u2PXxMlo49PutQLnk2PhI/imC69hFl1yY4aT5Nax8=", @@ -1087,13 +967,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -1103,7 +983,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -1119,20 +999,36 @@ "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": { "inputs": { "flake-schemas": "flake-schemas", "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs_15", - "rust-overlay": "rust-overlay_4" + "nixpkgs": "nixpkgs_14", + "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1761548673, - "narHash": "sha256-/513FfwpfbeppPdGDbmLhgcctLqEHdx8Rs92jImKA3M=", + "lastModified": 1763246168, + "narHash": "sha256-gUDJZGSOg5syHtQvLImOKL6Eaw4e1ybz4o5pid66kQg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "25ef687b6a0a13e9d39c3949e7de05873f5571a9", + "rev": "6476fbdd52621b4a532309d982d468dc08204151", "type": "github" }, "original": { @@ -1148,7 +1044,6 @@ "angrr": "angrr", "arbys": "arbys", "culr": "culr", - "helix": "helix", "hjem": "hjem", "hjem-rum": "hjem-rum", "hudcore": "hudcore", @@ -1157,10 +1052,9 @@ "niri-tag": "niri-tag", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs-stable": "nixpkgs-stable_2", - "nyx": "nyx", - "zedless": "zedless" + "nyx": "nyx" } }, "rust-analyzer-src": { @@ -1181,27 +1075,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1759631821, - "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "hjem", @@ -1223,7 +1096,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { "nixpkgs": [ "hjem-rum", @@ -1246,7 +1119,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_3": { "inputs": { "nixpkgs": [ "nyx", @@ -1254,11 +1127,11 @@ ] }, "locked": { - "lastModified": 1761446259, - "narHash": "sha256-JNNOtIIVIX+yBIsh1rq1Nxhc1LZq168vuQB5sqrZbCY=", + "lastModified": 1763087910, + "narHash": "sha256-eB9Z1mWd1U6N61+F8qwDggX0ihM55s4E0CluwNukJRU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "95098bb4d55ebe167c082fc40705a73ef76b58e4", + "rev": "cf4a68749733d45c0420726596367acd708eb2e8", "type": "github" }, "original": { @@ -1273,7 +1146,7 @@ "hjem", "nixpkgs" ], - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "systems": "systems_2" }, "locked": { @@ -1297,7 +1170,7 @@ "hjem", "nixpkgs" ], - "rust-overlay": "rust-overlay_3", + "rust-overlay": "rust-overlay_2", "systems": "systems_3" }, "locked": { @@ -1397,11 +1270,11 @@ ] }, "locked": { - "lastModified": 1761311587, - "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "type": "github" }, "original": { @@ -1433,8 +1306,8 @@ }, "unf": { "inputs": { - "ndg": "ndg_3", - "nixpkgs": "nixpkgs_7" + "ndg": "ndg_2", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1748163740, @@ -1470,11 +1343,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761622056, - "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { @@ -1482,25 +1355,6 @@ "repo": "xwayland-satellite", "type": "github" } - }, - "zedless": { - "inputs": { - "flake-compat": "flake-compat_6", - "nixpkgs": "nixpkgs_16" - }, - "locked": { - "lastModified": 1754831523, - "narHash": "sha256-tkdq7WR0AvIy/eof2L2ELXKh6b73P7dcWcgJC7ww3aM=", - "owner": "zedless-editor", - "repo": "zed", - "rev": "adb21022b5063757c035d851a0e458f8e4ae954b", - "type": "github" - }, - "original": { - "owner": "zedless-editor", - "repo": "zed", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b6979a7..6930da5 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/22c5c52ca2d2cc1692bb74c873965cc1d9fa31d3"; - helix.url = "github:helix-editor/helix"; + # helix.url = "github:helix-editor/helix"; nix-index-database.url = "github:Mic92/nix-index-database"; @@ -41,8 +41,6 @@ arbys.url = "git+https://git.atagen.co/atagen/arbys"; - zedless.url = "github:zedless-editor/zed"; - __flake-compat = { url = "git+https://git.lix.systems/lix-project/flake-compat.git"; flake = false; diff --git a/graphical/binds.nix b/graphical/binds.nix index 9e390c8..6d41925 100644 --- a/graphical/binds.nix +++ b/graphical/binds.nix @@ -54,11 +54,21 @@ scope "user.desktops.niri.binds" "toggle-tag" "99" ]; + "Mod+Shift+Minus".spawn = [ + "tagctl" + "toggle" + "99" + ]; "Mod+Equal".spawn = [ "tagctl" "toggle-tag" "101" ]; + "Mod+Shift+Equal".spawn = [ + "tagctl" + "toggle" + "101" + ]; "Mod+D".spawn = [ "qs" "ipc" diff --git a/graphical/boot.nix b/graphical/boot.nix index 146f2a1..0571183 100644 --- a/graphical/boot.nix +++ b/graphical/boot.nix @@ -41,8 +41,8 @@ scope "boot" { }; plymouth = { enable = true; - # theme needs fixing - # inherit (config.rice.plymouth) theme themePackages font; + # theme still needs fixing + inherit (config.rice.plymouth) theme themePackages font; }; loader.limine.extraEntries = '' diff --git a/graphical/cisco.nix b/graphical/cisco.nix deleted file mode 100644 index e31d486..0000000 --- a/graphical/cisco.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = [ pkgs.ciscoPacketTracer8 ]; - nixpkgs.config.permittedInsecurePackages = [ - "libxml2-2.13.8" - ]; -} diff --git a/graphical/desktop/quickshell/logout/Logout.qml b/graphical/desktop/quickshell/logout/Logout.qml index 0e7f04b..0f268de 100644 --- a/graphical/desktop/quickshell/logout/Logout.qml +++ b/graphical/desktop/quickshell/logout/Logout.qml @@ -8,8 +8,6 @@ import Quickshell.Wayland Singleton { id: topLevel - // required property real width - // required property real height property real openTime: 600 default property list buttons @@ -149,10 +147,14 @@ Singleton { implicitWidth: gridParent.dims.h implicitHeight: gridParent.dims.v + palette { + buttonText: "#ffab5b" + } font { family: "MS W98 UI" pointSize: 12 + } background: Rectangle { color: button.hovered ? "#ffb852" : "#272a2a" diff --git a/graphical/editor.nix b/graphical/editor.nix index 64ccbe1..5f74eea 100644 --- a/graphical/editor.nix +++ b/graphical/editor.nix @@ -1,7 +1,8 @@ -{ - inputs, - scope, - getFlakePkg, - ... -}: -scope "apps.ide" <| getFlakePkg inputs.zedless +# { +# inputs, +# scope, +# getFlakePkg, +# ... +# }: +# scope "apps.ide" <| getFlakePkg inputs.zedless +_: { } diff --git a/graphical/kernel.nix b/graphical/kernel.nix index b86aa52..0a44f72 100644 --- a/graphical/kernel.nix +++ b/graphical/kernel.nix @@ -7,5 +7,6 @@ enable = true; scheduler = "scx_bpfland"; }; - boot.kernelPackages = pkgs.linuxPackages_cachyos-gcc; + # boot.kernelPackages = pkgs.linuxPackages_cachyos-gcc; + boot.kernelPackages = pkgs.linuxPackages_xanmod; } diff --git a/graphical/network.nix b/graphical/network.nix index d53f1c1..376eef6 100644 --- a/graphical/network.nix +++ b/graphical/network.nix @@ -1,19 +1,46 @@ _: { - networking.networkmanager.enable = true; - systemd.services.NetworkManager-wait-online.enable = true; - services.resolved = { - enable = true; - fallbackDns = [ + networking = { + # dhcpcd.extraConfig = "nohook resolv.conf"; + nameservers = [ "103.1.206.179" "168.138.8.38" "168.138.12.137" ]; - dnssec = "false"; }; + + # services.unbound = { + # enable = true; + # settings = { + # server = { + # interface = [ + # "127.0.0.1" + # "::0" + # ]; + # access-control = [ "127.0.0.1 allow" ]; + # harden-glue = true; + # harden-dnssec-stripped = true; + # use-caps-for-id = false; + # prefetch = true; + # hide-identity = true; + # hide-version = true; + # }; + # forward-zone = [ + # { + # name = "."; + # forward-addr = [ + # "103.1.206.179" + # "168.138.8.38" + # "168.138.12.137" + # ]; + # forward-tls-upstream = true; + # } + # ]; + # }; + # }; + services.mullvad-vpn.enable = true; services.tailscale = { enable = true; useRoutingFeatures = "client"; }; - } diff --git a/graphical/password-manager.nix b/graphical/password-manager.nix index 2295d12..edcd3d6 100644 --- a/graphical/password-manager.nix +++ b/graphical/password-manager.nix @@ -9,6 +9,10 @@ }; }; + # bitwarden ? element ? + nixpkgs.config.permittedInsecurePackages = [ + "electron-36.9.5" + ]; apps = with pkgs; { passwordManager = bitwarden-desktop; passwordCli = rbw; diff --git a/graphical/rice.nix b/graphical/rice.nix index c171ed0..6ed8bce 100644 --- a/graphical/rice.nix +++ b/graphical/rice.nix @@ -3,6 +3,7 @@ localPkgs, config, inputs, + getFlakePkg, ... }: { @@ -61,7 +62,7 @@ theme = "starship"; font = "${config.rice.fonts.sans.package}/share/fonts/truetype/MSW98UI-Regular.ttf"; themePackages = [ - inputs.hudcore.packages.${pkgs.system}.default + (getFlakePkg inputs.hudcore) ]; }; }; diff --git a/hosts/adrift/id.nix b/hosts/adrift/id.nix index d5efea6..fef976d 100644 --- a/hosts/adrift/id.nix +++ b/hosts/adrift/id.nix @@ -5,5 +5,5 @@ time.hardwareClockInLocalTime = false; i18n.defaultLocale = "en_AU.UTF-8"; i18n.supportedLocales = [ "en_AU.UTF-8/UTF-8" ]; - nixpkgs.system = "x86_64-linux"; + nixpkgs.hostPlatform.system = "x86_64-linux"; } diff --git a/hosts/quiver/id.nix b/hosts/quiver/id.nix index c783063..25e683c 100644 --- a/hosts/quiver/id.nix +++ b/hosts/quiver/id.nix @@ -4,5 +4,5 @@ _: { time.hardwareClockInLocalTime = false; i18n.defaultLocale = "en_AU.UTF-8"; i18n.supportedLocales = [ "en_AU.UTF-8/UTF-8" ]; - nixpkgs.system = "x86_64-linux"; + nixpkgs.hostPlatform.system = "x86_64-linux"; } diff --git a/hosts/quiver/llm.nix b/hosts/quiver/llm.nix index c74e1fe..2f101f5 100644 --- a/hosts/quiver/llm.nix +++ b/hosts/quiver/llm.nix @@ -6,7 +6,7 @@ }: scope "services" { ollama = { - enable = true; + enable = false; user = "ollama"; }; diff --git a/lib/create.nix b/lib/create.nix index 5860c21..86aa304 100644 --- a/lib/create.nix +++ b/lib/create.nix @@ -12,7 +12,6 @@ in lib.nixosSystem { specialArgs = { inherit inputs; - inherit (info) system; localPkgs = lib.packagesFromDirectoryRecursive { inherit (inputs.nixpkgs.legacyPackages.${info.system}) callPackage; directory = ../pkgs; @@ -23,6 +22,7 @@ in getPkgs = builtins.attrValues; getFlakePkg = p: p.packages.${info.system}.default; getFlakePkg' = p: n: p.packages.${info.system}.${n}; + stdenv.hostPlatform = info.system; }; modules = [ inputs.arbys.nixosModules.arbys