From 1f447a4b56643a59693c365d9b822c4dc84be87c Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sun, 24 Sep 2023 21:56:38 +0200
Subject: [PATCH 01/66] feat: switch apache to sway

---
 configuration.nix                             |  40 ++----
 flake.nix                                     |   1 +
 greetd.nix                                    |  19 +++
 home-manager/i3/default.nix                   | 136 ------------------
 .../i3/wallpapers/nix-wallpaper-dracula.png   | Bin 26003 -> 0 bytes
 home-manager/i3/workspaces/workspace-1.json   |  10 --
 home-manager/i3/workspaces/workspace-2.json   |  10 --
 home-manager/i3/workspaces/workspace-4.json   |  10 --
 home-manager/i3/workspaces/workspace-5.json   |  10 --
 home-manager/kitty.nix                        |   2 +-
 home-manager/rofi.nix                         |  13 --
 home-manager/sway/default.nix                 |  71 +++++++++
 home-manager/{i3 => sway}/i3status-rust.nix   |   0
 home-mandlm.nix                               |   3 +-
 machines/apache/configuration.nix             |   2 +-
 15 files changed, 105 insertions(+), 222 deletions(-)
 create mode 100644 greetd.nix
 delete mode 100644 home-manager/i3/default.nix
 delete mode 100644 home-manager/i3/wallpapers/nix-wallpaper-dracula.png
 delete mode 100644 home-manager/i3/workspaces/workspace-1.json
 delete mode 100644 home-manager/i3/workspaces/workspace-2.json
 delete mode 100644 home-manager/i3/workspaces/workspace-4.json
 delete mode 100644 home-manager/i3/workspaces/workspace-5.json
 delete mode 100644 home-manager/rofi.nix
 create mode 100644 home-manager/sway/default.nix
 rename home-manager/{i3 => sway}/i3status-rust.nix (100%)

diff --git a/configuration.nix b/configuration.nix
index 531c6e9..690358d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -43,31 +43,6 @@
     zsh.enable = true;
   };
 
-  services.xserver = {
-    enable = true;
-    windowManager.i3.enable = true;
-
-    layout = "de";
-    xkbVariant = "nodeadkeys";
-    xkbModel = "pc105";
-
-    libinput = {
-      enable = true;
-      touchpad = {
-        horizontalScrolling = false;
-        naturalScrolling = true;
-      };
-    };
-
-    displayManager = {
-      defaultSession = "none+i3";
-      autoLogin = {
-        enable = true;
-        user = "mandlm";
-      };
-    };
-  };
-
   virtualisation.docker.enable = true;
 
   time.timeZone = "Europe/Berlin";
@@ -82,15 +57,22 @@
   fonts.fonts = with pkgs; [
     (nerdfonts.override { fonts = [ "DejaVuSansMono" "FiraCode" ]; })
     font-awesome
+    dejavu_fonts
   ];
 
-  hardware.pulseaudio.enable = true;
+  hardware = {
+    pulseaudio.enable = true;
 
-  hardware.sane = {
-    enable = true;
-    extraBackends = [ pkgs.sane-airscan ];
+    opengl.enable = true;
+
+    sane = {
+      enable = true;
+      extraBackends = [ pkgs.sane-airscan ];
+    };
   };
 
+  security.polkit.enable = true;
+
   environment.systemPackages = with pkgs; [
     neovim
     git
diff --git a/flake.nix b/flake.nix
index 903ce6d..e63201e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,6 +53,7 @@
           system = "x86_64-linux";
           modules = [
             ./configuration.nix
+            ./greetd.nix
             ./users.nix
             ./machines/apache/configuration.nix
             ./machines/apache/hardware-configuration.nix
diff --git a/greetd.nix b/greetd.nix
new file mode 100644
index 0000000..564d9e6
--- /dev/null
+++ b/greetd.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+{
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session.command = ''
+        ${pkgs.greetd.tuigreet}/bin/tuigreet \
+          --time \
+          --asterisks \
+          --user-menu \
+          --cmd sway
+      '';
+    };
+  };
+
+  environment.etc."greetd/environments".text = ''
+    sway
+  '';
+}
diff --git a/home-manager/i3/default.nix b/home-manager/i3/default.nix
deleted file mode 100644
index 9a93754..0000000
--- a/home-manager/i3/default.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-let
-  cfg = config.xsession.windowManager.i3;
-  font.name = "DejaVu Sans Mono";
-  font.size = 12.0;
-in
-{
-  imports = [
-    ./i3status-rust.nix
-  ];
-
-  home.file = {
-    workspaces = {
-      source = ./workspaces;
-      target = ".config/i3/workspaces";
-      recursive = true;
-    };
-    wallpapers = {
-      source = ./wallpapers;
-      target = ".config/i3/wallpapers";
-      recursive = true;
-    };
-  };
-
-  xsession.windowManager.i3 = {
-    enable = true;
-
-    config = {
-      modifier = "Mod4";
-      terminal = "${pkgs.kitty}/bin/kitty";
-
-      fonts = {
-        names = [ font.name ];
-        size = font.size;
-      };
-
-      window = {
-        titlebar = false;
-        border = 0;
-      };
-
-      floating = {
-        titlebar = false;
-        border = 0;
-      };
-
-      menu = "${pkgs.rofi}/bin/rofi -show drun";
-
-      bars = [{
-        mode = "hide";
-        position = "top";
-        statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml";
-
-        fonts = {
-          names = [ font.name ];
-          size = font.size * 1.1;
-        };
-      }];
-
-      defaultWorkspace = "workspace number 1";
-
-      keybindings = lib.mkOptionDefault {
-        "${cfg.config.modifier}+Shift+o" = "exec xdg-open \"zoommtg://zoom.us/join?action=join&confno=4861587170&pwd=ZVk3aHphcWppY21ONjZOMVh6STN6dz09\"";
-        "${cfg.config.modifier}+Shift+s" = "exec flameshot gui";
-      };
-
-      startup = [
-        { command = "i3-msg 'workspace 1; append_layout ~/.config/i3/workspaces/workspace-1.json'"; }
-        { command = "i3-msg 'workspace 2; append_layout ~/.config/i3/workspaces/workspace-2.json'"; }
-        { command = "i3-msg 'workspace 4; append_layout ~/.config/i3/workspaces/workspace-4.json'"; }
-        { command = "i3-msg 'workspace 5; append_layout ~/.config/i3/workspaces/workspace-5.json'"; }
-        { command = "kitty"; notification = false; }
-        { command = "firefox"; notification = false; }
-        { command = "element-desktop"; notification = false; }
-        { command = "keepassxc"; notification = false; }
-        { command = "nextcloud"; notification = false; }
-        { command = "thunderbird"; notification = false; }
-      ];
-
-      assigns = {
-        "6" = [{ class = "^\.zoom $"; }];
-      };
-    };
-  };
-
-  services = {
-    betterlockscreen = {
-      enable = true;
-      arguments = [ "--update /home/mandlm/.config/i3/wallpapers/nix-wallpaper-dracula.png" ];
-    };
-
-    flameshot = {
-      enable = true;
-      settings = {
-        General = {
-          showStartupLaunchMessage = false;
-        };
-      };
-    };
-
-    unclutter.enable = true;
-
-    dunst = {
-      enable = true;
-      settings = {
-        global = {
-          follow = "keyboard";
-          font = "DejaVu Sans Mono 11";
-          frame_width = 1;
-        };
-
-        urgency_low = {
-          frame_color = "#268bd2";
-          foreground = "#eee8d5";
-          background = "#002b36";
-          timeout = 4;
-        };
-
-        urgency_normal = {
-          frame_color = "#859900";
-          foreground = "#eee8d5";
-          background = "#002b36";
-          timeout = 6;
-        };
-
-        urgency_critical = {
-          frame_color = "#dc322f";
-          foreground = "#eee8d5";
-          background = "#002b36";
-          timeout = 8;
-        };
-      };
-    };
-  };
-}
diff --git a/home-manager/i3/wallpapers/nix-wallpaper-dracula.png b/home-manager/i3/wallpapers/nix-wallpaper-dracula.png
deleted file mode 100644
index 8e439ac59f7e94b222780c3a25eb30932a6a369f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26003
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%0D=6U7a;43^FufhrR?B{^o<$Yd1Vny-w{sd
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
bj$FccHN<9r7x$f5PzLpM^>bP0l+XkKAN5$l

diff --git a/home-manager/i3/workspaces/workspace-1.json b/home-manager/i3/workspaces/workspace-1.json
deleted file mode 100644
index d6ce6b0..0000000
--- a/home-manager/i3/workspaces/workspace-1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-// vim:ts=4:sw=4:et
-{
-  "name": "Terminal",
-  "swallows": [
-    {
-      "class": "^kitty$"
-    }
-  ],
-  "type": "con"
-}
diff --git a/home-manager/i3/workspaces/workspace-2.json b/home-manager/i3/workspaces/workspace-2.json
deleted file mode 100644
index a6d29f3..0000000
--- a/home-manager/i3/workspaces/workspace-2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-// vim:ts=4:sw=4:et
-{
-  "name": "Element",
-  "swallows": [
-    {
-      "class": "^Element$"
-    }
-  ],
-  "type": "con"
-}
diff --git a/home-manager/i3/workspaces/workspace-4.json b/home-manager/i3/workspaces/workspace-4.json
deleted file mode 100644
index 108f590..0000000
--- a/home-manager/i3/workspaces/workspace-4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-// vim:ts=4:sw=4:et
-{
-  "name": "Email",
-  "swallows": [
-    {
-      "class": "^thunderbird$"
-    }
-  ],
-  "type": "con"
-}
diff --git a/home-manager/i3/workspaces/workspace-5.json b/home-manager/i3/workspaces/workspace-5.json
deleted file mode 100644
index 7c74fa7..0000000
--- a/home-manager/i3/workspaces/workspace-5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-// vim:ts=4:sw=4:et
-{
-  "name": "Browser",
-  "swallows": [
-    {
-      "class": "^firefox$"
-    }
-  ],
-  "type": "con"
-}
diff --git a/home-manager/kitty.nix b/home-manager/kitty.nix
index dc585bf..9a204d6 100644
--- a/home-manager/kitty.nix
+++ b/home-manager/kitty.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, user, theme, ... }:
+{ theme, ... }:
 
 let
   theme_name = if theme == "light" then "Solarized Light" else "Solarized Dark";
diff --git a/home-manager/rofi.nix b/home-manager/rofi.nix
deleted file mode 100644
index 0c75bfd..0000000
--- a/home-manager/rofi.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, pkgs, user, ... }:
-
-{
-  programs.rofi = {
-    enable = true;
-    font = "DejaVu Sans Mono 12";
-    terminal = "${pkgs.kitty}/bin/kitty";
-    extraConfig = {
-      show-icons = true;
-      matching = "fuzzy";
-    };
-  };
-}
diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
new file mode 100644
index 0000000..a11f835
--- /dev/null
+++ b/home-manager/sway/default.nix
@@ -0,0 +1,71 @@
+{ config, lib, pkgs, user, ... }:
+let
+  font.name = "DejaVu Sans Mono";
+  font.size = 12.0;
+in
+{
+  imports = [
+    ./i3status-rust.nix
+  ];
+
+  programs.fuzzel = {
+    enable = true;
+    settings = {
+      main = {
+        terminal = "${pkgs.kitty}/bin/kitty";
+        layer = "overlay";
+        font = "DejaVu Sans Mono:size=10";
+      };
+      colors.background = "55000000";
+    };
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+
+    config = rec {
+      modifier = "Mod4";
+      terminal = "${pkgs.kitty}/bin/kitty";
+
+      input = {
+        "type:keyboard" = {
+          xkb_layout = "de";
+        };
+        "type:touchpad" = {
+          natural_scroll = "enabled";
+          tap = "enabled";
+          accel_profile = "flat";
+          dwt = "enabled";
+        };
+      };
+
+      seat = {
+        "*" = {
+          hide_cursor = "1000";
+        };
+      };
+
+      fonts = {
+        names = [ font.name ];
+        size = font.size;
+      };
+
+      bars = [{
+        mode = "hide";
+        position = "top";
+        statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml";
+
+        fonts = {
+          names = [ font.name ];
+          size = font.size;
+        };
+      }];
+
+      menu = "${pkgs.fuzzel}/bin/fuzzel";
+    };
+
+    extraConfig = ''
+    '';
+  };
+
+}
diff --git a/home-manager/i3/i3status-rust.nix b/home-manager/sway/i3status-rust.nix
similarity index 100%
rename from home-manager/i3/i3status-rust.nix
rename to home-manager/sway/i3status-rust.nix
diff --git a/home-mandlm.nix b/home-mandlm.nix
index 287dbc0..d3aaad0 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -44,8 +44,7 @@
     ./home-manager/gpg
     ./home-manager/zsh.nix
     ./home-manager/starship.nix
-    ./home-manager/i3
-    ./home-manager/rofi.nix
+    ./home-manager/sway
     ./home-manager/direnv.nix
     ./home-manager/bat.nix
   ];
