hd/cfg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update nixpkgs, small changes

Browse source
This commit is contained in:
Henri Dohmen 2025-05-18 13:27:15 +02:00
parent bf05141776
commit dbd88aea66
4 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -60,11 +60,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747155932, "lastModified": 1747559278,
"narHash": "sha256-NnPzzXEqfYjfrimLzK0JOBItfdEJdP/i6SNTuunCGgw=", "narHash": "sha256-10VfcILI2zYY1/ZlOx/cakDmpJgSEJYEG3gMrjzFREY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8d832ddfda9facf538f3dda9b6985fb0234f151c", "rev": "ee85cfc5c132e2cf956a7b5ab156ddaedaefcbbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -112,11 +112,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746904237, "lastModified": 1746461020,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1746904237, "lastModified": 1747327360,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
mod/home-manager.nix
View file

@ -8,11 +8,17 @@
{ {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{
home-manager.users."hd" = lib.mkAliasDefinitions options.home;
# install to /etc/profiles, not ~/.nix-profile
home-manager.useUserPackages = true;
# dont use home.nixpkgs
home-manager.useGlobalPkgs = true;
}
]; ];
config = { config = {
home.home.stateVersion = config.system.stateVersion; home.home.stateVersion = config.system.stateVersion;
home-manager.users."hd" = lib.mkAliasDefinitions options.home;
}; };
options = { options = {
@ -21,5 +27,4 @@
default = { }; default = { };
}; };
}; };
} }

6
mod/nix-configuration.nix
View file

@ -5,18 +5,14 @@
... ...
}: }:
{ {
config = {
nix.settings = { nix.settings = {
experimental-features = [ experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
trusted-users = [ trusted-users = [ "root" ];
"root"
];
auto-optimise-store = true; auto-optimise-store = true;
}; };
nixpkgs.config.allowUnfree = false; nixpkgs.config.allowUnfree = false;
};
} }

6
mod/users.nix
View file

@ -23,6 +23,12 @@
}; };
users.root = { users.root = {
hashedPassword = "!"; hashedPassword = "!";
# I don't like the unprivileged users to have unrestricted access to root
# but this is required for colmena. Better options are
# - only authorize root's pubkey
# - create password protected key
# TODO: do one of the above
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEG+dd4m98aKEWfFa/7VZUlJNX0axvIlHVihT8w7RLyY" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEG+dd4m98aKEWfFa/7VZUlJNX0axvIlHVihT8w7RLyY"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIsoj2+esEebRwDV2PuNRt9Vz28oolOy+Hc2THwrWTAB" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIsoj2+esEebRwDV2PuNRt9Vz28oolOy+Hc2THwrWTAB"