Fix greetd, sway tweaks

home-manager/modules/rofi/default.nix

@@ -14,5 +14,9 @@ in
       theme = ./launch.rasi;
       terminal = "${pkgs.alacritty}/bin/alacritty";
     };
+
+    home.file.".local/rofi/themes/power.rasi" = {
+      source = ./power.rasi;
+    };
   };
 }

home-manager/modules/sway/default.nix

@@ -3,7 +3,7 @@ with lib;
 let
   cfg = config.eboskma.programs.sway;
   mod = "Mod4";
-  swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image /home/erwin/Dropbox/Private/Wallpapers/2560x1440/arch.png --fade-in 0.5 --scaling fill";
+  swaylockcmd = "${pkgs.swaylock}/bin/swaylock --ignore-empty-password --daemonize --show-failed-attempts --indicator-caps-lock --clock --image ~/.wallpapers/river-2560.png --fade-in 0.5 --scaling fill";
 in
 {
   options.eboskma.programs.sway.enable = mkEnableOption "Enable sway";
@@ -143,14 +143,14 @@ in
           "${mod}+Shift+c" = "reload";
           "${mod}+Shift+p" = "restart";
 
-          "${mod}+Shift+f" = "exec --no-startup-id ~/.config/wofi/session.sh";
+          "${mod}+Shift+f" = "exec --no-startup-id ~/.config/rofi/session.sh";
           "${mod}+l" = "exec ${swaylockcmd}";
           "${mod}+p" = "mode resize";
 
-          "${mod}+Print" = "exec grim -o $(swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[] | select(.focused) | .name')";
-          "${mod}+Shift+Print" = "exec grim -o $(swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t \"image/png\" -f";
-          "${mod}+Shift+Ctrl+Print" = "exec grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t \"image/png\" -f";
-          "${mod}+Shift+Alt+Print" = "exec grim -g \"$(${pkgs.slurp}/bin/slurp)\"";
+          "${mod}+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[] | select(.focused) | .name')";
+          "${mod}+Shift+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t \"image/png\" -f";
+          "${mod}+Shift+Ctrl+Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t \"image/png\" -f";
+          "${mod}+Shift+Alt+Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\"";
 
           "XF86AudioRaiseVolume" = "exec ${pkgs.pamedia}/bin/pamedia up";
           "XF86AudioLowerVolume" = "exec ${pkgs.pamedia}/bin/pamedia down";
@@ -180,7 +180,46 @@ in
         for_window [app_id="gnome-calculator"] floating enable
 
         exec --no-startup-id ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
+        exec --no-startup-id ${pkgs.swayidle}/bin/swayidle -w timeout 900 ${swaylockcmd};
+        exec --no-startup-id ${pkgs.swayidle}/bin/swayidle -w 1200 ${pkgs.sway}/bin/swaymsg 'output * dpms off' resume ${pkgs.sway}/bin/swaymsg 'output * dpms off';
       '';
+
+      extraSessionCommands =
+        ''
+          export _JAVA_AWT_WM_NONREPARENTING=1
+          export MOZ_ENABLE_WAYLAND=1
+          export MOZ_DBUS_REMOTE=1
+          export QT_QPA_PLATFORM=wayland
+          export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+          export QT_QPA_PLATFORMTHEME=qt5ct
+          export SDL_VIDEODRIVER=wayland
+          export SSH_AUTH_SOCK="''${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
+          export WLR_NO_HARDWARE_CURSORS=1
+        '';
+
+      wrapperFeatures = {
+        base = true;
+        gtk = true;
+      };
+
+      xwayland = true;
+    };
+
+    home = {
+      file.".wallpapers".source = ./wallpapers;
+
+      packages = with pkgs; [
+        dunst
+        swayidle
+        swaylock
+      ];
+    };
+
+    systemd.user.targets.tray = {
+      Unit = {
+        Description = "Home Manager System Tray";
+        Requires = [ "graphical-session-pre.target" ];
+      };
     };
   };
 }

machines/vm2/hardware-configuration.nix

@@ -10,8 +10,8 @@
     ];
 
   boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
+  boot.initrd.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =

modules/base/default.nix

@@ -29,5 +29,10 @@ in
     boot.plymouth = mkIf (cfg.plymouth.enable) {
       enable = true;
     };
+
+    hardware.opengl = {
+      enable = true;
+      driSupport = true;
+    };
   };
 }

modules/greetd/default.nix

@@ -12,7 +12,6 @@ in
     {
       services.greetd = {
         enable = true;
-        package = pkgs.greetd.gtkgreet;
         restart = true;
         settings = {
           default_session = {
@@ -20,6 +19,7 @@ in
           };
         };
       };
+      environment.systemPackages = [ pkgs.greetd.gtkgreet ];
 
       environment.etc = {
         "greetd/sway-config" = {