From 8cc6d2b71cedbb31aeedffc76488a41d021ae8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 3 Jul 2025 08:34:22 +0200 Subject: [PATCH] remove niv residue ```fish for d in {.,**/*} if [ ! -d $d ]; continue; end set from ./nix/sources.nix set to ./npins set from (realpath -s $from --relative-to $d) set to (realpath -s $to --relative-to $d) echo "($d, $from, $to)" for f in $d/* if [ ! -f $f ]; continue; end sed -i "s=$from=$to=" $f end end ``` --- Justfile | 4 ++-- default.nix | 2 +- nix/configurations/tungsten.nix | 2 +- nix/configurations/vanadium.nix | 2 +- nix/configurations/vanadium/overlay.nix | 2 +- nix/devShells/flora.nix | 2 +- nix/devShells/necro-man.nix | 2 +- nix/devShells/vim-tw.nix | 2 +- nix/overlays/agenix.nix | 2 +- nix/overlays/disko.nix | 2 +- nix/overlays/fcitx5-table-extra-taiwanese.nix | 2 +- nix/overlays/nil.nix | 2 +- nix/overlays/nix-tree.nix | 2 +- nix/overlays/nur.nix | 2 +- nix/overlays/pin-emacs28.nix | 2 +- nix/overlays/pin-isabelle-2023.nix | 2 +- nix/overlays/pin-wireshark.nix | 2 +- nix/overlays/wallpapers.nix | 2 +- nix/overlays/wired-notify.nix | 2 +- nix/packages/default.nix | 2 +- nix/sources.nix | 2 -- shell.nix | 2 +- 22 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 nix/sources.nix diff --git a/Justfile b/Justfile index fd4c87a8..17d6a417 100644 --- a/Justfile +++ b/Justfile @@ -5,7 +5,7 @@ os host action: #!/usr/bin/env bash set -euo pipefail - nixpkgs=$(nix-instantiate --eval -E "let sources = import ./nix/sources.nix; in sources.nixpkgs.outPath" | jq -r .) + nixpkgs=$(nix-instantiate --eval -E "let sources = import ./npins; in sources.nixpkgs.outPath" | jq -r .) sudo nixos-rebuild {{ action }} \ -I nixpkgs=${nixpkgs} \ -I nixos-config=./nix/configurations/{{ host }}.nix \ @@ -17,7 +17,7 @@ install host: #!/usr/bin/env bash set -euo pipefail - nixpkgs=$(nix-instantiate --eval -E "let sources = import ./nix/sources.nix; in sources.nixpkgs.outPath" | jq -r .) + nixpkgs=$(nix-instantiate --eval -E "let sources = import ./npins; in sources.nixpkgs.outPath" | jq -r .) sudo nixos-install \ -I nixpkgs=${nixpkgs} \ -I nixos-config=./nix/configurations/{{ host }}.nix \ diff --git a/default.nix b/default.nix index 63c86ade..0a0f3316 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{sources ? import ./nix/sources.nix}: { +{sources ? import ./npins}: { lib = import (sources.nixpkgs + "/lib"); nixosConfigurations = builtins.mapAttrs (_: import (sources.nixpkgs + "/nixos/lib/eval-config.nix")) { diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index 1fae09ed..92d2fb38 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -1,6 +1,6 @@ # Entry point to cherry pick modules let - sources = import ../sources.nix; + sources = import ../../npins; hostname = "tungsten"; username = "leana"; diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 59899aac..c68d59f5 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -1,6 +1,6 @@ # Entry point to cherry pick modules let - sources = import ../sources.nix; + sources = import ../../npins; hostname = "vanadium"; username = "leana"; diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix index 2d0f3538..b866a7f9 100644 --- a/nix/configurations/vanadium/overlay.nix +++ b/nix/configurations/vanadium/overlay.nix @@ -1,5 +1,5 @@ let - sources = import ../../sources.nix; + sources = import ../../../npins; lib = import (sources.nixpkgs + "/lib"); infuse-lib = import sources.infuse { diff --git a/nix/devShells/flora.nix b/nix/devShells/flora.nix index 076867ee..21c35fb8 100644 --- a/nix/devShells/flora.nix +++ b/nix/devShells/flora.nix @@ -2,7 +2,7 @@ # This is the non flake shell that just gets the basics of flora so I can have hls support outside of docker # let - sources = import ../sources.nix; + sources = import ../../npins; in {pkgs ? import sources.pin-florashell {}}: pkgs.mkShell (let diff --git a/nix/devShells/necro-man.nix b/nix/devShells/necro-man.nix index 8b0f2cf1..098e0cdc 100644 --- a/nix/devShells/necro-man.nix +++ b/nix/devShells/necro-man.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in {pkgs ? import sources.pin-necro-man-nixpkgs {}}: let shell = { diff --git a/nix/devShells/vim-tw.nix b/nix/devShells/vim-tw.nix index f9a5ca97..58c6678c 100644 --- a/nix/devShells/vim-tw.nix +++ b/nix/devShells/vim-tw.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in {pkgs ? import sources.pin-vim-tw {}}: pkgs.mkShell { diff --git a/nix/overlays/agenix.nix b/nix/overlays/agenix.nix index 571e8ddf..952db8d7 100644 --- a/nix/overlays/agenix.nix +++ b/nix/overlays/agenix.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in final: _: { inherit (final.callPackage sources.agenix {}) agenix; diff --git a/nix/overlays/disko.nix b/nix/overlays/disko.nix index 9c2a41f0..7a7c539d 100644 --- a/nix/overlays/disko.nix +++ b/nix/overlays/disko.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in final: _: { disko = diff --git a/nix/overlays/fcitx5-table-extra-taiwanese.nix b/nix/overlays/fcitx5-table-extra-taiwanese.nix index 3fdad750..b24003f8 100644 --- a/nix/overlays/fcitx5-table-extra-taiwanese.nix +++ b/nix/overlays/fcitx5-table-extra-taiwanese.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in final: prev: { fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (oldAttrs: { diff --git a/nix/overlays/nil.nix b/nix/overlays/nil.nix index 778895ee..daca3bf1 100644 --- a/nix/overlays/nil.nix +++ b/nix/overlays/nil.nix @@ -1,6 +1,6 @@ # Run the one with my cool feature here for now let - sources = import ../sources.nix; + sources = import ../../npins; inherit (sources) nil; inherit (nil.repository) owner repo; in diff --git a/nix/overlays/nix-tree.nix b/nix/overlays/nix-tree.nix index 778eef6d..36c30bfe 100644 --- a/nix/overlays/nix-tree.nix +++ b/nix/overlays/nix-tree.nix @@ -1,7 +1,7 @@ # The one in nixpkgs doesn't work # Getting nix-tree: user error (Failed parsing nix path-info output.) let - sources = import ../sources.nix; + sources = import ../../npins; in final: _: { nix-tree = (import sources.nix-tree).packages.${final.system}.default; diff --git a/nix/overlays/nur.nix b/nix/overlays/nur.nix index 82cb25e6..57c2994f 100644 --- a/nix/overlays/nur.nix +++ b/nix/overlays/nur.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: prev: { nur = import sources.nur { diff --git a/nix/overlays/pin-emacs28.nix b/nix/overlays/pin-emacs28.nix index 3bcca404..f37787d7 100644 --- a/nix/overlays/pin-emacs28.nix +++ b/nix/overlays/pin-emacs28.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: _: { unsafe-emacs28 = (import sources.pin-emacs28 {}).emacs; diff --git a/nix/overlays/pin-isabelle-2023.nix b/nix/overlays/pin-isabelle-2023.nix index 121e95c0..38a100c5 100644 --- a/nix/overlays/pin-isabelle-2023.nix +++ b/nix/overlays/pin-isabelle-2023.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: _: { # Isabelle version 2023 diff --git a/nix/overlays/pin-wireshark.nix b/nix/overlays/pin-wireshark.nix index f56c1258..dd9c800a 100644 --- a/nix/overlays/pin-wireshark.nix +++ b/nix/overlays/pin-wireshark.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: _: { # Wireshark bug diff --git a/nix/overlays/wallpapers.nix b/nix/overlays/wallpapers.nix index ed6018c9..0545f74e 100644 --- a/nix/overlays/wallpapers.nix +++ b/nix/overlays/wallpapers.nix @@ -1,5 +1,5 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in _: _: { wallpapers = import sources.wallpapers {}; diff --git a/nix/overlays/wired-notify.nix b/nix/overlays/wired-notify.nix index 1d1a7081..2e158aa5 100644 --- a/nix/overlays/wired-notify.nix +++ b/nix/overlays/wired-notify.nix @@ -1,4 +1,4 @@ let - sources = import ../sources.nix; + sources = import ../../npins; in (import sources.wired-notify).overlays.default diff --git a/nix/packages/default.nix b/nix/packages/default.nix index a56b9e65..62311f0f 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -1,4 +1,4 @@ -{sources ? import ../sources.nix}: let +{sources ? import ../../npins}: let scopeOverlay = overlay: final: prev: {export = prev.export or {} // overlay final prev;}; in ( diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index fa4ff0b5..00000000 --- a/nix/sources.nix +++ /dev/null @@ -1,2 +0,0 @@ -# Compatibility shim that redirects to npins -import ../npins diff --git a/shell.nix b/shell.nix index c8537eba..d7f54c4b 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,5 @@ { - sources ? import ./nix/sources.nix, + sources ? import ./npins, pkgs ? import sources.nixpkgs { overlays = map import [