mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2024-11-15 05:13:10 +01:00
cleanup and add ifsr cache
This commit is contained in:
parent
b4af225678
commit
f4fc1ccdf3
46
flake.lock
46
flake.lock
|
@ -180,11 +180,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708031129,
|
"lastModified": 1708806879,
|
||||||
"narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
|
"narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
|
"rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -202,24 +202,24 @@
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706522977,
|
"lastModified": 1706522977,
|
||||||
"narHash": "sha256-Tq69CQ+uutfY477w8uCRyF/2V0Wh/+zHzM3qwcVmqsk=",
|
"narHash": "sha256-Tq69CQ+uutfY477w8uCRyF/2V0Wh/+zHzM3qwcVmqsk=",
|
||||||
"owner": "therealr5",
|
"owner": "rouven0",
|
||||||
"repo": "TruckSimulatorBot-images",
|
"repo": "TruckSimulatorBot-images",
|
||||||
"rev": "d54a772d48a329a402433cc90502700a6699008e",
|
"rev": "d54a772d48a329a402433cc90502700a6699008e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "therealr5",
|
"owner": "rouven0",
|
||||||
"repo": "TruckSimulatorBot-images",
|
"repo": "TruckSimulatorBot-images",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"impermanence": {
|
"impermanence": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706639736,
|
"lastModified": 1708968331,
|
||||||
"narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
|
"narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "impermanence",
|
"repo": "impermanence",
|
||||||
"rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
|
"rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -281,11 +281,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708225687,
|
"lastModified": 1708830466,
|
||||||
"narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=",
|
"narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127",
|
"rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -296,11 +296,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708118438,
|
"lastModified": 1708807242,
|
||||||
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
|
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
|
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -349,13 +349,13 @@
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698315015,
|
"lastModified": 1698315015,
|
||||||
"narHash": "sha256-RWYymaHHx6pi4HRLfJJTF3u4Im22uUtVZDUvTbP0Qrc=",
|
"narHash": "sha256-RWYymaHHx6pi4HRLfJJTF3u4Im22uUtVZDUvTbP0Qrc=",
|
||||||
"owner": "therealr5",
|
"owner": "rouven0",
|
||||||
"repo": "pfersel",
|
"repo": "pfersel",
|
||||||
"rev": "40292aa59ed9f6630dc39405f318842a9c8e7cb3",
|
"rev": "40292aa59ed9f6630dc39405f318842a9c8e7cb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "therealr5",
|
"owner": "rouven0",
|
||||||
"repo": "pfersel",
|
"repo": "pfersel",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -400,13 +400,13 @@
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706780558,
|
"lastModified": 1706780558,
|
||||||
"narHash": "sha256-tZRNaZKENRzd83oLgqgG/G2A+7FgsISFhgblGjFM244=",
|
"narHash": "sha256-tZRNaZKENRzd83oLgqgG/G2A+7FgsISFhgblGjFM244=",
|
||||||
"owner": "therealr5",
|
"owner": "rouven0",
|
||||||
"repo": "purge",
|
"repo": "purge",
|
||||||
"rev": "3875053bd588aeee14849c50c60f6a33ac784da3",
|
"rev": "3875053bd588aeee14849c50c60f6a33ac784da3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "therealr5",
|
"owner": "rouven0",
|
||||||
"repo": "purge",
|
"repo": "purge",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -488,15 +488,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1706780552,
|
"lastModified": 1708375524,
|
||||||
"narHash": "sha256-qXEAZNReY2jeoxLO/uZmZMOEOQq6BRq/Mh20BQGF2Bs=",
|
"narHash": "sha256-6XxKJhGupxakfrz8GBJJ/l9RvLs3tt9wuj3c8MZoSuo=",
|
||||||
"owner": "therealr5",
|
"owner": "rouven0",
|
||||||
"repo": "TruckSimulatorBot",
|
"repo": "TruckSimulatorBot",
|
||||||
"rev": "88194a54c984fb91090c00d116c821627af9ed2f",
|
"rev": "6b33532486100f83fc9c7f2da3d1b54ea4fe5986",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "therealr5",
|
"owner": "rouven0",
|
||||||
"repo": "TruckSimulatorBot",
|
"repo": "TruckSimulatorBot",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,15 +26,15 @@
|
||||||
nix-colors.url = "github:Misterio77/nix-colors";
|
nix-colors.url = "github:Misterio77/nix-colors";
|
||||||
|
|
||||||
purge = {
|
purge = {
|
||||||
url = "github:therealr5/purge";
|
url = "github:rouven0/purge";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
trucksimulatorbot = {
|
trucksimulatorbot = {
|
||||||
url = "github:therealr5/TruckSimulatorBot";
|
url = "github:rouven0/TruckSimulatorBot";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
pfersel = {
|
pfersel = {
|
||||||
url = "github:therealr5/pfersel";
|
url = "github:rouven0/pfersel";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -8,17 +8,14 @@ let
|
||||||
inherit (prev) python3Packages;
|
inherit (prev) python3Packages;
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
pcmanfm = prev.pcmanfm.overrideAttrs (_: {
|
|
||||||
# remove deskop preferences shortcut
|
|
||||||
postInstall = ''
|
|
||||||
rm $out/share/applications/pcmanfm-desktop-pref.desktop
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
|
|
||||||
pww = callPackage ../pkgs/pww { };
|
pww = callPackage ../pkgs/pww { };
|
||||||
ianny = callPackage ../pkgs/ianny { };
|
ianny = callPackage ../pkgs/ianny { };
|
||||||
|
|
||||||
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
|
tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
|
||||||
|
imv = prev.imv.override {
|
||||||
|
# freeimage is broken
|
||||||
|
withBackends = [ "libtiff" "libjpeg" "libpng" "librsvg" "libheif" ];
|
||||||
|
};
|
||||||
|
|
||||||
gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
|
gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
|
||||||
jmri = callPackage ../pkgs/jmri { };
|
jmri = callPackage ../pkgs/jmri { };
|
||||||
|
|
|
@ -6,15 +6,16 @@
|
||||||
nixpkgs.flake = nixpkgs;
|
nixpkgs.flake = nixpkgs;
|
||||||
};
|
};
|
||||||
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
||||||
# keep build-time deps around for offline-rebuilding
|
|
||||||
settings = {
|
settings = {
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
|
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://cache.rfive.de"
|
"https://cache.rfive.de"
|
||||||
|
"https://cache.ifsr.de"
|
||||||
];
|
];
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw="
|
"cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw="
|
||||||
|
"cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg="
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue