refactor: eliminate old module setup [part 1]

This commit is contained in:
Leon Schwarzäugl 2025-03-27 01:32:41 +01:00
parent da4cf4eca0
commit de9b5cf40c
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
58 changed files with 2375 additions and 2899 deletions

View file

@ -1,4 +1,4 @@
{ self, pkgs, inputs, outputs, config, lib, modulesPath, primaryUser ? "swarsel", ... }:
{ self, pkgs, inputs, config, lib, modulesPath, primaryUser ? "swarsel", ... }:
let
pubKeys = lib.filesystem.listFilesRecursive "${self}/secrets/keys/ssh";
in
@ -9,12 +9,15 @@ in
"${modulesPath}/installer/cd-dvd/channel.nix"
"${self}/profiles/iso/minimal.nix"
"${self}/profiles/nixos/common/sharedsetup.nix"
"${self}/profiles/home/common/sharedsetup.nix"
inputs.home-manager.nixosModules.home-manager
{
home-manager.users."${primaryUser}".imports = [
"${self}/profiles/home/common/settings.nix"
] ++ (builtins.attrValues outputs.homeModules);
"${self}/profiles/home/common/sharedsetup.nix"
];
}
];

View file

@ -200,13 +200,13 @@ in
xkb_layout = "us";
xkb_variant = "altgr-intl";
};
"2362:628:PIXA3854:00_093A:0274_Touchpad" = {
dwt = "enabled";
tap = "enabled";
natural_scroll = "enabled";
middle_emulation = "enabled";
drag_lock = "disabled";
};
# "2362:628:PIXA3854:00_093A:0274_Touchpad" = {
# dwt = "enabled";
# tap = "enabled";
# natural_scroll = "enabled";
# middle_emulation = "enabled";
# drag_lock = "disabled";
# };
"1133:50504:Logitech_USB_Receiver" = {
xkb_layout = "us";
xkb_variant = "altgr-intl";

View file

@ -6,12 +6,15 @@ in
imports = [
"${profilesPath}/nixos/server"
"${profilesPath}/nixos/common/sharedsetup.nix"
"${profilesPath}/home/common/sharedsetup.nix"
./hardware-configuration.nix
inputs.home-manager.nixosModules.home-manager
{
home-manager.users."${primaryUser}".imports = [
"${profilesPath}/home/server"
"${profilesPath}/home/common/sharedsetup.nix"
];
}
];
@ -79,14 +82,11 @@ in
swarselsystems = {
hasBluetooth = false;
hasFingerprint = false;
isImpermanence = false;
isLinux = true;
isBtrfs = false;
flakePath = "/root/.dotfiles";
server = {
enable = true;
forgejo = true;
ankisync = true;
};

View file

@ -1,4 +1,4 @@
{ self, inputs, outputs, pkgs, lib, primaryUser, ... }:
{ self, inputs, pkgs, lib, primaryUser, ... }:
let
profilesPath = "${self}/profiles";
sharedOptions = {
@ -14,6 +14,7 @@ in
"${profilesPath}/nixos/optional/autologin.nix"
"${profilesPath}/nixos/common/settings.nix"
"${profilesPath}/nixos/common/sharedsetup.nix"
"${profilesPath}/nixos/common/home-manager.nix"
"${profilesPath}/nixos/common/home-manager-extra.nix"
"${profilesPath}/nixos/common/xserver.nix"
@ -22,6 +23,7 @@ in
"${profilesPath}/nixos/common/lanzaboote.nix"
"${profilesPath}/nixos/common/sops.nix"
"${profilesPath}/nixos/server/ssh.nix"
"${profilesPath}/home/common/sharedsetup.nix"
inputs.home-manager.nixosModules.home-manager
{
@ -30,9 +32,10 @@ in
"${profilesPath}/home/common/settings.nix"
"${profilesPath}/home/common/sops.nix"
"${profilesPath}/home/common/ssh.nix"
] ++ (builtins.attrValues outputs.homeModules);
"${profilesPath}/home/common/sharedsetup.nix"
];
}
] ++ (builtins.attrValues outputs.nixosModules) ++ (builtins.attrValues outputs.homeModules);
];
environment.systemPackages = with pkgs; [

View file

@ -32,13 +32,10 @@ in
};
swarselsystems = {
hasBluetooth = false;
hasFingerprint = false;
isImpermanence = false;
isBtrfs = false;
isLinux = true;
server = {
enable = true;
kavita = true;
navidrome = true;
jellyfin = true;