From b4a40fa36d99e9b7f0144a9b9fdd4806d3771995 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Mon, 20 Feb 2023 10:55:17 +0100
Subject: [PATCH 01/31] feat(wallpaper): fix wallpaper

---
 dotfiles/sway/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 3359a4f..c6487e0 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -5,7 +5,7 @@ set $down j
 set $up k
 set $right l
 set $term alacritty
-set $wallpaper /home/stefan/Downloads/bg.jpg
+set $wallpaper /home/stefan/wall.png
 set $lock swaylock -t -i $wallpaper --scaling=fill
 set $font CaskaydiaCove Nerd Font 10
 set $menucolor --ff=#f8f8f2 --nf=#f8f8f2 --tf=#bd93f9 --hf=#bd93f9 --tb=#282a36 --fb=#282a36 --nb=#282a36 --hb=#282a36 --sb=#282a36

From ed4af6d356971d276383aa5e6e1e22efbb9f57b8 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Mon, 20 Feb 2023 10:55:34 +0100
Subject: [PATCH 02/31] fix(sway): keybindings

---
 dotfiles/sway/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index c6487e0..39ba6ac 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -31,8 +31,8 @@ bindsym $mod+Up exec light -A 5
 bindsym $mod+Down exec light -U 5
 bindsym $mod+c exec alacritty --class float -t pyCalc -e python
 bindsym $mod+i exec alacritty --class float -t insect -e insect
-bindsym $mod+Space exec swayr switch-to
-bindsym $mod+n exec swayr switch-to-urgent-or-lru-window
+bindsym $mod+m exec swayr switch-to
+bindsym $mod+n exec emacsclient -cn
 bindsym Print exec grim -g "$(slurp)" - | wl-copy -t image/png
 bindswitch --reload --locked lid:on output eDP-1 disable
 bindswitch --reload --locked lid:off output eDP-1 enable

From 458ce0ccf6df6e30d177581db8926a2aa8117c72 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:32:53 +0100
Subject: [PATCH 03/31] fix(sway): remove cursor theme resetting (breaks it)

---
 dotfiles/sway/config | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 39ba6ac..471ed1a 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -17,6 +17,7 @@ input "0:0:TUXEDO_Keyboard" xkb_layout de
 output * bg $wallpaper fill
 output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz
 output "Dell Inc. Dell U4919DW HZVZWP2" res 5120x1440
+output eDP-1 scale 1.25
 
 # user keybinds
 bindsym $mod+Return exec $term
@@ -149,9 +150,8 @@ bar {
 
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
-    gsettings set $gnome-schema gtk-theme 'Dracula'
-    gsettings set $gnome-schema icon-theme 'Dracula'
-    gsettings set $gnome-schema cursor-theme 'Capitaine Cursors - White'
+    gsettings set $gnome-schema icon-theme 'capitaine-cursors-white'
+    gsettings set $gnome-schema cursor-theme 'capitaine-cursors-white'
 }
 
 # autostarts
@@ -163,8 +163,11 @@ exec emacs --daemon
 exec swayidle before-sleep "$lock"
 exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1
 exec systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
 exec bash -c '[ "$HOSTNAME" == sphere ] && cloudstation'
 exec swayrd
+exec xinput set-prop "PIXA3854:00 093A:0274 Touchpad" 365 1
+
 
 # pastebin
 exec wl-paste --primary -t text --watch clipman store

From 5f1cd851b9df793aef5179e82625c83d7398a684 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:33:08 +0100
Subject: [PATCH 04/31] fix(status): use correct battery number for framework

---
 dotfiles/sway/status.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml
index 7f94a43..5586edd 100644
--- a/dotfiles/sway/status.toml
+++ b/dotfiles/sway/status.toml
@@ -95,7 +95,7 @@ block = "backlight"
 
 [[block]]
 block = "battery"
-device = "BAT0"
+device = "BAT1"
 interval = 10
 format = "{percentage} ({time})"
 full_format = "{percentage} ({time}) "

From 0d4265f5f1e9d484635da6e97b4cb96263e8c54e Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:33:20 +0100
Subject: [PATCH 05/31] feat(alacritty): smaller fontsize

---
 dotfiles/alacritty.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/alacritty.yml b/dotfiles/alacritty.yml
index 4d524b9..6e675f3 100644
--- a/dotfiles/alacritty.yml
+++ b/dotfiles/alacritty.yml
@@ -1,7 +1,7 @@
 font:
   normal:
     family: CaskaydiaCove Nerd Font
-  size: 12
+  size: 8
 
 draw_bold_text_with_bright_colors: true
 

From b528bbd88f435125e652b52f83f22c0aa407877d Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:33:29 +0100
Subject: [PATCH 06/31] feat(hardware): framework

---
 hardware/framework.nix | 85 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 hardware/framework.nix

diff --git a/hardware/framework.nix b/hardware/framework.nix
new file mode 100644
index 0000000..4dbb97c
--- /dev/null
+++ b/hardware/framework.nix
@@ -0,0 +1,85 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+let
+  #nixkernel = import <nixos-kernel> {};
+in
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" "i915" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "workpool/nixos/root";
+      fsType = "zfs";
+    };
+
+  fileSystems."/home" =
+    { device = "workpool/nixos/home";
+      fsType = "zfs";
+    };
+
+  fileSystems."/var/lib/docker" =
+    { device = "workpool/nixos/docker";
+      fsType = "zfs";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/AA17-42AD";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/18ae41eb-e32e-46a3-9e22-3395c37782df"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # custom
+  boot.loader.systemd-boot.enable = true;
+  networking.hostId = "f0000001";
+  networking.hostName = "sphere";
+  services.tlp.enable = true;
+  services.hardware.bolt.enable = true;
+
+  # framework hardware
+  #boot.kernelPackages = nixkernel.linuxPackages_5_19;
+  #boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  boot.kernelParams = [
+    "mem_sleep_default=deep"
+    "nvme.noacpi=1"
+    "i915.enable_psr=1"
+  ];
+  boot.blacklistedKernelModules = [ "hid-sensor-hub" ];
+  hardware.acpilight.enable = true;
+  hardware.video.hidpi.enable = lib.mkDefault true;
+  services.xserver.dpi = 125;
+  environment.variables = {
+    VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
+  };
+  hardware.opengl.extraPackages = with pkgs; [
+    vaapiIntel
+    libvdpau-va-gl
+    intel-media-driver
+  ];
+  services.tlp.settings = {
+    CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+    CPU_ENERGY_PERF_POLICY_ON_BAT = "performance";
+  };
+}

From f40031327f06694a09ef7a95491f53c245fcbe31 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:33:39 +0100
Subject: [PATCH 07/31] fix(nagstamon): fix package and update to 3.10

---
 packages/nagstamon.nix | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/nagstamon.nix b/packages/nagstamon.nix
index 86fe18f..1e72611 100644
--- a/packages/nagstamon.nix
+++ b/packages/nagstamon.nix
@@ -1,17 +1,17 @@
-{ lib, fetchFromGitHub, python39Packages, wrapQtAppsHook }:
+{ lib, fetchFromGitHub, python310Packages, wrapQtAppsHook, pkgs }:
 
 let
   pname = "nagstamon";
