uku/flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move some desktop stuff into common

Browse source
This commit is contained in:
uku 2024-01-18 15:36:37 +01:00
parent 7c0a075a8d
commit 6b4b1566c8
Signed by: uku
GPG key ID: 7D01D7B105E77166
2 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/common.nix
View file

@ -6,6 +6,11 @@
ragenix, ragenix,
... ...
}: { }: {
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = ["quiet" "loglevel=3"];
};
environment = { environment = {
systemPackages = with pkgs; let systemPackages = with pkgs; let
inherit (pkgs.stdenv.hostPlatform) system; inherit (pkgs.stdenv.hostPlatform) system;
@ -21,9 +26,21 @@
}; };
}; };
age.secrets = { networking.networkmanager.enable = true;
time.timeZone = "Europe/Paris";
i18n.defaultLocale = "en_US.UTF-8";
console.keyMap = "fr";
age = {
identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
secrets = {
tailscaleKey.file = ../secrets/tailscaleKey.age; tailscaleKey.file = ../secrets/tailscaleKey.age;
}; };
};
programs = { programs = {
ssh.startAgent = true; ssh.startAgent = true;
@ -37,6 +54,11 @@
}; };
}; };
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
};
services = { services = {
openssh = { openssh = {
enable = true; enable = true;
@ -51,7 +73,15 @@
}; };
}; };
nixpkgs.config.allowUnfree = true; security = {
rtkit.enable = true;
polkit.enable = true;
};
nixpkgs = {
config.allowUnfree = true;
overlays = [(import ../exprs/overlay.nix)];
};
nix = { nix = {
gc = { gc = {

37
modules/desktop.nix
View file

@ -13,9 +13,6 @@ in {
]; ];
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = ["quiet" "loglevel=3"];
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
kernelModules = ["v4l2loopback"]; kernelModules = ["v4l2loopback"];
@ -82,11 +79,6 @@ in {
icons.enable = true; icons.enable = true;
}; };
networking.networkmanager.enable = true;
time.timeZone = "Europe/Paris";
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {
LC_ADDRESS = "fr_FR.UTF-8"; LC_ADDRESS = "fr_FR.UTF-8";
LC_IDENTIFICATION = "fr_FR.UTF-8"; LC_IDENTIFICATION = "fr_FR.UTF-8";
@ -99,29 +91,14 @@ in {
LC_TIME = "fr_FR.UTF-8"; LC_TIME = "fr_FR.UTF-8";
}; };
console.keyMap = "fr"; security.pam.services.login.enableGnomeKeyring = true;
security = { age.secrets = let
rtkit.enable = true;
polkit.enable = true;
pam.services.login.enableGnomeKeyring = true;
};
age = {
identityPaths = ["/etc/ssh/ssh_host_ed25519_key"];
secrets = let
base = ../secrets/desktop; base = ../secrets/desktop;
in { in {
rootPassword.file = "${base}/rootPassword.age"; rootPassword.file = "${base}/rootPassword.age";
userPassword.file = "${base}/userPassword.age"; userPassword.file = "${base}/userPassword.age";
}; };
};
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
};
hm = { hm = {
imports = [ imports = [
@ -166,10 +143,6 @@ in {
}; };
}; };
nixpkgs = {
overlays = [(import ../exprs/overlay.nix)];
};
programs = { programs = {
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;
@ -193,14 +166,16 @@ in {
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
users.users."${username}" = { users.users = {
"${username}" = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.fish; shell = pkgs.fish;
extraGroups = ["networkmanager" "wheel" "video" "libvirtd"]; extraGroups = ["networkmanager" "wheel" "video" "libvirtd"];
hashedPasswordFile = config.age.secrets.userPassword.path; hashedPasswordFile = config.age.secrets.userPassword.path;
}; };
users.users.root.hashedPasswordFile = config.age.secrets.rootPassword.path; root.hashedPasswordFile = config.age.secrets.rootPassword.path;
};
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [