boot.nix

@@ -32,6 +32,7 @@
   # extra enabled kernel modules
   boot.kernelModules = [
     "sg" # for generic SCSI devices such as /dev/sg0
+    "wireguard"
   ];
 
   # Kernel parameter on boot
@@ -46,4 +47,4 @@
   boot.initrd.secrets = {
     "/crypto_keyfile.bin" = null;
   };
-}
+}

configuration.nix

@@ -19,9 +19,11 @@ in
     ./users/servostar/user.nix
     ./.luks-swap.nix
     ./fonts.nix
-    ./extra
-    ./core
-    ./dev
+    ./extra/dvd.nix
+    ./extra/bluray.nix
+    ./extra/platformio.nix
+    ./extra/yubikey.nix
+    ./extra/language-server.nix
   ];
 
   hardware.bluetooth.enable = true;
@@ -39,6 +41,8 @@ in
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
+  networking.wireguard.enable = true;
+
   # Enable networking
   networking.networkmanager.enable = true;
 
@@ -174,8 +178,6 @@ in
   environment.systemPackages = (with pkgs; [
     (python3.withPackages(python-packages))
 
-    conda
-
     virt-manager
     distrobox
 
@@ -236,6 +238,12 @@ in
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  networking.firewall.allowedUDPPorts = [
+    51820 # wireguard client
+  ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 

core/default.nix

@@ -1,5 +0,0 @@
-{
-    imports = [
-        ./dotnet.nix
-    ];
-}

core/dotnet.nix

@@ -1,5 +0,0 @@
-{ pkgs, config, ... }: {
-    environment.systemPackages = with pkgs; [
-        mono
-    ];
-}

dev/default.nix

@@ -1,7 +0,0 @@
-{
-    imports = [
-        ./language-server.nix
-        ./dotnet.nix
-        ./platformio.nix
-    ];
-}

dev/dotnet.nix

@@ -1,5 +0,0 @@
-{ pkgs, config, ... }: {
-    environment.systemPackages = with pkgs; [
-        dotnet-sdk
-    ];
-}

extra/default.nix

@@ -1,8 +0,0 @@
-{
-    imports = [
-        ./bluray.nix
-        ./dvd.nix
-        ./yubikey.nix
-        ./wireguard.nix
-    ];
-}

extra/language-server.nix

@@ -4,7 +4,5 @@
         shellcheck
         lua-language-server
         pyright
-        arduino-language-server
-        clang
     ];
 }

extra/wireguard.nix

@@ -1,15 +0,0 @@
-{ pkgs, config, ... }: {
-
-    networking.wireguard.enable = true;
-
-    # Open ports in the firewall.
-    # networking.firewall.allowedTCPPorts = [ ... ];
-    # networking.firewall.allowedUDPPorts = [ ... ];
-    networking.firewall.allowedUDPPorts = [
-        51820 # wireguard client
-    ];
-
-    boot.kernelModules = [
-        "wireguard"
-  ];
-}

nixos-build.sh

@@ -6,10 +6,8 @@ read -r choice
 case "$choice" in 
     y|Y )
         echo "copying files..."
-        cp -rv dev /etc/nixos
-        cp -rv core /etc/nixos
-        cp -rv extra /etc/nixos
-        cp -rv users /etc/nixos
+        cp -rv extra /etc/nixos/
+        cp -rv users /etc/nixos/users
         cp -rv *.nix /etc/nixos/
     ;;
     n|N )

users/servostar/user.nix

@@ -171,8 +171,8 @@
     xdg.configFile."VSCodium/User/settings.json".source = config/settings.json; # VSCodium settings
     xdg.configFile."aacs/KEYDB.cfg".source = config/keydb.cfg;                  # key database for blueray decryption
     # kitty configuration
-    xdg.configFile."kitty/kitty.conf".source = config/kitty/kitty.conf;
-    xdg.configFile."kitty/tokyonight.conf".source = config/kitty/tokyonight.conf;
+    xdg.configFile."kitty/kitty.conf".source = config/kitty/kitty.conf
+    xdg.configFile."kitty/tokyonight.conf".source = config/kitty/tokyonight.conf
 
     # ------------------------------------------------------
     # ZSH