refactor: restructure config files

2026-04-27 15:59:20 +02:00
parent bac6e4997b
commit 0b2ecd31b0
58 changed files with 6 additions and 2 deletions
@@ -0,0 +1,37 @@
+{
+  config,
+  inputs,
+  ...
+}:
+let
+  nixosModules = config.flake.modules.nixos;
+  hmModules = config.flake.modules.homeManager;
+in
+{
+  flake.modules.nixos.host-base = {
+    imports = [
+      nixosModules.meta
+      inputs.home-manager.nixosModules.home-manager
+      nixosModules.nix
+      nixosModules.region-nl
+      nixosModules.sops-password
+    ];
+
+    home-manager = {
+      useGlobalPkgs = true;
+      backupFileExtension = "bak";
+      extraSpecialArgs = { inherit inputs; };
+      sharedModules = [
+        hmModules.syncthing
+        hmModules.shell
+        hmModules.neovim
+      ];
+    };
+
+    users.mutableUsers = false;
+
+    security.sudo.extraConfig = ''
+      Defaults env_keep+=SSH_AUTH_SOCK
+    '';
+  };
+}
@@ -0,0 +1,63 @@
+{ config, ... }:
+let
+  nixosModules = config.flake.modules.nixos;
+  homeModules = config.flake.modules.homeManager;
+  account = config.repo.account;
+in
+{
+  flake.modules.nixos.workstation-base = {
+    imports = [
+      nixosModules.host-base
+
+      nixosModules.audio
+      nixosModules.bluetooth
+      nixosModules.flatpak
+      nixosModules.fonts
+      nixosModules.networking
+      nixosModules.niri
+      nixosModules.plymouth
+      nixosModules.printing
+      nixosModules.sddm
+      nixosModules.sops-admin-key-file
+      nixosModules.standard-boot
+      nixosModules.theme
+      nixosModules.ai
+    ];
+
+    services.dbus.implementation = "broker";
+
+    programs.nix-ld.enable = true;
+    environment.localBinInPath = true;
+
+    home-manager.users.${account.name}.imports = [
+      homeModules.workstation-base
+    ];
+  };
+
+  flake.modules.homeManager.workstation-base = {
+    imports = [
+      homeModules.ai
+      homeModules.bitwarden
+      homeModules.clipboard
+      homeModules.dev-tools
+      homeModules.email
+      homeModules.local-apps
+      homeModules.mpv
+      homeModules.nh
+      homeModules.niri
+      homeModules.nix
+      homeModules.pim
+      homeModules.podman
+      homeModules.qbittorrent-client
+      homeModules.sops
+      homeModules.git
+      homeModules.ssh-client
+      homeModules.primary-terminal-foot
+      homeModules.terminal-kitty
+      homeModules.theme
+      homeModules.vicinae
+      homeModules.xdg
+      homeModules.noctalia
+    ];
+  };
+}