diff --git a/machines/apache/configuration.nix b/machines/apache/configuration.nix
index d3d2b13..1303e3c 100644
--- a/machines/apache/configuration.nix
+++ b/machines/apache/configuration.nix
@@ -3,6 +3,6 @@
 {
   networking.hostName = "apache";
   boot.loader.grub.enableCryptodisk = true;
-  services.xserver.videoDrivers = [ "intel" "nvidia" ];
+  # services.xserver.videoDrivers = [ "intel" "nvidia" ];
 }
 

From 1c66c5662e3d7a2eb69339305016a167d7444455 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 25 Sep 2023 14:16:31 +0200
Subject: [PATCH 02/66] feat: configure fuzzle

---
 home-manager/sway/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index a11f835..2cb59a7 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -14,9 +14,14 @@ in
       main = {
         terminal = "${pkgs.kitty}/bin/kitty";
         layer = "overlay";
-        font = "DejaVu Sans Mono:size=10";
+        font = "DejaVu Sans Mono:size=12";
       };
-      colors.background = "55000000";
+      colors = {
+        background = "002b36ff";
+        border = "ffffffaa";
+      };
+    };
+  };
     };
   };
 

From f7902362cc0cc075a0594455505a35c667c5b386 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 25 Sep 2023 14:16:42 +0200
Subject: [PATCH 03/66] feat: add xdg-open etc.

---
 home-manager/sway/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index 2cb59a7..ad1a6d9 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -8,6 +8,10 @@ in
     ./i3status-rust.nix
   ];
 
+  home.packages = with pkgs; [
+    xdg-utils
+  ];
+
   programs.fuzzel = {
     enable = true;
     settings = {

From 6913cc47d0bf59d36339fea1b99d1eb22c976cf0 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 25 Sep 2023 14:16:57 +0200
Subject: [PATCH 04/66] feat: add mouse cursor

---
 home-manager/sway/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index ad1a6d9..223f0f2 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -26,6 +26,14 @@ in
       };
     };
   };
+
+  home.pointerCursor = {
+    name = "Adwaita";
+    package = pkgs.gnome.adwaita-icon-theme;
+    size = 24;
+    x11 = {
+      enable = true;
+      defaultCursor = "Adwaita";
     };
   };
 

From 3a451c7d9c68f1ab1fb4958927cf848f93850738 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 25 Sep 2023 14:17:12 +0200
Subject: [PATCH 05/66] feat: add autostart and key bindings

---
 home-manager/sway/default.nix | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index 223f0f2..b86c8fd 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -79,10 +79,32 @@ in
       }];
 
       menu = "${pkgs.fuzzel}/bin/fuzzel";
-    };
 
-    extraConfig = ''
-    '';
+      keybindings =
+        let
+          modifier = config.wayland.windowManager.sway.config.modifier;
+        in
+        lib.mkOptionDefault {
+          "${modifier}+Shift+o" = "exec xdg-open \"zoommtg://zoom.us/join?action=join&confno=4861587170&pwd=ZVk3aHphcWppY21ONjZOMVh6STN6dz09\"";
+        };
+
+      assigns = {
+        "6" = [{ class = "^\.zoom $"; }];
+      };
+
+      startup = [
+        { command = "keepassxc"; }
+        { command = "nextcloud"; }
+        { command = "swaymsg 'workspace 1"; }
+        { command = "kitty"; }
+        { command = "swaymsg 'workspace 2"; }
+        { command = "element-desktop"; }
+        { command = "swaymsg 'workspace 4"; }
+        { command = "thunderbird"; }
+        { command = "swaymsg 'workspace 5"; }
+        { command = "firefox"; }
+      ];
+    };
   };
 
 }

From 051550f773a05a1c42270736518ab4a03c51a5fe Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 25 Sep 2023 14:17:30 +0200
Subject: [PATCH 06/66] feat: set default workspace

---
 home-manager/sway/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index b86c8fd..a6a3f78 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -62,6 +62,8 @@ in
         };
       };
 
+      defaultWorkspace = "1";
+
       fonts = {
         names = [ font.name ];
         size = font.size;

From c4a82dfb80cb335467d82e5a91c48a0c0293122e Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 25 Sep 2023 14:17:55 +0200
Subject: [PATCH 07/66] feat: configure p330 specialization

---
 machines/apache/configuration.nix |  1 -
 machines/p330/configuration.nix   | 27 --------------------
 machines/p330/home-mandlm.nix     | 42 +++++++++++++++++++------------
 3 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/machines/apache/configuration.nix b/machines/apache/configuration.nix
index 1303e3c..7f30ab2 100644
--- a/machines/apache/configuration.nix
+++ b/machines/apache/configuration.nix
@@ -3,6 +3,5 @@
 {
   networking.hostName = "apache";
   boot.loader.grub.enableCryptodisk = true;
-  # services.xserver.videoDrivers = [ "intel" "nvidia" ];
 }
 
diff --git a/machines/p330/configuration.nix b/machines/p330/configuration.nix
index fc06f1c..3313dd3 100644
--- a/machines/p330/configuration.nix
+++ b/machines/p330/configuration.nix
@@ -6,31 +6,4 @@
 
   boot.loader.grub.enableCryptodisk = true;
   boot.supportedFilesystems = [ "zfs" ];
-
-  services.xserver = {
-    videoDrivers = [ "intel" ];
-    dpi = 144;
-    xrandrHeads = [
-      {
-        output = "DP2";
-        primary = true;
-        monitorConfig = ''
-          Option  "Position"   "0 790"
-        '';
-      }
-      {
-        output = "DP3";
-        monitorConfig = ''
-          Option  "Position"   "3840 0"
-          Option  "Rotate"     "right"
-        '';
-      }
-    ];
-    serverFlagsSection = ''
-      Option "BlankTime" "19"
-      Option "StandbyTime" "0"
-      Option "SuspendTime" "0"
-      Option "OffTime" "20"
-    '';
-  };
 }
