update lindy & switch to sway

6 files changed, 55 insertions, 18 deletions

diff --git a/nixos/common.nix b/nixos/common.nix
index 525a49e..b0eaab2 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -166,7 +166,7 @@
 
   # ---- config for japanese (thx functor.tokyo)
 
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     profont
     symbola
     font-awesome
diff --git a/nixos/lindy.nix b/nixos/lindy.nix
index c9331fa..a1f59c4 100644
--- a/nixos/lindy.nix
+++ b/nixos/lindy.nix
@@ -4,10 +4,11 @@
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     ./common.nix
-    ./kde.nix
+    #./kde.nix
     #./95theme.nix
     #./gnome.nix
     #./fdn-vpn.nix
+    ./wayfire.nix
   ];
 
   networking.hostName = "lindy";
@@ -108,7 +109,7 @@ Komaru UUID=caf8496f-006b-4762-bb20-506d4c7bdb51 /nix/persist/root/komaru_key
   # ---- immutable user config ----
 
   users.mutableUsers = false;
-  users.users.lx.passwordFile = "/home/lx/.password";
+  users.users.lx.hashedPasswordFile = "/home/lx/.password";
   users.users.lx.uid = 1000;
 
   # ----
diff --git a/nixos/wayfire.nix b/nixos/wayfire.nix
index 772902d..10ae1f6 100644
--- a/nixos/wayfire.nix
+++ b/nixos/wayfire.nix
@@ -9,24 +9,22 @@
   security.pam.services.swaylock = {};
 
   environment.systemPackages = with pkgs; [
-    wayfire-with-plugins
-    wayfirePlugins.wcm
-    wayfirePlugins.wf-shell
-    waybar
-    alacritty
-    swaylock
+    # ---- wayfire ----
+    #wayfire-with-plugins
+    #wayfirePlugins.wcm
+    #wayfirePlugins.wf-shell
 
+    # ---- sway ----
     swayfx
     swaybg
-    swayimg
     bemenu
+    swayimg
 
-    gnome.adwaita-icon-theme
-
-    gnome.nautilus
-    gnome.eog
-    gnome.gedit
-    gnome.file-roller
-    evince
+    # ---- common utils ----
+    xdg-desktop-portal-wlr
+    waybar
+    alacritty
+    swaylock
+    wdisplays
   ];
 }
diff --git a/nixos/wmonly.nix b/nixos/wmonly.nix
index d45c176..2f1b2f1 100644
--- a/nixos/wmonly.nix
+++ b/nixos/wmonly.nix
@@ -15,7 +15,15 @@
     dmenu
     feh
     acpi
+    playerctl
     libreoffice-still
     geany
+    gnome.nautilus
+    gnome.eog
+    gnome.gedit
+    gnome.file-roller
+    evince
+
+    gnome.adwaita-icon-theme
   ];
 }
diff --git a/nixpkgs/lindy.nix b/nixpkgs/lindy.nix
index 66cb4f9..61bec7b 100644
--- a/nixpkgs/lindy.nix
+++ b/nixpkgs/lindy.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  imports = [ ./common.nix ];
+  imports = [ ./common.nix ./wmonly.nix ];
 
   home.homeDirectory = "/home/lx";
   xdg.userDirs.download = "/home/lx/Downloads";
diff --git a/sway/config b/sway/config
index 3e3f3e2..2e2f667 100644
--- a/sway/config
+++ b/sway/config
@@ -51,6 +51,12 @@ bindsym $mod+Down focus down
 bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
+# common shortcuts (alt+tab, etc) for moving around
+bindsym Mod1+Tab focus next
+bindsym Mod1+Shift+Tab focus prev
+bindsym Mod1+Ctrl+Right workspace next
+bindsym Mod1+Ctrl+Left workspace prev
+
 # move focused window
 bindsym $mod+Shift+H move left
 bindsym $mod+Shift+J move down
@@ -163,11 +169,16 @@ bindsym $mod+Shift+X exec swaylock -c 000000
 
 bindsym XF86MonBrightnessDown exec brightnessctl set 10%-
 bindsym XF86MonBrightnessUp exec brightnessctl set +10%
+
 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 bindsym XF86AudioRaiseVolume exec pactl set-sink-mute @DEFAULT_SINK@ false && pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym XF86AudioLowerVolume exec pactl set-sink-mute @DEFAULT_SINK@ false && pactl set-sink-volume @DEFAULT_SINK@ -5%
 
+bindsym XF86AudioPlay exec playerctl play-pause
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
+
 
 # ---- AUTOSTART PROGRAMS ----
 
@@ -176,3 +187,22 @@ exec waybar
 exec nm-applet
 exec fcitx5
 
+# ---- INCLUDED FROM 50-systemd-user.conf FROM ARCHLINUX sway PACKAGE ----
+
+# sway does not set DISPLAY/WAYLAND_DISPLAY in the systemd user environment
+# See FS#63021
+# Adapted from xorg's 50-systemd-user.sh, which achieves a similar goal.
+
+# Upstream refuses to set XDG_CURRENT_DESKTOP so we have to.
+exec systemctl --user set-environment XDG_CURRENT_DESKTOP=sway
+exec systemctl --user import-environment DISPLAY \
+                                         SWAYSOCK \
+                                         WAYLAND_DISPLAY \
+                                         XDG_CURRENT_DESKTOP
+
+exec hash dbus-update-activation-environment 2>/dev/null && \
+     dbus-update-activation-environment --systemd DISPLAY \
+                                                  SWAYSOCK \
+                                                  XDG_CURRENT_DESKTOP=sway \
+                                                  WAYLAND_DISPLAY
+