Update the flake again with some minor details
This commit is contained in:
parent
c3193845a4
commit
2e7f9a1f3e
|
@ -9,7 +9,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
finalprev = (final: prev: {
|
finalprev = (final: prev: {
|
||||||
unstable = import inputs.nixpkgs-unstable {
|
unstable = import inputs.unstable {
|
||||||
system = final.system;
|
system = final.system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
36
flake.lock
36
flake.lock
|
@ -333,22 +333,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1727348695,
|
|
||||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717602782,
|
"lastModified": 1717602782,
|
||||||
|
@ -447,8 +431,8 @@
|
||||||
"mailserver": "mailserver",
|
"mailserver": "mailserver",
|
||||||
"minecraft": "minecraft",
|
"minecraft": "minecraft",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nur": "nur",
|
||||||
"nur": "nur"
|
"unstable": "unstable"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
|
@ -521,6 +505,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1728492678,
|
||||||
|
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
|
|
21
flake.nix
21
flake.nix
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
|
mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
|
||||||
blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz";
|
blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz";
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
outputs = {
|
outputs = {
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-unstable,
|
unstable,
|
||||||
nur,
|
nur,
|
||||||
mailserver,
|
mailserver,
|
||||||
blender-bin,
|
blender-bin,
|
||||||
|
@ -34,18 +34,17 @@
|
||||||
lanzaboote,
|
lanzaboote,
|
||||||
home-manager,
|
home-manager,
|
||||||
...
|
...
|
||||||
} @inputs: let
|
}@inputs: let
|
||||||
inherit (self) outputs;
|
|
||||||
mkNixos = modules: nixpkgs.lib.nixosSystem {
|
mkNixos = modules: nixpkgs.lib.nixosSystem {
|
||||||
inherit modules;
|
inherit modules;
|
||||||
specialArgs = { inherit inputs outputs; };
|
specialArgs = { inherit (self) inputs outputs; };
|
||||||
};
|
};
|
||||||
|
|
||||||
mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration {
|
mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration {
|
||||||
inherit modules pkgs;
|
inherit modules pkgs;
|
||||||
extraSpecialArgs = { inherit inputs outputs; };
|
extraSpecialArgs = { inherit (self) inputs outputs; };
|
||||||
};
|
};
|
||||||
in rec {
|
in {
|
||||||
# Your custom packages and modifications, exported as overlays
|
# Your custom packages and modifications, exported as overlays
|
||||||
overlays = import ./extras/overlays.nix { inherit inputs; };
|
overlays = import ./extras/overlays.nix { inherit inputs; };
|
||||||
|
|
||||||
|
@ -57,7 +56,7 @@
|
||||||
look = import ./extras/look.nix;
|
look = import ./extras/look.nix;
|
||||||
ws = import ./extras/workspaces.nix;
|
ws = import ./extras/workspaces.nix;
|
||||||
|
|
||||||
# NixOS config entrypoint, use 'nixos-rebuild --flake .#your-hostname'
|
# NixOS configuration: 'nixos-rebuild --flake .#hostname'
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
JimDesktop = mkNixos [
|
JimDesktop = mkNixos [
|
||||||
./system/hosts/JimDesktop/configuration.nix
|
./system/hosts/JimDesktop/configuration.nix
|
||||||
|
@ -73,12 +72,12 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Home-manager configuration, use 'home-manager --flake .#your-username@your-hostname'
|
# Home-manager configuration: 'home-manager --flake .#username@hostname'
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
"jimbo@JimDesktop" = mkHome [
|
"jimbo@JimDesktop" = mkHome [
|
||||||
./home/hosts/JimDesktop/home.nix
|
./home/hosts/JimDesktop/home.nix
|
||||||
nur.nixosModules.nur
|
nur.nixosModules.nur
|
||||||
] nixpkgs.legacyPackages."x86_64-linux";
|
] nixpkgs.legacyPackages.x86_64-linux;
|
||||||
|
|
||||||
"jimbo@JimServer" = mkHome [
|
"jimbo@JimServer" = mkHome [
|
||||||
./home/hosts/JimServer/home.nix
|
./home/hosts/JimServer/home.nix
|
||||||
|
@ -89,7 +88,7 @@
|
||||||
nur.nixosModules.nur
|
nur.nixosModules.nur
|
||||||
] nixpkgs.legacyPackages.aarch64-linux;
|
] nixpkgs.legacyPackages.aarch64-linux;
|
||||||
|
|
||||||
# Derivation for ssh envrionments on other people's servers
|
# Profile for ssh envrionments on different non-root systems
|
||||||
"jimbo@JimTerminal" = mkHome [
|
"jimbo@JimTerminal" = mkHome [
|
||||||
./home/hosts/JimTerminal/home.nix
|
./home/hosts/JimTerminal/home.nix
|
||||||
] nixpkgs.legacyPackages.x86_64-linux;
|
] nixpkgs.legacyPackages.x86_64-linux;
|
||||||
|
|
Loading…
Reference in a new issue