-  version = "v3.8.0";
-in python39Packages.buildPythonApplication rec {
+  version = "v3.10.1";
+in python310Packages.buildPythonApplication rec {
   inherit pname;
   inherit version;
 
   src = fetchFromGitHub {
     owner = "HenriWahl";
     repo = "Nagstamon";
-    rev = "${version}";
-    sha256 = "0a8aqw44z58pabsgxlvndnmzzvc50wrb4g12yp6zgajn40b2l8pw";
+    rev = version;
+    sha256 = "sha256-TdwvHQDDQqZ6uvdCTJCMCdivM/vaZpMrpLRMKN2y76Y=";
   };
 
   doCheck = false;
@@ -21,17 +21,18 @@ in python39Packages.buildPythonApplication rec {
     wrapQtApp $out/bin/nagstamon.py
   '';
 
-  propagatedBuildInputs = with python39Packages; [
-    beautifulsoup4
-    configparser
-    dateutil
-    keyring
-    lxml
-    psutil
-    pyqt5_with_qtmultimedia
-    requests
-    setuptools
-    xlib
+  propagatedBuildInputs = [
+    python310Packages.beautifulsoup4
+    python310Packages.configparser
+    python310Packages.dateutil
+    python310Packages.keyring
+    python310Packages.lxml
+    python310Packages.psutil
+    python310Packages.pyqt5_with_qtmultimedia
+    python310Packages.requests
+    python310Packages.requests-kerberos
+    python310Packages.setuptools
+    python310Packages.xlib
   ];
 
   meta = with lib; {
@@ -42,4 +43,3 @@ in python39Packages.buildPythonApplication rec {
     inherit version;
   };
 }
-

From 959c3c0fe94e8815fddd17fb1c740b14e0f82034 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:34:11 +0100
Subject: [PATCH 08/31] feat(work): add google cloud sdk plugins

---
 roles/work.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/roles/work.nix b/roles/work.nix
index 8a7485e..1026c2e 100644
--- a/roles/work.nix
+++ b/roles/work.nix
@@ -34,11 +34,13 @@ in {
     nagstamon
 
     drone-cli
-    go-jira
     govc
     ttyd
     unstable.discord
-    unstable.google-cloud-sdk
+    unstable.go-jira
+    (unstable.google-cloud-sdk.withExtraComponents [
+      unstable.google-cloud-sdk.components.gke-gcloud-auth-plugin
+    ])
     unstable.slack
     unstable.velero
 

From f8690d90e6e7f09add077683c5d5f9a1300f8fe6 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:34:23 +0100
Subject: [PATCH 09/31] feat(network): add openconnect vpn support

---
 roles/network.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/network.nix b/roles/network.nix
index 4dce0d4..843b7c8 100644
--- a/roles/network.nix
+++ b/roles/network.nix
@@ -9,5 +9,6 @@ in {
   environment.systemPackages = with pkgs; [
     networkmanagerapplet
     networkmanager-vpnc
+    openconnect_openssl
   ];
 }

From e361a43b48ebab3073421b28a3d604b99d74ef66 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:34:48 +0100
Subject: [PATCH 10/31] feat(golang): update to 1.19

---
 roles/dev.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/roles/dev.nix b/roles/dev.nix
index 92cda0c..f74fbce 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -3,9 +3,16 @@
 let unstable = import <nixos-unstable> { };
 in {
 
+  services.emacs.package = pkgs.emacsPgtk;
+  nixpkgs.overlays = [
+    (import (builtins.fetchTarball {
+      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+    }))
+  ];
+
   environment.systemPackages = with pkgs; [
     gnumake
-    go_1_17
+    go_1_19
     rustup
     shellcheck
     unstable.golangci-lint
@@ -27,7 +34,7 @@ in {
     musl
 
     dbeaver
-    emacs
+    emacs-gtk
     gitAndTools.delta
     lazygit
     ltrace

From 58a0d3f1d8a446ec862c9ea044656c348c1a1526 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:35:21 +0100
Subject: [PATCH 11/31] feat(admin): add nmap and ipcalc

---
 roles/admin.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/admin.nix b/roles/admin.nix
index 7a58cb8..e7614e9 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -10,9 +10,11 @@ in {
     kind
     kubectl
     kubeseal
+    nmap
     pwgen
     terraform
     whois
+    ipcalc
 
     unstable.argocd
     unstable.kubernetes-helm

From 2660ebc7afcba003774069f3a8f0f8a9c2b2f139 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:35:35 +0100
Subject: [PATCH 12/31] feat(desktop): desktop changes

---
 roles/desktop.nix | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index d8e9780..405171b 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -14,7 +14,6 @@ in
   services.autorandr.enable = true;
   services.xserver = {
     enable = true;
-    dpi = 96;
 
     displayManager = {
       sddm.enable = true;
@@ -28,6 +27,7 @@ in
     windowManager.i3 = {
       enable = true;
       extraPackages = with pkgs; [
+        arandr
         autorandr
         dmenu
         dunst
@@ -41,9 +41,10 @@ in
   };
 
 
-  programs.dconf.enable = true;
+  programs.droidcam.enable = true;
   programs.sway = {
     enable = true;
+    wrapperFeatures.gtk = true;
     extraPackages = with pkgs; [
       bemenu
       brightnessctl
@@ -59,16 +60,11 @@ in
       swayr
       wf-recorder
       wofi
-      xwayland
     ];
     extraSessionCommands = "";
   };
+  xdg.portal.enable = true;
 
-  xdg.portal = {
-    enable = true;
-    gtkUsePortal = true;
-    extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr ];
-  };
   boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
 
   colors = {
@@ -125,11 +121,10 @@ in
     };
   };
 
-  programs.qt5ct.enable = true;
+  qt5.platformTheme = "qt5ct";
 
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
-  security.polkit.enable = true;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -194,6 +189,7 @@ in
     libsForQt5.qtstyleplugins
     lxappearance
     numix-icon-theme
+    numix-cursor-theme
 
     alacritty
     imv
@@ -209,6 +205,7 @@ in
     pcmanfm
     pulseeffects-pw
     qrencode
+    uxplay
 
     solaar
     gdk-pixbuf
@@ -259,8 +256,14 @@ in
 
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.gutenprint ];
-  services.avahi.enable = true;
-  services.avahi.nssmdns = true;
-
-  hardware.opengl = { enable = true; };
+  services.avahi = {
+    enable = true;
+    nssmdns = true;
+    publish = {
+      enable = true;
+      addresses = true;
+      workstation = true;
+      userServices = true;
+    };
+  };
 }

From c426807bceeef64d57a980a267e0809b10f756b1 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:35:53 +0100
Subject: [PATCH 13/31] fix(configuration): allow broken kerberos package

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

diff --git a/configuration.nix b/configuration.nix
index 364eb1e..23c4c58 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,7 +32,10 @@
   services.openssh.enable = true;
   networking.firewall.enable = true;
 
-  nixpkgs.config.permittedInsecurePackages = [ "openssl-1.0.2u" ];
+  nixpkgs.config.permittedInsecurePackages = [
+    "openssl-1.0.2u"
+    "python3.10-kerberos-1.3.1"
+  ];
 
   # removed for mobile working
   # system.autoUpgrade.enable = true;

From 18902b41c33a75b6643ea9be7d712d15b3f203a1 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 3 Mar 2023 10:38:23 +0100
Subject: [PATCH 14/31] chore: remove x

---
 dotfiles/i3/config      | 167 ----------------------------------------
 dotfiles/i3/status.toml | 107 -------------------------
 roles/desktop.nix       |  31 --------
 3 files changed, 305 deletions(-)
 delete mode 100644 dotfiles/i3/config
 delete mode 100644 dotfiles/i3/status.toml

diff --git a/dotfiles/i3/config b/dotfiles/i3/config
deleted file mode 100644
index 1620807..0000000
--- a/dotfiles/i3/config
+++ /dev/null
@@ -1,167 +0,0 @@
-# config
-set $mod Mod1
-set $left h
-set $down j
-set $up k
-set $right l
-set $term alacritty
-set $wallpaper /home/stefan/Downloads/bg.jpg
-set $lock swaylock -t -i $wallpaper --scaling=fill
-set $font CaskaydiaCove Nerd Font 10
-set $menucolor --ff=#f8f8f2 --nf=#f8f8f2 --tf=#bd93f9 --hf=#bd93f9 --tb=#282a36 --fb=#282a36 --nb=#282a36 --hb=#282a36 --sb=#282a36
-set $menu dmenu_run
-
-#input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de
-#input "0:0:TUXEDO_Keyboard" xkb_layout de
-#
-#output * bg $wallpaper fill
-#output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz
-#output "Dell Inc. Dell U4919DW HZVZWP2" res 5120x1440
-
-# user keybinds
-bindsym $mod+Return exec $term
-bindsym $mod+Shift+q kill
-bindsym $mod+d exec $menu
-floating_modifier $mod normal
-bindsym $mod+Shift+c reload
-bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
-bindsym $mod+o exec keepassxc
-bindsym $mod+z exec $lock
-bindsym $mod+Up exec light -A 5
-bindsym $mod+Down exec light -U 5
-bindsym $mod+c exec alacritty --class float -t pyCalc -e python
-bindsym $mod+i exec alacritty --class float -t insect -e insect
-bindsym $mod+Space exec swayr switch-to
-bindsym $mod+n exec swayr switch-to-urgent-or-lru-window
-bindsym Print exec grim -g "$(slurp)" - | wl-copy -t image/png
-#bindswitch --reload --locked lid:on output eDP-1 disable
-#bindswitch --reload --locked lid:off output eDP-1 enable
-
-# app rules
-#for_window [app_id="org.keepassxc.KeePassXC"] floating enable
-#for_window [title="Firefox — Sharing Indicator"] floating enable
-#for_window [title="Picture-in-Picture"] floating enable
-#for_window [title="pyCalc"] floating enable
-#for_window [title="insect"] floating enable
-
-# font
-font $font
-
-# colors
-set $black  #282a36
-set $red #ff6188
-set $cyan #78dce8
-set $white #fcfcfa
-set $yellow #f1fa8c
-set $violet #bd93f9
-set $black2 #323232
-
-#                        border   backgnd  text    indicator  childborder
-client.focused           $violet  $black   $white  $violet    $violet
-client.focused_inactive  $black   $black   $white  $black2    $black
-client.unfocused         $black   $black   $white  $black2    $black
-client.urgent            $red     $red     $black  $black2    $white
-
-
-# movement
-bindsym $mod+$left focus left
-bindsym $mod+$down focus down
-bindsym $mod+$up focus up
-bindsym $mod+$right focus right
-bindsym $mod+Shift+$left move left
-bindsym $mod+Shift+$down move down
-bindsym $mod+Shift+$up move up
-bindsym $mod+Shift+$right move right
-
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2
-bindsym $mod+3 workspace 3
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
-bindsym $mod+6 workspace 6
-bindsym $mod+7 workspace 7
-bindsym $mod+8 workspace 8
-bindsym $mod+9 workspace 9
-bindsym $mod+0 workspace 10
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace 2
-bindsym $mod+Shift+3 move container to workspace 3
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
-bindsym $mod+Shift+7 move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace 8
-bindsym $mod+Shift+9 move container to workspace 9
-bindsym $mod+Shift+0 move container to workspace 10
-
-bindsym $mod+b splith
-bindsym $mod+v splitv
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-bindsym $mod+f fullscreen
-bindsym $mod+Shift+space floating toggle
-bindsym $mod+space focus mode_toggle
-bindsym $mod+a focus parent
-
-bindsym $mod+Shift+minus move scratchpad
-bindsym $mod+minus scratchpad show
-
-mode "resize" {
-    bindsym $left resize shrink width 10px
-    bindsym $down resize grow height 10px
-    bindsym $up resize shrink height 10px
-    bindsym $right resize grow width 10px
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-bindsym $mod+r mode "resize"
-
-mode "umlaut" {
-    bindsym s exec wtype ß
-    bindsym a exec wtype ä
-    bindsym o exec wtype ö
-    bindsym u exec wtype ü
-    bindsym Shift+a exec wtype Ä
-    bindsym Shift+o exec wtype Ö
-    bindsym Shift+u exec wtype Ü
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-bindsym $mod+u mode "umlaut"
-
-bar {
-  font $font
-  position bottom
-  colors {
-    background $black
-    statusline $white
-    separator  $violet
-
-    #                   border   back     text
-    focused_workspace   $violet  $violet  $black
-    active_workspace    $violet  $violet  $black
-    urgent_workspace    $red     $red     $white
-    inactive_workspace  $black   $black   $white
-  }
-  status_command i3status-rs /etc/sway/status.toml
-}
-
-set $gnome-schema org.gnome.desktop.interface
-exec_always {
-    gsettings set $gnome-schema gtk-theme 'Dracula'
-    gsettings set $gnome-schema icon-theme 'Dracula'
-    gsettings set $gnome-schema cursor-theme 'Capitaine Cursors - White'
-}
-
-# autostarts
-exec dunst
-exec emacs --daemon
-#exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1
-exec systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-exec bash -c '[ "$HOSTNAME" == sphere ] && cloudstation'
-#exec swayrd
-
-# pastebin
-#exec wl-paste --primary -t text --watch clipman store
-#bindsym $mod+p exec clipman pick -t "bemenu" --tool-args='-b --fn "$font" -l 10 $menucolor'
diff --git a/dotfiles/i3/status.toml b/dotfiles/i3/status.toml
deleted file mode 100644
index 7f94a43..0000000
--- a/dotfiles/i3/status.toml
+++ /dev/null
@@ -1,107 +0,0 @@
-[theme]
-name = "plain"
-[theme.overrides]
-idle_bg = "#282a36"
-idle_fg = "#f8f8f2"
-info_bg = "#282a36"
-info_fg = "#f8f8f2"
-good_bg = "#282a36"
-good_fg = "#50fa7b"
-warning_bg = "#282a36"
-warning_fg = "#f1fa8c"
-critical_bg = "#282a36"
-critical_fg = "#ff5555"
-separator_bg = "#282a36"
-separator_fg = "#bd93f9"
-separator = "|"
-
-[icons]
-name = "none"
-[icons.overrides]
-backlight_empty = ""
-backlight_full = ""
-backlight_partial1 = ""
-backlight_partial2 = ""
-backlight_partial3 = ""
-bat = ""
-bat_charging = ""
-bat_discharging = ""
-bat_empty = ""
-bat_quarter = ""
-bat_half = ""
-bat_three_quarters = ""
-bat_full = ""
-cogs = "龍"
-disk_drive = ""
-headphones = "  "
-memory_mem = ""
-net_down = "DOWN"
-net_up = "UP"
-net_vpn = " "
-net_wired = ""
-net_wireless = " "
-thermometer = "  "
-time = ""
-volume_empty = ""
-volume_full = ""
-volume_half = ""
-volume_muted= " MUTE"
-
-
-[[block]]
-block = "net"
-device = "wg"
-hide_inactive = true
-hide_missing = true
-
-[[block]]
-block = "net"
-device = "wlo1"
-hide_inactive = true
-hide_missing = true
-
-[[block]]
-block = "custom"
-command = '''echo " $(cat /sys/class/thermal/thermal_zone0/temp | head -c 2) °C"'''
-
-[[block]]
-block = "disk_space"
-path = "/"
-info_type = "available"
-unit = "GB"
-format = "{icon} {available}"
-interval = 20
-warning = 20.0
-alert = 10.0
-
-[[block]]
-block = "memory"
-display_type = "memory"
-format_mem = "{mem_total_used_percents}"
-icons_format = " {icon}"
-clickable = false
-
-[[block]]
-block = "load"
-interval = 1
-format = "{1m}"
-
-[[block]]
-block = "sound"
-driver = "pulseaudio"
-
-[[block]]
-block = "backlight"
-
-[[block]]
-block = "battery"
-device = "BAT0"
-interval = 10
-format = "{percentage} ({time})"
-full_format = "{percentage} ({time}) "
-icons_format = " {icon} "
-
-[[block]]
-block = "time"
-interval = 60
-format = "%Y-%m-%d %H:%M"
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 405171b..b8d115a 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -10,37 +10,6 @@ let
   unstable = import <nixos-unstable> { config.allowUnfree = true; };
 in
 {
-
-  services.autorandr.enable = true;
-  services.xserver = {
-    enable = true;
-
-    displayManager = {
-      sddm.enable = true;
-      defaultSession = "none+i3";
-    };
-
-    libinput = {
-      enable = true;
-    };
-
-    windowManager.i3 = {
-      enable = true;
-      extraPackages = with pkgs; [
-        arandr
-        autorandr
-        dmenu
-        dunst
-        feh
-        i3lock
-        i3status-rust
-        maim
-        xclip
-      ];
-    };
-  };
-
-
   programs.droidcam.enable = true;
   programs.sway = {
     enable = true;

From a4bff2a186f16daab7b8c6d1985247539bbea133 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 24 Mar 2023 08:44:05 +0100
Subject: [PATCH 15/31] feat(sway): lightmode

---
 dotfiles/sway/config      | 66 ++++++++++++++++++++++-----------------
 dotfiles/sway/status.toml | 25 ++++++++-------
 2 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 471ed1a..41b5865 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -1,15 +1,33 @@
+# colors
+set $black #000000
+set $red #e75544
+set $cyan #3c74f6
+set $white #fafafa
+set $yellow #908550
+set $violet #a73ca6
+#set $black2 #323232
+set $white2 #f0f0f0
+
 # config
 set $mod Mod1
 set $left h
 set $down j
 set $up k
 set $right l
-set $term alacritty
+set $term wezterm
 set $wallpaper /home/stefan/wall.png
 set $lock swaylock -t -i $wallpaper --scaling=fill
 set $font CaskaydiaCove Nerd Font 10
-set $menucolor --ff=#f8f8f2 --nf=#f8f8f2 --tf=#bd93f9 --hf=#bd93f9 --tb=#282a36 --fb=#282a36 --nb=#282a36 --hb=#282a36 --sb=#282a36
+set $menucolor \
+    --tf=$white --tb=$cyan  \
+    --ff=$black --fb=$white \
+    --cf=$cyan  --cb=$white \
+    --nf=$black --nb=$white \
+    --af=$black --ab=$white2 \
+    --hf=$white --hb=$cyan  \
+    --sf=$white --sb=$cyan
 set $menu bemenu-run -H 23 -b -p run $menucolor
+font $font
 
 input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de
 input "0:0:TUXEDO_Keyboard" xkb_layout de
@@ -45,23 +63,11 @@ for_window [title="Picture-in-Picture"] floating enable
 for_window [title="pyCalc"] floating enable
 for_window [title="insect"] floating enable
 
-# font
-font $font
-
-# colors
-set $black  #282a36
-set $red #ff6188
-set $cyan #78dce8
-set $white #fcfcfa
-set $yellow #f1fa8c
-set $violet #bd93f9
-set $black2 #323232
-
 #                        border   backgnd  text    indicator  childborder
-client.focused           $violet  $black   $white  $violet    $violet
-client.focused_inactive  $black   $black   $white  $black2    $black
-client.unfocused         $black   $black   $white  $black2    $black
-client.urgent            $red     $red     $black  $black2    $white
+client.focused           $cyan    $white   $black  $violet    $cyan
+client.focused_inactive  $white2  $white2  $black  $white2    $white
+client.unfocused         $white2  $white2  $black  $white2    $white
+client.urgent            $red     $red     $white  $white2    $black
 
 
 # movement
@@ -135,30 +141,34 @@ bar {
   font $font
   position bottom
   colors {
-    background $black
-    statusline $white
-    separator  $violet
+    background $white
+    statusline $black
+    separator  $cyan
 
     #                   border   back     text
-    focused_workspace   $violet  $violet  $black
-    active_workspace    $violet  $violet  $black
-    urgent_workspace    $red     $red     $white
-    inactive_workspace  $black   $black   $white
+    focused_workspace   $cyan    $cyan    $white
+    active_workspace    $cyan    $cyan    $white
+    urgent_workspace    $red     $red     $black
+    inactive_workspace  $white   $white   $black
   }
+
   status_command i3status-rs /etc/sway/status.toml
 }
 
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
+    gsettings set $gnome-schema cursor-theme Adwaita
     gsettings set $gnome-schema icon-theme 'capitaine-cursors-white'
     gsettings set $gnome-schema cursor-theme 'capitaine-cursors-white'
 }
 
 # autostarts
 exec mako --font "$font" \
-  --background-color=$black \
-  --border-color=$violet \
-  --text-color=$white
+  --background-color "$white" \
+  --border-colo "$red" \
+  --text-color "$black" \
+  --default-timeout 1000 \
+  --padding 10
 exec emacs --daemon
 exec swayidle before-sleep "$lock"
 exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1
diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml
index 5586edd..357d6bb 100644
--- a/dotfiles/sway/status.toml
+++ b/dotfiles/sway/status.toml
@@ -1,20 +1,21 @@
 [theme]
 name = "plain"
 [theme.overrides]
-idle_bg = "#282a36"
-idle_fg = "#f8f8f2"
-info_bg = "#282a36"
-info_fg = "#f8f8f2"
-good_bg = "#282a36"
-good_fg = "#50fa7b"
-warning_bg = "#282a36"
-warning_fg = "#f1fa8c"
-critical_bg = "#282a36"
-critical_fg = "#ff5555"
-separator_bg = "#282a36"
-separator_fg = "#bd93f9"
+idle_bg = "#fafafa"
+idle_fg = "#000000"
+info_bg = "#fafafa"
+info_fg = "#000000"
+good_bg = "#fafafa"
+good_fg = "#000000"
+warning_bg = "#fafafa"
+warning_fg = "#908550"
+critical_bg = "#fafafa"
+critical_fg = "#e75544"
+separator_bg = "#fafafa"
+separator_fg = "#3c74f6"
 separator = "|"
 
+
 [icons]
 name = "none"
 [icons.overrides]

From 210bc59571fafd50d6c712ed9b877828113da42e Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 24 Mar 2023 08:44:33 +0100
Subject: [PATCH 16/31] feat(wezterm): add wezterm

---
 dotfiles/wezterm.lua | 42 ++++++++++++++++++++++++++++++++++++++++++
 roles/desktop.nix    |  4 +++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 dotfiles/wezterm.lua

diff --git a/dotfiles/wezterm.lua b/dotfiles/wezterm.lua
new file mode 100644
index 0000000..8c3982e
--- /dev/null
+++ b/dotfiles/wezterm.lua
@@ -0,0 +1,42 @@
+local wezterm = require 'wezterm';
+
+return {
+  audible_bell = "Disabled",
+  bold_brightens_ansi_colors = true,
+  color_scheme = "One Light (base16)",
+  enable_tab_bar = false,
+  enable_wayland = true,
+  font_size = 12,
+  font = wezterm.font("CaskaydiaCove Nerd Font"),
+  window_background_opacity = 0.97,
+  window_close_confirmation = 'NeverPrompt',
+  default_prog = { '/run/current-system/sw/bin/bash' },
+
+  selection_fg = 'black',
+  selection_bg = '#fafafa',
+
+  keys = {
+    {
+      key = 'Escape',
+      mods = 'CTRL',
+      action = wezterm.action.QuickSelect,
+    },
+  },
+
+  window_padding = {
+    left = 0,
+    right = 0,
+    top = 0,
+    bottom = 0,
+  },
+
+  quick_select_patterns = {
+    '^([^ ]+) +(?:ClusterIP|Bound)',
+    '^([^ ]+) +(?:[0-9]+/[0-9]+)',
+    '^([^ ]+) +(?:[0-9]+ )',
+    '^([^ ]+) +(?:Opaque|kubernetes\\.io|helm\\.sh)',
+    '^([^ ]+) +(?:Active)',
+    '[^ ]+@[^ ]+.service',
+    'git push.*',
+  },
+}
diff --git a/roles/desktop.nix b/roles/desktop.nix
index b8d115a..d449adc 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -51,7 +51,6 @@ in
 
   environment = {
     etc = {
-      "i3/config".source = ../dotfiles/i3/config;
       "sway/config".source = ../dotfiles/sway/config;
       "sway/status.toml".source = ../dotfiles/sway/status.toml;
       "xdg/alacritty/alacritty.yml".text = ''
@@ -87,6 +86,7 @@ in
         key_bindings:
           - { key: Escape, mods: Control, action: ToggleViMode }
       '';
+      "wezterm.lua".source = ../dotfiles/wezterm.lua;
     };
   };
 
@@ -175,6 +175,7 @@ in
     pulseeffects-pw
     qrencode
     uxplay
+    wezterm
 
     solaar
     gdk-pixbuf
@@ -203,6 +204,7 @@ in
         export QT_QPA_PLATFORM=wayland-egl
         export QT_WAYLAND_FORCE_DPI=96
         export SDL_VIDEODRIVER=wayland
+        export WEZTERM_CONFIG_FILE=/etc/wezterm.lua
         export XDG_CURRENT_DESKTOP=sway
         export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
         export XDG_SESSION_TYPE=wayland

From 2622bdb1444937f529ac6275e53cde4047b54be1 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 24 Mar 2023 08:44:56 +0100
Subject: [PATCH 17/31] feat(yubikey): add support

---
 roles/base.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/roles/base.nix b/roles/base.nix
index 2764f21..f3c625c 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -175,4 +175,7 @@ in {
     };
   };
 
+  # yubikey support
+  services.udev.packages = [ pkgs.yubikey-personalization ];
+  services.pcscd.enable = true;
 }

From 698e0b6ec2b49326da9de79eb9fc83b4837b8d19 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 24 Mar 2023 08:46:34 +0100
Subject: [PATCH 18/31] feat(kubectx): test kubectl

---
 roles/admin.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/roles/admin.nix b/roles/admin.nix
index e7614e9..0e76052 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -9,6 +9,7 @@ in {
     k9s
     kind
     kubectl
+    kubectx
     kubeseal
     nmap
     pwgen
@@ -32,6 +33,11 @@ in {
     (import ../packages/certmanager.nix)
   ];
 
+  programs.bash.shellAliases = {
+    kx = "kubectx";
+    kns = "kubens";
+  };
+
   virtualisation.docker = {
     enable = true;
     storageDriver = "zfs";

From 49ae5f39817fd35a7b84962028eb2801115afab3 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Wed, 3 Jan 2024 15:26:33 +0100
Subject: [PATCH 19/31] work

---
 dotfiles/alacritty.yml    | 30 ++++++++-----
 dotfiles/sway/config      | 14 +++++--
 dotfiles/sway/status.toml | 88 +++++++++++++++++----------------------
 dotfiles/wezterm.lua      |  3 --
 hardware/framework.nix    |  1 -
 packages/nagstamon.nix    | 31 +++++++-------
 roles/base.nix            |  5 +--
 roles/desktop.nix         | 15 ++++---
 roles/dev.nix             | 22 ++++------
 roles/work.nix            | 27 +++++++++++-
 10 files changed, 129 insertions(+), 107 deletions(-)

diff --git a/dotfiles/alacritty.yml b/dotfiles/alacritty.yml
index 6e675f3..81419b5 100644
--- a/dotfiles/alacritty.yml
+++ b/dotfiles/alacritty.yml
@@ -7,18 +7,28 @@ draw_bold_text_with_bright_colors: true
 
 colors:
   primary:
-    background: "0x19181A"
-    foreground: "0xFCFCFA"
+    background: '0xf8f8f8'
+    foreground: '0x2a2b33'
 
   normal:
-    black: "0x19181A"
-    red: "0xcc6666"
-    green: "0xa9dc76"
-    yellow: "0xffd866"
-    cyan: "0x78dce8"
-    magenta: "0xFC9867"
-    blue: "0xAB9DF2"
-    white: "0xFCFCFA"
+    black:   '0x000000'
+    red:     '0xde3d35'
+    green:   '0x3e953a'
+    yellow:  '0xd2b67b'
+    blue:    '0x2f5af3'
+    magenta: '0xa00095'
+    cyan:    '0x3e953a'
+    white:   '0xbbbbbb'
+
+  bright:
+    black:   '0x000000'
+    red:     '0xde3d35'
+    green:   '0x3e953a'
+    yellow:  '0xd2b67b'
+    blue:    '0x2f5af3'
+    magenta: '0xa00095'
+    cyan:    '0x3e953a'
+    white:   '0xffffff'
 
 window:
   dynamic_title: true
diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 41b5865..95de070 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -14,11 +14,12 @@ set $left h
 set $down j
 set $up k
 set $right l
-set $term wezterm
+#set $term wezterm
+set $term alacritty
 set $wallpaper /home/stefan/wall.png
 set $lock swaylock -t -i $wallpaper --scaling=fill
 set $font CaskaydiaCove Nerd Font 10
-set $menucolor \
+set $menucolor -H 23 -b \
     --tf=$white --tb=$cyan  \
     --ff=$black --fb=$white \
     --cf=$cyan  --cb=$white \
@@ -26,14 +27,20 @@ set $menucolor \
     --af=$black --ab=$white2 \
     --hf=$white --hb=$cyan  \
     --sf=$white --sb=$cyan
-set $menu bemenu-run -H 23 -b -p run $menucolor
+set $menu bemenu-run -p run $menucolor
+set $otpmenu ykman oath accounts code -s "$(ykman oath accounts list | bemenu -i $menucolor)" | wl-copy
 font $font
 
 input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de
 input "0:0:TUXEDO_Keyboard" xkb_layout de
+input 1130:35:HID_046a:0023 xkb_layout de
+input "2362:628:PIXA3854:00_093A:0274_Touchpad" click_method clickfinger
 
 output * bg $wallpaper fill
 output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz
+output "BenQ Corporation BenQ SW2700 83H03922SL0" pos 1440 720
+output "BNQ BenQ PD2705Q W4N00777019" transform 270
+output "BNQ BenQ PD2705Q W4N00777019" pos 0 0
 output "Dell Inc. Dell U4919DW HZVZWP2" res 5120x1440
 output eDP-1 scale 1.25
 
@@ -45,6 +52,7 @@ floating_modifier $mod normal
 bindsym $mod+Shift+c reload
 bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 bindsym $mod+o exec keepassxc
+bindsym $mod+Shift+o exec $otpmenu
 bindsym $mod+z exec $lock
 bindsym $mod+Up exec light -A 5
 bindsym $mod+Down exec light -U 5
diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml
index 357d6bb..4696623 100644
--- a/dotfiles/sway/status.toml
+++ b/dotfiles/sway/status.toml
@@ -1,5 +1,5 @@
 [theme]
-name = "plain"
+theme = "plain"
 [theme.overrides]
 idle_bg = "#fafafa"
 idle_fg = "#000000"
@@ -17,49 +17,45 @@ separator = "|"
 
 
 [icons]
-name = "none"
+icons = "none"
 [icons.overrides]
-backlight_empty = ""
-backlight_full = ""
-backlight_partial1 = ""
-backlight_partial2 = ""
-backlight_partial3 = ""
-bat = ""
-bat_charging = ""
-bat_discharging = ""
-bat_empty = ""
-bat_quarter = ""
-bat_half = ""
-bat_three_quarters = ""
-bat_full = ""
-cogs = "龍"
-disk_drive = ""
-headphones = "  "
-memory_mem = ""
-net_down = "DOWN"
-net_up = "UP"
+backlight = [
+  "󰌶",
+  "󱩏",
+  "󱩒",
+  "󱩕",
+  "󰛨",
+]
+bat = [
+  "󱃍 ",
+  "󰁻",
+  "󰁾",
+  "󰂁",
+  "󰁹",
+]
+bat_charging = ""
+cogs = ""
+disk_drive = "󱛟"
+headphones = "  "
+memory_mem = "󰍛"
+net_down = "󰅛"
+net_up = "󰱓"
 net_vpn = " "
 net_wired = ""
-net_wireless = " "
-thermometer = "  "
-time = ""
-volume_empty = ""
-volume_full = ""
-volume_half = ""
-volume_muted= " MUTE"
-
+net_wireless = " 󰖩"
+thermometer = " 󰔏 "
+time = "󰥔"
+volume_muted = "󰖁 MUTE"
+volume = [
+  "",
+  "󰕾",
+  "",
+]
 
 [[block]]
 block = "net"
-device = "wg"
-hide_inactive = true
-hide_missing = true
-
-[[block]]
-block = "net"
-device = "wlo1"
-hide_inactive = true
-hide_missing = true
+device = "wlp166s0"
+format = " $icon $ip$frequency "
 
 [[block]]
 block = "custom"
@@ -69,23 +65,19 @@ command = '''echo " $(cat /sys/class/thermal/thermal_zone0/temp | head -c 2)
 block = "disk_space"
 path = "/"
 info_type = "available"
-unit = "GB"
-format = "{icon} {available}"
+format = " $icon $available "
 interval = 20
 warning = 20.0
 alert = 10.0
 
 [[block]]
 block = "memory"
-display_type = "memory"
-format_mem = "{mem_total_used_percents}"
-icons_format = " {icon}"
-clickable = false
+format = " $icon $mem_used/$mem_total "
 
 [[block]]
 block = "load"
 interval = 1
-format = "{1m}"
+format = " $icon $1m "
 
 [[block]]
 block = "sound"
@@ -98,11 +90,9 @@ block = "backlight"
 block = "battery"
 device = "BAT1"
 interval = 10
-format = "{percentage} ({time})"
-full_format = "{percentage} ({time}) "
-icons_format = " {icon} "
+format = " $icon $percentage ($time) "
 
 [[block]]
 block = "time"
 interval = 60
-format = "%Y-%m-%d %H:%M"
+format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M') "
diff --git a/dotfiles/wezterm.lua b/dotfiles/wezterm.lua
index 8c3982e..de74238 100644
--- a/dotfiles/wezterm.lua
+++ b/dotfiles/wezterm.lua
@@ -12,9 +12,6 @@ return {
   window_close_confirmation = 'NeverPrompt',
   default_prog = { '/run/current-system/sw/bin/bash' },
 
-  selection_fg = 'black',
-  selection_bg = '#fafafa',
-
   keys = {
     {
       key = 'Escape',
diff --git a/hardware/framework.nix b/hardware/framework.nix
index 4dbb97c..d9f1e62 100644
--- a/hardware/framework.nix
+++ b/hardware/framework.nix
@@ -68,7 +68,6 @@ in
   ];
   boot.blacklistedKernelModules = [ "hid-sensor-hub" ];
   hardware.acpilight.enable = true;
-  hardware.video.hidpi.enable = lib.mkDefault true;
   services.xserver.dpi = 125;
   environment.variables = {
     VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
diff --git a/packages/nagstamon.nix b/packages/nagstamon.nix
index 1e72611..aa48c23 100644
--- a/packages/nagstamon.nix
+++ b/packages/nagstamon.nix
@@ -1,9 +1,10 @@
-{ lib, fetchFromGitHub, python310Packages, wrapQtAppsHook, pkgs }:
+{ lib, fetchFromGitHub, python311Packages, wrapQtAppsHook, pkgs }:
 
 let
   pname = "nagstamon";
-  version = "v3.10.1";
-in python310Packages.buildPythonApplication rec {
+  version = "v3.12.0";
+
+in python311Packages.buildPythonApplication rec {
   inherit pname;
   inherit version;
 
@@ -11,7 +12,7 @@ in python310Packages.buildPythonApplication rec {
     owner = "HenriWahl";
     repo = "Nagstamon";
     rev = version;
-    sha256 = "sha256-TdwvHQDDQqZ6uvdCTJCMCdivM/vaZpMrpLRMKN2y76Y=";
+    sha256 = "sha256-SI0FPTqJquaVyl/gpp883eGLq7tZ6J0fqn0jp77M8GM=";
   };
 
   doCheck = false;
@@ -22,17 +23,17 @@ in python310Packages.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    python310Packages.beautifulsoup4
-    python310Packages.configparser
-    python310Packages.dateutil
-    python310Packages.keyring
-    python310Packages.lxml
-    python310Packages.psutil
-    python310Packages.pyqt5_with_qtmultimedia
-    python310Packages.requests
-    python310Packages.requests-kerberos
-    python310Packages.setuptools
-    python310Packages.xlib
+    python311Packages.beautifulsoup4
+    python311Packages.configparser
+    python311Packages.dateutil
+    python311Packages.keyring
+    python311Packages.lxml
+    python311Packages.psutil
+    python311Packages.pyqt5_with_qtmultimedia
+    python311Packages.requests
+    python311Packages.requests-kerberos
+    python311Packages.setuptools
+    python311Packages.xlib
   ];
 
   meta = with lib; {
diff --git a/roles/base.nix b/roles/base.nix
index f3c625c..1186c9b 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -49,6 +49,7 @@ in {
       EDITOR = "nvim";
       STARSHIP_CONFIG = "/etc/starship.toml";
       HISTCONTROL = "ignoreboth";
+      NIXOS_OZONE_WL = "y";
     };
   };
 
@@ -174,8 +175,4 @@ in {
       LC_IDENTIFICATION = "de_DE.UTF-8";
     };
   };
-
-  # yubikey support
-  services.udev.packages = [ pkgs.yubikey-personalization ];
-  services.pcscd.enable = true;
 }
diff --git a/roles/desktop.nix b/roles/desktop.nix
index d449adc..dd63c44 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -90,7 +90,7 @@ in
     };
   };
 
-  qt5.platformTheme = "qt5ct";
+  qt.platformTheme = "qt5ct";
 
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -99,10 +99,6 @@ in
     alsa.enable = true;
     pulse.enable = true;
     jack.enable = true;
-
-    config.pipewire = {
-      "context.properties" = { "default.clock.rate" = 48000; };
-    };
   };
   services.udev.packages = [
     (pkgs.writeTextFile {
@@ -114,9 +110,9 @@ in
     })
   ];
 
-  fonts.enableDefaultFonts = true;
+  fonts.enableDefaultPackages = true;
   fonts.fontconfig.antialias = true;
-  fonts.fonts = with pkgs; [
+  fonts.packages = with pkgs; [
     corefonts
     emacs-all-the-icons-fonts
     fira-code
@@ -161,6 +157,7 @@ in
     numix-cursor-theme
 
     alacritty
+    gimp
     imv
     inkscape
     keepassxc
@@ -175,7 +172,9 @@ in
     pulseeffects-pw
     qrencode
     uxplay
-    wezterm
+    unstable.wezterm
+    unstable.prusa-slicer
+    unstable.super-slicer-latest
 
     solaar
     gdk-pixbuf
diff --git a/roles/dev.nix b/roles/dev.nix
index f74fbce..c4fd14c 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -1,14 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, buildPythonPackage, pkgs, fetchPypi,... }:
 
-let unstable = import <nixos-unstable> { };
+let
+  unstable = import <nixos-unstable> { };
 in {
 
-  services.emacs.package = pkgs.emacsPgtk;
-  nixpkgs.overlays = [
-    (import (builtins.fetchTarball {
-      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-    }))
-  ];
+  services.emacs.package = pkgs.emacs29-pgtk;
 
   environment.systemPackages = with pkgs; [
     gnumake
@@ -18,23 +14,23 @@ in {
     unstable.golangci-lint
     unstable.gopls
     unstable.rust-analyzer
-    #unstable.esphome
 
-    unstable.nodePackages.pyright
-    (python39.withPackages
+    (python310.withPackages
       (python-packages: with python-packages; [
         black
         diagrams
         pymemcache
         pyyaml
         requests
-      ]))
+        python-lsp-server
+      ])
+    )
 
     mariadb-client
     musl
 
     dbeaver
-    emacs-gtk
+    emacs29-pgtk
     gitAndTools.delta
     lazygit
     ltrace
diff --git a/roles/work.nix b/roles/work.nix
index 1026c2e..fc60c0a 100644
--- a/roles/work.nix
+++ b/roles/work.nix
@@ -7,6 +7,15 @@ let
     pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { };
 in {
 
+  environment.variables = {
+    USE_GKE_GCLOUD_AUTH_PLUGIN = "True";
+  };
+
+  services.tailscale = {
+    enable = true;
+    package = unstable.tailscale;
+  };
+
   security.pki.certificateFiles = [
     ../dotfiles/certs/NetzmarktCA.crt
     ../dotfiles/certs/vcenter.netzmarkt.lan.crt
@@ -21,8 +30,12 @@ in {
     172.20.0.2 grafana.kind
     172.20.0.2 alert.kind
 
+    #192.168.2.111 hass.home.f2o.io
+
     #127.0.0.1 auth-dev.thobits.com
     127.0.0.1 database
+    127.0.0.1 youtube.com
+    127.0.0.1 www.youtube.com
   '';
 
   environment.systemPackages = with pkgs; [
@@ -32,6 +45,10 @@ in {
     # (import ../packages/vaultsink.nix) needs opensource verson
     cloudstation
     nagstamon
+    yubikey-manager
+    anydesk
+    chromium
+    nodejs
 
     drone-cli
     govc
@@ -41,10 +58,18 @@ in {
     (unstable.google-cloud-sdk.withExtraComponents [
       unstable.google-cloud-sdk.components.gke-gcloud-auth-plugin
     ])
-    unstable.slack
+    slack
     unstable.velero
 
     unstable.obs-studio
     unstable.obs-studio-plugins.wlrobs
+
+    unstable.mindustry-wayland
+    prusa-slicer
   ];
+
+  # yubikey support
+  services.udev.packages = [ pkgs.yubikey-personalization ];
+  services.pcscd.enable = true;
+
 }

From ddf25a45b0167cb9339f9383b7ece41b9bb6c22d Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Wed, 3 Jan 2024 16:20:36 +0100
Subject: [PATCH 20/31] fix nixos 23.11

---
 roles/desktop.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index dd63c44..aef3f36 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -169,7 +169,6 @@ in
     nodePackages.insect
     pavucontrol
     pcmanfm
-    pulseeffects-pw
     qrencode
     uxplay
     unstable.wezterm

From d492658eccd1f8c18e552d7a09a9f7b1d071ebdd Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Wed, 3 Jan 2024 16:20:44 +0100
Subject: [PATCH 21/31] fix(slack): enable screenshare

---
 roles/work.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/roles/work.nix b/roles/work.nix
index fc60c0a..ac89906 100644
--- a/roles/work.nix
+++ b/roles/work.nix
@@ -3,8 +3,18 @@
 let
   unstable = import <nixos-unstable> { config.allowUnfree = true; };
   cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) { };
-  nagstamon =
-    pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { };
+  nagstamon = pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { };
+  myslack = pkgs.slack.overrideAttrs (oldAttrs: rec {
+    fixupPhase = ''
+      sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar
+
+      rm $out/bin/slack
+      makeWrapper $out/lib/slack/slack $out/bin/slack \
+        --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+        --suffix PATH : ${lib.makeBinPath [ pkgs.xdg-utils ]} \
+        --add-flags "--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer"
+    '';
+  });
 in {
 
   environment.variables = {
@@ -58,7 +68,7 @@ in {
     (unstable.google-cloud-sdk.withExtraComponents [
       unstable.google-cloud-sdk.components.gke-gcloud-auth-plugin
     ])
-    slack
+    myslack
     unstable.velero
 
     unstable.obs-studio

From 4eb2a0dd1bf96c38de9dc3b26ac9211fe96568ae Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Wed, 3 Jan 2024 16:48:00 +0100
Subject: [PATCH 22/31] fix(nagstamon): working on wayland

---
 packages/nagstamon.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nagstamon.nix b/packages/nagstamon.nix
index aa48c23..c78c154 100644
--- a/packages/nagstamon.nix
+++ b/packages/nagstamon.nix
@@ -19,7 +19,7 @@ in python311Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ wrapQtAppsHook ];
   postFixup = ''
-    wrapQtApp $out/bin/nagstamon.py
+    makeQtWrapper $out/bin/nagstamon.py $out/bin/nagstamon
   '';
 
   propagatedBuildInputs = [
@@ -34,6 +34,7 @@ in python311Packages.buildPythonApplication rec {
     python311Packages.requests-kerberos
     python311Packages.setuptools
     python311Packages.xlib
+    pkgs.libsForQt5.qt5.qtwayland
   ];
 
   meta = with lib; {

From 6a911794f1419d2073f95aec6cb2ce2531e9d1e1 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 15 Mar 2024 11:15:00 +0100
Subject: [PATCH 23/31] switch notify daemon

---
 dotfiles/sway/config      |  7 +------
 dotfiles/sway/status.toml | 12 ++++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 95de070..513f932 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -171,12 +171,7 @@ exec_always {
 }
 
 # autostarts
-exec mako --font "$font" \
-  --background-color "$white" \
-  --border-colo "$red" \
-  --text-color "$black" \
-  --default-timeout 1000 \
-  --padding 10
+exec swaync
 exec emacs --daemon
 exec swayidle before-sleep "$lock"
 exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1
diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml
index 4696623..6add7e0 100644
--- a/dotfiles/sway/status.toml
+++ b/dotfiles/sway/status.toml
@@ -91,8 +91,20 @@ block = "battery"
 device = "BAT1"
 interval = 10
 format = " $icon $percentage ($time) "
+full_format = " $icon $percentage "
 
 [[block]]
 block = "time"
 interval = 60
 format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M') "
+
+[[block]]
+block = "notify"
+driver = "swaync"
+format = " $icon {($notification_count.eng(w:1)) |}"
+[[block.click]]
+button = "left"
+action = "show"
+[[block.click]]
+button = "right"
+action = "toggle_paused"

From 5446d3aaceb5c24c070d0a31bc3704a3cc313dfd Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 15 Mar 2024 11:15:40 +0100
Subject: [PATCH 24/31] libvirt uefi

still not working
---
 roles/admin.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/roles/admin.nix b/roles/admin.nix
index 0e76052..541f26b 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -1,6 +1,7 @@
 { pkgs, options, ... }:
 
-let unstable = import <nixos-unstable> { };
+let
+unstable = import <nixos-unstable> { config.allowUnfree = true; };
 in {
   environment.systemPackages = with pkgs; [
     cryptsetup
@@ -42,5 +43,11 @@ in {
     enable = true;
     storageDriver = "zfs";
   };
-  virtualisation.libvirtd.enable = true;
+  virtualisation.libvirtd = {
+    enable = true;
+    qemu = {
+      swtpm.enable = true;
+      ovmf.enable = true;
+    };
+  };
 }

From 44ed4f7a5c1377a65fe042cbacb76e35d400211c Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 15 Mar 2024 11:15:51 +0100
Subject: [PATCH 25/31] fix lorri confi

---
 roles/base.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/roles/base.nix b/roles/base.nix
index 1186c9b..032f4d7 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -90,6 +90,8 @@ in {
       alias ls="ls --color=auto"
       alias vim="nvim"
       alias k="kubectl"
+      alias n="nix-shell -p"
+      alias nu="nix-shell -I nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos-unstable -p"
 
       sink() {
         VAULT_TOKEN=$(vault token lookup -format=json | jq -r .data.id) \
@@ -139,7 +141,12 @@ in {
 
   services.fwupd.enable = true;
   services.resolved.enable = true;
+
   services.lorri.enable = true;
+  systemd.user.services.lorri.serviceConfig = {
+    ProtectSystem = pkgs.lib.mkForce "full";
+    ProtectHome = pkgs.lib.mkForce false;
+  };
 
   security.wrappers.gvfsd-nfs = {
     source = "${pkgs.gnome.gvfs}/libexec/gvfsd-nfs";

From 3e522cebfd6a48f3741ce3cf0bdf673048b11eca Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 15 Mar 2024 11:16:02 +0100
Subject: [PATCH 26/31] up

---
 roles/desktop.nix | 6 +++---
 roles/work.nix    | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/roles/desktop.nix b/roles/desktop.nix
index aef3f36..bade0d7 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -26,6 +26,7 @@ in
       slurp
       swayidle
       swaylock
+      swaynotificationcenter
       swayr
       wf-recorder
       wofi
@@ -170,10 +171,9 @@ in
     pavucontrol
     pcmanfm
     qrencode
-    uxplay
+    remmina
     unstable.wezterm
-    unstable.prusa-slicer
-    unstable.super-slicer-latest
+    uxplay
 
     solaar
     gdk-pixbuf
diff --git a/roles/work.nix b/roles/work.nix
index ac89906..46c3d9d 100644
--- a/roles/work.nix
+++ b/roles/work.nix
@@ -41,6 +41,7 @@ in {
     172.20.0.2 alert.kind
 
     #192.168.2.111 hass.home.f2o.io
+    #192.168.2.111 sync.home.f2o.io
 
     #127.0.0.1 auth-dev.thobits.com
     127.0.0.1 database
@@ -59,6 +60,7 @@ in {
     anydesk
     chromium
     nodejs
+    vscodium
 
     drone-cli
     govc

From 2a39913fde75780574c24f90a0beac4cee998fe4 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Mon, 22 Apr 2024 08:40:54 +0200
Subject: [PATCH 27/31] feat: remove unused helm2

---
 packages/helm2.nix | 27 ---------------------------
 roles/admin.nix    |  1 -
 roles/work.nix     |  1 -
 3 files changed, 29 deletions(-)
 delete mode 100644 packages/helm2.nix

diff --git a/packages/helm2.nix b/packages/helm2.nix
deleted file mode 100644
index ebd69e7..0000000
--- a/packages/helm2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-with import <nixpkgs> { };
-
-stdenv.mkDerivation rec {
-  name = "helm2";
-  version = "2.14.3";
-  src = fetchurl {
-    url = "https://get.helm.sh/helm-v${version}-linux-amd64.tar.gz";
-    sha256 = "38614a665859c0f01c9c1d84fa9a5027364f936814d1e47839b05327e400bf55";
-  };
-
-  nativeBuildInputs = [ autoPatchelfHook ];
-
-  unpackPhase = ''
-    tar xvpzf $src
-  '';
-
-  installPhase = ''
-    install -m 755 -D linux-amd64/helm $out/bin/helm2
-  '';
-
-  meta = with lib; {
-    homepage = "https://helm.sh";
-    description = "helms depricated v2 verison";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ foosinn ];
-  };
-}
diff --git a/roles/admin.nix b/roles/admin.nix
index 541f26b..182ab4d 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -30,7 +30,6 @@ in {
     virt-manager
 
     (import ../packages/skaffold.nix)
-    (import ../packages/helm2.nix)
     (import ../packages/certmanager.nix)
   ];
 
diff --git a/roles/work.nix b/roles/work.nix
index 46c3d9d..c697556 100644
--- a/roles/work.nix
+++ b/roles/work.nix
@@ -76,7 +76,6 @@ in {
     unstable.obs-studio
     unstable.obs-studio-plugins.wlrobs
 
-    unstable.mindustry-wayland
     prusa-slicer
   ];
 

From 599d34d9cb71676487aa61e5f3dd31adf4209f66 Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Tue, 8 Oct 2024 13:06:54 +0200
Subject: [PATCH 28/31] updates

---
 configuration.nix |  1 +
 roles/admin.nix   | 12 ++++++------
 roles/desktop.nix |  8 ++++----
 roles/dev.nix     |  9 ++++-----
 roles/mail.nix    |  3 +--
 roles/network.nix |  2 +-
 roles/private.nix |  1 -
 roles/work.nix    | 19 +++++++++++--------
 8 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 23c4c58..ec8fc82 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -30,6 +30,7 @@
   time.timeZone = "Europe/Berlin";
 
   services.openssh.enable = true;
+
   networking.firewall.enable = true;
 
   nixpkgs.config.permittedInsecurePackages = [
diff --git a/roles/admin.nix b/roles/admin.nix
index 182ab4d..7256f86 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -1,7 +1,6 @@
 { pkgs, options, ... }:
 
 let
-unstable = import <nixos-unstable> { config.allowUnfree = true; };
 in {
   environment.systemPackages = with pkgs; [
     cryptsetup
@@ -18,11 +17,12 @@ in {
     whois
     ipcalc
 
-    unstable.argocd
-    unstable.kubernetes-helm
-    unstable.kustomize
-    unstable.terraform-ls
-    unstable.vault
+    argocd
+    kubernetes-helm
+    kustomize
+    pre-commit
+    terraform-ls
+    vault
 
     docker-compose
     fuse-overlayfs
diff --git a/roles/desktop.nix b/roles/desktop.nix
index bade0d7..ae794fb 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -1,4 +1,4 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+#g Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, ... }:
@@ -7,7 +7,6 @@ let
   colors = config.colors;
   schema = pkgs.gsettings-desktop-schemas;
   datadir = "${schema}/share/gsettings-schemas/${schema.name}";
-  unstable = import <nixos-unstable> { config.allowUnfree = true; };
 in
 {
   programs.droidcam.enable = true;
@@ -110,6 +109,7 @@ in
       destination = "/etc/udev/rules.d/80-uinput.rules";
     })
   ];
+  services.ratbagd.enable = true;
 
   fonts.enableDefaultPackages = true;
   fonts.fontconfig.antialias = true;
@@ -172,7 +172,7 @@ in
     pcmanfm
     qrencode
     remmina
-    unstable.wezterm
+    wezterm
     uxplay
 
     solaar
@@ -227,7 +227,7 @@ in
   services.printing.drivers = [ pkgs.gutenprint ];
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
     publish = {
       enable = true;
       addresses = true;
diff --git a/roles/dev.nix b/roles/dev.nix
index c4fd14c..28172b9 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -8,28 +8,28 @@ in {
 
   environment.systemPackages = with pkgs; [
     gnumake
-    go_1_19
+    go
     rustup
     shellcheck
     unstable.golangci-lint
     unstable.gopls
     unstable.rust-analyzer
 
-    (python310.withPackages
+    (python311.withPackages
       (python-packages: with python-packages; [
         black
         diagrams
         pymemcache
         pyyaml
         requests
-        python-lsp-server
+        ruff-lsp
       ])
     )
 
     mariadb-client
     musl
 
-    dbeaver
+    dbeaver-bin
     emacs29-pgtk
     gitAndTools.delta
     lazygit
@@ -37,7 +37,6 @@ in {
     parallel
     sops
     tig
-    unstable.bazel
 
     openssl
     pkg-config
diff --git a/roles/mail.nix b/roles/mail.nix
index f2cd7e0..7615422 100644
--- a/roles/mail.nix
+++ b/roles/mail.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
 let
-  unstable = import <nixos-unstable> { config.allowUnfree = true; };
   notcoal = pkgs.callPackage ../packages/notcoal { };
 in {
   environment.systemPackages = with pkgs; [
@@ -11,7 +10,7 @@ in {
     notmuch
     notcoal
     thunderbird
-    unstable.astroid
+    astroid
     vdirsyncer
   ];
 }
diff --git a/roles/network.nix b/roles/network.nix
index 843b7c8..a7b3b84 100644
--- a/roles/network.nix
+++ b/roles/network.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-let unstable = import <nixos-unstable> { config.allowUnfree = true; };
+let
 in {
 
   networking.networkmanager.enable = true;
diff --git a/roles/private.nix b/roles/private.nix
index dd28440..408652f 100644
--- a/roles/private.nix
+++ b/roles/private.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
 let
-  unstable = import <nixos-unstable> { };
   openscad-ls = pkgs.callPackage ../packages/openscad-language-server.nix { };
 in
 {
diff --git a/roles/work.nix b/roles/work.nix
index c697556..502c1ae 100644
--- a/roles/work.nix
+++ b/roles/work.nix
@@ -42,11 +42,16 @@ in {
 
     #192.168.2.111 hass.home.f2o.io
     #192.168.2.111 sync.home.f2o.io
+    192.168.2.111 pl.home.f2o.io
 
     #127.0.0.1 auth-dev.thobits.com
     127.0.0.1 database
     127.0.0.1 youtube.com
     127.0.0.1 www.youtube.com
+
+    34.49.192.42 www.tbone.audio
+    34.49.192.42 jobs.thomann.de
+
   '';
 
   environment.systemPackages = with pkgs; [
@@ -65,16 +70,15 @@ in {
     drone-cli
     govc
     ttyd
-    unstable.discord
-    unstable.go-jira
-    (unstable.google-cloud-sdk.withExtraComponents [
-      unstable.google-cloud-sdk.components.gke-gcloud-auth-plugin
+    discord
+    (google-cloud-sdk.withExtraComponents [
+      google-cloud-sdk.components.gke-gcloud-auth-plugin
     ])
     myslack
-    unstable.velero
+    velero
 
-    unstable.obs-studio
-    unstable.obs-studio-plugins.wlrobs
+    obs-studio
+    obs-studio-plugins.wlrobs
 
     prusa-slicer
   ];
@@ -82,5 +86,4 @@ in {
   # yubikey support
   services.udev.packages = [ pkgs.yubikey-personalization ];
   services.pcscd.enable = true;
-
 }

From 359b7cf8d041cc764c630903bcc22e1ede854aad Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Fri, 15 Nov 2024 11:05:08 +0100
Subject: [PATCH 29/31] up

---
 packages/neovim.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/neovim.nix b/packages/neovim.nix
index 933ab1c..2138777 100644
--- a/packages/neovim.nix
+++ b/packages/neovim.nix
@@ -98,7 +98,7 @@ neovim.override {
       noremap <leader>ml  :fzf_lsp_layout<cr>
 
       let g:which_key_map.g = { 'name': '+git' }
-      noremap <leader>gs :!lazygit
+      noremap <leader>gs :call LazyGit<cr>
 
       " lang specifics
       let g:rustfmt_autosave = 1
@@ -110,10 +110,11 @@ neovim.override {
         airline
         easymotion
         editorconfig-vim
-        fzfWrapper
-        fzf-vim
         fzf-lsp-nvim
+        fzf-vim
+        fzfWrapper
         LanguageClient-neovim
+        lazygit-nvim
         ncm2
         nnn-vim
         surround

From aaf916de7507e5ca975c8735adf94dd5dbca1acd Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Mon, 20 Jan 2025 09:03:31 +0100
Subject: [PATCH 30/31] fix

---
 dotfiles/sway/config   | 1 -
 hardware/framework.nix | 2 +-
 roles/desktop.nix      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 513f932..08d076c 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -39,7 +39,6 @@ input "2362:628:PIXA3854:00_093A:0274_Touchpad" click_method clickfinger
 output * bg $wallpaper fill
 output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz
 output "BenQ Corporation BenQ SW2700 83H03922SL0" pos 1440 720
-output "BNQ BenQ PD2705Q W4N00777019" transform 270
 output "BNQ BenQ PD2705Q W4N00777019" pos 0 0
 output "Dell Inc. Dell U4919DW HZVZWP2" res 5120x1440
 output eDP-1 scale 1.25
diff --git a/hardware/framework.nix b/hardware/framework.nix
index d9f1e62..dd83777 100644
--- a/hardware/framework.nix
+++ b/hardware/framework.nix
@@ -72,7 +72,7 @@ in
   environment.variables = {
     VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
   };
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.graphics.extraPackages = with pkgs; [
     vaapiIntel
     libvdpau-va-gl
     intel-media-driver
diff --git a/roles/desktop.nix b/roles/desktop.nix
index ae794fb..9eea2de 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -181,7 +181,7 @@ in
     clipman
     wdisplays
     wl-clipboard
-    xdg_utils
+    xdg-utils
     xfce.thunar
     xfce.thunar-volman
     wtype

From b104bba6f22333d8eb187e9f42971728ed16969e Mon Sep 17 00:00:00 2001
From: Stefan Schwarz <stefan.schwarz@thomann.io>
Date: Tue, 6 May 2025 12:46:51 +0200
Subject: [PATCH 31/31] up

---
 dotfiles/sway/config   | 5 +++--
 hardware/framework.nix | 1 -
 roles/admin.nix        | 2 ++
 roles/desktop.nix      | 4 ++--
 roles/dev.nix          | 6 +++---
 roles/work.nix         | 5 +----
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dotfiles/sway/config b/dotfiles/sway/config
index 08d076c..ec3b364 100644
--- a/dotfiles/sway/config
+++ b/dotfiles/sway/config
@@ -35,6 +35,7 @@ input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de
 input "0:0:TUXEDO_Keyboard" xkb_layout de
 input 1130:35:HID_046a:0023 xkb_layout de
 input "2362:628:PIXA3854:00_093A:0274_Touchpad" click_method clickfinger
+input * xkb_options compose:paus
 
 output * bg $wallpaper fill
 output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz
@@ -56,7 +57,7 @@ bindsym $mod+z exec $lock
 bindsym $mod+Up exec light -A 5
 bindsym $mod+Down exec light -U 5
 bindsym $mod+c exec alacritty --class float -t pyCalc -e python
-bindsym $mod+i exec alacritty --class float -t insect -e insect
+bindsym $mod+i exec alacritty --class float -t numbat -e numbat
 bindsym $mod+m exec swayr switch-to
 bindsym $mod+n exec emacsclient -cn
 bindsym Print exec grim -g "$(slurp)" - | wl-copy -t image/png
@@ -68,7 +69,7 @@ for_window [app_id="org.keepassxc.KeePassXC"] floating enable
 for_window [title="Firefox — Sharing Indicator"] floating enable
 for_window [title="Picture-in-Picture"] floating enable
 for_window [title="pyCalc"] floating enable
-for_window [title="insect"] floating enable
+for_window [title="numbat"] floating enable
 
 #                        border   backgnd  text    indicator  childborder
 client.focused           $cyan    $white   $black  $violet    $cyan
diff --git a/hardware/framework.nix b/hardware/framework.nix
index dd83777..f029ec5 100644
--- a/hardware/framework.nix
+++ b/hardware/framework.nix
@@ -62,7 +62,6 @@ in
   #boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
   boot.kernelParams = [
-    "mem_sleep_default=deep"
     "nvme.noacpi=1"
     "i915.enable_psr=1"
   ];
diff --git a/roles/admin.nix b/roles/admin.nix
index 7256f86..7d70648 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -14,6 +14,7 @@ in {
     nmap
     pwgen
     terraform
+    terraform-docs
     whois
     ipcalc
 
@@ -23,6 +24,7 @@ in {
     pre-commit
     terraform-ls
     vault
+    yaml-language-server
 
     docker-compose
     fuse-overlayfs
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 9eea2de..38f85c8 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -167,13 +167,13 @@ in
     mpv
     mumble
     neofetch
-    nodePackages.insect
+    numbat
     pavucontrol
     pcmanfm
     qrencode
     remmina
-    wezterm
     uxplay
+    wezterm
 
     solaar
     gdk-pixbuf
diff --git a/roles/dev.nix b/roles/dev.nix
index 28172b9..eba14da 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -4,16 +4,16 @@ let
   unstable = import <nixos-unstable> { };
 in {
 
-  services.emacs.package = pkgs.emacs29-pgtk;
+  services.emacs.package = pkgs.emacs-pgtk;
 
   environment.systemPackages = with pkgs; [
     gnumake
     go
+    phpactor
     rustup
     shellcheck
     unstable.golangci-lint
     unstable.gopls
-    unstable.rust-analyzer
 
     (python311.withPackages
       (python-packages: with python-packages; [
@@ -30,7 +30,7 @@ in {
     musl
 
     dbeaver-bin
-    emacs29-pgtk
+    emacs-pgtk
     gitAndTools.delta
     lazygit
     ltrace
diff --git a/roles/work.nix b/roles/work.nix
index 502c1ae..7032d63 100644
--- a/roles/work.nix
+++ b/roles/work.nix
@@ -48,10 +48,6 @@ in {
     127.0.0.1 database
     127.0.0.1 youtube.com
     127.0.0.1 www.youtube.com
-
-    34.49.192.42 www.tbone.audio
-    34.49.192.42 jobs.thomann.de
-
   '';
 
   environment.systemPackages = with pkgs; [
@@ -66,6 +62,7 @@ in {
     chromium
     nodejs
     vscodium
+    git-lfs
 
     drone-cli
     govc