Compare commits

...

2 commits

18 changed files with 31 additions and 20 deletions

View file

@ -3,6 +3,7 @@
./sysadmin ./sysadmin
./users ./users
./environment.nix ./environment.nix
./home-manager.nix
./nginx.nix ./nginx.nix
./openssh.nix ./openssh.nix
./security.nix ./security.nix

18
common/home-manager.nix Normal file
View file

@ -0,0 +1,18 @@
{ config, lib, pkgs, ... }:
{
home-manager = {
useUserPackages = true;
useGlobalPkgs = true;
users = {
qenya = { config, lib, pkgs, osConfig, ... }: {
home.homeDirectory = osConfig.users.users.qenya.home;
imports = [
../home/qenya
];
};
};
};
}

View file

@ -5,21 +5,8 @@ in {
users.users.qenya = { users.users.qenya = {
isNormalUser = true; isNormalUser = true;
home = "/home/qenya"; home = "/home/qenya";
extraGroups = [
"wheel" # sudo
"networkmanager" # UI wifi configuration
"dialout" # access to serial ports
];
shell = pkgs.zsh; shell = pkgs.zsh;
openssh.authorizedKeys.keys = keys.users.qenya; openssh.authorizedKeys.keys = keys.users.qenya;
uid = 1001; uid = 1001;
}; };
home-manager.users.qenya = { config, lib, pkgs, osConfig, ... }: {
home.homeDirectory = osConfig.users.users.qenya.home;
imports = [
../../home
];
};
} }

View file

@ -47,11 +47,6 @@
overlays = [ nur.overlay ]; overlays = [ nur.overlay ];
}; };
home-manager = {
useUserPackages = true;
useGlobalPkgs = true;
};
imports = [ imports = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
nur.nixosModules.nur nur.nixosModules.nur

View file

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

View file

@ -8,6 +8,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
users.users.qenya.extraGroups = [ "wheel" ];
qenya.sysadmin.enable = true; qenya.sysadmin.enable = true;
system.stateVersion = "23.11"; system.stateVersion = "23.11";

View file

@ -8,6 +8,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
users.users.qenya.extraGroups = [ "wheel" ];
qenya.sysadmin.enable = true; qenya.sysadmin.enable = true;
age.secrets.wireguard-peer-orm.file = ../../secrets/wireguard-peer-orm.age; age.secrets.wireguard-peer-orm.file = ../../secrets/wireguard-peer-orm.age;

View file

@ -43,6 +43,12 @@
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
users.users.qenya.extraGroups = [
"wheel" # sudo
"networkmanager" # UI wifi configuration
"dialout" # access to serial ports
];
# USB drives # USB drives
boot.supportedFilesystems = [ "ntfs" ]; boot.supportedFilesystems = [ "ntfs" ];

View file

@ -8,6 +8,8 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
users.users.qenya.extraGroups = [ "wheel" ];
qenya.sysadmin.enable = true; qenya.sysadmin.enable = true;
age.secrets.wireguard-peer-yevaud.file = ../../secrets/wireguard-peer-yevaud.age; age.secrets.wireguard-peer-yevaud.file = ../../secrets/wireguard-peer-yevaud.age;