diff --git a/machines/p330/home-mandlm.nix b/machines/p330/home-mandlm.nix
index 810d749..a5986ee 100644
--- a/machines/p330/home-mandlm.nix
+++ b/machines/p330/home-mandlm.nix
@@ -1,23 +1,33 @@
 { config, lib, pkgs, user, ... }:
 
 {
-  xsession.windowManager.i3.config = {
+  wayland.windowManager.sway.config = {
+    output = {
+      DP-2 = {
+        scale = "1.5";
+        position = "0 526";
+        # position = "0 790";
+      };
+      DP-3 = {
+        scale = "1.5";
+        position = "2560 0";
+        # position = "3840 0";
+        transform = "90";
+      };
+    };
+
     workspaceOutputAssign = [
-      { workspace = "1"; output = "DP3"; }
-      { workspace = "2"; output = "DP2"; }
-      { workspace = "3"; output = "DP3"; }
-      { workspace = "4"; output = "DP2"; }
-      { workspace = "5"; output = "DP3"; }
-      { workspace = "6"; output = "DP2"; }
-      { workspace = "7"; output = "DP3"; }
-      { workspace = "8"; output = "DP2"; }
-      { workspace = "9"; output = "DP3"; }
-      { workspace = "10"; output = "DP2"; }
+      { workspace = "0"; output = "DP-2"; }
+      { workspace = "1"; output = "DP-3"; }
+      { workspace = "2"; output = "DP-2"; }
+      { workspace = "3"; output = "DP-3"; }
+      { workspace = "4"; output = "DP-2"; }
+      { workspace = "5"; output = "DP-3"; }
+      { workspace = "6"; output = "DP-2"; }
+      { workspace = "7"; output = "DP-3"; }
+      { workspace = "8"; output = "DP-2"; }
+      { workspace = "9"; output = "DP-3"; }
     ];
+
   };
-
-  programs.kitty.font.size = 16;
-  programs.rofi.font = lib.mkForce "DejaVu Sans Mono 16";
-
-  services.betterlockscreen.inactiveInterval = 20;
 }

From a3832ac5eb93a10e9715c31ddce2e5458bed2fee Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 25 Sep 2023 14:18:11 +0200
Subject: [PATCH 08/66] chore: nix flake update

---
 flake.lock | 18 +++++++++---------
 flake.nix  |  3 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3a5b822..1c77ec1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693208669,
-        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
+        "lastModified": 1695108154,
+        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
+        "rev": "07682fff75d41f18327a871088d20af2710d4744",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694304580,
-        "narHash": "sha256-5tIpNodDpEKT8mM/F5zCzWEAnidOg8eb1/x3SRaaBLs=",
+        "lastModified": 1695416179,
+        "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4c8cf44c5b9481a4f093f1df3b8b7ba997a7c760",
+        "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1694183432,
-        "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
+        "lastModified": 1695360818,
+        "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
+        "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e63201e..3281a74 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,7 @@
           system = "x86_64-linux";
           modules = [
             ./configuration.nix
+            ./greetd.nix
             ./users.nix
             ./machines/nixos-vm/configuration.nix
             ./machines/nixos-vm/hardware-configuration.nix
@@ -78,6 +79,7 @@
           system = "x86_64-linux";
           modules = [
             ./configuration.nix
+            ./greetd.nix
             ./users.nix
             ./machines/p330/configuration.nix
             ./machines/p330/hardware-configuration.nix
@@ -102,6 +104,7 @@
           system = "x86_64-linux";
           modules = [
             ./configuration.nix
+            ./greetd.nix
             ./users.nix
             ./machines/yoga/configuration.nix
             ./machines/yoga/hardware-configuration.nix

From 0ee3a84f4a8832402eb11998f6d6ee6ec6111d84 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 26 Sep 2023 08:48:56 +0200
Subject: [PATCH 09/66] feat: add swaylock-fancy

---
 configuration.nix             | 5 ++++-
 home-manager/sway/default.nix | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 690358d..80a9390 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -71,7 +71,10 @@
     };
   };
 
-  security.polkit.enable = true;
+  security = {
+    polkit.enable = true;
+    pam.services.swaylock = { };
+  };
 
   environment.systemPackages = with pkgs; [
     neovim
diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index a6a3f78..d2c21e8 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -10,6 +10,7 @@ in
 
   home.packages = with pkgs; [
     xdg-utils
+    swaylock-fancy
   ];
 
   programs.fuzzel = {
@@ -88,6 +89,7 @@ in
         in
         lib.mkOptionDefault {
           "${modifier}+Shift+o" = "exec xdg-open \"zoommtg://zoom.us/join?action=join&confno=4861587170&pwd=ZVk3aHphcWppY21ONjZOMVh6STN6dz09\"";
+          "${modifier}+l" = "exec swaylock-fancy";
         };
 
       assigns = {
@@ -108,5 +110,4 @@ in
       ];
     };
   };
-
 }

From 6672763d1d32682a5a67ae3f675865e5a09d33cc Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 26 Sep 2023 08:49:07 +0200
Subject: [PATCH 10/66] chore: clean comments

---
 machines/p330/home-mandlm.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/machines/p330/home-mandlm.nix b/machines/p330/home-mandlm.nix
index a5986ee..e4d1c2d 100644
--- a/machines/p330/home-mandlm.nix
+++ b/machines/p330/home-mandlm.nix
@@ -6,12 +6,10 @@
       DP-2 = {
         scale = "1.5";
         position = "0 526";
-        # position = "0 790";
       };
       DP-3 = {
         scale = "1.5";
         position = "2560 0";
-        # position = "3840 0";
         transform = "90";
       };
     };
@@ -28,6 +26,5 @@
       { workspace = "8"; output = "DP-2"; }
       { workspace = "9"; output = "DP-3"; }
     ];
-
   };
 }

From edf8967c1055da4b5c9077e06aeea43d5aafab73 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 27 Sep 2023 10:29:39 +0200
Subject: [PATCH 11/66] feat: increase hide_cursor timout to 5 secs

---
 home-manager/sway/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index d2c21e8..5082fb9 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -59,7 +59,7 @@ in
 
       seat = {
         "*" = {
-          hide_cursor = "1000";
+          hide_cursor = "5000";
         };
       };
 

From ea81d831371f31fe1f6ceee66771f9fa54ce2049 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Fri, 29 Sep 2023 07:51:31 +0200
Subject: [PATCH 12/66] feat: add dunst

