changes to modules + adoption of PC

modules/additionalUsers/aariz.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  users.users.aariz = {
+    isNormalUser = true;
+    description = "Aariz Khokhar";
+    packages = with pkgs; [ google-chrome ];
+    shell = pkgs.bash;
+  };
+}

modules/bluetooth/default.nix

@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+
+{
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+    settings = {
+      General = {
+        Experimental = true;
+      };
+      Policy = {
+        AutoEnable = true;
+      };
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    bluez
+    bluez-tools
+    blueman
+  ];
+
+  services.blueman.enable = true;
+}

modules/core/default.nix

@@ -1,16 +1,26 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   time.timeZone = "America/Chicago";
 
+  programs.fish.enable = true;
+
   users.users.river = {
     isNormalUser = true;
+    description = "Maaz Khokhar";
     extraGroups = [
       "wheel"
       "networkmanager"
+      "input"
     ];
+
+    shell = pkgs.fish;
   };
 
+  nixpkgs.config.allowUnfree = true;
+
   environment.systemPackages = with pkgs; [
     git
     neovim
@@ -21,24 +31,69 @@
     ghostty
     wireplumber
     brightnessctl
+    pulseaudio
+    pavucontrol
+    ghostty
+    git-credential-manager
   ];
 
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 7d";
+  nix = {
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 7d";
+    };
+    settings = {
+      trusted-users = [
+        "root"
+        "river"
+      ];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+      auto-optimise-store = true;
+    };
   };
 
-  nix.settings.auto-optimise-store = true;
+  programs.nix-ld.enable = true;
 
-  services.pipewire = {
-    enable = true;
-    pulse.enable = true;
-    alsa.enable = true;
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+
+    extraLocaleSettings = {
+      LC_ADDRESS = "en_US.UTF-8";
+      LC_IDENTIFICATION = "en_US.UTF-8";
+      LC_MEASUREMENT = "en_US.UTF-8";
+      LC_MONETARY = "en_US.UTF-8";
+      LC_NAME = "en_US.UTF-8";
+      LC_NUMERIC = "en_US.UTF-8";
+      LC_PAPER = "en_US.UTF-8";
+      LC_TELEPHONE = "en_US.UTF-8";
+      LC_TIME = "en_US.UTF-8";
+    };
   };
 
-  services.openssh = {
-    enable = true;
-    settings.PermitRootLogin = "no";
+  security.rtkit.enable = true;
+
+  services = {
+    xserver.xkb = {
+      layout = "us";
+      variant = "";
+    };
+
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+
+    openssh = {
+      enable = true;
+      settings.PermitRootLogin = "no";
+    };
+
+    printing.enable = true;
   };
 }

modules/development/claude.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    claude-code
+  ];
+}

modules/development/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports = [
@@ -10,5 +10,21 @@
     git
     neovim
     nixfmt
+    nixd
+    kubectl
+    jq
+    tmux
+    vscode
+    devenv
+    xh
+    nodejs
+  ];
+
+  # Nix LSP
+  nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
+
+  fonts.packages = with pkgs; [
+    nerd-fonts.fira-code
+    nerd-fonts.jetbrains-mono
   ];
 }

modules/gaming/default.nix

@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    steam
+    prismlauncher
+    nvtopPackages.amd
+  ];
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+  };
+
+  programs.gamemode.enable = true;
+
+  # GPU Driver
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+    extraPackages = with pkgs; [
+      mesa
+      vulkan-loader
+      vulkan-validation-layers
+    ];
+  };
+
+  services.xserver.videoDrivers = [ "amdgpu" ];
+}

modules/networking/core/default.nix

@@ -6,8 +6,18 @@
   ];
 
   networking = {
-    hostName = "laptop";
-    networkmanager.enable = true;
+    networkmanager = {
+      enable = true;
+      dns = "systemd-resolved";
+    };
+    extraHosts = "192.168.1.60 laptop";
+    nftables.enable = true;
+
+    nameservers = [
+      "192.168.1.193" # Pi-hole
+      "1.1.1.1" # Cloudflare
+      "1.0.0.1" # Cloudflare (Secondary)
+    ];
   };
 
   services.resolved = {
@@ -25,6 +35,4 @@
     };
 
   };
-
-  networking.nftables.enable = true;
 }

modules/networking/tailscale.nix

@@ -1,7 +1,12 @@
 { config, ... }:
 
 {
-  services.tailscale.enable = true;
+  services.tailscale = {
+    enable = true;
+    openFirewall = true;
+    extraSetFlags = [ "--operator=river" ];
+  };
+
   networking.firewall = {
     trustedInterfaces = [ config.services.tailscale.interfaceName ];
     allowedUDPPorts = [ config.services.tailscale.port ];
@@ -13,4 +18,8 @@
 
   systemd.network.wait-online.enable = false;
   boot.initrd.systemd.network.wait-online.enable = false;
+
+  users.users.river.extraGroups = [
+    "tailscale"
+  ];
 }

modules/obs/default.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-backgroundremoval
+      obs-pipewire-audio-capture
+      obs-vaapi
+      obs-gstreamer
+      obs-vkcapture
+    ];
+  };
+}

modules/ollama/default.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  services.ollama = {
+    enable = true;
+    host = "0.0.0.0";
+    port = 11434;
+    package = pkgs.ollama-rocm;
+  };
+
+  networking.firewall.allowedTCPPorts = [ 11434 ];
+}

modules/sunshine/default.nix

@@ -0,0 +1,29 @@
+{ ... }:
+
+{
+  services.sunshine = {
+    enable = true;
+    autoStart = true;
+    capSysAdmin = true;
+    openFirewall = true;
+  };
+
+  networking.firewall = {
+    allowedTCPPorts = [
+      47984
+      47989
+      47990
+      48010
+    ];
+    allowedUDPPortRanges = [
+      {
+        from = 47998;
+        to = 48000;
+      }
+      {
+        from = 8000;
+        to = 8010;
+      }
+    ];
+  };
+}

modules/virtualization/default.nix

@@ -3,5 +3,6 @@
   imports = [
     ./podman.nix
     ./qemu.nix
+    ./lima.nix
   ];
 }

modules/virtualization/lima.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    lima
+  ];
+}

modules/virtualization/podman.nix

@@ -33,5 +33,6 @@
   environment.systemPackages = with pkgs; [
     podman
     podman-compose
+    podman-desktop
   ];
 }

modules/virtualization/qemu.nix

@@ -1,12 +1,16 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   virtualisation.spiceUSBRedirection.enable = true;
 
-  virtualisation.libvirtd = {
-    enable = true;
-    qemu = {
-      swtpm.enable = true;
+  virtualisation = {
+    containers.enable = true;
+    libvirtd = {
+      enable = true;
+      qemu = {
+        package = pkgs.qemu_kvm;
+        swtpm.enable = true;
+      };
     };
   };