♻️ [shared] Moved Hm configs to shared base

hosts/pi4/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  systemConfig,
-  ...
-}:
+{ lib, ... }:
 
 {
   imports = with lib.custom; [
@@ -11,6 +7,4 @@
     ./hardware.nix
     ./security
   ];
-
-  system.stateVersion = systemConfig.version;
 }

hosts/pi4/home-manager/default.nix

@@ -1,33 +1,9 @@
-{
-  lib,
-  inputs,
-  outputs,
-  systemConfig,
-  ...
-}:
+{ lib, ... }:
 
 {
-  imports = [
-    inputs.catppuccin.homeModules.catppuccin
-    (lib.custom.relativeToRoot "shared/desktop/home-manager/development/git.nix")
-    (lib.custom.relativeToRoot "shared/desktop/home-manager/development/helix.nix")
-    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/btop.nix")
-    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/eza.nix")
-    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/fastfetch.nix")
-    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/fish.nix")
-    (lib.custom.relativeToRoot "shared/desktop/home-manager/shell/zoxide.nix")
-    (lib.custom.relativeToRoot "shared/desktop/home-manager/gpg.nix")
+  imports = with lib.custom; [
+    (relativeToBase "home-manager")
   ];
 
-  home.stateVersion = systemConfig.version;
-
-  # Adds pkgs.unstable in order to fetch packages from unstable repositories
-  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
-
-  programs = {
-    git.signing.key = "E3FA0E995C0D0E5E";
-    # Let Home Manager install and manage itself.
-    home-manager.enable = true;
-  };
-
+  programs.git.signing.key = "E3FA0E995C0D0E5E";
 }

hosts/pi4/security/default.nix

@@ -1,17 +1,8 @@
-{ lib, ... }:
-
 {
-  imports = with lib.custom; [
-    (relativeToRoot "shared/modules/security/ssh.nix")
+  imports = [
     ./firewall.nix
   ];
 
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-  services = {
-    pcscd.enable = true;
-    gnome.gnome-keyring.enable = true;
-  };
+  programs.gnupg.agent.enableSSHSupport = true;
+  services.pcscd.enable = true;
 }

shared/base/home-manager/default.nix

@@ -1,3 +1,12 @@
+{ inputs, ... }:
+
 {
-  imports = [ ./ssh.nix ];
+  imports = [
+    inputs.catppuccin.homeModules.catppuccin
+    ./development
+    ./shell
+    ./gpg.nix
+    ./home-manager.nix
+    ./ssh.nix
+  ];
 }

shared/base/home-manager/development/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./git.nix
+    ./helix.nix
+  ];
+}

shared/base/home-manager/development/git.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, common, ... }:
 
 {
   home.packages = with pkgs; [
@@ -14,7 +14,7 @@
       enable = true;
       package = package;
       userName = "Martin Berg Alstad";
-      userEmail = "git@martials.no";
+      userEmail = "git@${common.domain}";
 
       aliases = {
         amend = "commit --amend";

shared/base/home-manager/home-manager.nix

@@ -0,0 +1,20 @@
+{
+  outputs,
+  systemConfig,
+  common,
+  ...
+}:
+
+{
+  home = {
+    username = systemConfig.username;
+    homeDirectory = common.dir.home;
+    stateVersion = systemConfig.version;
+  };
+
+  # Adds pkgs.unstable in order to fetch packages from unstable repositories
+  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+}

shared/base/home-manager/shell/default.nix

@@ -0,0 +1,10 @@
+{
+  imports = [
+    ./btop.nix
+    ./eza.nix
+    ./fastfetch.nix
+    ./fish.nix
+    ./fzf.nix
+    ./zoxide.nix
+  ];
+}

shared/base/modules/security/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./keyring.nix
     ./sops.nix
     ./ssh.nix
   ];

shared/base/modules/security/keyring.nix

@@ -0,0 +1,3 @@
+{
+  services.gnome.gnome-keyring.enable = true;
+}

shared/desktop/home-manager/default.nix

@@ -1,9 +1,6 @@
 {
-  inputs,
-  outputs,
   lib,
   common,
-  systemConfig,
   ...
 }:
 let
@@ -12,41 +9,23 @@ in
 {
   imports = [
     (lib.custom.relativeToBase "home-manager")
-    inputs.catppuccin.homeModules.catppuccin
+    ./development
+    ./hyprland
+    ./media
+    ./rofi
+    ./shell
+    ./zen
     ./cursors.nix
     ./default-applications.nix
-    ./development
     ./freetube.nix
     ./gtk.nix
-    ./gpg.nix
     ./kitty.nix
-    ./media
     ./nextcloud.nix
-    ./rofi
-    ./hyprland
-    ./shell
     ./sioyek.nix
     ./spicetify.nix
-    ./zen
   ];
 
-  home = {
-    username = systemConfig.username;
-    homeDirectory = dir.home;
-
-    sessionVariables = {
-      XDG_PICTURES_DIR = dir.pictures; # Define the default dir for pictures
-    };
-
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    stateVersion = systemConfig.version;
+  home.sessionVariables = {
+    XDG_PICTURES_DIR = dir.pictures; # Define the default dir for pictures
   };
-
-  # Adds pkgs.unstable in order to fetch packages from unstable repositories
-  nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
 }

shared/desktop/home-manager/development/default.nix

@@ -1,7 +1,5 @@
 {
   imports = [
-    ./git.nix
-    ./helix.nix
     ./zed.nix
   ];
   # TODO set Wayland vmOptions in Jetbrains products, Requires current installed version in path

shared/desktop/home-manager/shell/default.nix

@@ -1,12 +1,6 @@
 {
   imports = [
-    ./btop.nix
     ./cava
-    ./eza.nix
-    ./fastfetch.nix
-    ./fish.nix
-    ./fzf.nix
     ./yazi
-    ./zoxide.nix
   ];
 }

shared/desktop/modules/gnome/default.nix

@@ -21,7 +21,6 @@
   programs.dconf.enable = true; # Required for some gnome applications
 
   services = {
-    gnome.gnome-keyring.enable = true;
     gvfs.enable = true; # Gnome Virtual File-system. Required for various things in nautilus
     udev.packages = with pkgs; [ gnome-settings-daemon ];
   };