---
 home-manager/sway/default.nix |  1 +
 home-manager/sway/dunst.nix   | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 home-manager/sway/dunst.nix

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index 5082fb9..af0bcf2 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -6,6 +6,7 @@ in
 {
   imports = [
     ./i3status-rust.nix
+    ./dunst.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/home-manager/sway/dunst.nix b/home-manager/sway/dunst.nix
new file mode 100644
index 0000000..f7078d5
--- /dev/null
+++ b/home-manager/sway/dunst.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, user, ... }:
+{
+  services.dunst = {
+    enable = true;
+    settings = {
+      global = {
+        follow = "keyboard";
+        font = "DejaVu Sans Mono 11";
+        frame_width = 1;
+      };
+
+      urgency_low = {
+        frame_color = "#268bd2";
+        foreground = "#eee8d5";
+        background = "#002b36";
+        timeout = 4;
+      };
+
+      urgency_normal = {
+        frame_color = "#859900";
+        foreground = "#eee8d5";
+        background = "#002b36";
+        timeout = 6;
+      };
+
+      urgency_critical = {
+        frame_color = "#dc322f";
+        foreground = "#eee8d5";
+        background = "#002b36";
+        timeout = 8;
+      };
+    };
+  };
+}

From c7db575f3bbc6b62429ae4631a6b00863d89f733 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Fri, 29 Sep 2023 09:22:10 +0200
Subject: [PATCH 13/66] fix: use nerdfont only for symbols in kitty

---
 configuration.nix      | 4 ++--
 home-manager/kitty.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 80a9390..70a675b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -55,9 +55,9 @@
   };
 
   fonts.fonts = with pkgs; [
-    (nerdfonts.override { fonts = [ "DejaVuSansMono" "FiraCode" ]; })
-    font-awesome
+    (nerdfonts.override { fonts = [ "DejaVuSansMono" "NerdFontsSymbolsOnly" ]; })
     dejavu_fonts
+    fira-code
   ];
 
   hardware = {
diff --git a/home-manager/kitty.nix b/home-manager/kitty.nix
index 9a204d6..372d237 100644
--- a/home-manager/kitty.nix
+++ b/home-manager/kitty.nix
@@ -9,7 +9,7 @@ in
       enable = true;
       theme = theme_name;
       font = {
-        name = "FiraCode Nerd Font Mono";
+        name = "FiraCode";
       };
       settings = {
         tab_bar_style = "powerline";

From 8d33d629c77392960f31a403980461fd7584b418 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Fri, 29 Sep 2023 09:22:30 +0200
Subject: [PATCH 14/66] fix: use nerdfont compatible lsp-status icon

---
 home-manager/neovim/lspconfig.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 700c1cf..8030910 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -49,6 +49,7 @@ lsp_status.config({
     current_function = false,
     show_filename = false,
     diagnostics = true,
+    status_symbol = "",
 })
 lsp_status.register_progress()
 

From fd7095bbe78771102271bce7d24768783b7389a5 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 26 Sep 2023 13:06:56 +0200
Subject: [PATCH 15/66] feat(wip): add swayidle

---
 home-manager/sway/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index af0bcf2..a5526f9 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -2,6 +2,8 @@
 let
   font.name = "DejaVu Sans Mono";
   font.size = 12.0;
+  lock_command = "${pkgs.swaylock-fancy}/bin/swaylock-fancy --daemonize --show-failed-attempts --ignore-empty-password";
+  swaymsg = "${pkgs.sway}/bin/swaymsg";
 in
 {
   imports = [
@@ -39,6 +41,17 @@ in
     };
   };
 
+  services.swayidle = {
+    enable = true;
+    events = [
+      { event = "before-sleep"; command = lock_command; }
+    ];
+    timeouts = [
+      { timeout = 300; command = "${swaymsg} output '*' power off"; resumeCommand = "${swaymsg} output '*' power on"; }
+      { timeout = 900; command = lock_command; }
+    ];
+  };
+
   wayland.windowManager.sway = {
     enable = true;
 
@@ -90,7 +103,7 @@ in
         in
         lib.mkOptionDefault {
           "${modifier}+Shift+o" = "exec xdg-open \"zoommtg://zoom.us/join?action=join&confno=4861587170&pwd=ZVk3aHphcWppY21ONjZOMVh6STN6dz09\"";
-          "${modifier}+l" = "exec swaylock-fancy";
+          "${modifier}+l" = "exec ${lock_command}";
         };
 
       assigns = {

From 60c315423cf89cacafa0962d8f5809f4850a826c Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sun, 1 Oct 2023 10:53:24 +0200
Subject: [PATCH 16/66] feat: use shotman as screenshot tool

---
 home-manager/sway/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index a5526f9..73a8e4d 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -14,6 +14,7 @@ in
   home.packages = with pkgs; [
     xdg-utils
     swaylock-fancy
+    shotman
   ];
 
   programs.fuzzel = {
@@ -103,6 +104,7 @@ in
         in
         lib.mkOptionDefault {
           "${modifier}+Shift+o" = "exec xdg-open \"zoommtg://zoom.us/join?action=join&confno=4861587170&pwd=ZVk3aHphcWppY21ONjZOMVh6STN6dz09\"";
+          "${modifier}+Shift+s" = "exec shotman --capture region --copy";
           "${modifier}+l" = "exec ${lock_command}";
         };
 

From c06d7054ed2f9a0e3230580207ab97a2e5c6428f Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sun, 1 Oct 2023 11:01:55 +0200
Subject: [PATCH 17/66] feat: enable wayland clipboard in neovim

---
 home-manager/sway/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index 73a8e4d..c6c0561 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -15,6 +15,7 @@ in
     xdg-utils
     swaylock-fancy
     shotman
+    wl-clipboard
   ];
 
   programs.fuzzel = {

From 4bdc608068caefaec7961de9ba16e71936b8051c Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 3 Oct 2023 18:42:11 +0200
Subject: [PATCH 18/66] feat: don't focus new windows

---
 home-manager/sway/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index c6c0561..90cdda8 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -81,6 +81,8 @@ in
 
       defaultWorkspace = "1";
 
+      focus.newWindow = "urgent";
+
       fonts = {
         names = [ font.name ];
         size = font.size;

From d86f00a7bf57956ba4d1228a6ad42754f82ec3c7 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 5 Oct 2023 08:07:15 +0200
Subject: [PATCH 19/66] chore: nix flake update

---
 flake.lock                               | 12 ++++++------
 home-manager/neovim/indent-blankline.lua |  9 ++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1c77ec1..92c98dd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695416179,
-        "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=",
+        "lastModified": 1696374741,
+        "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6",
+        "rev": "8a4c17493e5c39769f79117937c79e1c88de6729",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1695360818,
-        "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
+        "lastModified": 1696193975,
+        "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
+        "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/neovim/indent-blankline.lua b/home-manager/neovim/indent-blankline.lua
index 921a59b..d7e7b6c 100644
--- a/home-manager/neovim/indent-blankline.lua
+++ b/home-manager/neovim/indent-blankline.lua
@@ -1,6 +1,5 @@
-require("indent_blankline").setup {
-    char = "┊",
-    buftype_exclude = { "terminal", "help", "nofile" },
-    filetype_exclude = { 'help', 'packer' },
-    show_trailing_blankline_indent = false
+require("ibl").setup {
+    indent = {
+        char = "┊",
+    },
 }

From c7e5fd760c339e1da423e8bb27c62b3c58093f1a Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 10 Oct 2023 08:59:32 +0200
Subject: [PATCH 20/66] feat: raise screen blanking timeouts

---
 home-manager/sway/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index 90cdda8..e94f023 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -49,8 +49,8 @@ in
       { event = "before-sleep"; command = lock_command; }
     ];
     timeouts = [
-      { timeout = 300; command = "${swaymsg} output '*' power off"; resumeCommand = "${swaymsg} output '*' power on"; }
-      { timeout = 900; command = lock_command; }
+      { timeout = 900; command = "${swaymsg} output '*' power off"; resumeCommand = "${swaymsg} output '*' power on"; }
+      { timeout = 1000; command = lock_command; }
     ];
   };
 

From 6e6411eddf6bf76ac0a52d673344ceaf396a0dbf Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 12 Oct 2023 08:33:48 +0200
Subject: [PATCH 21/66] feat: add clangd and cmake lsp config

---
 home-manager/neovim/lspconfig.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 8030910..70dc01e 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -67,6 +67,8 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities(lsp_status.cap
 
 local servers = {
     ["bashls"] = {},
+    ["clangd"] = {},
+    ["cmake"] = {},
     ["dockerls"] = {},
     ["jsonls"] = {},
     ["lua_ls"] = {

From 24b86f821bc69deebf71f454383729833561b3a8 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 12 Oct 2023 08:34:03 +0200
Subject: [PATCH 22/66] fix: remove custom vue-language-server path to enable
 volar package

---
 home-manager/neovim/lspconfig.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 70dc01e..b02fe9e 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -190,7 +190,6 @@ lspconfig["html"].setup({
 
 -- setup volar
 lspconfig["volar"].setup({
-    cmd = { "./node_modules/.bin/vue-language-server", "--stdio" },
     filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' },
     on_attach = on_attach,
     capabilities = capabilities,

From 0b5ba97b32e5ccee644838a9c780350769737811 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 12 Oct 2023 08:34:44 +0200
Subject: [PATCH 23/66] feat(sway): add mod-shift-m keybinding to reset display

---
 home-manager/sway/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index e94f023..c610773 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -109,6 +109,7 @@ in
           "${modifier}+Shift+o" = "exec xdg-open \"zoommtg://zoom.us/join?action=join&confno=4861587170&pwd=ZVk3aHphcWppY21ONjZOMVh6STN6dz09\"";
           "${modifier}+Shift+s" = "exec shotman --capture region --copy";
           "${modifier}+l" = "exec ${lock_command}";
+          "${modifier}+Shift+m" = "output DP-2 power off, output DP-3 power off, output DP-2 power on, output DP-3 power on";
         };
 
       assigns = {

From 6fca68679d50ebc224048a039c58a9e66be9c414 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 16 Oct 2023 08:03:19 +0200
Subject: [PATCH 24/66] chore: nix flake update

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 92c98dd..0655d48 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696374741,
-        "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=",
+        "lastModified": 1697226376,
+        "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8a4c17493e5c39769f79117937c79e1c88de6729",
+        "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1696193975,
-        "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
+        "lastModified": 1697059129,
+        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242",
+        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
         "type": "github"
       },
       "original": {

From bb6968c86ee4e69f154b61f7f380f491f990b021 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 16 Oct 2023 20:28:18 +0200
Subject: [PATCH 25/66] feat: add marksman language server

---
 home-manager/neovim/default.nix   | 1 +
 home-manager/neovim/lspconfig.lua | 1 +
 2 files changed, 2 insertions(+)

diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index 6e4969d..e37da8b 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -64,6 +64,7 @@ in
     nodePackages.vscode-langservers-extracted
     lldb
     vscode-extensions.vadimcn.vscode-lldb
+    marksman
   ];
 
   # symlink for a stable path 
diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index b02fe9e..78b5877 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -87,6 +87,7 @@ local servers = {
             },
         },
     },
+    ["marksman"] = {},
     ["pylsp"] = {
         pylsp = {
             plugins = {

From 7349a8848ddbab8329987d923de46c8cd15f5b9a Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 16 Oct 2023 20:43:08 +0200
Subject: [PATCH 26/66] feat: use eslint language server instead of null-ls

---
 home-manager/neovim/lspconfig.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 78b5877..37c4ecc 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -70,6 +70,7 @@ local servers = {
     ["clangd"] = {},
     ["cmake"] = {},
     ["dockerls"] = {},
+    ["eslint"] = {},
     ["jsonls"] = {},
     ["lua_ls"] = {
         Lua = {
@@ -150,8 +151,6 @@ local null_ls = require("null-ls")
 null_ls.setup({
     sources = {
         null_ls.builtins.formatting.prettier,
-        null_ls.builtins.code_actions.eslint_d,
-        null_ls.builtins.diagnostics.eslint_d,
         null_ls.builtins.diagnostics.tsc,
     },
     on_attach = on_attach,

From f7e66f11d58de0c744b8ad0dfb1b3aae07f07005 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 16 Oct 2023 20:47:49 +0200
Subject: [PATCH 27/66] feat: install vue-language-server

---
 home-manager/neovim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index e37da8b..5c531c6 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -62,6 +62,7 @@ in
     nodePackages.typescript
     nodePackages.dockerfile-language-server-nodejs
     nodePackages.vscode-langservers-extracted
+    nodePackages.volar
     lldb
     vscode-extensions.vadimcn.vscode-lldb
     marksman

From 52dacfda31c3b5cf4f9101654aab178aa147147c Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 16 Oct 2023 20:54:16 +0200
Subject: [PATCH 28/66] feat: use installed html language server

---
 home-manager/neovim/lspconfig.lua | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 37c4ecc..878a4aa 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -71,6 +71,7 @@ local servers = {
     ["cmake"] = {},
     ["dockerls"] = {},
     ["eslint"] = {},
+    ["html"] = {},
     ["jsonls"] = {},
     ["lua_ls"] = {
         Lua = {
@@ -181,13 +182,6 @@ for type, icon in pairs(diagnostics_signs) do
     vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
 end
 
--- setup html languageserver
-lspconfig["html"].setup({
-    cmd = { "html-languageserver", "--stdio" },
-    on_attach = on_attach,
-    capabilities = capabilities,
-})
-
 -- setup volar
 lspconfig["volar"].setup({
     filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue', 'json' },

From e0203937210045e41dbc539338abcdc451b3c7a5 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 18 Oct 2023 09:20:55 +0200
Subject: [PATCH 29/66] feat: add calibre

---
 configuration.nix | 2 ++
 home-mandlm.nix   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/configuration.nix b/configuration.nix
index 70a675b..00b6e9d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -88,6 +88,8 @@
     settings.X11Forwarding = true;
   };
 
+  services.udisks2.enable = true;
+
   services.printing = {
     enable = true;
   };
diff --git a/home-mandlm.nix b/home-mandlm.nix
index d3aaad0..6c5fec7 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -29,6 +29,7 @@
       kubectx
       gnome.simple-scan
       nix-output-monitor
+      calibre
     ];
 
     stateVersion = "22.05";

From 6e018f83967c7a48f2921a51c3c6b04084e4766b Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 18 Oct 2023 09:21:07 +0200
Subject: [PATCH 30/66] feat: add c++ language servers

---
 home-manager/neovim/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index 5c531c6..c40f9fc 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -66,6 +66,8 @@ in
     lldb
     vscode-extensions.vadimcn.vscode-lldb
     marksman
+    clang-tools
+    cmake-language-server
   ];
 
   # symlink for a stable path 

From d63f547a177dd5ec5e06146961f392c6544e0666 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 23 Oct 2023 08:38:46 +0200
Subject: [PATCH 31/66] feat: enable wlr desktop sharing

---
 configuration.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configuration.nix b/configuration.nix
index 00b6e9d..da63e84 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -83,6 +83,11 @@
 
   environment.pathsToLink = [ "/share/zsh" ];
 
+  xdg.portal = {
+    enable = true;
+    wlr.enable = true;
+  };
+
   services.openssh = {
     enable = true;
     settings.X11Forwarding = true;

From 5fd57a74edaf46f31a72bc226d7a07f622cf5e15 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 23 Oct 2023 08:39:47 +0200
Subject: [PATCH 32/66] feat: remove nix-output-monitor

---
 home-mandlm.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/home-mandlm.nix b/home-mandlm.nix
index 6c5fec7..068bafe 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -28,7 +28,6 @@
       kubectl
       kubectx
       gnome.simple-scan
-      nix-output-monitor
       calibre
     ];
 

From 73838a8411f49a2c7bb7695e65dbcc674e9e338f Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 23 Oct 2023 08:46:07 +0200
Subject: [PATCH 33/66] feat: use update nixos packages for nvim plugins flog,
 lsp_lines and signature-help

---
 home-manager/neovim/default.nix | 45 ---------------------------------
 1 file changed, 45 deletions(-)

diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index c40f9fc..e82efaf 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -1,49 +1,5 @@
 { config, lib, pkgs, user, theme, ... }:
 
-let
-  cmp-nvim-lsp-signature-help = pkgs.vimUtils.buildVimPlugin {
-    name = "cmp-nvim-lsp-signature-help";
-    version = "2023-02-27";
-    src = pkgs.fetchFromGitHub {
-      owner = "hrsh7th";
-      repo = "cmp-nvim-lsp-signature-help";
-      rev = "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1";
-      sha256 = "sha256-yDxYvjTIeXIKYR3tg+bf+okXKr5JYc/I9obP+6uKey4=";
-    };
-    meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help";
-  };
-
-  lsp_lines-nvim = pkgs.vimUtils.buildVimPlugin {
-    name = "lsp_lines.nvim";
-    version = "2023-02-27";
-    src = pkgs.fetchgit {
-      url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
-      rev = "ec98b45c8280e5ef8c84028d4f38aa447276c002";
-      sha256 = "sha256-HjLCfuvZZ7vTJT0Te5VBRLNWvWIBFBou1Mvoxe2Hi3c=";
-    };
-    meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
-  };
-  pre-commit-nvim = pkgs.vimUtils.buildVimPlugin {
-    name = "pre-commit.nvim";
-    version = "2022-08-05";
-    src = pkgs.fetchgit {
-      url = "https://github.com/Ttibsi/pre-commit.nvim";
-      rev = "4a608cef0f0a196fa39cdc60579eb9cf601d21c4";
-      sha256 = "Y0biF/yrOX1YYztj8/u0n8zPN4YLGLSQL3vb9I3+3dE=";
-    };
-    meta.homepage = "https://github.com/Ttibsi/pre-commit.nvim";
-  };
-  vim-flog = pkgs.vimUtils.buildVimPlugin {
-    name = "vim-flog";
-    version = "2023-01-24";
-    src = pkgs.fetchgit {
-      url = "https://github.com/rbong/vim-flog";
-      rev = "2ba8af2c9682e3560db5b813d10acf3ba3415bc1";
-      sha256 = "sha256-xnzHAc30DD9W9/5s8PvpuBaEUJbB4BJ7WqbNb/CY3mY=";
-    };
-    meta.homepage = "https://github.com/rbong/vim-flog/";
-  };
-in
 {
   home.packages = with pkgs.unstable; [
     xclip
@@ -107,7 +63,6 @@ in
         plenary-nvim
         vim-illuminate
         registers-nvim
-        pre-commit-nvim
         vim-surround
 
         editorconfig-nvim

From 8f7ab8dda192914ad0b3c4dee1a8d0bc2f3d3445 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 23 Oct 2023 08:47:00 +0200
Subject: [PATCH 34/66] chore: nix flake update

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0655d48..6208c29 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697226376,
-        "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=",
+        "lastModified": 1697851979,
+        "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5",
+        "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1697059129,
-        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
+        "lastModified": 1697723726,
+        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
+        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
         "type": "github"
       },
       "original": {

From bdd09aa73eb1a199a405c0b809ac285f41589a4d Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 25 Oct 2023 10:33:06 +0200
Subject: [PATCH 35/66] feat(sway): disable dead keys on keyboard

---
 home-manager/sway/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index c610773..739d897 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -64,6 +64,7 @@ in
       input = {
         "type:keyboard" = {
           xkb_layout = "de";
+          xkb_variant = "nodeadkeys";
         };
         "type:touchpad" = {
           natural_scroll = "enabled";

From 56bf157a60c55c58262b533865fc504df48528cd Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 25 Oct 2023 10:33:42 +0200
Subject: [PATCH 36/66] feat: use pipewire instead of pulseaudio to support
 zoom screensharing

---
 configuration.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index da63e84..283960e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -61,8 +61,6 @@
   ];
 
   hardware = {
-    pulseaudio.enable = true;
-
     opengl.enable = true;
 
     sane = {
@@ -73,6 +71,7 @@
 
   security = {
     polkit.enable = true;
+    rtkit.enable = true;
     pam.services.swaylock = { };
   };
 
@@ -88,6 +87,12 @@
     wlr.enable = true;
   };
 
+  services.pipewire = {
+    enable = true;
+    wireplumber.enable = true;
+    pulse.enable = true;
+  };
+
   services.openssh = {
     enable = true;
     settings.X11Forwarding = true;

From 06405a5d477928e80157e05bf055550ed95de2dd Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 25 Oct 2023 10:37:53 +0200
Subject: [PATCH 37/66] feat: remove obsolete nvim-illuminate lsp config

---
 home-manager/neovim/lspconfig.lua | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 878a4aa..682e65a 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -39,9 +39,6 @@ local on_attach = function(client, bufnr)
             callback = format_buffer,
         })
     end
-
-    local illuminate = require("illuminate")
-    illuminate.on_attach(client)
 end
 
 local lsp_status = require("lsp-status")

From a43a04aeaba5b0e1093bda60d4d9175061ade28a Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 25 Oct 2023 10:38:15 +0200
Subject: [PATCH 38/66] feat: remove conflicting g-t key mapping

---
 home-manager/neovim/lspconfig.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 682e65a..92123c2 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -19,7 +19,6 @@ local on_attach = function(client, bufnr)
 
     nnoremap("gD", vim.lsp.buf.declaration)
     nnoremap("gd", telescope.lsp_definitions)
-    nnoremap("gt", telescope.lsp_type_definitions)
     nnoremap("gi", telescope.lsp_implementations)
     nnoremap("gr", telescope.lsp_references)
     nnoremap("K", vim.lsp.buf.hover)

From 02635a71b1474c250c4600af0043defcc8877fc7 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 25 Oct 2023 10:38:33 +0200
Subject: [PATCH 39/66] feat: configure illuminate highlighting as bold

---
 home-manager/neovim/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index e82efaf..9fa62e2 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -142,6 +142,10 @@
 
             vim.g.gitblame_date_format = "%r"
 
+            -- setup illuminate highlight groups
+            vim.api.nvim_set_hl(0, "IlluminatedWordText", { bold = true })
+            vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "IlluminatedWordText" })
+            vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "IlluminatedWordText" })
         EOF
       '';
     };

From e91d1e1ce6ede494d54e440a694ed2536d527787 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 25 Oct 2023 10:49:16 +0200
Subject: [PATCH 40/66] feat: configure treesitter incremental selection,
 remove obsolte settings

---
 home-manager/neovim/treesitter.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/home-manager/neovim/treesitter.lua b/home-manager/neovim/treesitter.lua
index 931c77d..eca7e14 100644
--- a/home-manager/neovim/treesitter.lua
+++ b/home-manager/neovim/treesitter.lua
@@ -1,14 +1,14 @@
 require('nvim-treesitter.configs').setup({
     highlight = {
         enable = true,
-        additional_vim_regex_highlighting = false
     },
-    indent = {
-        enable = false,
-    },
-    rainbow = {
+    incremental_selection = {
         enable = true,
-        extended_mode = true,
-        max_file_lines = nil,
+        keymaps = {
+            init_selection = "v",
+            node_decremental = "<",
+            node_incremental = ">",
+            scope_incremental = false,
+        },
     },
 })

From b67b8b70e4703ca0d45bae0aa477a7fcbc4731f4 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 31 Oct 2023 09:13:03 +0100
Subject: [PATCH 41/66] feat: replace exa with eza

---
 home-manager/zsh.nix | 2 +-
 home-mandlm.nix      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 4ee0682..9b8a205 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -23,7 +23,7 @@ in
     };
 
     shellAliases = {
-      ls = "exa --group-directories-first --git";
+      ls = "eza --group-directories-first --git";
       neovide = "neovide --multigrid";
       xclip = "xclip -selection clipboard";
     };
diff --git a/home-mandlm.nix b/home-mandlm.nix
index 068bafe..91e5e2b 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -6,7 +6,7 @@
     homeDirectory = "/home/${user}";
 
     packages = with pkgs; [
-      exa
+      unstable.eza
       firefox
       jq
       htop

From 16a7d1db2d817cfe31fe55db9f180b645506f5b5 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 31 Oct 2023 09:13:17 +0100
Subject: [PATCH 42/66] feat: install zoom from unstable

---
 home-mandlm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-mandlm.nix b/home-mandlm.nix
index 91e5e2b..ef656ec 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -23,7 +23,7 @@
       light
       element-desktop
       difftastic
-      zoom-us
+      unstable.zoom-us
       darktable
       kubectl
       kubectx

From 97e641e20555402d0a9513ad9bb583a791c63e60 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 31 Oct 2023 09:15:44 +0100
Subject: [PATCH 43/66] chore: nix flake update

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6208c29..28725f4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1697851979,
-        "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
+        "lastModified": 1698562188,
+        "narHash": "sha256-9nkxGnA/T+jLhHAMFRW157Qi/zfbf5dF1q7HfKROl3o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
+        "rev": "3e10c80821dedb93592682379f476745f370a58e",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1697723726,
-        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
+        "lastModified": 1698318101,
+        "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
+        "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
         "type": "github"
       },
       "original": {

From f9ebd12607e1697826dd08f57a7e0e77d46e015b Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Fri, 3 Nov 2023 16:19:30 +0100
Subject: [PATCH 44/66] chore: nix flake update

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 28725f4..7315763 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1698562188,
-        "narHash": "sha256-9nkxGnA/T+jLhHAMFRW157Qi/zfbf5dF1q7HfKROl3o=",
+        "lastModified": 1698846319,
+        "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3e10c80821dedb93592682379f476745f370a58e",
+        "rev": "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1698318101,
-        "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
+        "lastModified": 1698924604,
+        "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
+        "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
         "type": "github"
       },
       "original": {

From 4304b2730b3857d81a9b18ca6c8462c92784e1c2 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sun, 5 Nov 2023 15:04:42 +0100
Subject: [PATCH 45/66] fix: revert to stable zoom

---
 home-mandlm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-mandlm.nix b/home-mandlm.nix
index ef656ec..91e5e2b 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -23,7 +23,7 @@
       light
       element-desktop
       difftastic
-      unstable.zoom-us
+      zoom-us
       darktable
       kubectl
       kubectx

From 98ca23db7ee5516afc7f1ffb65cc412d1fd04421 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sun, 5 Nov 2023 15:04:55 +0100
Subject: [PATCH 46/66] feat: add libreoffice

---
 home-mandlm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-mandlm.nix b/home-mandlm.nix
index 91e5e2b..b945d80 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -29,6 +29,7 @@
       kubectx
       gnome.simple-scan
       calibre
+      libreoffice
     ];
 
     stateVersion = "22.05";

From ae5a3ffc15a2c0ff21e72344f0c610e5dd6b490b Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sun, 5 Nov 2023 18:25:07 +0100
Subject: [PATCH 47/66] feat: allow yubikey otp authentication

---
 configuration.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/configuration.nix b/configuration.nix
index 283960e..5c80b80 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -73,6 +73,13 @@
     polkit.enable = true;
     rtkit.enable = true;
     pam.services.swaylock = { };
+
+    pam.yubico = {
+      enable = true;
+      mode = "challenge-response";
+      id = [ "23664350" ];
+      control = "sufficient";
+    };
   };
 
   environment.systemPackages = with pkgs; [
@@ -87,6 +94,8 @@
     wlr.enable = true;
   };
 
+  services.udev.packages = [ pkgs.yubikey-personalization ];
+
   services.pipewire = {
     enable = true;
     wireplumber.enable = true;

From 3ada2600f8ef95a589425d765e5c9adabd5abe80 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 14 Nov 2023 08:19:32 +0100
Subject: [PATCH 48/66] chore: nix flake update

---
 flake.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7315763..8d03f5c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695108154,
-        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+        "lastModified": 1699748081,
+        "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "07682fff75d41f18327a871088d20af2710d4744",
+        "rev": "04bac349d585c9df38d78e0285b780a140dc74a4",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1698846319,
-        "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=",
+        "lastModified": 1699596684,
+        "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857",
+        "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1698924604,
-        "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
+        "lastModified": 1699099776,
+        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
+        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
         "type": "github"
       },
       "original": {

From ddeb0b7024f5852d51e396b26ed4c98d3697441a Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 20 Nov 2023 07:55:19 +0100
Subject: [PATCH 49/66] chore: nix flake update

---
 flake.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8d03f5c..ee09ab0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699748081,
-        "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",
+        "lastModified": 1700392168,
+        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "04bac349d585c9df38d78e0285b780a140dc74a4",
+        "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699596684,
-        "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=",
+        "lastModified": 1700403855,
+        "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73",
+        "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1699099776,
-        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
+        "lastModified": 1700204040,
+        "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
+        "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
         "type": "github"
       },
       "original": {

From 4ca2bb7fa3dcb783ab79b73971ccbd29fd6c4c30 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 27 Nov 2023 10:37:45 +0100
Subject: [PATCH 50/66] chore: nix flake update

---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index ee09ab0..0421bc0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700403855,
-        "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=",
+        "lastModified": 1700989516,
+        "narHash": "sha256-oKbmPa2wpTHh9XB3+zIx97uMZGNnp97GPliKKG2/plo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db",
+        "rev": "d2e4de209881b38392933fabf303cde3454b0b4c",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1700204040,
-        "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
+        "lastModified": 1700794826,
+        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
+        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
         "type": "github"
       },
       "original": {

From bc480b218ab0b0d6c62070e397e9590b039ec896 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 30 Nov 2023 15:11:22 +0100
Subject: [PATCH 51/66] chore: update to nixos 23.11

---
 configuration.nix |  2 +-
 flake.lock        | 22 +++++++++++-----------
 flake.nix         |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 5c80b80..957b205 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -54,7 +54,7 @@
     keyMap = "de-latin1-nodeadkeys";
   };
 
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     (nerdfonts.override { fonts = [ "DejaVuSansMono" "NerdFontsSymbolsOnly" ]; })
     dejavu_fonts
     fira-code
diff --git a/flake.lock b/flake.lock
index 0421bc0..6488e82 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,43 +7,43 @@
         ]
       },
       "locked": {
-        "lastModified": 1700392168,
-        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
+        "lastModified": 1700814205,
+        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
+        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
+        "ref": "release-23.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700989516,
-        "narHash": "sha256-oKbmPa2wpTHh9XB3+zIx97uMZGNnp97GPliKKG2/plo=",
+        "lastModified": 1701263465,
+        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d2e4de209881b38392933fabf303cde3454b0b4c",
+        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1700794826,
-        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
+        "lastModified": 1701068326,
+        "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
+        "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 3281a74..c9c58b6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,10 @@
 {
   inputs = {
-    nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
+    nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11;
     nixpkgs-unstable.url = github:NixOS/nixpkgs/nixos-unstable;
 
     home-manager = {
-      url = github:nix-community/home-manager/release-23.05;
+      url = github:nix-community/home-manager/release-23.11;
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

From bbd480f5118e900560518aa8a63a8cc6e1d47f53 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 11 Dec 2023 07:38:39 +0100
Subject: [PATCH 52/66] feat: make zoom windows floating

---
 configuration.nix             | 9 +++++++++
 home-manager/sway/default.nix | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/configuration.nix b/configuration.nix
index 957b205..dbeb026 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -92,6 +92,15 @@
   xdg.portal = {
     enable = true;
     wlr.enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-wlr
+      pkgs.xdg-desktop-portal-gtk
+    ];
+    config = {
+      common = {
+        default = [ "wlr" "gtk" ];
+      };
+    };
   };
 
   services.udev.packages = [ pkgs.yubikey-personalization ];
diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index 739d897..a903807 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -78,12 +78,15 @@ in
         "*" = {
           hide_cursor = "5000";
         };
+
       };
 
       defaultWorkspace = "1";
 
       focus.newWindow = "urgent";
 
+      floating.criteria = [{ app_id = "zoom"; floating = true; }];
+
       fonts = {
         names = [ font.name ];
         size = font.size;

From ad6f261bcade730497e3c8f503d4f6ad58858775 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 11 Dec 2023 07:39:05 +0100
Subject: [PATCH 53/66] feat: configure swaylock-fancy

---
 home-manager/sway/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index a903807..badef4d 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -13,7 +13,6 @@ in
 
   home.packages = with pkgs; [
     xdg-utils
-    swaylock-fancy
     shotman
     wl-clipboard
   ];
@@ -33,6 +32,11 @@ in
     };
   };
 
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-fancy;
+  };
+
   home.pointerCursor = {
     name = "Adwaita";
     package = pkgs.gnome.adwaita-icon-theme;

From 5bf65163a681801fdfe95ffe023fdc92787fd851 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 11 Dec 2023 07:39:18 +0100
Subject: [PATCH 54/66] feat: add cargo-bin to path

---
 home-mandlm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/home-mandlm.nix b/home-mandlm.nix
index b945d80..35c8d01 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -4,6 +4,9 @@
   home = {
     username = "${user}";
     homeDirectory = "/home/${user}";
+    sessionPath = [
+      "$HOME/.cargo/bin/"
+    ];
 
     packages = with pkgs; [
       unstable.eza

From 78eed1036930d62f9091cf52ff64bd8bb674e386 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 11 Dec 2023 07:39:28 +0100
Subject: [PATCH 55/66] feat: install gthumb

---
 home-mandlm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home-mandlm.nix b/home-mandlm.nix
index 35c8d01..0755a2b 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -33,6 +33,7 @@
       gnome.simple-scan
       calibre
       libreoffice
+      gthumb
     ];
 
     stateVersion = "22.05";

From deaeb9d3b340bdd0d5850e03a55732f85559854c Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 11 Dec 2023 07:40:55 +0100
Subject: [PATCH 56/66] chore: nix flake update

---
 flake.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6488e82..1be6d37 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700814205,
-        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
+        "lastModified": 1702195709,
+        "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
+        "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701263465,
-        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
+        "lastModified": 1701952659,
+        "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
+        "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1701068326,
-        "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
+        "lastModified": 1702151865,
+        "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
+        "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
         "type": "github"
       },
       "original": {

From 36d1bb4252ba53785709ea18d16455000bc1c2e8 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 11 Dec 2023 08:14:36 +0100
Subject: [PATCH 57/66] feat: use carapace for completion

---
 home-manager/carapace.nix | 9 +++++++++
 home-manager/zsh.nix      | 4 ++--
 home-mandlm.nix           | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 home-manager/carapace.nix

diff --git a/home-manager/carapace.nix b/home-manager/carapace.nix
new file mode 100644
index 0000000..92f2b3d
--- /dev/null
+++ b/home-manager/carapace.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, user, theme, ... }:
+{
+  programs.carapace = {
+    enable = true;
+    enableZshIntegration = true;
+    enableNushellIntegration = true;
+  };
+}
+
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 9b8a205..a33a598 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -5,8 +5,8 @@ in
 {
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
-    enableCompletion = true;
+    # enableAutosuggestions = true;
+    # enableCompletion = true;
     history.size = 10000;
 
     initExtra = ''
diff --git a/home-mandlm.nix b/home-mandlm.nix
index 0755a2b..4505896 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -47,6 +47,7 @@
     ./home-manager/kitty.nix
     ./home-manager/neovim
     ./home-manager/gpg
+    ./home-manager/carapace.nix
     ./home-manager/zsh.nix
     ./home-manager/starship.nix
     ./home-manager/sway

From cdcebfde46ad872f6b6a4521666e95568469f0fc Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 11 Dec 2023 20:04:42 +0100
Subject: [PATCH 58/66] feat: add nushell

---
 home-manager/direnv.nix           |  1 +
 home-manager/neovim/lspconfig.lua |  1 +
 home-manager/nushell.nix          | 36 +++++++++++++++++++++++++++++++
 home-mandlm.nix                   |  1 +
 users.nix                         |  2 +-
 5 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 home-manager/nushell.nix

diff --git a/home-manager/direnv.nix b/home-manager/direnv.nix
index 1061719..1dd2ed5 100644
--- a/home-manager/direnv.nix
+++ b/home-manager/direnv.nix
@@ -5,6 +5,7 @@
     direnv = {
       enable = true;
       enableZshIntegration = true;
+      enableNushellIntegration = true;
       nix-direnv.enable = true;
     };
   };
diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 92123c2..20b41c5 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -86,6 +86,7 @@ local servers = {
         },
     },
     ["marksman"] = {},
+    ["nushell"] = {},
     ["pylsp"] = {
         pylsp = {
             plugins = {
diff --git a/home-manager/nushell.nix b/home-manager/nushell.nix
new file mode 100644
index 0000000..88abfc1
--- /dev/null
+++ b/home-manager/nushell.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, user, theme, ... }:
+{
+  programs.nushell = {
+    enable = true;
+    extraConfig = ''
+      let carapace_completer = {|spans|
+      carapace $spans.0 nushell $spans | from json
+      }
+      $env.config = {
+       show_banner: false,
+       edit_mode: vi 
+       shell_integration: true
+       use_kitty_protocol: true 
+       completions: {
+       case_sensitive: false # case-sensitive completions
+       quick: true    # set to false to prevent auto-selecting completions
+       partial: true    # set to false to prevent partial filling of the prompt
+       algorithm: "fuzzy"    # prefix or fuzzy
+       external: {
+       # set to false to prevent nushell looking into $env.PATH to find more suggestions
+           enable: true 
+       # set to lower can improve completion performance at the cost of omitting some options
+           max_results: 100 
+           completer: $carapace_completer # check 'carapace_completer' 
+         }
+       }
+      } 
+      $env.PATH = ($env.PATH | 
+      split row (char esep) |
+      prepend /home/myuser/.apps |
+      append /usr/bin/env
+      )
+    '';
+  };
+}
+
diff --git a/home-mandlm.nix b/home-mandlm.nix
index 4505896..740b487 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -49,6 +49,7 @@
     ./home-manager/gpg
     ./home-manager/carapace.nix
     ./home-manager/zsh.nix
+    ./home-manager/nushell.nix
     ./home-manager/starship.nix
     ./home-manager/sway
     ./home-manager/direnv.nix
diff --git a/users.nix b/users.nix
index 7843422..668190c 100644
--- a/users.nix
+++ b/users.nix
@@ -8,7 +8,7 @@
       isNormalUser = true;
       uid = 1000;
       home = "/home/mandlm";
-      shell = pkgs.zsh;
+      shell = pkgs.nushell;
       extraGroups = [ "wheel" "networkmanager" "audio" "video" "input" "docker" "scanner" "lp" ];
       hashedPassword = "$6$wV6dzYlgke5tN01q$rCMP/Hquss/1BgKarnZUkmejpBtjEcwmlUhbhAAmjc2Pwdbztp3yr/bD/LJ63XoZ0oD7yhTMqbECDdMqNKKDe/";
       openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI6NmrDRvDtUkeJM8cE7DvZKtiNBKUQ+30MhOX4BwWPzN2b+kM+TjZ5Dtiln+Zbk/QToCDFir+CIKHshpgtCPAvVkjmldeqqflKKUkShTjWfF2zRwEql58DGaTuJqPgMhS9ZVDI5OL6VoecSxWOLSKCqGu4R+yJJnTRBSaoHNzBsq81psYk/yty+QofbWsJktjJc2r3JSuM8UUVkCVqcYS9wd/3vW3NbkqOL7KJhktsJa6sBZfTs1Yr1lpKqJou24CE1TGwTxiZ7SASjiRzbtK7J9jJBCjZ80hgEp/Cop0caaVw7aedo6xRC26X2TSm7ljAdvcPew9m6ayxuLaV9Nz mandlm@apache" ];

From 4265578b803e55992f411328276c0501d59c2c20 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Mon, 11 Dec 2023 20:05:05 +0100
Subject: [PATCH 59/66] feat: add zoxide

---
 home-manager/zoxide.nix | 10 ++++++++++
 home-mandlm.nix         |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 home-manager/zoxide.nix

diff --git a/home-manager/zoxide.nix b/home-manager/zoxide.nix
new file mode 100644
index 0000000..47c1207
--- /dev/null
+++ b/home-manager/zoxide.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, user, theme, ... }:
+
+{
+  programs.zoxide = {
+    enable = true;
+    enableNushellIntegration = true;
+    enableZshIntegration = true;
+  };
+}
+
diff --git a/home-mandlm.nix b/home-mandlm.nix
index 740b487..39b4450 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -54,5 +54,6 @@
     ./home-manager/sway
     ./home-manager/direnv.nix
     ./home-manager/bat.nix
+    ./home-manager/zoxide.nix
   ];
 }

From ecaa5095cf136ded5f1e920d4850f604655e7536 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Thu, 14 Dec 2023 17:07:25 +0100
Subject: [PATCH 60/66] feat: manage firefox with home-manager

---
 home-manager/firefox.nix | 9 +++++++++
 home-mandlm.nix          | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 home-manager/firefox.nix

diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix
new file mode 100644
index 0000000..327b21a
--- /dev/null
+++ b/home-manager/firefox.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, user, ... }:
+
+{
+  programs = {
+    firefox = {
+      enable = true;
+    };
+  };
+}
diff --git a/home-mandlm.nix b/home-mandlm.nix
index 39b4450..d57ee53 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -10,7 +10,6 @@
 
     packages = with pkgs; [
       unstable.eza
-      firefox
       jq
       htop
       ripgrep
@@ -42,6 +41,7 @@
   programs.home-manager.enable = true;
 
   imports = [
+    ./home-manager/firefox.nix
     ./home-manager/fzf.nix
     ./home-manager/git.nix
     ./home-manager/kitty.nix

From dd280068e264d0b9ae697a5d41e18c77a48bd78f Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 19 Dec 2023 10:04:07 +0100
Subject: [PATCH 61/66] chore: nix flake update

---
 flake.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1be6d37..b2d602e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702195709,
-        "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
+        "lastModified": 1702814678,
+        "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
+        "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701952659,
-        "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
+        "lastModified": 1702780907,
+        "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
+        "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1702151865,
-        "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
+        "lastModified": 1702830618,
+        "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
+        "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
         "type": "github"
       },
       "original": {

From 258e5a6b0e792d983627101cbd9ba558f8252641 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 19 Dec 2023 10:04:45 +0100
Subject: [PATCH 62/66] refactor: remove obsolete zfs settings

---
 machines/p330/configuration.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/machines/p330/configuration.nix b/machines/p330/configuration.nix
index 3313dd3..14add4f 100644
--- a/machines/p330/configuration.nix
+++ b/machines/p330/configuration.nix
@@ -2,8 +2,5 @@
 
 {
   networking.hostName = "p330";
-  networking.hostId = "05130071";
-
   boot.loader.grub.enableCryptodisk = true;
-  boot.supportedFilesystems = [ "zfs" ];
 }

From 44dbc88d8eb35d0ec7a104fb116cd7485b39c3bc Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Fri, 29 Dec 2023 16:06:38 +0100
Subject: [PATCH 63/66] feat: add fwupd

---
 configuration.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configuration.nix b/configuration.nix
index dbeb026..3fd93fa 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,6 +32,8 @@
     '';
   };
 
+  services.fwupd.enable = true;
+
   services.gnome.gnome-keyring.enable = true;
 
   services.resolved.enable = true;

From b35f0aa0da4eba3191fba810414e9f1415742250 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 9 Jan 2024 08:28:01 +0100
Subject: [PATCH 64/66] chore: nix flake update

---
 flake.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index b2d602e..4472ee2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702814678,
-        "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=",
+        "lastModified": 1704099619,
+        "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef",
+        "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702780907,
-        "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
+        "lastModified": 1704420045,
+        "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
+        "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1702830618,
-        "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
+        "lastModified": 1704538339,
+        "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
+        "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701",
         "type": "github"
       },
       "original": {

From 76062fc63f1446a1857177cd09c3616b81eda5ad Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 9 Jan 2024 08:28:34 +0100
Subject: [PATCH 65/66] feat: enable digital camera user-support

---
 configuration.nix |  1 +
 users.nix         | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/configuration.nix b/configuration.nix
index 3fd93fa..d4293c7 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -43,6 +43,7 @@
   programs = {
     appgate-sdp.enable = true;
     zsh.enable = true;
+    gphoto2.enable = true;
   };
 
   virtualisation.docker.enable = true;
diff --git a/users.nix b/users.nix
index 668190c..fbc8c2f 100644
--- a/users.nix
+++ b/users.nix
@@ -9,7 +9,17 @@
       uid = 1000;
       home = "/home/mandlm";
       shell = pkgs.nushell;
-      extraGroups = [ "wheel" "networkmanager" "audio" "video" "input" "docker" "scanner" "lp" ];
+      extraGroups = [
+        "wheel"
+        "networkmanager"
+        "audio"
+        "video"
+        "input"
+        "docker"
+        "scanner"
+        "lp"
+        "camera"
+      ];
       hashedPassword = "$6$wV6dzYlgke5tN01q$rCMP/Hquss/1BgKarnZUkmejpBtjEcwmlUhbhAAmjc2Pwdbztp3yr/bD/LJ63XoZ0oD7yhTMqbECDdMqNKKDe/";
       openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI6NmrDRvDtUkeJM8cE7DvZKtiNBKUQ+30MhOX4BwWPzN2b+kM+TjZ5Dtiln+Zbk/QToCDFir+CIKHshpgtCPAvVkjmldeqqflKKUkShTjWfF2zRwEql58DGaTuJqPgMhS9ZVDI5OL6VoecSxWOLSKCqGu4R+yJJnTRBSaoHNzBsq81psYk/yty+QofbWsJktjJc2r3JSuM8UUVkCVqcYS9wd/3vW3NbkqOL7KJhktsJa6sBZfTs1Yr1lpKqJou24CE1TGwTxiZ7SASjiRzbtK7J9jJBCjZ80hgEp/Cop0caaVw7aedo6xRC26X2TSm7ljAdvcPew9m6ayxuLaV9Nz mandlm@apache" ];
     };

From af9a0ec6d0496bc942350193c0159b70fad1569c Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 9 Jan 2024 09:11:19 +0100
Subject: [PATCH 66/66] feat(nvim): replace discontinued rust-tools.nvim with
 rustaceanvim

---
 home-manager/neovim/default.nix   |  3 ++-
 home-manager/neovim/lspconfig.lua | 18 +++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index 9fa62e2..390e874 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -97,10 +97,11 @@
         # LSP
         nvim-lspconfig
         lsp-status-nvim
-        rust-tools-nvim
+        rustaceanvim
         neodev-nvim
         null-ls-nvim
         lsp_lines-nvim
+        lsp-inlayhints-nvim
 
         # debugging
         nvim-dap
diff --git a/home-manager/neovim/lspconfig.lua b/home-manager/neovim/lspconfig.lua
index 20b41c5..e767caf 100644
--- a/home-manager/neovim/lspconfig.lua
+++ b/home-manager/neovim/lspconfig.lua
@@ -15,6 +15,8 @@ local on_attach = function(client, bufnr)
         })
     end
 
+    require("lsp-inlayhints").on_attach(client, bufnr)
+
     local telescope = require("telescope.builtin")
 
     nnoremap("gD", vim.lsp.buf.declaration)
@@ -40,6 +42,8 @@ local on_attach = function(client, bufnr)
     end
 end
 
+require("lsp-inlayhints").setup({})
+
 local lsp_status = require("lsp-status")
 lsp_status.config({
     current_function = false,
@@ -118,12 +122,8 @@ for lsp, settings in pairs(servers) do
     })
 end
 
--- setup rust tools
-local codelldb_base_path = vim.env.HOME .. "/.vscode-extensions/vscode-lldb/share/vscode/extensions/vadimcn.vscode-lldb/"
-local codelldb_bin_path = codelldb_base_path .. 'adapter/codelldb'
-local codelldb_lib_path = codelldb_base_path .. 'lldb/lib/liblldb.so'
-
-require("rust-tools").setup({
+-- setup rustaceanvim
+vim.g.rustaceanvim = {
     server = {
         on_attach = on_attach,
         settings = {
@@ -137,12 +137,8 @@ require("rust-tools").setup({
                 },
             },
         },
-        capabilities = capabilities,
     },
-    dap = {
-        adapter = require("rust-tools.dap").get_codelldb_adapter(codelldb_bin_path, codelldb_lib_path)
-    },
-})
+}
 
 -- setup null-ls for markdown formatting
 local null_ls = require("null-ls")