global vs workstation and hosts vs profile

nixos/home/jahanson/global.nix

@@ -28,12 +28,59 @@ with config;
         gnupg
         go-task
 
+        # cli
+        _1password
+        bat
+        dbus
+        direnv
+        git
+        nix-index
+        python3
+        fzf
+        ripgrep
+        fastfetch
+
         # archives
         zip
         xz
         unzip
         p7zip
 
+        # terminal file managers
+        nnn
+        ranger
+        yazi
+
+        # networking tools
+        iperf3
+        dnsutils  # `dig` + `nslookup`
+        ldns # replacement of `dig`, it provide the command `drill`
+        aria2 # A lightweight multi-protocol & multi-source command-line download utility
+        socat # replacement of openbsd-netcat
+        nmap # A utility for network discovery and security auditing
+        ipcalc  # it is a calculator for the IPv4/v6 addresses
+
+        # system tools
+        sysstat
+        lm_sensors # for `sensors` command
+        ethtool
+        pciutils # lspci
+        usbutils # lsusb
+
+        # system call monitoring
+        strace # system call monitoring
+        ltrace # library call monitoring
+        lsof # list open files
+
+        btop # replacement of htop/nmon
+        iotop # io monitoring
+        iftop # network monitoring
+
+        # utils
+        direnv # shell environment management
+        pre-commit # Pre-commit tasks for git
+        minio-client # S3 management
+        
         # nix tools
         nvd
       ];

nixos/home/jahanson/workstation.nix

@@ -32,52 +32,9 @@ with config;
         vlc
 
         # cli
-        _1password
-        bat
-        dbus
-        direnv
-        git
-        nix-index
-        python3
-        fzf
-        ripgrep
         brightnessctl
-        fastfetch
 
-        # terminal file managers
+        # dev utils
-        nnn
-        ranger
-        yazi
-
-        # networking tools
-        iperf3
-        dnsutils  # `dig` + `nslookup`
-        ldns # replacement of `dig`, it provide the command `drill`
-        aria2 # A lightweight multi-protocol & multi-source command-line download utility
-        socat # replacement of openbsd-netcat
-        nmap # A utility for network discovery and security auditing
-        ipcalc  # it is a calculator for the IPv4/v6 addresses
-
-        # system tools
-        sysstat
-        lm_sensors # for `sensors` command
-        ethtool
-        pciutils # lspci
-        usbutils # lsusb
-
-        # system call monitoring
-        strace # system call monitoring
-        ltrace # library call monitoring
-        lsof # list open files
-
-        btop # replacement of htop/nmon
-        iotop # io monitoring
-        iftop # network monitoring
-
-        # utils
-        direnv # shell environment management
-        pre-commit # Pre-commit tasks for git
-        minio-client # S3 management
         shellcheck
         envsubst
       ];

nixos/hosts/durincore/default.nix

@@ -7,11 +7,6 @@
 
     # hardware-configuration.nix - half of the hardware-configuration.nix file
 
-    mySystem = {
-      services.openssh.enable = true;
-      security.wheelNeedsSudoPassword = false;
-    };
-
     # TODO build this in from flake host names
     networking.hostName = "durincore";
 

nixos/profiles/hw-hetzner-cax.nix

@@ -15,16 +15,17 @@
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  mySystem.services = {
+  mySystem = {
-    openssh.enable = true;
+    services.openssh.enable = true;
-  };
+    security.wheelNeedsSudoPassword = false;
     
     # Restic backups disabled.
-  mySystem.system.resticBackup =
+    system.resticBackup =
     {
       local.enable = false;
       remote.enable = false;
     };
+  };
 
   networking.useDHCP = lib.mkDefault true;
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";