up

hosts/desktop/configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, master, lib, inputs, ... }:
+{ config, pkgs, master, lib, pkgs-master, ... }:
 
 {
   imports =
@@ -24,6 +24,8 @@
   openFirewall = true;
 };
 
+hardware.graphics.enable = true;
+
 
 boot = {
 
@@ -42,12 +44,20 @@ boot = {
     consoleLogLevel = 0;
     initrd.verbose = false;
     kernelPackages = pkgs.linuxPackages_zen;
-    /*kernelPatches = [
-      {
-	name = "dsc";
-	patch = ../../patches/vesa-dsc-fixed-bpp.patch;
+    kernelPatches = [
+      /*{
+				name = "dsc";
+				patch = ../../patches/bigscreen_1.patch;
       }
-    ];*/
+			{
+				name = "dsc2";
+				patch = ../../patches/bigscreen_2.patch;
+			}*/
+			/*{
+				name = "dsc15";
+				patch = ../../patches/bigscreen_15.patch;
+			}*/
+    ];
     kernelParams = [
       "quiet"
       "splash"
@@ -64,6 +74,7 @@ boot = {
 
   };
 
+
   services.udev.extraRules = ''
   ACTION=="add", KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="35bd", ATTRS{idProduct}=="0101", TAG+="uaccess", MODE="0660"
   '';
@@ -121,6 +132,10 @@ boot = {
   services.desktopManager.cosmic.enable = true;
   services.desktopManager.gnome.enable = false;
   services.displayManager.gdm.enable = false;
+	programs.hyprland = {
+		withUWSM = true;
+		enable = true;
+	};
   /*services.displayManager = {
 	autoLogin.enable = true;
 	autoLogin.user = "joshuaelm";
@@ -143,6 +158,7 @@ boot = {
   programs.steam.gamescopeSession.enable = true;
 
 
+
   # Polkit
 
   security.polkit.enable = true;
@@ -248,7 +264,7 @@ boot = {
     resample.quality = 1;
   };
 };
-hardware.pulseaudio.extraConfig = ''
+services.pulseaudio.extraConfig = ''
   .nofail
   unload-module module-suspend-on-idle
   .fail
@@ -264,13 +280,18 @@ hardware.pulseaudio.extraConfig = ''
     isNormalUser = true;
     description = "Joshua Elmasri";
     extraGroups = [ "networkmanager" "input" "wheel" "adbusers" ];
-    shell = pkgs.fish;
     packages = with pkgs; [
     #  thunderbird
     ];
+    shell = pkgs.bash;
   };
+  /*programs.bash.interactiveShellInit = ''
+    if ! [ "$TERM" = "dumb" ] && [ -z "$BASH_EXECUTION_STRING" ]; then
+      exec nu
+    fi
+  '';*/
 
-  programs.fish.enable = true;
+  programs.fish.enable = false;
 
   nix.optimise.automatic = true;
 
@@ -317,6 +338,7 @@ hardware.pulseaudio.extraConfig = ''
   ];
 
 
+  services.input-remapper.enable = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -340,6 +362,7 @@ hardware.pulseaudio.extraConfig = ''
     killall
     usbutils
     mangohud
+		oversteer
     # cemu broken with latest update
     oterm
     wget
@@ -350,13 +373,14 @@ hardware.pulseaudio.extraConfig = ''
     cowsay
     pfetch
     ryubing
-    hyprpolkitagent
     gomatrix
     python3
     pavucontrol
     bluebubbles
     xfce.thunar
     parallel-launcher
+		corectrl
+    wiremix
     termsonic
     steamtinkerlaunch
     kdePackages.kdenlive
@@ -365,14 +389,11 @@ hardware.pulseaudio.extraConfig = ''
     lapce
     prismlauncher
     protonup-qt
-    openjdk23
     heroic
     protontricks
     gamescope
     playerctl
     wine
-    #alvr
-    cava
     libreoffice
     neovide
     flatpak
@@ -401,14 +422,20 @@ hardware.pulseaudio.extraConfig = ''
   };
   hardware.steam-hardware.enable=true;
   services.monado = {
-    enable = true;
+    enable = false;
     defaultRuntime = true; # Register as default OpenXR runtime
   };
+	services.wivrn.enable = true;
+	services.wivrn.package = pkgs-master.wivrn;
+	services.wivrn.defaultRuntime = true;
   systemd.user.services.monado.environment = {
     STEAMVR_LH_ENABLE = "1";
     XRT_COMPOSITOR_COMPUTE = "1";
     WMR_HANDTRACKING = "0";
   };
+	programs.alvr.enable = false;
+	programs.alvr.openFirewall = true;
+
 
 
   nixpkgs.config.packageOverrides = pkgs: {
@@ -449,6 +476,7 @@ hardware.pulseaudio.extraConfig = ''
   # Enable the OpenSSH daemon.
    services.openssh.enable = true;
    services.openssh.allowSFTP = true;
+   services.openssh.settings.PasswordAuthentication = true;
 
   # Open ports in the firewall.
    networking.firewall.allowedTCPPorts = [ 7860 3042 3246 9943 9944 7801 11434 47990 48010 5001 ];

hosts/desktop/hardware-configuration.nix

@@ -10,16 +10,16 @@
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/56963958-ba4d-413a-bb5e-30440a85f911";
+    { device = "/dev/disk/by-uuid/6452f60b-602c-42ae-bff6-7b0a35e59bfb";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DC02-0B36";
+    { device = "/dev/disk/by-uuid/9947-B99A";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };

hosts/desktop/home.nix

@@ -6,7 +6,7 @@
   home.username = "joshuaelm";
   home.homeDirectory = "/home/joshuaelm";
 
-  imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr/hyprland_desktop.nix ../../modules/ashell ../../modules/waybar/waybar.nix ../../modules/zen ../../modules/rofi ../../modules/kitty ];
+  imports = [ ../../modules/nvim ../../modules/stylix.nix ../../modules/hypr ../../modules/ashell ../../modules/waybar/waybar.nix ../../modules/zen ../../modules/rofi ../../modules/kitty ../../modules/cava ../../modules/starship ../../modules/fuzzel ../../modules/nushell ];
 
 
   home.packages = [
@@ -25,7 +25,6 @@
   programs.cava.enable = true;
   programs.btop.enable = true;
   services.hyprpaper.enable = true;
-  wayland.windowManager.hyprland.enable = true;
   home.shell.enableFishIntegration = true;
 
   home.file.".icons/default".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";