nate/dotfiles/waybar/config

@@ -199,7 +199,7 @@
 
     "custom/spotify": {
         "format": " ",
-        "on-click": "foot -e 'ncspot'",
+        "on-click": "xfce4-terminal -e 'ncspot'",
         "tooltip": false
     },
 

nate/modules/home-manager/home.nix

@@ -60,7 +60,6 @@
     #
     # Gaming
     #
-    amdgpu_top
     wine-wayland
     webcord
 
@@ -85,7 +84,6 @@
     imv
     mpv
     gimp
-    ffmpeg
 
     #
     # Communication

nate/modules/sway/sway_conf.nix

@@ -1,4 +1,4 @@
-{ lib, config, pkgs, userName, ... }:
+{ lib, config, pkgs, ... }:
 {
     options.swaywm = {
         enable = lib.mkEnableOption "Enable sway window manager.";
@@ -86,10 +86,9 @@
             # ])
         ];
 
-        # environment.loginShellInit = ''
+        environment.loginShellInit = ''
-        #     [[ "$(tty)" == /dev/tty1 ]] && sway
+            [[ "$(tty)" == /dev/tty1 ]] && sway
-        # '';
+        '';
-
         # Thunar config
         programs.thunar = {
             enable = true;
@@ -114,60 +113,26 @@
         services.gvfs.enable = true;  # thunar functionalities
         services.openssh.enable = true;
         services.dbus.enable = true;
-
-        # Audio
-        security.rtkit.enable = true;
         services.pipewire = {
           enable = true;
           alsa.enable = true;
-          # alsa.support32Bit = true;
           pulse.enable = true;
-          wireplumber.enable = true;
         };
-        sound.enable = false;
+
         ###
         ##  Misc
         ###
-
+        sound.enable = true;
         # Necessary for home-manager sway setup
         security.polkit.enable = true;
 
-        # services.xserver.enable = true;
+        # Use amdgpu-pro drivers for davinci
-        # services.xserver.displayManager.defaultSession = "sway";
-        # services.xserver.displayManager.gdm.enable = true;
-        # services.xserver.displayManager.gdm.wayland = true;
-        # services.xserver.displayManager.gdm.settings = {
-            # greeter.includeAll = false;
-            # greeter.include = "nate";
-        # };
-
-        services.greetd = {
-          enable = true;
-          settings = rec {
-            initial_session = {
-              command = "${pkgs.sway}/bin/sway";
-              user = "nate";
-            };
-            default_session = initial_session;
-          };
-        };
-
-        services.xserver.videoDrivers = [ "amdgpu" ];
-        # Enable HIP
-        systemd.tmpfiles.rules = [
-            "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
-        ];
         # services.xserver.videoDrivers = [ "amdgpu-pro" ];
         hardware.opengl = {
             # Mesa
             enable = true;
             # Vulkan
             driSupport = true;
-            # Rocm support and vulkan drivers
-            extraPackages = with pkgs; [
-                rocmPackages.clr.icd
-                amdvlk
-            ];
         };
     };
 }