From b5cd34b76f72b614fb0fba684dd1e664a51a7b1f Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Mon, 22 Jan 2024 19:23:28 -0600
Subject: [PATCH] Fixed portal issues and switching from gdm to sddm

---
 config/home/packages.nix         |  2 +-
 config/system/default.nix        |  1 +
 config/system/displaymanager.nix | 15 +++++++++++++++
 config/system/services.nix       | 14 +++++++++-----
 hardware.nix                     |  8 +++++---
 system.nix                       | 15 ++-------------
 6 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 config/system/displaymanager.nix

diff --git a/config/home/packages.nix b/config/home/packages.nix
index 522a422..9e8612d 100644
--- a/config/home/packages.nix
+++ b/config/home/packages.nix
@@ -7,7 +7,7 @@
     pkgs."${browser}" discord libvirt swww grim slurp gnome.file-roller
     swaynotificationcenter rofi-wayland imv transmission-gtk mpv
     gimp obs-studio blender kdenlive godot_4 rustup pavucontrol audacity
-    zeroad xonotic openra font-awesome spotify swayidle vim neovide neovim
+    font-awesome spotify swayidle vim neovide neovim
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
     # Import Scripts
     (import ./../scripts/emopicker9000.nix { inherit pkgs; })
diff --git a/config/system/default.nix b/config/system/default.nix
index 7910202..8c8a489 100644
--- a/config/system/default.nix
+++ b/config/system/default.nix
@@ -6,6 +6,7 @@
     ./amd-steam.nix
     ./autorun.nix
     ./boot.nix
+    ./displaymanager.nix
     ./intel-opengl.nix
     ./intel-steam.nix
     ./polkit.nix
diff --git a/config/system/displaymanager.nix b/config/system/displaymanager.nix
new file mode 100644
index 0000000..eccebf0
--- /dev/null
+++ b/config/system/displaymanager.nix
@@ -0,0 +1,15 @@
+{ pkgs, config, ... }:
+
+{
+  services.xserver.displayManager = {
+    # enable = true;
+    # layout = "us";
+    # xkbVariant = "";
+    # libinput.enable = true;
+    sddm = {
+      enable = true;
+      autoNumlock = true;
+      wayland.enable = true;
+    }
+  };
+}
diff --git a/config/system/services.nix b/config/system/services.nix
index b13cb19..249ae6a 100644
--- a/config/system/services.nix
+++ b/config/system/services.nix
@@ -4,12 +4,16 @@
   # List services that you want to enable:
   services.openssh.enable = true;
   services.fstrim.enable = true;
-  services.xserver = {
+  xdg.portal = {
     enable = true;
-    layout = "us";
-    xkbVariant = "";
-    libinput.enable = true;
-    videoDrivers = [ "amdgpu" ];
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal
+    ];
+    configPackages = [ pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal
+    ];
   };
   services.pipewire = {
     enable = true;
diff --git a/hardware.nix b/hardware.nix
index 0561015..998605c 100644
--- a/hardware.nix
+++ b/hardware.nix
@@ -8,18 +8,20 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/37d2dff5-91fd-42c8-b836-1cc3d18b9cd4";
+    { device = "/dev/disk/by-uuid/b3302d13-4461-425c-aecc-13296f8bc93b";
       fsType = "ext4";
     };
 
+  boot.initrd.luks.devices."luks-bcd5941f-0fd9-4a5e-b8ff-b6bef60a1dd1".device = "/dev/disk/by-uuid/bcd5941f-0fd9-4a5e-b8ff-b6bef60a1dd1";
+
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6ADB-9840";
+    { device = "/dev/disk/by-uuid/67A4-1012";
       fsType = "vfat";
     };
 
diff --git a/system.nix b/system.nix
index 5e3d1a1..0accb68 100644
--- a/system.nix
+++ b/system.nix
@@ -48,13 +48,11 @@
     polkit_gnome lm_sensors unzip unrar libnotify 
     v4l-utils ydotool wl-clipboard socat cowsay lsd 
     pkg-config meson hugo gnumake ninja go nodejs symbola
-    noto-fonts-color-emoji material-icons brightnessctl 
-    gnome.adwaita-icon-theme
+    noto-fonts-color-emoji material-icons brightnessctl
   ];
 
-  programs.java.enable = true;
-  programs.dconf.enable = true;
   programs.steam.gamescopeSession.enable = true;
+  programs.dconf.enable = true;
   
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
@@ -68,15 +66,6 @@
     POLKIT_BIN = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
   };
 
-  xdg = {
-    portal = {
-      extraPortals = with pkgs; [
-        xdg-desktop-portal
-        xdg-desktop-portal-hyprland
-      ];
-    };
-  };
-
   # Optimization settings and garbage collection automation
   nix = {
     settings.auto-optimise-store = true;