Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Forcing unstable does not work well with setting nix paths, separate that into its own nix file

Browse source
This commit is contained in:
Jimbo 2024-09-03 01:01:58 -04:00
parent 66bfbba1f3
commit 1b8721c683
5 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -61,7 +61,7 @@
nixos-mailserver.nixosModule
];
};
JimDeck = nixpkgs-unstable.lib.nixosSystem {
JimDeck = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
modules = [
./nixos/deck.nix
@ -70,7 +70,7 @@
};
};
# Standalone home-manager configuration entrypoint
# Standalone home-manager configuration
# Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = {
"jimbo@JimDesktop" = home-manager.lib.homeManagerConfiguration {
@ -89,7 +89,7 @@
];
};
"jimbo@JimDeck" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs-unstable.legacyPackages.x86_64-linux;
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = {inherit inputs outputs;};
modules = [
./home-manager/jimbo_deck.nix

19
nixos/base.nix
View file

@ -24,21 +24,6 @@
};
};
# This will add each flake input as a registry
# To make nix commands consistent with your flake
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nix.nixPath = ["/etc/nix/path"];
environment.etc =
lib.mapAttrs'
(name: value: {
name = "nix/path/${name}";
value.source = value.flake;
})
config.nix.registry;
# Enable flakes and garbage collection
nix = {
settings = {
@ -50,8 +35,10 @@
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 14d";
options = "--delete-older-than 1w"
};
# You can also manually optimize the store via nix-store --optimise
settings.auto-optimise-store = true;
};
# Set timezone

1
nixos/desktop.nix
View file

@ -21,6 +21,7 @@
# Modules
./modules/security.nix
./modules/legacy.nix
# Hardware
./hardware/machines/desktop.nix

16
nixos/modules/legacy.nix Normal file
View file

@ -0,0 +1,16 @@
{
# This will add each flake input as a registry
# To make nix commands consistent with your flake
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nix.nixPath = ["/etc/nix/path"];
environment.etc =
lib.mapAttrs'
(name: value: {
name = "nix/path/${name}";
value.source = value.flake;
})
config.nix.registry;
}

1
nixos/server.nix
View file

@ -11,6 +11,7 @@
# Modules
./modules/security.nix
./modules/legacy.nix
# Hardware
./hardware/machines/server.nix