From 21d07edcf1ed2eb3d4eb22f0998f86eb91b0b219 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Thu, 22 May 2025 19:36:29 +0200 Subject: [PATCH] :recycle: [shared] Moved files to base shared directory --- hosts/pi4/default.nix | 7 +------ hosts/pi4/development.nix | 11 ----------- hosts/pi4/networking.nix | 13 ------------- shared/base/modules/default.nix | 9 ++++++++- shared/base/modules/development/default.nix | 13 +++++++++++++ .../modules/development/formatters.nix | 0 .../{desktop => base}/modules/development/nix.nix | 0 shared/base/modules/networking.nix | 15 ++++----------- shared/{desktop => base}/modules/nix-helper.nix | 0 shared/{desktop => base}/modules/nixos.nix | 0 shared/base/modules/security/default.nix | 8 ++++++++ .../{desktop => base}/modules/security/sops.nix | 0 shared/{desktop => base}/modules/security/ssh.nix | 0 shared/{desktop => base}/modules/shell.nix | 0 shared/desktop/modules/default.nix | 7 ++----- shared/desktop/modules/development/default.nix | 5 ----- shared/desktop/modules/qt.nix | 9 +++++++-- shared/desktop/modules/security/default.nix | 4 ---- 18 files changed, 43 insertions(+), 58 deletions(-) delete mode 100644 hosts/pi4/development.nix delete mode 100644 hosts/pi4/networking.nix create mode 100644 shared/base/modules/development/default.nix rename shared/{desktop => base}/modules/development/formatters.nix (100%) rename shared/{desktop => base}/modules/development/nix.nix (100%) rename shared/{desktop => base}/modules/nix-helper.nix (100%) rename shared/{desktop => base}/modules/nixos.nix (100%) create mode 100644 shared/base/modules/security/default.nix rename shared/{desktop => base}/modules/security/sops.nix (100%) rename shared/{desktop => base}/modules/security/ssh.nix (100%) rename shared/{desktop => base}/modules/shell.nix (100%) diff --git a/hosts/pi4/default.nix b/hosts/pi4/default.nix index 47535b8..fcbec8d 100644 --- a/hosts/pi4/default.nix +++ b/hosts/pi4/default.nix @@ -7,14 +7,9 @@ { imports = with lib.custom; [ - (relativeToRoot "shared/desktop/modules/nix-helper.nix") - (relativeToRoot "shared/desktop/modules/nixos.nix") - (relativeToRoot "shared/desktop/modules/shell.nix") - (relativeToRoot "shared/desktop/modules/security/sops.nix") + (relativeToBase "modules") ./boot.nix - ./development.nix ./hardware.nix - ./networking.nix ./security ]; diff --git a/hosts/pi4/development.nix b/hosts/pi4/development.nix deleted file mode 100644 index 8784f42..0000000 --- a/hosts/pi4/development.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, lib, ... }: - -{ - imports = [ - (lib.custom.relativeToRoot "shared/modules/development/formatters.nix") - ]; - - environment.systemPackages = with pkgs; [ - just - ]; -} diff --git a/hosts/pi4/networking.nix b/hosts/pi4/networking.nix deleted file mode 100644 index 0849945..0000000 --- a/hosts/pi4/networking.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ systemConfig, ... }: - -{ - networking = { - hostName = systemConfig.hostName; - networkmanager.enable = true; - }; - - services = { - openssh.enable = true; - tailscale.enable = true; - }; -} diff --git a/shared/base/modules/default.nix b/shared/base/modules/default.nix index fbd27be..0093dc5 100644 --- a/shared/base/modules/default.nix +++ b/shared/base/modules/default.nix @@ -1,3 +1,10 @@ { - imports = [ ./networking.nix ]; + imports = [ + ./development + ./networking.nix + ./nix-helper.nix + ./nixos.nix + ./security + ./shell.nix + ]; } diff --git a/shared/base/modules/development/default.nix b/shared/base/modules/development/default.nix new file mode 100644 index 0000000..c6465df --- /dev/null +++ b/shared/base/modules/development/default.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: + +{ + imports = [ + ./formatters.nix + ./nix.nix + ]; + + environment.systemPackages = with pkgs; [ + git + just + ]; +} diff --git a/shared/desktop/modules/development/formatters.nix b/shared/base/modules/development/formatters.nix similarity index 100% rename from shared/desktop/modules/development/formatters.nix rename to shared/base/modules/development/formatters.nix diff --git a/shared/desktop/modules/development/nix.nix b/shared/base/modules/development/nix.nix similarity index 100% rename from shared/desktop/modules/development/nix.nix rename to shared/base/modules/development/nix.nix diff --git a/shared/base/modules/networking.nix b/shared/base/modules/networking.nix index 4e79445..2b76ab5 100644 --- a/shared/base/modules/networking.nix +++ b/shared/base/modules/networking.nix @@ -8,19 +8,12 @@ networking = { networkmanager.enable = true; hostName = systemConfig.hostName; - # wireless.enable = true; # Enables wireless support via wpa_supplicant. }; - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - programs.ssh.enableAskPassword = false; - services.tailscale.enable = true; + services = { + openssh.enable = true; + tailscale.enable = true; + }; } diff --git a/shared/desktop/modules/nix-helper.nix b/shared/base/modules/nix-helper.nix similarity index 100% rename from shared/desktop/modules/nix-helper.nix rename to shared/base/modules/nix-helper.nix diff --git a/shared/desktop/modules/nixos.nix b/shared/base/modules/nixos.nix similarity index 100% rename from shared/desktop/modules/nixos.nix rename to shared/base/modules/nixos.nix diff --git a/shared/base/modules/security/default.nix b/shared/base/modules/security/default.nix new file mode 100644 index 0000000..02f28b8 --- /dev/null +++ b/shared/base/modules/security/default.nix @@ -0,0 +1,8 @@ +{ + imports = [ + ./sops.nix + ./ssh.nix + ]; + + programs.gnupg.agent.enable = true; +} diff --git a/shared/desktop/modules/security/sops.nix b/shared/base/modules/security/sops.nix similarity index 100% rename from shared/desktop/modules/security/sops.nix rename to shared/base/modules/security/sops.nix diff --git a/shared/desktop/modules/security/ssh.nix b/shared/base/modules/security/ssh.nix similarity index 100% rename from shared/desktop/modules/security/ssh.nix rename to shared/base/modules/security/ssh.nix diff --git a/shared/desktop/modules/shell.nix b/shared/base/modules/shell.nix similarity index 100% rename from shared/desktop/modules/shell.nix rename to shared/base/modules/shell.nix diff --git a/shared/desktop/modules/default.nix b/shared/desktop/modules/default.nix index 6322647..e3a9ef8 100644 --- a/shared/desktop/modules/default.nix +++ b/shared/desktop/modules/default.nix @@ -1,8 +1,8 @@ { lib, ... }: { - imports = [ - (lib.custom.relativeToBase "modules") + imports = with lib.custom; [ + (relativeToBase "modules") ./boot.nix ./development ./electron.nix @@ -14,13 +14,10 @@ ./locale.nix ./mail.nix ./media.nix - ./nixos.nix - ./nix-helper.nix ./office.nix ./hyprland ./sddm.nix ./security - ./shell.nix ./social.nix ./users.nix ./qt.nix diff --git a/shared/desktop/modules/development/default.nix b/shared/desktop/modules/development/default.nix index 579a561..d30be79 100644 --- a/shared/desktop/modules/development/default.nix +++ b/shared/desktop/modules/development/default.nix @@ -4,17 +4,12 @@ imports = [ ./docker.nix ./dotnet.nix - ./formatters.nix - ./nix.nix ./node.nix ./ollama.nix ./rust.nix ]; environment.systemPackages = with pkgs; [ - # Tools - git - just unstable.libpq # Required for PostgreSQL ]; } diff --git a/shared/desktop/modules/qt.nix b/shared/desktop/modules/qt.nix index 789cb01..ff0f13e 100644 --- a/shared/desktop/modules/qt.nix +++ b/shared/desktop/modules/qt.nix @@ -1,10 +1,15 @@ -{ pkgs, ... }: +{ + pkgs, + lib, + systemConfig, + ... +}: { environment = { sessionVariables = { QT_QPA_PLATFORMTHEME = "qt6ct"; - QT_QPA_PLATFORM = "wayland"; # Enable Wayland for QT + QT_QPA_PLATFORM = lib.mkIf systemConfig.wayland.enable "wayland"; # Enable Wayland for QT }; systemPackages = with pkgs.kdePackages; [ qtwayland diff --git a/shared/desktop/modules/security/default.nix b/shared/desktop/modules/security/default.nix index 1225fcd..4fdd9fd 100644 --- a/shared/desktop/modules/security/default.nix +++ b/shared/desktop/modules/security/default.nix @@ -1,9 +1,5 @@ { imports = [ - ./sops.nix - ./ssh.nix ./yubikey.nix ]; - - programs.gnupg.agent.enable = true; }