home

commit 795d00258c5028674505a0a48014df674adb0c1c
parent 9399cba4e3824bc1e2ed76e33ad9ae592b117faf
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon,  2 Sep 2024 23:05:13 +0200

wakasu+users/vincent: switching back to sway

It works, it's simple and it doesn't break.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/hosts/wakasu.nix
 | 
4
++--
M
systems/modules/desktop/sway.nix
 | 
1
-
M
users/vincent/core/zsh.nix
 | 
3
+--
M
users/vincent/desktop/sway.nix
 | 
11
++++++-----
M
users/vincent/desktop/wayland.nix
 | 
2
+-

5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/systems/hosts/wakasu.nix b/systems/hosts/wakasu.nix
@@ -114,8 +114,8 @@ in
       bluetooth.enable = true;
     };
     desktop = {
-      # wayland.sway.enable = true;
-      wayland.hyprland.enable = true;
+      wayland.sway.enable = true;
+      # wayland.hyprland.enable = true;
     };
     dev = {
       enable = true;
diff --git a/systems/modules/desktop/sway.nix b/systems/modules/desktop/sway.nix
@@ -29,7 +29,6 @@ in
           xdg-desktop-portal-wlr
           xdg-desktop-portal-gtk
         ];
-        gtkUsePortal = true;
       };
     };
 
diff --git a/users/vincent/core/zsh.nix b/users/vincent/core/zsh.nix
@@ -83,9 +83,8 @@ in
       }
     '';
     loginExtra = ''
-      # export GOPATH=${config.home.homeDirectory}
       if [[ -z $DISPLAY && $TTY = /dev/tty1 ]]; then
-        exec Hyprland
+        exec sway
       fi
     '';
     profileExtra = ''
diff --git a/users/vincent/desktop/sway.nix b/users/vincent/desktop/sway.nix
@@ -6,7 +6,7 @@ let
     fd . -d 3 --type d ~/src | ${pkgs.wofi}/bin/wofi -dmenu | xargs -I {} zsh -i -c "cd {}; emacs ."
   '';
   fontConf = {
-    names = [ "Ubuntu Mono" ];
+    names = [ "JetBrains Mono" ];
     size = 12.0;
   };
 in
@@ -22,6 +22,7 @@ in
       export _JAVA_AWT_WM_NONREPARTENTING=1
       export MOZ_ENABLE_WAYLAND=1
     '';
+    checkConfig = false;
     config = {
       gaps = {
         inner = 2;
@@ -225,8 +226,8 @@ in
         bindsym XF86AudioPrev exec "playerctl previous"
         bindsym Cancel exec "playerctl previous"
 
-        bindcode ${mod}+49 exec swaymsg [app_id="metask"] scratchpad show || exec ${pkgs.kitty}/bin/kitty --title metask --class metask tmux
-        bindsym --whole-window button8 exec sswaymsg [app_id="metask"] scratchpad show || exec ${pkgs.kitty}/bin/kitty --title metask --class metask tmux
+        bindcode ${mod}+49 exec swaymsg [app_id="metask"] scratchpad show || exec ${pkgs.kitty}/bin/kitty --title metask --class metask
+        bindsym --whole-window button8 exec sswaymsg [app_id="metask"] scratchpad show || exec ${pkgs.kitty}/bin/kitty --title metask --class metask
         bindcode ${mod}+Shift+49 exec swaymsg '[app_id="emacs" title="^_emacs scratchpad_$"]' scratchpad show || exec ${config.programs.emacs.package}/bin/emacsclient -c -F "((name . \"_emacs scratchpad_\"))"
         bindsym --whole-window button9 exec swaymsg '[app_id="emacs" title="^_emacs scratchpad_$"]' scratchpad show || exec ${config.programs.emacs.package}/bin/emacsclient -c -F "((name . \"_emacs scratchpad_\"))"
 
@@ -244,10 +245,10 @@ in
   };
   home.packages = with pkgs; [
     swaybg
-    swaynotificationcenter
+    # swaynotificationcenter
     # terminals
     # FIXME move this away, they work on both Xorg and Wayland/Sway
-    alacritty
+    kitty
   ];
 
 }
diff --git a/users/vincent/desktop/wayland.nix b/users/vincent/desktop/wayland.nix
@@ -19,7 +19,7 @@
         position = "bottom";
         mode = "hide";
         modifier-reset = "release";
-        modules-left = [ "sway/workspaces" "hyprland/workspaces" "sway/mode" "custom/media" ];
+        modules-left = [ "sway/workspaces" "sway/mode" "custom/media" ];
         modules-center = [ "clock" "custom/notification" ];
         modules-right = [ "temperature" "pulseaudio" "backlight" "battery#bat0" "tray" ];
         ipc = true;