flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738743987,
-        "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
+        "lastModified": 1733570843,
+        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
+        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1734366194,
+        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
         "type": "github"
       },
       "original": {
@@ -58,13 +58,47 @@
         "type": "github"
       }
     },
+    "nix-ld": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1734338723,
+        "narHash": "sha256-BpJs2QnVwdE4Btsx2BcBmdsq86H7QJYv2GmoOkr1ii4=",
+        "owner": "Mic92",
+        "repo": "nix-ld",
+        "rev": "911665df070e3d6c970e5a248fc4a38550bd5689",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-ld",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738702386,
-        "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
+        "lastModified": 1733015953,
+        "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1734737257,
+        "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
+        "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa",
         "type": "github"
       },
       "original": {
@@ -79,7 +113,8 @@
         "darwin": "darwin",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs"
+        "nix-ld": "nix-ld",
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },

flake.nix

@@ -3,6 +3,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
+    nix-ld.url = "github:Mic92/nix-ld";
     home-manager = {
       url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -17,6 +18,7 @@
     self,
     nixpkgs,
     nix-flatpak,
+    nix-ld,
     darwin,
     home-manager,
     ...
@@ -57,6 +59,7 @@
       };
       modules = [
         nix-flatpak.nixosModules.nix-flatpak
+        nix-ld.nixosModules.nix-ld
         ./modules/common
         ./modules/machine/cloud
 
@@ -80,6 +83,7 @@
         hostname = "valefor";
       };
       modules = [
+        nix-ld.nixosModules.nix-ld
         ./modules/common
         ./modules/machine/valefor
 

home/git.nix

@@ -15,8 +15,7 @@
     extraConfig = {
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      pull.merge = true;
-      merge.tool = "nvimdiff";
+      pull.rebase = true;
     };
 
     ignores = [
@@ -40,7 +39,7 @@
       dc = "diff --cached";
       amend = "commit --amend -m";
 
-      # aliases for submodules
+      # aliases for submodule
       update = "submodule update --init --recursive";
       foreach = "submodule foreach";
     };

home/packages/common.nix

@@ -45,8 +45,6 @@
     nodejs
     cargo
     python3
-    jetbrains.rust-rover
-    jetbrains.rider
 
     # nix specific stuff
     nixd

modules/common/users.nix

@@ -23,8 +23,6 @@
     })
   ];
 
-  security.sudo.wheelNeedsPassword = false;
-
   users.groups.wyatt = {};
 
   nix.settings.trusted-users = [userName];

modules/graphics/default.nix

@@ -63,6 +63,8 @@ in {
     (mkIf (cfg.gpuVendor == "amd") {
       services.xserver.videoDrivers = ["amdgpu"];
       hardware.opengl.extraPackages = with pkgs; [
+        rocm-opencl-icd
+        rocm-opencl-runtime
         amdvlk
       ];
       environment.systemPackages = with pkgs; [

modules/machine/cloud/configuration.nix

@@ -59,7 +59,6 @@ in {
     wttrbar
     cliphist
     patchelf
-    nix-ld
   ];
 
   # Set the EDITOR global environment variable to neovim
@@ -86,7 +85,7 @@ in {
   # Graphics module (../../graphics/default.nix)
   graphics = {
     enable = true;
-    gpuVendor = "amd"; # or "amd" or "intel"
+    gpuVendor = "nvidia"; # or "amd" or "intel"
     wayland.enable = true;
     vulkan.enable = true;
   };
@@ -144,7 +143,7 @@ in {
   # Core networking module (see ../../networking/core.nix)
   network = {
     firewall.enable = true;
-    networkManager.enable = true;
+    networkmanager.enable = true;
   };
 
   # Enable dconf

modules/machine/valefor/configuration.nix

@@ -33,7 +33,6 @@
     neovim
     git
     patchelf
-    nix-ld
   ];
 
   # Set the EDITOR global environment variable to neovim
@@ -88,7 +87,7 @@
   # Core networking module (see ../../networking/core.nix)
   network = {
     firewall.enable = true;
-    networkManager.enable = true;
+    networkmanager.enable = true;
   };
 
   # DNS module (see ../../networking/dns.nix)

modules/networking/dns.nix

@@ -98,12 +98,34 @@ in {
     })
 
     (lib.mkIf cfg.technitium.enable {
-      services.technitium-dns-server = {
-        enable = true;
-        openFirewall = true;
-        firewallTCPPorts = [53 5380 53443];
-        firewallUDPPorts = [53];
+      systemd.services.technitium-dns = {
+        description = "Technitium DNS Server";
+        wantedBy = ["multi-user.target"];
+
+        serviceConfig = {
+          ExecStart = "${pkgs.technitium}/bin/dns-server-start.sh";
+          Restart = "on-failure";
+        };
+
+        # Environment configuration
+        environment =
+          {
+            DNS_LISTEN_ADDRESS = cfg.technitium.settings.address;
+            DNS_LISTEN_PORT = toString cfg.technitium.settings.port;
+          }
+          // lib.mapAttrs' (
+            name: value:
+              lib.nameValuePair "DNS_${lib.toUpper name}" (toString value)
+          )
+          cfg.technitium.settings.extraOptions;
       };
+
+      networking.firewall = {
+        allowedTCPPorts = [53 cfg.technitium.settings.port];
+        allowedUDPPorts = [53 cfg.technitium.settings.port];
+      };
+
+      environment.systemPackages = [pkgs.technitium];
     })
   ];
 }

modules/pwrMgmt/README.md

@@ -14,7 +14,7 @@ Given that this configuration is in the `machine/<hostname>` directory (where ho
     # other configuration files here...
   ];
 
-  pwrMgmt = {
+  customPowerManagement = {
     enable = true;
     cpuFreqGovernor = "performance";
     powertop.enable = false;
@@ -29,7 +29,7 @@ Given that this configuration is in the `machine/<hostname>` directory (where ho
     # other configuration files here...
   ];
 
-  pwrMgmt = {
+  customPowerManagement = {
     enable = true;
     cpuFreqGovernor = "powersave";
     powertop = {