mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 06:39:14 +00:00
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
```
This commit is contained in:
parent
d93f2c3a1c
commit
8cc6d2b71c
22 changed files with 22 additions and 24 deletions
4
Justfile
4
Justfile
|
|
@ -5,7 +5,7 @@ os host action:
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
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 }} \
|
sudo nixos-rebuild {{ action }} \
|
||||||
-I nixpkgs=${nixpkgs} \
|
-I nixpkgs=${nixpkgs} \
|
||||||
-I nixos-config=./nix/configurations/{{ host }}.nix \
|
-I nixos-config=./nix/configurations/{{ host }}.nix \
|
||||||
|
|
@ -17,7 +17,7 @@ install host:
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
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 \
|
sudo nixos-install \
|
||||||
-I nixpkgs=${nixpkgs} \
|
-I nixpkgs=${nixpkgs} \
|
||||||
-I nixos-config=./nix/configurations/{{ host }}.nix \
|
-I nixos-config=./nix/configurations/{{ host }}.nix \
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{sources ? import ./nix/sources.nix}: {
|
{sources ? import ./npins}: {
|
||||||
lib = import (sources.nixpkgs + "/lib");
|
lib = import (sources.nixpkgs + "/lib");
|
||||||
|
|
||||||
nixosConfigurations = builtins.mapAttrs (_: import (sources.nixpkgs + "/nixos/lib/eval-config.nix")) {
|
nixosConfigurations = builtins.mapAttrs (_: import (sources.nixpkgs + "/nixos/lib/eval-config.nix")) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Entry point to cherry pick modules
|
# Entry point to cherry pick modules
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
|
|
||||||
hostname = "tungsten";
|
hostname = "tungsten";
|
||||||
username = "leana";
|
username = "leana";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Entry point to cherry pick modules
|
# Entry point to cherry pick modules
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
|
|
||||||
hostname = "vanadium";
|
hostname = "vanadium";
|
||||||
username = "leana";
|
username = "leana";
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../../sources.nix;
|
sources = import ../../../npins;
|
||||||
lib = import (sources.nixpkgs + "/lib");
|
lib = import (sources.nixpkgs + "/lib");
|
||||||
|
|
||||||
infuse-lib = import sources.infuse {
|
infuse-lib = import sources.infuse {
|
||||||
|
|
|
||||||
|
|
@ -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
|
# This is the non flake shell that just gets the basics of flora so I can have hls support outside of docker
|
||||||
#
|
#
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
{pkgs ? import sources.pin-florashell {}}:
|
{pkgs ? import sources.pin-florashell {}}:
|
||||||
pkgs.mkShell (let
|
pkgs.mkShell (let
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
{pkgs ? import sources.pin-necro-man-nixpkgs {}}: let
|
{pkgs ? import sources.pin-necro-man-nixpkgs {}}: let
|
||||||
shell = {
|
shell = {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
{pkgs ? import sources.pin-vim-tw {}}:
|
{pkgs ? import sources.pin-vim-tw {}}:
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
final: _: {
|
final: _: {
|
||||||
inherit (final.callPackage sources.agenix {}) agenix;
|
inherit (final.callPackage sources.agenix {}) agenix;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
final: _: {
|
final: _: {
|
||||||
disko =
|
disko =
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
final: prev: {
|
final: prev: {
|
||||||
fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (oldAttrs: {
|
fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (oldAttrs: {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Run the one with my cool feature here for now
|
# Run the one with my cool feature here for now
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
inherit (sources) nil;
|
inherit (sources) nil;
|
||||||
inherit (nil.repository) owner repo;
|
inherit (nil.repository) owner repo;
|
||||||
in
|
in
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# The one in nixpkgs doesn't work
|
# The one in nixpkgs doesn't work
|
||||||
# Getting nix-tree: user error (Failed parsing nix path-info output.)
|
# Getting nix-tree: user error (Failed parsing nix path-info output.)
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
final: _: {
|
final: _: {
|
||||||
nix-tree = (import sources.nix-tree).packages.${final.system}.default;
|
nix-tree = (import sources.nix-tree).packages.${final.system}.default;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
_: prev: {
|
_: prev: {
|
||||||
nur = import sources.nur {
|
nur = import sources.nur {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
_: _: {
|
_: _: {
|
||||||
unsafe-emacs28 = (import sources.pin-emacs28 {}).emacs;
|
unsafe-emacs28 = (import sources.pin-emacs28 {}).emacs;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
_: _: {
|
_: _: {
|
||||||
# Isabelle version 2023
|
# Isabelle version 2023
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
_: _: {
|
_: _: {
|
||||||
# Wireshark bug
|
# Wireshark bug
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
_: _: {
|
_: _: {
|
||||||
wallpapers = import sources.wallpapers {};
|
wallpapers = import sources.wallpapers {};
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
let
|
let
|
||||||
sources = import ../sources.nix;
|
sources = import ../../npins;
|
||||||
in
|
in
|
||||||
(import sources.wired-notify).overlays.default
|
(import sources.wired-notify).overlays.default
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{sources ? import ../sources.nix}: let
|
{sources ? import ../../npins}: let
|
||||||
scopeOverlay = overlay: final: prev: {export = prev.export or {} // overlay final prev;};
|
scopeOverlay = overlay: final: prev: {export = prev.export or {} // overlay final prev;};
|
||||||
in
|
in
|
||||||
(
|
(
|
||||||
|
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
# Compatibility shim that redirects to npins
|
|
||||||
import ../npins
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
sources ? import ./nix/sources.nix,
|
sources ? import ./npins,
|
||||||
pkgs ?
|
pkgs ?
|
||||||
import sources.nixpkgs {
|
import sources.nixpkgs {
|
||||||
overlays = map import [
|
overlays = map import [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue