Some refactoring work...

1 files changed, 24 insertions, 12 deletions

diff --git a/modules/base.nix b/modules/base.nix
index c89f963..7364dfa 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -6,12 +6,14 @@
       ./packages/vim.nix
       ./users/Rory.nix
     ];
-  boot.kernelParams = [ 
-    "memory_hotplug.memmap_on_memory=1"
-    "memhp_default_state=online"
-    "net.core.default_qdisc=fq"
-    "net.ipv4.tcp_congestion_control=bbr"
-  ];
+  boot = {
+    kernelParams = [ 
+      "memory_hotplug.memmap_on_memory=1"
+      "memhp_default_state=online"
+      "net.core.default_qdisc=fq"
+      "net.ipv4.tcp_congestion_control=bbr"
+    ];
+  }
   networking = {
     hostName = lib.mkDefault "Rory-nix-base";
     firewall = {
@@ -46,9 +48,10 @@
     wget
     neofetch
     lnav
-    zsh
+    pciutils
     git
     lsd
+    duf
     htop
     btop
     #sshfs
@@ -77,10 +80,19 @@
     "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
     "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
   ];
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  nix.settings.auto-optimise-store = true;
-  nixpkgs.config.allowUnfree = true;
-  security.sudo.wheelNeedsPassword = false;
-  security.polkit.enable = true;
+  nix = {
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      auto-optimise-store = true;
+    };
+  };
+  nixpkgs = {
+    config.allowUnfree = true;
+  };
+  security = {
+    polkit.enable = true;
+    sudo.wheelNeedsPassword = false;
+  };
+
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }