flake.lock: Update

Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede' (2024-11-06)
  → 'github:nixos/nixpkgs/689fed12a013f56d4c4d3f612489634267d86529' (2024-11-12)
• Updated input 'nixpkgs-unstable':
    'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05)
  → 'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -25,27 +25,43 @@
         ]
       },
       "locked": {
-        "lastModified": 1685019994,
-        "narHash": "sha256-81o6SKZPALvib21hIOMx2lIhFSs0mRy0PfPvg0zsfTk=",
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d1f04b0f365a34896a37d9015637796537ec88a3",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1684935479,
-        "narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=",
+        "lastModified": 1731386116,
+        "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f91ee3065de91a3531329a674a45ddcb3467a650",
+        "rev": "689fed12a013f56d4c4d3f612489634267d86529",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1731319897,
+        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
         "type": "github"
       },
       "original": {
@@ -59,7 +75,8 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
     "systems": {

flake.nix

@@ -1,11 +1,13 @@
 {
   inputs = {
     home-manager = {
-      url = "github:nix-community/home-manager/master";
-      /* url = "github:nix-community/home-manager/release-22.05"; */
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs = {
+      url = "github:nixos/nixpkgs/nixos-24.05";
+    };
+    nixpkgs-unstable = {
       url = "github:nixos/nixpkgs/nixos-unstable";
     };
     flake-utils = {

home/default.nix

@@ -20,6 +20,7 @@ user:
     ./home.nix
     ./htop.nix
     ./i3.nix
+    ./kdeconnect.nix
     ./lsd.nix
     ./man.nix
     ./neovim/neovim.nix
@@ -29,7 +30,6 @@ user:
     ./pasystray.nix
     ./photography.nix
     ./picom.nix
-    ./polybar.nix
     ./programs.nix
     ./qt.nix
     ./redshift.nix
@@ -38,10 +38,12 @@ user:
     ./rofi.nix
     ./rust.nix
     ./signal.nix
+    ./sway.nix
     ./telegram.nix
     ./thunderbird.nix
     ./tmux.nix
     ./tor.nix
+    ./waybar.nix
     ./xdg.nix
     ./zathura.nix
     ./zoom.nix

home/gammastep.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+  services.gammastep = {
+    enable = true;
+    longitude = "49.01315";
+    latitude = "12.1119";
+  };
+}

home/i3.nix

@@ -27,9 +27,22 @@ let
 
   mode_system = "System:   L :  | S :  | P :  | R :  | E : ";
 in {
-  xsession.windowManager.i3 = {
+  imports = [
+    ./polybar.nix
+  ];
+  home.packages = with pkgs; [
+    # i3lock
+    dmenu
+    i3blocks
+    i3lock-fancy-rapid
+    i3status
+    rofi
+  ];
+  xsession = {
     enable = true;
-    # package = pkgs.i3-gaps;
+    windowManager.i3 = {
+      enable = true;
+# package = pkgs.i3-gaps;
       config = {
         modifier = mod;
 
@@ -125,7 +138,7 @@ in {
           "${mod}+r" = "mode \"resize\"";
           "${mod}+x" = "mode \"${mode_system}\"";
 
-        "${mod}+Shift+x" = "exec i3lock-fancy -n";
+          "${mod}+Shift+x" = "exec i3lock-fancy-rapid 5 3";
         };
 
         modes = {
@@ -150,7 +163,7 @@ in {
             r = "exec systemctl reboot, mode \"default\"";
             e = "exec i3-msg exit, mode \"default\"";
 
-          # back to normal: Enter or Escape or mod+x again
+# back to normal: Enter or Escape or mod+x again
             Return = "mode \"default\"";
             Escape = "mode \"default\"";
             "${mod}+x" = "mode \"default\"";
@@ -158,11 +171,12 @@ in {
         };
         window = {
           hideEdgeBorders = "both";
-        # disable titlebar
+# disable titlebar
           titlebar = false;
         };
       };
 
     };
+  };
 }
 

home/kdeconnect.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  services.kdeconnect = {
+    enable = true;
+    indicator = true;
+  };
+}

home/mail/default.nix

@@ -28,7 +28,7 @@ let
       showSignature = "append";
     };
     aerc = {
-      enable = true;
+      enable = false;
       extraAccounts = {
         pgp-opportunistic-encrypt = true;
         pgp-autosign = true;
@@ -38,7 +38,7 @@ let
       enable = true;
       /* TODO: which boxes? */
       boxes = [ "Inbox" ];
-      onNotify = "mbsync ${configName}";
+      onNotify = "${pkgs.isync}/bin/mbsync ${configName}";
       onNotifyPost = "${pkgs.libnotify}/bin/notify-send -a mail '${configName}: new in %s'";
     };
     mbsync = {
@@ -75,7 +75,7 @@ in {
   home.packages = with pkgs; [
     libsecret
     libnotify
-    urlview
+    urlscan
   ];
   home.file.mailcap = {
     target = ".mailcap";
@@ -84,7 +84,7 @@ in {
 
   programs.password-store.enable = true;
   programs.aerc = {
-    enable = true;
+    enable = false;
     extraConfig = builtins.readFile ./aerc/aerc.conf;
     /* { */
       /* general = { */
@@ -104,6 +104,10 @@ in {
   services.imapnotify.enable = true;
   programs.notmuch = {
     enable = true;
+    hooks.postNew = ''
+      # remove inbox tag from moved messages
+      notmuch tag -inbox not 'folder:/.*\/Inbox/'
+    '';
   };
 
   programs.neomutt = {
@@ -114,8 +118,12 @@ in {
     macros = [
       { map = [ "pager" "index" ];
         key = "B";
-        action = "|urlview\\n";
+        action = "|urlscan\\n";
       }
+      /*{ map = [ "pager" "index" ];
+        key = "dd";
+        action = ":set delete = yes\\n<clear-flag>N<delete-message>";
+      }*/
     ];
     binds = [
       /* sidebar */
@@ -226,12 +234,18 @@ in {
         key = "zA";
         action = "collapse-all";
       }
+
+      /* search with notmuch */
+      { map = [ "pager" "index" ];
+        key = "S";
+        action = "vfolder-from-query";
+      }
     ];
   };
   programs.msmtp.enable = true;
 
   accounts.email.accounts = let
-    aliases = "mail(\\+.*)?@vbrandl.net";
+    aliases = ".*@vbrandl.net";
   in {
     vbrandl = (
         mailBaseConfig {

home/neovim/init.lua

@@ -27,27 +27,31 @@ require('packer').startup(function(use)
   }
 
   use {
-    'simrat39/rust-tools.nvim',
+    "mrcjkb/rustaceanvim",
+    ft = { 'rust' },
     requires = {
-      { 'neovim/nvim-lspconfig' },
-
-      -- Debugging
-      { 'nvim-lua/plenary.nvim' },
-      { 'mfussenegger/nvim-dap' },
+      {
+        "lvimuser/lsp-inlayhints.nvim",
+        opts = {}
+      },
+      { "nvim-lua/plenary.nvim" },
+      { "mfussenegger/nvim-dap" },
     },
     config = function()
-      local rt = require("rust-tools")
-
-      rt.setup({
-        server = {
-          on_attach = function(_, bufnr)
-            -- Hover actions
-            vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
-            -- Code action groups
-            vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
-          end,
+      vim.g.rustaceanvim = {
+        tools = {
+          hover_actions = {
+            auto_focus = true,
           },
-      })
+        },
+        server = {
+          on_attach = function(client, bufnr)
+            require("lsp-inlayhints").setup()
+            require("lsp-inlayhints").on_attach(client, bufnr)
+            require("lsp-inlayhints").show()
+          end
+        }
+      }
     end,
   }
 
@@ -64,7 +68,7 @@ require('packer').startup(function(use)
 
   -- use { 'kien/ctrlp.vim' }
   use {
-    'nvim-telescope/telescope.nvim', tag = '0.1.0',
+    'nvim-telescope/telescope.nvim',
     requires = {
       { 'nvim-lua/plenary.nvim' }
     },

home/neovim/init.vim

@@ -67,9 +67,6 @@ set undofile
 " clear highlighted search
 noremap <space> :nohlsearch<cr>
 
-" Highlight symbol under cursor on CursorHold
-autocmd CursorHold * silent call CocActionAsync('highlight')
-
 " Append modeline after last line in buffer.
 " Use substitute() instead of printf() to handle '%%s' modeline in LaTeX files.
 function! AppendModeline()

home/neovim/neovim.nix

@@ -452,13 +452,6 @@ in {
   programs.neovim = {
     vimAlias = true;
     viAlias = true;
-    coc = {
-      enable = true;
-      # settings = {
-      #   "rust-analyzer.serverPath" = "${pkgs.rust-analyzer}/bin/rust-analyzer";
-      #   "gopls.experimentalWorkspaceModule" = true;
-      # };
-    };
   } // config;
   # programs.vim = config;
 

home/polybar.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }: {
+{ config, pkgs, ... }: {
   services.polybar = {
-    enable = true;
+    enable = config.xsession.windowManager.i3.enable;
     config = {
       "bar/top" = {
         monitor = "\${env:MONITOR:}";

home/programs.nix

@@ -5,8 +5,6 @@
     gnumake
     pkg-config
 
-    i3lock-fancy
-
     antigen
     nodejs
     fortune
@@ -28,5 +26,7 @@
 
     /* obs-studio */
     # unstable.obs-v4l2sink
+
+    jellyfin-media-player
   ];
 }

home/qt.nix

@@ -1,6 +1,6 @@
 { ... }: {
   qt = {
     enable = true;
-    platformTheme = "gtk";
+    platformTheme.name = "gtk";
   };
 }

home/redshift.nix

@@ -1,6 +1,6 @@
-{ ... }: {
+{ config, ... }: {
   services.redshift = {
-    enable = true;
+    enable = config.xsession.windowManager.i3.enable;
     longitude = "49.01315";
     latitude = "12.1119";
   };

home/rust.nix

@@ -3,7 +3,6 @@
     cargo-edit
     # llvmPackages_latest.bintools
     llvmPackages_latest.llvm
-    rust-analyzer
     rustup
     sccache
     xorriso

home/sway.nix

@@ -0,0 +1,153 @@
+{ lib, pkgs, ... }: 
+let
+  mod = "Mod4";
+  ws1 = "1: www";
+  ws2 = "2: >_";
+  ws3 = "3: </>";
+  ws4 = "4: IM";
+  ws5 = "5: ./";
+  ws6 = "6: doc";
+  ws7 = "7: mail";
+  ws8 = "8";
+  ws9 = "9";
+  ws10 = "10: media";
+
+  mode_system = "System:   L :  | S :  | P :  | R :  | E : ";
+in {
+  imports = [
+    ./gammastep.nix
+  ];
+
+  home.packages = with pkgs; [
+    slurp # screenshot selection
+    grim # screenshots
+    wl-clipboard # copy/paste
+    swaybg # background images
+  ];
+
+  # similar to i3-lock-fancy
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+    settings = {
+      screenshots = true;
+      effect-blur = "7x5";
+      clock = true;
+      indicator = true;
+      indicator-thickness = 7;
+    };
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+    swaynag.enable = true;
+    config = {
+      modifier = mod;
+
+      workspaceAutoBackAndForth = true;
+
+      fonts = {
+        names = [ "NotoSans-Regular" "FontAwesome" ];
+        style = "Monospace";
+        size = 12.0;
+      };
+
+/* TODO: background
+      output = {
+        "*" = {
+          bg = "/home/me/media/Pictures/wallpapers/gargantua-black-3840x2160-11475.jpg fill";
+        };
+      };
+      */
+
+      assigns = {
+        "${ws1}" = [ { app_id = "firefox"; } ];
+        "${ws5}" = [ { app_id="thunar"; } ];
+        "${ws7}" = [ { class="Thunderbird"; } ];
+      };
+
+      floating = {
+        criteria = [
+        { window_role = "pop-up"; }
+        { window_role = "task_dialog"; }
+        { title = "Preferences$"; }
+        { app_id = "org.keepassxc.KeePassXC"; }
+        { app_id = "pavucontrol"; }
+        { class = "^Pinentry-gtk-2$"; }
+        ];
+      };
+
+      terminal = "alacritty";
+
+      keybindings = lib.mkOptionDefault {
+        "${mod}+b" = "split h";
+        "${mod}+v" = "split v";
+        "${mod}+s" = "layout stacking";
+        "${mod}+w" = "layout tabbed";
+        "${mod}+e" = "layout toggle split";
+        "${mod}+space" = "focus mode_toggle";
+        "${mod}+d" = "exec rofi -show drun";
+        "${mod}+Tab" = "exec rofi -show window";
+
+        "${mod}+1" = "workspace ${ws1}";
+        "${mod}+2" = "workspace ${ws2}";
+        "${mod}+3" = "workspace ${ws3}";
+        "${mod}+4" = "workspace ${ws4}; layout tabbed";
+        "${mod}+5" = "workspace ${ws5}";
+        "${mod}+6" = "workspace ${ws6}";
+        "${mod}+7" = "workspace ${ws7}; layout tabbed";
+        "${mod}+8" = "workspace ${ws8}";
+        "${mod}+9" = "workspace ${ws9}";
+        "${mod}+0" = "workspace ${ws10}";
+
+        "${mod}+Shift+1" = "move container to workspace ${ws1}";
+        "${mod}+Shift+2" = "move container to workspace ${ws2}";
+        "${mod}+Shift+3" = "move container to workspace ${ws3}";
+        "${mod}+Shift+4" = "move container to workspace ${ws4}";
+        "${mod}+Shift+5" = "move container to workspace ${ws5}";
+        "${mod}+Shift+6" = "move container to workspace ${ws6}";
+        "${mod}+Shift+7" = "move container to workspace ${ws7}";
+        "${mod}+Shift+8" = "move container to workspace ${ws8}";
+        "${mod}+Shift+9" = "move container to workspace ${ws9}";
+        "${mod}+Shift+0" = "move container to workspace ${ws10}";
+
+        "${mod}+Shift+r" = "reload";
+
+        "${mod}+r" = "mode \"resize\"";
+        "${mod}+x" = "mode \"${mode_system}\"";
+
+        "${mod}+Shift+x" = "exec swaylock";
+      };
+
+      modes = {
+        resize = {
+          h = "resize shrink width 10 px or 10 ppt";
+          j = "resize grow height 10 px or 10 ppt";
+          k = "resize shrink height 10 px or 10 ppt";
+          l = "resize grow width 10 px or 10 ppt";
+
+          Return = "mode \"default\"";
+          Escape = "mode \"default\"";
+          "${mod}+r" = "mode \"default\"";
+        };
+        "${mode_system}" = {
+          l = "exec ~/bin/lock.sh, mode \"default\"";
+          s = "exec $Lock systemctl suspend, mode \"default\"";
+          p = "exec systemctl poweroff -i, mode \"default\"";
+          r = "exec systemctl reboot, mode \"default\"";
+          e = "exec i3-msg exit, mode \"default\"";
+
+          # back to normal: Enter or Escape or mod+x again
+          Return = "mode \"default\"";
+          Escape = "mode \"default\"";
+          "${mod}+x" = "mode \"default\"";
+        };
+      };
+      window = {
+        hideEdgeBorders = "both";
+        # disable titlebar
+        titlebar = false;
+      };
+    };
+  };
+}

home/waybar.nix

@@ -0,0 +1,100 @@
+{ config, pkgs, ... }: {
+  programs.waybar = {
+    enable = config.wayland.windowManager.sway.enable;
+    systemd.enable = true;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+        output = [
+          "eDP-1"
+          "HDMI-A-1"
+        ];
+        modules-left = ["sway/workspaces" "sway/mode"];
+        #modules-center = ["sway/window"];
+        modules-right = [
+          "pulseaudio"
+          "network"
+          "disk"
+          "memory"
+          "cpu"
+          "battery"
+          "clock#date"
+          "clock#time"
+          "tray"
+        ];
+
+        "disk" = {
+          format = "Disk {percentage_free}%";
+        };
+
+        "pulseaudio" = {
+          format = "{volume}% {format_source}";
+          on-click = "pavucontrol";
+        };
+
+        "cpu" = {
+          format = "CPU  {usage}% ({load})";
+          states = {
+            warning = "70";
+            critical = "90";
+          };
+        };
+
+        "memory" = {
+          format = "Mem {}%";
+          states = {
+            warning = "70";
+            critical = "90";
+          };
+        };
+
+        "network" = {
+          format-wifi = "  {essid} ({signalStrength}%)";
+          format-ethernet = "  {ifname}: {ipaddr}/{cidr}";
+          format-disconnected = "⚠  Disconnected";
+        };
+
+        "battery" = {
+          states = {
+            warning = "30";
+            critical = "15";
+          };
+          format = "  {icon}  {capacity}%";
+          format-discharging = "{icon}  {capacity}%";
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
+        };
+
+        tray = {
+          icon-size = 21;
+          spacing = 10;
+        };
+
+        "clock#time" = {
+          interval = 1;
+          format = "{:%H:%M:%S}";
+        };
+
+        "clock#date" = {
+          format = "{:%e %B %Y}";
+        };
+
+        "sway/workspaces" = {
+          all-outputs = false;
+        };
+      };
+    };
+
+    package = pkgs.waybar.override {
+      pulseSupport = true;
+      #i3Support = true;
+    };
+  };
+}

home/zsh.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }: {
   programs.zsh = {
     enable = true;
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
     enableCompletion = true;
     autocd = true;
     dotDir = ".config/zsh";

machines/common.nix

@@ -1,7 +1,7 @@
 inputs:
 { config, lib, pkgs, ... }: {
   nix = {
-    package = pkgs.nixUnstable;
+    package = pkgs.nixStable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
@@ -26,17 +26,17 @@ inputs:
   i18n.defaultLocale = "en_GB.UTF-8";
   time.timeZone = "Europe/Berlin";
 
-  sound.enable = true;
+  #sound.enable = true;
 
   hardware = {
     # TODO: remove
     enableAllFirmware = true;
-    pulseaudio = {
+    #pulseaudio = {
       # TODO: pipewire
-      enable = true;
+      #enable = true;
       # stop mumble from muting other processes
-      extraConfig = "unload-module module-role-cork";
-    };
+      #extraConfig = "unload-module module-role-cork";
+    #};
     opengl = {
       enable = true;
       # driSupport = true;
@@ -66,9 +66,13 @@ inputs:
 
     # Enable CUPS to print documents.
     printing.enable = true;
+
     pipewire = {
-      enable = false;
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
       pulse.enable = true;
+      wireplumber.enable = true;
     };
     # required for nextcloud
     gnome.gnome-keyring.enable = true;
@@ -82,26 +86,25 @@ inputs:
       enable = true;
     };
 
+    displayManager = {
+      #defaultSession = "none+i3";
+      defaultSession = "sway";
+    };
+
     xserver = {
       enable = true;
 
+      xkb = {
+        options = "caps:escape";
         layout = "eu";
-      xkbOptions = "caps:escape";
+      };
 
       displayManager = {
-        defaultSession = "none+i3";
-        lightdm.enable = true;
+        gdm.enable = true;
       };
 
       windowManager.i3 = {
         enable = true;
-        extraPackages = with pkgs; [
-          dmenu
-          rofi
-          i3status
-          i3lock
-          i3blocks
-        ];
       };
     };
   };
@@ -110,6 +113,18 @@ inputs:
     "L+ /lib64/ld-linux-x86-64.so.2 - - - - ${pkgs.glibc}/lib64/ld-linux-x86-64.so.2"
   ];
 
+  # pipewire bluetooth config (https://nixos.wiki/wiki/PipeWire#Bluetooth_Configuration)
+  environment.etc = {
+    "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
+      bluez_monitor.properties = {
+        ["bluez5.enable-sbc-xq"] = true,
+        ["bluez5.enable-msbc"] = true,
+        ["bluez5.enable-hw-volume"] = true,
+        ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+      }
+    '';
+  };
+
   environment.systemPackages = with pkgs; [
     alacritty
     arandr
@@ -134,9 +149,9 @@ inputs:
   ];
 
   virtualisation = {
-    # docker = {
-    #   enable = true;
-    # };
+    docker = {
+      enable = false;
+    };
 
     podman = {
       enable = true;
@@ -145,12 +160,22 @@ inputs:
         /* to make networking in docker-compose work */
         dns_enabled = true;
       };
-      #dockerSocket.enable = true;
+      dockerSocket.enable = true;
     };
     # lxd.enable = true;
     # virtualbox.host.enable = true;
     # virtualbox.host.enableExtensionPack = true;
   };
+  # virt-manager
+  virtualisation.libvirtd.enable = true;
+  programs.virt-manager.enable = true;
+  #dconf.settings = {
+    #"org/virt-manager/virt-manager/connections" = {
+      #autoconnect = ["qemu:///system"];
+      #uris = ["qemu:///system"];
+    #};
+  #};
+
 
   programs = {
     # enable zsh globally
@@ -158,12 +183,13 @@ inputs:
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
-      pinentryFlavor = "curses";
+      pinentryPackage = pkgs.pinentry-curses;
     };
     thunar = {
       enable = true;
       plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
     };
+    kdeconnect.enable = true;
   };
 
   environment.sessionVariables = {
@@ -175,8 +201,8 @@ inputs:
   environment.pathsToLink = [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw
 
   fonts = {
-    enableDefaultFonts = true;
-    fonts = with pkgs; [
+    enableDefaultPackages = true;
+    packages = with pkgs; [
       font-awesome
       nerdfonts
       noto-fonts
@@ -194,11 +220,20 @@ inputs:
     };
   };
 
+  security = {
     # generate login settings
     # ykman otp chalresp --touch --generate 2
-  security.pam.yubico = {
+    pam.yubico = {
       enable = true;
       # debug = true;
       mode = "challenge-response";
     };
+    sudo = {
+      package = pkgs.sudo.override { withInsults = true; };
+    };
+
+    # rtkit is optional but recommended for pipewire
+    rtkit.enable = true;
+  };
+
 }

machines/dev.nix

@@ -1,5 +1,5 @@
 inputs:
-{ pkgs, ... }: {
+{ pkgs, pkgs-unstable, ... }: {
   environment.systemPackages = with pkgs; [
     neovim
     vim
@@ -13,7 +13,7 @@ inputs:
     binutils
     curl
     htop
-    nixfmt
+    nixfmt-classic
     ripgrep
     shellcheck
     tmux
@@ -26,10 +26,13 @@ inputs:
 
     direnv
 
-    #idea.idea-community
-    jetbrains.idea-ultimate
+    # gitea cli
+    tea
 
-    dbeaver
+    #idea.idea-community
+    unstable.jetbrains.idea-community
+
+    dbeaver-bin
   ];
 
   services.lorri.enable = true;

machines/entertainment.nix

@@ -11,6 +11,9 @@ inputs:
     spotify
     vlc
 
+    # podcast app with nextcloud sync
+    libsForQt5.kasts
+
     teamspeak_client
 
     # support both 32- and 64-bit applications

machines/morpheus.nix

@@ -3,18 +3,38 @@ let
   system = "x86_64-linux";
   hostname = "morpheus";
   swapUUID = "93bdadfc-961a-4ea6-aef0-d3cd50847f0b";
+  overlay-unstable = final: prev: {
+    unstable = inputs.nixpkgs-unstable.legacyPackages.${prev.system};
+  };
 in
 inputs.nixpkgs.lib.nixosSystem {
   inherit system;
   modules = [
-    { system.stateVersion = "22.05"; }
+    ({ config, pkgs, ... } : {
+      system.stateVersion = "22.05";
+      nixpkgs.overlays = [ overlay-unstable ];
+    })
     (import ./common.nix inputs)
+    (import ./sway.nix inputs)
+    (import ./morpheus/btrbk.nix inputs)
     (import ./dev.nix inputs)
     (import ./entertainment.nix inputs)
     (import ./office.nix inputs)
     ({ pkgs, lib, ... }: {
       system.autoUpgrade = {
-        enable = true;
+        enable = false;
+        flake = inputs.self.outPath;
+        flags = [
+          "--update-input"
+          "nixpkgs"
+          "--update-input"
+          "nixpkgs-unstable"
+          "--update-input"
+          "home-manager"
+          "--update-input"
+          "flake-utils"
+          "-L" # print build logs
+        ];
         allowReboot = false;
       };
 
@@ -31,16 +51,14 @@ inputs.nixpkgs.lib.nixosSystem {
       };
       services = {
         # enable touchpad support
-        xserver.libinput.enable = true;
+        libinput.enable = true;
         blueman.enable = true;
         snapper.configs = {
           home = {
-            subvolume = "/home";
-            extraConfig = ''
-              ALLOW_USERS="me"
-              TIMELINE_CREATE=yes
-              TIMELINE_CLEANUP=yes
-            '';
+            SUBVOLUME = "/home";
+            ALLOW_USERS = [ "me" ];
+            TIMELINE_CREATE = true;
+            TIMELINE_CLEANUP = true;
           };
         };
       };
@@ -53,6 +71,7 @@ inputs.nixpkgs.lib.nixosSystem {
           "davfs2"
           "disk"
           "docker"
+          "libvirtd" # virt-manager
           "networkmanager"
           "plugdev"
           "podman"
@@ -69,7 +88,12 @@ inputs.nixpkgs.lib.nixosSystem {
           #availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
           availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
           kernelModules = [ ];
-          luks.devices."system".device = "/dev/disk/by-uuid/06549d22-b96c-44f2-bb27-45200d5feda5";
+          luks.devices."system" = {
+            device = "/dev/disk/by-uuid/06549d22-b96c-44f2-bb27-45200d5feda5";
+            # better SSD performance
+            # https://wiki.archlinux.org/title/Dm-crypt/Specialties#Disable_workqueue_for_increased_solid_state_drive_(SSD)_performance
+            bypassWorkqueues = true;
+          };
         };
         kernelModules = [ "kvm-amd" ];
         # use latest kernel
@@ -99,6 +123,13 @@ inputs.nixpkgs.lib.nixosSystem {
         supportedFilesystems = [ "ntfs" ];
       };
 
+      # btrf autoscrub
+      services.btrfs.autoScrub = {
+        enable = true;
+        # multiple subvolumes of the same fs are mounted. only scrub '/' to prevent multiple runs
+        fileSystems = [ "/" ];
+      };
+
       fileSystems."/" =
         { device = "/dev/disk/by-uuid/93bdadfc-961a-4ea6-aef0-d3cd50847f0b";
           fsType = "btrfs";

machines/morpheus/btrbk.nix

@@ -0,0 +1,69 @@
+{ ... }: {
+  services.btrbk = {
+    instances = {
+      /*
+      home = {
+        settings = {
+          snapshot_preserve = "24h 14d 4w 12m";
+          snapshot_preserve_min = "latest";
+
+          # don't auto cleanup target
+          target_preserve_min = "all";
+
+          volume."/" = {
+            snapshot_dir = ".btrbk";
+            subvolume = {
+              home = {
+                snapshot_create = "always";
+              };
+            };
+            target = "/run/media/me/backup/morpheus";
+          };
+        };
+      };
+      */
+
+      # local snapshots:
+      # - create hourly
+      # - keep hourly for 4 days and daily forever
+      home_local = {
+        onCalendar = "hourly";
+        settings = {
+          snapshot_preserve = "96h *d";
+          snapshot_preserve_min = "latest";
+          volume."/" = {
+            snapshot_dir = "/home/.btrbk";
+            subvolume.home = {
+              snapshot_create = "always";
+            };
+          };
+        };
+      };
+
+      # backup snapshots to backup drive
+      # - keep all hourly and the last 14 days of daily snapshots on the local disk
+      # - keep 14 daily, 8 weekly and all monthly snapshots on the backup drive
+      # - don't create new snapshots
+      # - TODO: trigger on mount
+      home_external = {
+        # disable systemd timer
+        onCalendar = null;
+        settings = {
+          snapshot_preserve = "*h 14d";
+          snapshot_preserve_min = "latest";
+
+          target_preserve = "14d 8w *m";
+          target_preserve_min = "2d";
+
+          volume."/" = {
+            snapshot_dir = "/home/.btrbk";
+            subvolume.home = {
+              snapshot_create = "no";
+            };
+            target = "/run/media/me/backup/morpheus";
+          };
+        };
+      };
+    };
+  };
+}

machines/sway.nix

@@ -0,0 +1,9 @@
+inputs:
+{ config, lib, pkgs, ... }: {
+  services.gnome.gnome-keyring.enable = true;
+  programs.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+  };
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+}

machines/w1n5t0n.nix

@@ -13,7 +13,7 @@ inputs.nixpkgs.lib.nixosSystem {
     (import ./office.nix inputs)
     ({ pkgs, lib, ... }: {
       system.autoUpgrade = {
-        enable = true;
+        enable = false;
         allowReboot = false;
       };
 

renovate.json5

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>renovate-bot/renovate-config"
+  ]
+}