♻️ [shared] Moved files to base shared directory

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

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
   ];
 }

shared/desktop/modules/development/formatters.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    nodePackages.prettier
-    nixfmt-rfc-style
-    treefmt
-    shfmt
-  ];
-}

shared/desktop/modules/development/nix.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    nixd
-    nil
-  ];
-}

shared/desktop/modules/nix-helper.nix

@@ -1,14 +0,0 @@
-# Nix-Helper: github.com/viperML/nh
-{ common, ... }:
-
-{
-  programs.nh = {
-    enable = true;
-    flake = common.root;
-    clean = {
-      enable = true;
-      dates = "weekly";
-      extraArgs = "--keep-since 30d";
-    };
-  };
-}

shared/desktop/modules/nixos.nix

@@ -1,25 +0,0 @@
-{
-  pkgs,
-  outputs,
-  systemConfig,
-  ...
-}:
-
-{
-  environment.systemPackages = with pkgs; [
-    nix-prefetch-github # Cmd to get rev and hash from GitHub
-  ];
-
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-
-  nixpkgs = {
-    # Allow unfree packages
-    config.allowUnfree = true;
-    overlays = [ outputs.overlays.unstable-packages ];
-  };
-
-  system.stateVersion = systemConfig.version;
-}

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

shared/desktop/modules/security/default.nix

@@ -1,9 +1,5 @@
 {
   imports = [
-    ./sops.nix
-    ./ssh.nix
     ./yubikey.nix
   ];
-
-  programs.gnupg.agent.enable = true;
 }

shared/desktop/modules/security/sops.nix

@@ -1,20 +0,0 @@
-{
-  inputs,
-  lib,
-  systemConfig,
-  ...
-}:
-
-{
-  imports = [
-    inputs.sops-nix.nixosModules.sops
-  ];
-
-  sops = {
-    defaultSopsFile = lib.custom.relativeToRoot "shared/secrets/secrets.yaml";
-    defaultSopsFormat = "yaml";
-
-    age.keyFile = "/home/${systemConfig.username}/.config/sops/age/keys.txt";
-    secrets.password-hash.neededForUsers = true;
-  };
-}

shared/desktop/modules/security/ssh.nix

@@ -1,27 +0,0 @@
-# /nix/store/<hash>/etc/ssh/ssh_config & /nix/store/<hash>/etc/ssh/authorized_keys
-{
-  systemConfig,
-  systems,
-  common,
-  ...
-}:
-with builtins;
-let
-  domain = "dns.${common.domain}";
-in
-{
-  programs.ssh.knownHosts = listToAttrs (
-    map (system: {
-      name = system.hostName;
-      value = {
-        extraHostNames = [
-          "${system.hostName}.${domain}"
-        ];
-        publicKey = system.ssh.publicKey;
-      };
-    }) systems
-  );
-  users.users.${systemConfig.username}.openssh.authorizedKeys.keys = (
-    map (system: system.ssh.publicKey) systems
-  );
-}

shared/desktop/modules/shell.nix

@@ -1,19 +0,0 @@
-# For Fish dotfiles, see: /home-manager/fish.nix
-{ pkgs, ... }:
-
-{
-  programs = {
-    bash = {
-      # Starts the OS using Bash, then starts fish if it's not running
-      interactiveShellInit = ''
-        if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-        then
-          shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-          exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-        fi
-      '';
-    };
-
-    fish.enable = true;
-  };
-}