included relevant work from impermanence branch

This commit is contained in:
pagedmov
2024-10-17 22:07:34 -04:00
parent f512c7c7bb
commit 11f97cf4f3
23 changed files with 222 additions and 173 deletions

View File

@@ -6,7 +6,14 @@
username,
host,
...
}: {
}:
let
desktop_modules = if (host == "oganesson") then [
./software/virtualization.nix
] else [ ];
in
{
imports =
[(import ./hardware/bootloader.nix)]
++ [(import ./hardware/network.nix)]
@@ -15,5 +22,6 @@
++ [(import ./software/packages.nix)]
++ [(import ./software/programs.nix)]
++ [(import ./software/services.nix)]
++ [(import ./software/users.nix)];
++ [(import ./software/users.nix)]
++ desktop_modules;
}

View File

@@ -2,11 +2,11 @@
networking = {
networkmanager.enable = true;
hostName =
if (host == "desktop")
then "argon"
if (host == "oganesson")
then "oganesson"
else "mercury";
hosts = {
"192.168.1.163" = ["glasshaus"];
"192.168.1.201" = ["glasshaus"];
"192.168.1.111" = ["argon"];
"192.168.1.223" = ["mercury"];
};

View File

@@ -36,11 +36,15 @@
mesa
mpd
mullvad
mesa
neofetch
nh
nix-index
nix-output-monitor
nix-prefetch-scripts
nixos-option
nix-search-cli
nvd
openssl
p7zip
jq
@@ -70,5 +74,6 @@
xpad
libnotify
file
libvirt-glib
];
}

View File

@@ -15,7 +15,7 @@
)
];
services.displayManager.sddm = {
enable = true;
enable = false;
wayland.enable = true;
theme = "catppuccin-mocha";
package = pkgs.kdePackages.sddm;

View File

@@ -1,42 +1,57 @@
{
config,
inputs,
pkgs,
username,
self,
host,
...
config,
inputs,
pkgs,
username,
self,
host,
...
}: let
nur = config.nur;
nur = config.nur;
in {
imports = [inputs.home-manager.nixosModules.home-manager];
home-manager = {
useUserPackages = true;
useGlobalPkgs = true;
backupFileExtension = "backup";
extraSpecialArgs = {inherit self inputs host username nur;};
users.${username} = {
programs.home-manager.enable = true;
imports = [./../../home];
home = {
username = "${username}";
homeDirectory = "/home/${username}";
stateVersion = "24.05";
pointerCursor = {
name = "Quintom_Ink";
size = 36;
package = pkgs.quintom-cursor-theme;
};
};
};
};
users.users.${username} = {
isNormalUser = true;
shell = pkgs.zsh;
extraGroups = ["wheel"];
};
security.sudo.extraConfig = ''
${username} ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild
'';
nix.settings.allowed-users = ["${username}"];
imports = [inputs.home-manager.nixosModules.home-manager];
home-manager = {
useUserPackages = true;
useGlobalPkgs = true;
backupFileExtension = "backup";
extraSpecialArgs = {inherit self inputs host username nur;};
users.${username} = {
dconf.settings = {
"org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"];
uris = ["qemu:///system"];
};
};
programs.home-manager.enable = true;
imports = [
./../../home
];
home = {
username = "${username}";
homeDirectory = "/home/${username}";
stateVersion = "24.05";
pointerCursor = {
name = "Quintom_Ink";
size = 36;
package = pkgs.quintom-cursor-theme;
};
};
};
};
users = {
groups.persist = {};
users = {
root.hashedPassword = "$y$j9T$/eZO.0cE2EcsF4od78laE/$A3kqgNhr6LkUZHI/0MXAhk.SSKk7QsCIwH/l6xeryy8";
${username} = {
isNormalUser = true;
hashedPassword = "$y$j9T$pdvRk/.3GbwvcPw0NTdwW0$ugclmwwlOO7iKLcJY4DkyD2tX6.LS26LHQ//0W1zLQ.";
shell = pkgs.zsh;
extraGroups = ["wheel" "persist" "libvirtd"];
};
};
};
security.sudo.extraConfig = ''
${username} ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild
'';
nix.settings.allowed-users = ["${username}"];
}

View File

@@ -0,0 +1,6 @@
{ username, ... }:
{
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
}