update

7 files changed, 203 insertions, 41 deletions

diff --git a/config/bash.nix b/config/bash.nix
index ae54f9e..df936b9 100644
--- a/config/bash.nix
+++ b/config/bash.nix
@@ -2,30 +2,10 @@
   programs.bash = {
     enable = true;
     initExtra= ''
-      function timer_start {
-        timer=''${timer:-$SECONDS}
-      }
-
-      function timer_stop {
-        timer_show=$(($SECONDS - $timer))
-        unset timer
-      }
-
-      trap 'timer_start' DEBUG
-
-      if [ "$PROMPT_COMMAND" == "" ]; then
-        PROMPT_COMMAND="timer_stop"
-      else
-        PROMPT_COMMAND="$PROMPT_COMMAND; timer_stop"
-      fi
-      export PS1='\[\e[38;5;243m\](''${timer_show}s) \h \[\e[38;5;254m\]\w \[\033[0m\]> '
+      export PS1='\[\[\e[38;5;254m\]\w \[\033[0m\]> '
 
       bind "set completion-ignore-case on"
 
-      if [[ -n "$IN_NIX_SHELL" ]]; then
-        export PS1="\[\e[38;5;242m\](dev) $PS1"
-      fi
-
       sessionizer() {
         DIR=$(fd . /home/compromyse --type d -L -d 3 | fzf)
         SESSION_NAME="$DIR_$(date +%M%S)"
diff --git a/config/labwc/config b/config/labwc/config
new file mode 100644
index 0000000..f9dfa5b
--- /dev/null
+++ b/config/labwc/config
@@ -0,0 +1,172 @@
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+# Your preferred terminal emulator
+set $term alacritty
+# Your preferred application launcher
+set $menu /config/dist/run.sh
+
+### Output configuration
+#
+output * bg /config/dist/wallpaper.png fill
+
+### Idle configuration
+exec swayidle -w before-sleep 'swaylock -f'
+
+### Autostart
+exec --no-startup-id autotiling-rs
+exec --no-startup-id way-displays
+exec --no-startup-id blueman-applet
+
+### Input configuration
+input "1739:52865:DLL0C55:00_06CB:CE81_Touchpad" {
+  dwt enabled
+  tap enabled
+  natural_scroll enabled
+  middle_emulation enabled
+}
+# You can get the names of your inputs by running: swaymsg -t get_inputs
+
+### Key bindings
+# Start a terminal
+bindsym $mod+Shift+Return exec $term
+
+# Kill focused window
+bindsym $mod+Shift+q kill
+
+# Start your launcher
+bindsym $mod+space exec $menu
+
+# Drag floating windows by holding down $mod and left mouse button.
+# Resize them with right mouse button + $mod.
+# Despite the name, also works for non-floating windows.
+# Change normal to inverse to use left mouse button for resizing and right
+# mouse button for dragging.
+floating_modifier $mod normal
+
+# Reload the configuration file
+bindsym $mod+Shift+c reload
+
+# Exit sway (logs you out of your Wayland session)
+bindsym $mod+Shift+b exec swaymsg exit
+#
+# Moving around:
+#
+# Move your focus around
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+
+# Move the focused window with the same, but add Shift
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+#
+# Workspaces:
+#
+# Switch to workspace
+bindsym $mod+1 workspace number 1
+bindsym $mod+2 workspace number 2
+bindsym $mod+3 workspace number 3
+bindsym $mod+4 workspace number 4
+bindsym $mod+5 workspace number 5
+bindsym $mod+6 workspace number 6
+bindsym $mod+7 workspace number 7
+bindsym $mod+8 workspace number 8
+bindsym $mod+9 workspace number 9
+bindsym $mod+0 workspace number 10
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number 1
+bindsym $mod+Shift+2 move container to workspace number 2
+bindsym $mod+Shift+3 move container to workspace number 3
+bindsym $mod+Shift+4 move container to workspace number 4
+bindsym $mod+Shift+5 move container to workspace number 5
+bindsym $mod+Shift+6 move container to workspace number 6
+bindsym $mod+Shift+7 move container to workspace number 7
+bindsym $mod+Shift+8 move container to workspace number 8
+bindsym $mod+Shift+9 move container to workspace number 9
+bindsym $mod+Shift+0 move container to workspace number 10
+#
+# Layout stuff:
+#
+# Switch the current container between different layout styles
+bindsym $mod+w layout tabbed
+
+# Make the current focus fullscreen
+bindsym $mod+f fullscreen
+
+# Toggle the current focus between tiling and floating mode
+bindsym $mod+Shift+space floating toggle
+#
+# Scratchpad:
+#
+# Sway has a "scratchpad", which is a bag of holding for windows.
+# You can send windows there and get them back later.
+
+# Move the currently focused window to the scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+  # left will shrink the containers width
+  # right will grow the containers width
+  # up will shrink the containers height
+  # down will grow the containers height
+  bindsym $left resize shrink width 10px
+  bindsym $down resize grow height 10px
+  bindsym $up resize shrink height 10px
+  bindsym $right resize grow width 10px
+
+  # Return to default mode
+  bindsym Return mode "default"
+  bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+#
+# Utilities:
+#
+# Special keys to adjust volume via PulseAudio
+bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+# Special keys to adjust brightness via brightnessctl
+bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
+# Special key to take a screenshot with grim
+bindsym Print exec grim -g "$(slurp)" - | wl-copy
+
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+bar {
+  position top
+
+  # When the status_command prints a new line to stdout, swaybar updates.
+  # The default just shows the current date and time.
+  status_command while /config/dist/bar.sh; do sleep 1; done
+
+  colors {
+    statusline #607767
+    background #0f1212
+    active_workspace #000000 #607767 #0f1212
+    focused_workspace #000000 #607767 #0f1212
+    inactive_workspace #000000 #0f1212 #607767
+  }
+}
+
+include @sysconfdir@/sway/config.d/*
diff --git a/config/labwc/default.nix b/config/labwc/default.nix
new file mode 100644
index 0000000..94daed4
--- /dev/null
+++ b/config/labwc/default.nix
@@ -0,0 +1,9 @@
+{ home, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    labwc
+  ];
+
+  # home.file.".config/sway/config".source = ./config;
+}
diff --git a/flake.lock b/flake.lock
index bfff347..e797a93 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747742835,
-        "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=",
+        "lastModified": 1748225455,
+        "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62",
+        "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748134483,
-        "narHash": "sha256-5PBK1nV8X39K3qUj8B477Aa2RdbLq3m7wRxUKRtggX4=",
+        "lastModified": 1748391243,
+        "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c1e671036224089937e111e32ea899f59181c383",
+        "rev": "f5b12be834874f7661db4ced969a621ab2d57971",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748167716,
-        "narHash": "sha256-Y6nSFb4OZGQPLYjFg2KPEZQU1ea6HqfLGL7u1MdCSlc=",
+        "lastModified": 1748417666,
+        "narHash": "sha256-Sdkdv1HWNtoFH0oOTYT9xzkw6pHnj5e6E3+F3cCiJo8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aa852f2301984fb797532cc18aa050b6a3ee694b",
+        "rev": "879a3857072bdfc01869941540bbe50ca1f0a896",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1748026106,
-        "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
+        "lastModified": 1748190013,
+        "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
+        "rev": "62b852f6c6742134ade1abdd2a21685fd617a291",
         "type": "github"
       },
       "original": {
@@ -115,11 +115,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742765550,
-        "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=",
+        "lastModified": 1748196248,
+        "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16",
+        "rev": "b7697abe89967839b273a863a3805345ea54ab56",
         "type": "github"
       },
       "original": {
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index 3b954c1..03d806f 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -27,12 +27,12 @@ in {
     "virtualization.nix"
     "remapcapslock.nix"
 
-    "wm_utils.nix"
-    "polkit.nix"
     "login.nix"
     # "plasma.nix"
     # "mate.nix"
     # "xfce.nix"
+    "wm_utils.nix"
+    "polkit.nix"
   ]);
 
   boot.loader = {
diff --git a/machines/x/home.nix b/machines/x/home.nix
index d4aba58..cece0d7 100644
--- a/machines/x/home.nix
+++ b/machines/x/home.nix
@@ -58,10 +58,11 @@
     "emacs"
     "nvim"
 
+    "labwc"
     # "qtile"
     # "plasma"
     # "sway"
-    "dwl.nix"
+    # "dwl.nix"
     "themes.nix"
     "way-displays"
     "swaylock"
diff --git a/modules/login.nix b/modules/login.nix
index f693969..dbf084a 100644
--- a/modules/login.nix
+++ b/modules/login.nix
@@ -11,8 +11,8 @@
     settings = {
       default_session = {
         # command = "tuigreet --time --remember --cmd \"sway\"";
-        # command = "tuigreet --time --remember --cmd \"startplasma-wayland\"";
-        command = "tuigreet --time --remember --cmd \"dwl -s dwlb\"";
+        command = "tuigreet --time --remember --cmd \"startplasma-wayland\"";
+        # command = "tuigreet --time --remember --cmd \"dwl -s dwlb\"";
         user = "greeter";
       };
     };