Merge

flake.lock

@@ -88,11 +88,19 @@
     },
     "nixpkgs-unstable": {
       "locked": {
+<<<<<<< HEAD
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+=======
         "lastModified": 1725103162,
         "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+>>>>>>> 5655c8a056d725790ff88631d9bcc98875ef0333
         "type": "github"
       },
       "original": {

hosts/desktop/default.nix

@@ -11,12 +11,17 @@
 
     # CLI
     ../../modules/system/cli/common.nix
+    ../../modules/system/cli/podman.nix
 
     # Hardware
     ../../modules/system/hardware/firewall.nix
     ../../modules/system/hardware/garbage-collection.nix
     ../../modules/system/hardware/locale.nix
     ../../modules/system/hardware/nvidia.nix
+
+    # Containers
+    # ../../modules/containers/adguard.nix
+    # ../../modules/containers/caddy.nix
   ];
 
   nix.settings = {
@@ -45,7 +50,17 @@
     extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  services.openssh.enable = true;
+
+  # boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # sunshine
+  services.sunshine = {
+    enable = true;
+    autoStart = true;
+    capSysAdmin = true;
+    openFirewall = true;
+  };
 
   system.stateVersion = "24.05";
 

hosts/desktop/hardware-configuration.nix

@@ -8,18 +8,18 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b4cefbc5-dd3d-4a4b-84d0-031b2ed7655c";
+    { device = "/dev/disk/by-uuid/f8dc500b-2b36-4ca8-940b-1716742d6cf3";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/9A7D-7464";
+    { device = "/dev/disk/by-uuid/029A-9287";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };

hosts/desktop/home.nix

@@ -30,7 +30,10 @@
     host = "xv-desktop";
 
     home.packages = with pkgs; [
-       unstable.prismlauncher
+      unstable.prismlauncher
+      unstable.modrinth-app
+      unstable.vesktop
+      unstable.blender
     ];
 
     home.stateVersion = "24.05";

modules/containers/adguard.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+  virtualisation.oci-containers.containers = {
+    adguardhome = {
+      image = "docker.io/adguard/adguardhome";
+      autoStart = true;
+      ports = [
+        "192.168.100.107:53:53/udp"
+        "81:3000/tcp"
+      ];
+      volumes = [
+        "workdir:/opt/adguardhome/work"
+        "confdir:/opt/adguardhome/conf"
+      ];
+    };
+  };
+
+  networking.firewall = {
+    allowedTCPPorts = [ 81 53 ];
+    allowedUDPPorts = [ 53 ];
+  };
+}

modules/containers/caddy.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+pkgs.dockerTools.buildImage {
+  name = "caddy-custom";
+  tag = "latest";
+
+  fromImage = "docker.io/caddy";
+  fromImageName = null;
+  fromImageTag = "2.8.4-builder";
+
+  runAsRoot = ''
+    #!${pkgs.runtimeShell}
+
+    xcaddy build --with github.com/caddy-dns/cloudflare
+  '';
+}

modules/home/gui/hyprland/default.nix

@@ -38,6 +38,13 @@
         "blueman-applet"
       ];
 
+      env = lib.mkIf (config.host == "xv-desktop") [
+        "LIBVA_DRIVER_NAME,nvidia"
+        "XDG_SESSION_TYPE,wayland"
+        "GBM_BACKEND,nvidia-drm"
+        "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+      ];
+
       "$mod" = "SUPER";
 
       input = {
@@ -86,11 +93,11 @@
         
       ]
       (lib.mkIf (config.host == "xv-desktop") [
-        "1, monitor:DP-2"
+        "1, monitor:DP-1"
-        "2, monitor:DP-2"
+        "2, monitor:DP-1"
-        "3, monitor:DP-2"
+        "3, monitor:DP-1"
-        "4, monitor:DP-2"
+        "4, monitor:DP-1"
-        "5, monitor:DP-2"
+        "5, monitor:DP-1"
         "6, monitor:HDMI-A-1"
         "7, monitor:HDMI-A-1"
         "8, monitor:HDMI-A-1"

modules/home/gui/hyprland/waybar.nix

@@ -35,6 +35,10 @@
             "DP-10" = [ 1 2 3 4 ];
             "DP-9" = [ 5 6 7 ];
             "eDP-1" = [ 8 9 10 ];
+          })
+          (lib.mkIf (config.host == "xv-desktop") {
+            "DP-1" = [ 1 2 3 4 5 ];
+            "HDMI-A-1" = [ 6 7 8 9 10 ];
           })];
           "format-icons" = {
             "default" = "";

modules/system/cli/podman.nix

@@ -9,6 +9,8 @@
     defaultNetwork.settings.dns_enabled = true;
   };
 
+  virtualisation.oci-containers.backend = "podman";
+
   environment.systemPackages = with pkgs; [
     dive
     podman-tui

modules/system/hardware/nvidia.nix

@@ -34,6 +34,13 @@
     open = false;
     nvidiaSettings = true;
 
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      version = "555.58.02";
+      sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
+      sha256_aarch64 = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
+      openSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+      settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+      persistencedSha256 = lib.fakeSha256;
+    };
   };
 }