[tmux] Add tmux

[nix-book] Compress swap
[emacs] Add org/projects agenda directory
2025-01-03 12:13:17 -08:00 · 2025-01-03 10:44:51 -08:00 · 2025-01-01 15:27:35 -08:00 · 2024-12-24 12:39:05 -08:00 · 2024-12-22 08:40:01 -08:00 · 2024-12-22 08:39:06 -08:00
25 changed files with 461 additions and 700 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,44 @@
 {
  "nodes": {
+    "doomemacs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733434763,
+        "narHash": "sha256-sebujw5VvBWMS+wXyjiGF81iyjPM/QQDnw5l7tDJCvk=",
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "rev": "ba1dca322f9a07bc2b7bec6a98f2c3c55c0bbd77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "type": "github"
+      }
+    },
+    "emacs-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-doom-emacs-unstraightened"
+        ],
+        "nixpkgs-stable": [
+          "nix-doom-emacs-unstraightened"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734315266,
+        "narHash": "sha256-k6ekQwIK/TASoPwTyeY2JiBHzwmPZSLGrYNXF+fLhC8=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "fce2b6224adae5f9b6d43d74ecb996a3133a63f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -7,11 +46,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728041527,
-        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
+        "lastModified": 1734344598,
+        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
+        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
        "type": "github"
      },
      "original": {
@@ -20,13 +59,36 @@
        "type": "github"
      }
    },
+    "nix-doom-emacs-unstraightened": {
+      "inputs": {
+        "doomemacs": "doomemacs",
+        "emacs-overlay": "emacs-overlay",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1734338553,
+        "narHash": "sha256-KEuh2nsgl8iiPWMg4wfrnCoZqPssw6dbMCy9MheLJZg=",
+        "owner": "marienz",
+        "repo": "nix-doom-emacs-unstraightened",
+        "rev": "728040b0b7c2c0baa47fb3365b57bd3e1658207a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "marienz",
+        "repo": "nix-doom-emacs-unstraightened",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1727802920,
-        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
        "type": "github"
      },
      "original": {
@@ -36,22 +98,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1725762081,
-        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "plasma-manager": {
      "inputs": {
        "home-manager": [
@@ -62,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728750492,
-        "narHash": "sha256-9IHlIsH4gLqQjS2lFbEnsl/ItdqzBBLWLsyXS0k0jf8=",
+        "lastModified": 1733858086,
+        "narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "c6d4b6f3e0138c08f37d66fcfbcbe37dab08f108",
+        "rev": "7e2010249529931a3848054d5ff0dbf24675ab68",
        "type": "github"
      },
      "original": {
@@ -78,6 +124,7 @@
    "root": {
      "inputs": {
        "home-manager": "home-manager",
+        "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
        "nixpkgs": "nixpkgs",
        "plasma-manager": "plasma-manager",
        "sops-nix": "sops-nix"
@@ -87,15 +134,14 @@
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        ]
      },
      "locked": {
-        "lastModified": 1727423009,
-        "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=",
+        "lastModified": 1733965552,
+        "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "127a96f49ddc377be6ba76964411bab11ae27803",
+        "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
        "type": "github"
      },
      "original": {
@@ -103,6 +149,21 @@
        "repo": "sops-nix",
        "type": "github"
      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,11 @@
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.home-manager.follows = "home-manager";
    };
+
+    nix-doom-emacs-unstraightened = {
+      url = "github:marienz/nix-doom-emacs-unstraightened";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  outputs = { self, nixpkgs, ... } @ inputs: let
@@ -29,7 +34,10 @@
      {
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
-        home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
+        home-manager.sharedModules = [
+          inputs.plasma-manager.homeManagerModules.plasma-manager
+          inputs.nix-doom-emacs-unstraightened.hmModule
+        ];
      }
    ];
  in {
@@ -40,8 +48,6 @@
        ./machines/z790prors/configuration.nix
        {
          home-manager.users.johno = import ./home/home-z790prors.nix;
-          home-manager.extraSpecialArgs.customPkgs =
-            nixpkgs.legacyPackages."${system}".callPackage ./packages {};
        }
      ];
    };
@@ -52,8 +58,6 @@
        ./machines/nix-book/configuration.nix
        {
          home-manager.users.johno = import ./home/home-nix-book.nix;
-          home-manager.extraSpecialArgs.customPkgs =
-            nixpkgs.legacyPackages."${system}".callPackage ./packages {};
        }
      ];
    };
@@ -65,8 +69,6 @@
        inputs.home-manager.nixosModules.home-manager
        {
          home-manager.users.johno = import ./home/home-default.nix;
-          home-manager.extraSpecialArgs.customPkgs =
-            nixpkgs.legacyPackages."${system}".callPackage ./packages {};
        }
      ];
    };
--- a/home/home-default.nix
+++ b/home/home-default.nix
@@ -1,5 +1,8 @@
 { pkgs, customPkgs, ... }:

+let
+  customPkgs = pkgs.callPackage ../packages {};
+in
 {
  # Home Manager needs a bit of information about you and the paths it should
  # manage.
@@ -95,6 +98,7 @@
  #  /etc/profiles/per-user/johno/etc/profile.d/hm-session-vars.sh
  #
  home.sessionVariables = {
+    ENABLE_GAMESCOPE_WSI = "1";
  };

  home.sessionPath = [
@@ -107,6 +111,7 @@
    ./modules/i3+sway
    ./modules/lutris
    ./modules/plasma-manager
+    ./modules/tmux
  ];

  programs.bash.enable = true;
--- a/home/home-nix-book.nix
+++ b/home/home-nix-book.nix
@@ -3,7 +3,6 @@
 {
  imports = [
    ./home-default.nix
-    ./modules/hyprland/nix-book.nix
  ];

  home.i3_sway.extraSwayConfig = {
--- a/home/home-z790prors.nix
+++ b/home/home-z790prors.nix
@@ -3,6 +3,5 @@
 {
  imports = [
    ./home-default.nix
-    ./modules/hyprland/z790prors.nix
  ];
 }
--- a/home/modules/emacs/default.nix
+++ b/home/modules/emacs/default.nix
@@ -2,21 +2,15 @@

 with lib;

-let
-  doomSync = (let
-    git = pkgs.git;
-  in ''
-    export PATH=${pkgs.emacs}/bin:${git}/bin:$PATH
-    ${config.xdg.configHome}/emacs/bin/doom sync -u -j $((`nproc`/4*3))
-  '');
-in {
+{
  config = {
    home.packages = [
      pkgs.emacs-all-the-icons-fonts
      pkgs.fontconfig
      pkgs.graphviz
      pkgs.isort
-      pkgs.nerdfonts
+      pkgs.nerd-fonts.fira-code
+      pkgs.nerd-fonts.droid-sans-mono
      pkgs.nil # nix lsp language server
      pkgs.nixfmt-rfc-style
      (pkgs.ripgrep.override {withPCRE2 = true;})
@@ -25,43 +19,15 @@ in {
      pkgs.python3
    ];

+    programs.doom-emacs = {
+      enable = true;
+      doomDir = ./doom;
+    };
+
    fonts.fontconfig.enable = true;

-    home.file = {
-      ".config/emacs" = {
-        source = fetchGit {
-          url = "https://github.com/doomemacs/doomemacs.git";
-          # When updating me, remember to run `doom sync`
-          rev = "5ad99220b86ae1bf421861dfad24492d768ac4d9";
-        };
-        # We need to use recursive mode here or else doom fails to sync for
-        # some reason related to the permissions on the synced path. I'm not
-        # quite sure of everything that's going on here.
-        recursive = true;
-
-        # Because `recursive = true` will cause this to sync every single
-        # activation, we turn this off here.
-        #
-        # There's probably a way we could do better detection of this within
-        # our onChange shell?
-        #
-        # onChange = doomSync;
-      };
-    };
-
    home.sessionVariables = {
-      DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
      EDITOR = "emacs -nw";
    };
-
-    home.sessionPath = [
-      "${config.xdg.configHome}/emacs/bin"
-    ];
-
-    xdg.configFile."doom" = {
-      source = ./doom;
-      # Sync doom if we updated the config
-      onChange = doomSync;
-    };
  };
 }
--- a/home/modules/emacs/doom/config.el
+++ b/home/modules/emacs/doom/config.el
@@ -28,6 +28,7 @@
 ;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
 ;; refresh your font settings. If Emacs still can't find your font, it likely
 ;; wasn't installed correctly. Font issues are rarely Doom issues!
+(setq doom-font (font-spec :family "Fira Code"))

 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
@@ -43,7 +44,11 @@
 (setq org-directory "~/org/")
 (after! org
  (setq org-agenda-span 'week
-        org-agenda-files `(,org-directory ,(concat org-directory "roam/"))
+        my-agenda-dirs '("projects" "roam")
+        org-agenda-files (cons org-directory (mapcan (lambda (x) (directory-files-recursively
+                                                                  (expand-file-name x org-directory)
+                                                                  "\.org$"))
+                                                     my-agenda-dirs))
        org-log-done 'time
        org-agenda-custom-commands '(("n" "Agenda"
                                      ((agenda "")
--- a/home/modules/emacs/doom/init.el
+++ b/home/modules/emacs/doom/init.el
@@ -149,7 +149,7 @@
       ;;lua               ; one-based indices? one-based indices
       markdown          ; writing docs for people to ignore
       ;;nim               ; python + lisp at the speed of c
-       (nix +tree-sitter +lsp)               ; I hereby declare "nix geht mehr!"
+       (nix +tree-sitter)               ; I hereby declare "nix geht mehr!"
       ;;ocaml             ; an objective camel
       (org +roam2)               ; organize your plain life in plain text
       ;;php               ; perl's insecure younger brother
--- a/home/modules/hyprland/default.nix
+++ b/home/modules/hyprland/default.nix
@@ -1,94 +0,0 @@
-{ inputs, ... }:
-
-{
-  imports = [
-    ./hyprpaper.nix
-  ];
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    plugins = [ inputs.hy3.packages.x86_64-linux.hy3 ];
-    settings = {
-      "$mod" = "SUPER";
-      "$terminal" = "kitty";
-      "$fileManager" = "dolphin";
-      "$menu" = "wofi --show drun";
-
-      exec-once = [
-        "waybar"
-        "dunst"
-      ];
-
-      xwayland = {
-        force_zero_scaling = true;
-      };
-
-      input = {
-        kb_layout = "us";
-        kb_options = "caps:escape";
-        follow_mouse = 1;
-        touchpad.natural_scroll = false;
-      };
-
-      windowrulev2 = [
-        # I can guess, but I should figure out what this actually does
-        "suppressevent maximize, class:.*"
-      ];
-
-      general.layout = "hy3";
-
-      bind =
-        [
-          "SHIFT_$mod, Q, killactive"
-          "SHIFT_$mod, M, exit"
-
-          "$mod, D, exec, $menu"
-          "$mod, Return, exec, $terminal"
-
-          "$mod, H, hy3:movefocus, l"
-          "$mod, L, hy3:movefocus, r"
-          "$mod, K, hy3:movefocus, u"
-          "$mod, J, hy3:movefocus, d"
-
-          "SHIFT_$mod, H, hy3:movewindow, l"
-          "SHIFT_$mod, L, hy3:movewindow, r"
-          "SHIFT_$mod, K, hy3:movewindow, u"
-          "SHIFT_$mod, J, hy3:movewindow, d"
-
-          "$mod, V, hy3:makegroup, opposite"
-          "$mod, W, hy3:changegroup, toggletab"
-
-          "$mod, A, hy3:changefocus, raise"
-          "SHIFT_$mod, A, hy3:changefocus, lower"
-
-          "$mod, M, fullscreen, 0"
-          "$mod, E, hy3:expand, expand"
-          "SHIFT_$mod, E, hy3:expand, base"
-
-          "$mod, Q, hy3:warpcursor"
-        ]
-        ++ (
-          # workspaces
-          # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-          builtins.concatLists (builtins.genList (
-            x: let
-              ws = let
-                c = (x + 1) / 10;
-              in
-                builtins.toString (x + 1 - (c * 10));
-            in [
-              "$mod, ${ws}, workspace, ${toString (x + 1)}"
-              "$mod SHIFT, ${ws}, hy3:movetoworkspace, ${toString (x + 1)}"
-            ]
-          )
-            10)
-        );
-
-      bindm =
-        [
-          "$mod, mouse:272, movewindow"
-          "$mod, mouse:273, resizewindow"
-        ];
-    };
-  };
-}
--- a/home/modules/hyprland/hyprpaper.nix
+++ b/home/modules/hyprland/hyprpaper.nix
@@ -1,21 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      ipc = "on";
-      splash = false;
-      preload = [
-        "${config.xdg.dataHome}/wallpaper.jpg"
-      ];
-      wallpaper = [
-        ",${config.xdg.dataHome}/wallpaper.jpg"
-      ];
-    };
-  };
-
-  xdg.dataFile."wallpaper.jpg" = {
-    source = ./wallpaper.jpg;
-  };
-}
--- a/home/modules/hyprland/nix-book.nix
+++ b/home/modules/hyprland/nix-book.nix
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  wayland.windowManager.hyprland.settings.monitor = ",preferred,2880x1800@90.00Hz,1.33333";
-}
--- a/home/modules/hyprland/wallpaper.jpg
+++ b/home/modules/hyprland/wallpaper.jpg
--- a/home/modules/hyprland/z790prors.nix
+++ b/home/modules/hyprland/z790prors.nix
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  wayland.windowManager.hyprland.settings.monitor = "DP-1,3440x1440@164.90,0x0,1.33333,vrr,1";
-  wayland.windowManager.hyprland.settings.env = [
-    "LIBVA_DRIVER_NAME,nvidia"
-    "XDG_SESSION_TYPE,wayland"
-    "GBM_BACKEND,nvidia-drm"
-    "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-    "NVD_BACKEND,direct"
-    "ELECTRON_OZONE_PLATFORM_HINT,auto"
-    "NIXOS_OZONE_WL,1"
-  ];
-
-  wayland.windowManager.hyprland.settings.cursor.no_hardware_cursors = true;
-}
--- a/home/modules/plasma-manager/default.nix
+++ b/home/modules/plasma-manager/default.nix
@@ -1,225 +1,80 @@
 { config, lib, pkgs, ... }:


-# The following can be generated with the command:
+# The current KDE config can be output with the command:
 # nix run github:nix-community/plasma-manager
 #
 # Plasma-manager options documentation
 # https://nix-community.github.io/plasma-manager/options.xhtml
 #
-# Polonium usage
-# https://github.com/zeroxoneafour/polonium/blob/master/docs/usage.md
-#
-# TODO: Extract this configuration into something that's a bit easier to manage
-# TODO: Update shortcuts for better window/tiling/desktop management akin to i3wm
-# TODO(ambitious): Add Kmail support to plasma-manager
+# TODO: (ambitious) Add Kmail support to plasma-manager
 {
  programs.plasma = {
    enable = true;
+    overrideConfig = true;
+
+    hotkeys.commands."launch-konsole" = {
+      name = "Launch Konsole";
+      key = "Meta+Return";
+      command = "konsole";
+    };
+
    shortcuts = {
-      "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L";
-      "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K";
-      "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S";
-      "kcm_touchpad"."Disable Touchpad" = "Touchpad Off";
-      "kcm_touchpad"."Enable Touchpad" = "Touchpad On";
-      "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Toggle Touchpad"];
-      "kmix"."decrease_microphone_volume" = "Microphone Volume Down";
-      "kmix"."decrease_volume" = "Volume Down";
-      "kmix"."decrease_volume_small" = "Shift+Volume Down";
-      "kmix"."increase_microphone_volume" = "Microphone Volume Up";
-      "kmix"."increase_volume" = "Volume Up";
-      "kmix"."increase_volume_small" = "Shift+Volume Up";
-      "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
-      "kmix"."mute" = "Volume Mute";
-      "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation";
-      "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"];
-      "ksmserver"."Log Out" = "Ctrl+Alt+Del";
-      "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation";
-      "ksmserver"."LogOut" = "none,,Log Out";
-      "ksmserver"."Reboot" = "none,,Reboot";
-      "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation";
-      "ksmserver"."Shut Down" = "none,,Shut Down";
-      "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A";
-      "kwin"."Cycle Overview" = [ ];
-      "kwin"."Cycle Overview Opposite" = [ ];
-      "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%";
-      "kwin"."Edit Tiles" = "Meta+T";
-      "kwin"."Expose" = "Ctrl+F9";
-      "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"];
-      "kwin"."ExposeClass" = "Ctrl+F7";
-      "kwin"."ExposeClassCurrentDesktop" = [ ];
-      "kwin"."Grid View" = "Meta+G";
-      "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%";
-      "kwin"."Kill Window" = "Meta+Ctrl+Esc";
-      "kwin"."Move Tablet to Next Output" = [ ];
-      "kwin"."MoveMouseToCenter" = "Meta+F6";
-      "kwin"."MoveMouseToFocus" = "Meta+F5";
-      "kwin"."MoveZoomDown" = [ ];
-      "kwin"."MoveZoomLeft" = [ ];
-      "kwin"."MoveZoomRight" = [ ];
-      "kwin"."MoveZoomUp" = [ ];
-      "kwin"."Overview" = "Meta+W";
-      "kwin"."PoloniumCycleEngine" = "Meta+|,none,Polonium: Cycle Engine";
-      "kwin"."PoloniumFocusAbove" = "Meta+K,none,Polonium: Focus Above";
-      "kwin"."PoloniumFocusBelow" = "Meta+J,none,Polonium: Focus Below";
-      "kwin"."PoloniumFocusLeft" = "Meta+H,none,Polonium: Focus Left";
-      "kwin"."PoloniumFocusRight" = "Meta+L,none,Polonium: Focus Right";
-      "kwin"."PoloniumInsertAbove" = "Meta+Shift+K,none,Polonium: Insert Above";
-      "kwin"."PoloniumInsertBelow" = "Meta+Shift+J,none,Polonium: Insert Below";
-      "kwin"."PoloniumInsertLeft" = "Meta+Shift+H,none,Polonium: Insert Left";
-      "kwin"."PoloniumInsertRight" = "Meta+Shift+L,none,Polonium: Insert Right";
-      "kwin"."PoloniumOpenSettings" = "Meta+\\\\,none,Polonium: Open Settings Dialog";
-      "kwin"."PoloniumResizeAbove" = "Meta+Ctrl+K,none,Polonium: Resize Above";
-      "kwin"."PoloniumResizeBelow" = "Meta+Ctrl+J,none,Polonium: Resize Below";
-      "kwin"."PoloniumResizeLeft" = "Meta+Ctrl+H,none,Polonium: Resize Left";
-      "kwin"."PoloniumResizeRight" = "Meta+Ctrl+L,none,Polonium: Resize Right";
-      "kwin"."PoloniumRetileWindow" = "Meta+Shift+Space,none,Polonium: Retile Window";
-      "kwin"."PoloniumSwitchBTree" = [ ];
-      "kwin"."PoloniumSwitchHalf" = [ ];
-      "kwin"."PoloniumSwitchKwin" = [ ];
-      "kwin"."PoloniumSwitchMonocle" = [ ];
-      "kwin"."PoloniumSwitchThreeColumn" = [ ];
-      "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut";
-      "kwin"."Show Desktop" = "Meta+D";
-      "kwin"."Suspend Compositing" = "Alt+Shift+F12";
-      "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down";
-      "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up";
-      "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left";
-      "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right";
-      "kwin"."Switch Window Down" = "Meta+Alt+Down";
-      "kwin"."Switch Window Left" = "Meta+Alt+Left";
-      "kwin"."Switch Window Right" = "Meta+Alt+Right";
-      "kwin"."Switch Window Up" = "Meta+Alt+Up";
-      "kwin"."Switch to Desktop 1" = "Meta+1,Ctrl+F1,Switch to Desktop 1";
-      "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10";
-      "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11";
-      "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12";
-      "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13";
-      "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14";
-      "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15";
-      "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16";
-      "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17";
-      "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18";
-      "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19";
-      "kwin"."Switch to Desktop 2" = "Meta+2,Ctrl+F2,Switch to Desktop 2";
-      "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20";
-      "kwin"."Switch to Desktop 3" = "Meta+3,Ctrl+F3,Switch to Desktop 3";
-      "kwin"."Switch to Desktop 4" = "Meta+4,Ctrl+F4,Switch to Desktop 4";
-      "kwin"."Switch to Desktop 5" = "Meta+5,,Switch to Desktop 5";
-      "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6";
-      "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7";
-      "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8";
-      "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9";
-      "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop";
-      "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen";
-      "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop";
-      "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen";
-      "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0";
-      "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1";
-      "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2";
-      "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3";
-      "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4";
-      "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5";
-      "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6";
-      "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7";
-      "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above";
-      "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below";
-      "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left";
-      "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right";
-      "kwin"."Toggle Night Color" = [ ];
-      "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower";
-      "kwin"."Walk Through Windows" = "Alt+Tab";
-      "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
-      "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative";
-      "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)";
-      "kwin"."Walk Through Windows of Current Application" = "Alt+`";
-      "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~";
-      "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative";
-      "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)";
-      "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others";
-      "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others";
-      "kwin"."Window Close" = "Alt+F4";
-      "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen";
-      "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally";
-      "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically";
-      "kwin"."Window Lower" = "none,,Lower Window";
-      "kwin"."Window Maximize" = "Meta+PgUp";
-      "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally";
-      "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically";
-      "kwin"."Window Minimize" = "Meta+PgDown";
-      "kwin"."Window Move" = "none,,Move Window";
-      "kwin"."Window Move Center" = "none,,Move Window to the Center";
-      "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame";
-      "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops";
-      "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down";
-      "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up";
-      "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left";
-      "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right";
-      "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down";
-      "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up";
-      "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left";
-      "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right";
-      "kwin"."Window Operations Menu" = "Alt+F3";
-      "kwin"."Window Pack Down" = "none,,Move Window Down";
-      "kwin"."Window Pack Left" = "none,,Move Window Left";
-      "kwin"."Window Pack Right" = "none,,Move Window Right";
-      "kwin"."Window Pack Up" = "none,,Move Window Up";
-      "kwin"."Window Quick Tile Bottom" = "Meta+Down";
-      "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left";
-      "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right";
-      "kwin"."Window Quick Tile Left" = "Meta+Left";
-      "kwin"."Window Quick Tile Right" = "Meta+Right";
-      "kwin"."Window Quick Tile Top" = "Meta+Up";
-      "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left";
-      "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right";
-      "kwin"."Window Raise" = "none,,Raise Window";
-      "kwin"."Window Resize" = "none,,Resize Window";
-      "kwin"."Window Shade" = "none,,Shade Window";
-      "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally";
-      "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically";
-      "kwin"."Window to Desktop 1" = "Meta+!,,Window to Desktop 1";
-      "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10";
-      "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11";
-      "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12";
-      "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13";
-      "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14";
-      "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15";
-      "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16";
-      "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17";
-      "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18";
-      "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19";
-      "kwin"."Window to Desktop 2" = "Meta+@,,Window to Desktop 2";
-      "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20";
-      "kwin"."Window to Desktop 3" = "Meta+#,,Window to Desktop 3";
-      "kwin"."Window to Desktop 4" = "Meta+$,,Window to Desktop 4";
-      "kwin"."Window to Desktop 5" = "Meta+%,,Window to Desktop 5";
-      "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6";
-      "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7";
-      "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8";
-      "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9";
-      "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop";
-      "kwin"."Window to Next Screen" = "Meta+Shift+Right";
-      "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop";
-      "kwin"."Window to Previous Screen" = "Meta+Shift+Left";
-      "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0";
-      "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1";
-      "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2";
-      "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3";
-      "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4";
-      "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5";
-      "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6";
-      "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7";
-      "kwin"."view_actual_size" = "Meta+0";
-      "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
-      "kwin"."view_zoom_out" = "Meta+-";
-      "mediacontrol"."mediavolumedown" = "none,,Media volume down";
-      "mediacontrol"."mediavolumeup" = "none,,Media volume up";
-      "mediacontrol"."nextmedia" = "Media Next";
-      "mediacontrol"."pausemedia" = "Media Pause";
-      "mediacontrol"."playmedia" = "none,,Play media playback";
-      "mediacontrol"."playpausemedia" = "Media Play";
-      "mediacontrol"."previousmedia" = "Media Previous";
-      "mediacontrol"."stopmedia" = "Media Stop";
+      kmix = {
+        "decrease_microphone_volume" = "Microphone Volume Down";
+        "decrease_volume" = "Volume Down";
+        "decrease_volume_small" = "Shift+Volume Down";
+        "increase_microphone_volume" = "Microphone Volume Up";
+        "increase_volume" = "Volume Up";
+        "increase_volume_small" = "Shift+Volume Up";
+        "mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
+        "mute" = "Volume Mute";
+      };
+
+      mediacontrol = {
+        "mediavolumedown" = "none,,Media volume down";
+        "mediavolumeup" = "none,,Media volume up";
+        "nextmedia" = "Media Next";
+        "pausemedia" = "Media Pause";
+        "playmedia" = "none,,Play media playback";
+        "playpausemedia" = "Media Play";
+        "previousmedia" = "Media Previous";
+        "stopmedia" = "Media Stop";
+      };
+
+      ksmserver = {
+        "Lock Session" = ["Meta+Ctrl+Q" "Screensaver" "Screensaver,Lock Session"];
+      };
+
+      kwin = {
+        "Window Close" = "Meta+Shift+Q";
+        "Kill Window" = "Meta+Ctrl+Esc";
+        "Window Operations Menu" = "Alt+F3";
+        "Window Resize" = "Meta+R,,Resize Window";
+
+        "Overview" = "Meta+W";
+        "Grid View" = "Meta+G";
+        "Edit Tiles" = "Meta+T";
+
+        "Activate Window Demanding Attention" = "Meta+Ctrl+A";
+
+        "Show Desktop" = "Meta+D";
+
+        "Walk Through Windows" = "Alt+Tab";
+        "Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
+        "Walk Through Windows of Current Application" = "Alt+`";
+        "Walk Through Windows of Current Application (Reverse)" = "Alt+~";
+        "Window Fullscreen" = "Meta+Shift+F,,Make Window Fullscreen";
+
+        "Window Quick Tile Bottom" = "Meta+Down";
+        "Window Quick Tile Left" = "Meta+Left";
+        "Window Quick Tile Right" = "Meta+Right";
+        "Window Quick Tile Top" = "Meta+Up";
+
+        "view_actual_size" = "Meta+0";
+        "view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
+        "view_zoom_out" = "Meta+-";
+      };
      "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down";
      "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down";
      "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down";
@@ -233,219 +88,40 @@
      "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off";
      "org_kde_powerdevil"."Turn Off Screen" = [ ];
      "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"];
-      "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
-      "plasmashell"."activate task manager entry 1" = "none,Meta+1,Activate Task Manager Entry 1";
-      "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10";
-      "plasmashell"."activate task manager entry 2" = "none,Meta+2,Activate Task Manager Entry 2";
-      "plasmashell"."activate task manager entry 3" = "none,Meta+3,Activate Task Manager Entry 3";
-      "plasmashell"."activate task manager entry 4" = "none,Meta+4,Activate Task Manager Entry 4";
-      "plasmashell"."activate task manager entry 5" = "none,Meta+5,Activate Task Manager Entry 5";
-      "plasmashell"."activate task manager entry 6" = "Meta+6";
-      "plasmashell"."activate task manager entry 7" = "Meta+7";
-      "plasmashell"."activate task manager entry 8" = "Meta+8";
-      "plasmashell"."activate task manager entry 9" = "Meta+9";
-      "plasmashell"."clear-history" = "none,,Clear Clipboard History";
-      "plasmashell"."clipboard_action" = "Meta+Ctrl+X";
-      "plasmashell"."cycle-panels" = "Meta+Alt+P";
-      "plasmashell"."cycleNextAction" = "none,,Next History Item";
-      "plasmashell"."cyclePrevAction" = "none,,Previous History Item";
-      "plasmashell"."manage activities" = "Meta+Q";
-      "plasmashell"."next activity" = "Meta+A,none,Walk through activities";
-      "plasmashell"."previous activity" = "Meta+Shift+A,none,Walk through activities (Reverse)";
-      "plasmashell"."repeat_action" = "none,Meta+Ctrl+R,Manually Invoke Action on Current Clipboard";
-      "plasmashell"."show dashboard" = "Ctrl+F12";
-      "plasmashell"."show-barcode" = "none,,Show Barcode…";
-      "plasmashell"."show-on-mouse-pos" = "Meta+V";
-      "plasmashell"."stop current activity" = "Meta+S";
-      "plasmashell"."switch to next activity" = "none,,Switch to Next Activity";
-      "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity";
-      "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb";
+
+      plasmashell = {
+        "activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
+        "activate task manager entry 1" = "none,,";
+        "activate task manager entry 2" = "none,,";
+        "activate task manager entry 3" = "none,,";
+        "activate task manager entry 4" = "none,,";
+        "activate task manager entry 5" = "none,,";
+        "activate task manager entry 6" = "none,,";
+        "activate task manager entry 7" = "none,,";
+        "activate task manager entry 8" = "none,,";
+        "activate task manager entry 9" = "none,,";
+        "activate task manager entry 10" = "none,,";
+        "show activity switcher" = "none,,";
+      };
    };
+
    configFile = {
-      "baloofilerc"."General"."dbVersion" = 2;
-      "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.tfstate*,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.terraform,.venv,venv,core-dumps,lost+found";
-      "baloofilerc"."General"."exclude filters version" = 9;
-      "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false;
-      "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22;
-      "katerc"."General"."Days Meta Infos" = 30;
-      "katerc"."General"."Save Meta Infos" = true;
-      "katerc"."General"."Show Full Path in Title" = false;
-      "katerc"."General"."Show Menu Bar" = true;
-      "katerc"."General"."Show Status Bar" = true;
-      "katerc"."General"."Show Tab Bar" = true;
-      "katerc"."General"."Show Url Nav Bar" = true;
-      "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false;
-      "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true;
-      "katerc"."KTextEditor Renderer"."Color Theme" = "Breeze Light";
-      "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1;
-      "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false;
-      "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false;
-      "katerc"."KTextEditor Renderer"."Text Font" = "Hack,10,-1,7,400,0,0,0,0,0,0,0,0,0,0,1";
-      "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false;
-      "katerc"."filetree"."editShade" = "183,220,246";
-      "katerc"."filetree"."listMode" = false;
-      "katerc"."filetree"."middleClickToClose" = false;
-      "katerc"."filetree"."shadingEnabled" = true;
-      "katerc"."filetree"."showCloseButton" = false;
-      "katerc"."filetree"."showFullPathOnRoots" = false;
-      "katerc"."filetree"."showToolbar" = true;
-      "katerc"."filetree"."sortRole" = 0;
-      "katerc"."filetree"."viewShade" = "211,190,222";
-      "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true;
-      "kded5rc"."Module-browserintegrationreminder"."autoload" = false;
-      "kded5rc"."Module-device_automounter"."autoload" = false;
-      "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false;
-      "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true;
-      "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true;
-      "kdeglobals"."KFileDialog Settings"."Decoration position" = 2;
-      "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5;
-      "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5;
-      "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false;
-      "kdeglobals"."KFileDialog Settings"."Show Full Path" = false;
-      "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true;
-      "kdeglobals"."KFileDialog Settings"."Show Preview" = false;
-      "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true;
-      "kdeglobals"."KFileDialog Settings"."Show hidden files" = false;
-      "kdeglobals"."KFileDialog Settings"."Sort by" = "Name";
-      "kdeglobals"."KFileDialog Settings"."Sort directories first" = true;
-      "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false;
-      "kdeglobals"."KFileDialog Settings"."Sort reversed" = false;
-      "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 131;
-      "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree";
-      "kdeglobals"."WM"."activeBackground" = "227,229,231";
-      "kdeglobals"."WM"."activeBlend" = "227,229,231";
-      "kdeglobals"."WM"."activeForeground" = "35,38,41";
-      "kdeglobals"."WM"."inactiveBackground" = "239,240,241";
-      "kdeglobals"."WM"."inactiveBlend" = "239,240,241";
-      "kdeglobals"."WM"."inactiveForeground" = "112,125,138";
-      "kiorc"."Confirmations"."ConfirmDelete" = true;
-      "kscreenlockerrc"."Daemon"."LockOnResume" = false;
-      "kwalletrc"."Wallet"."First Use" = false;
-      "kwinrc"."Desktops"."Id_1" = "48e67529-9a58-4caa-bc27-a02ddf746389";
-      "kwinrc"."Desktops"."Id_2" = "da76cc12-2e22-4fb4-87aa-3c17d7be63b0";
-      "kwinrc"."Desktops"."Id_3" = "a6cb23ae-3d6a-4609-b593-d956f16f125c";
-      "kwinrc"."Desktops"."Id_4" = "6e61e508-b5f1-4053-a9d3-34b80a155a10";
-      "kwinrc"."Desktops"."Number" = 4;
-      "kwinrc"."Desktops"."Rows" = 1;
-      "kwinrc"."Plugins"."poloniumEnabled" = true;
-      "kwinrc"."Tiling"."padding" = 4;
-      "kwinrc"."Xwayland"."Scale" = 1.25;
-      "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8";
-      "plasmarc"."Wallpapers"."usersWallpapers" = "";
-      "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots";
-      "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts";
-    };
-    dataFile = {
-      "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true;
-      "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true;
-      "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true;
-      "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true;
-      "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true;
-      "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true;
-      "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."rbqlplugin" = false;
-      "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true;
-      "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,594,0";
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline";
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 371;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = "";
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 371;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = "";
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 594;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin";
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 209;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false;
-      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,369,0";
-      "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled";
-      "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled";
-      "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 8;
-      "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0";
-      "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1;
-      "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 594;
-      "kate/anonymous.katesession"."Open Documents"."Count" = 1;
-      "kate/anonymous.katesession"."Open MainWindows"."Count" = 1;
-      "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = "";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = "";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = "";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = "";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = "";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = "";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = "";
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SizeLimit" = 128;
-      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false;
+      kwinrc.Desktops.Number = {
+        value = 10;
+        immutable = true;
+      };
+
+      kcminputrc.Libinput = {
+        AccelerationProfile = "adaptive";
+        PointerAcceleration = 0.5;
+      };
+
+      kcminputrc.Mouse = {
+        X11LibInputXAccelProfileFlat = false;
+        XLbInptAccelProfileFlat = false;
+      };
+
+      kdeglobals.KDE.LookAndFeelPackage = "org.kde.breezedark.desktop";
    };
  };
 }
--- a/home/modules/tmux/default.nix
+++ b/home/modules/tmux/default.nix
@@ -0,0 +1,58 @@
+{ config, lib, pkgs, ... }:
+
+let
+  tokyo-night = pkgs.tmuxPlugins.mkTmuxPlugin {
+    pluginName = "tokyo-night";
+    rtpFilePath = "tokyo-night.tmux";
+    version = "1.6.1";
+    src = pkgs.fetchFromGitHub {
+      owner = "janoamaral";
+      repo = "tokyo-night-tmux";
+      rev = "d610ced20d5f602a7995854931440e4a1e0ab780";
+      sha256 = "sha256-17vEgkL7C51p/l5gpT9dkOy0bY9n8l0/LV51mR1k+V8=";
+    };
+  };
+in
+{
+  programs.tmux.enable = true;
+  programs.tmux.escapeTime = 0;
+  programs.tmux.mouse = true;
+  programs.tmux.newSession = true;
+  programs.tmux.historyLimit = 50000;
+  programs.tmux.clock24 = true;
+  programs.tmux.baseIndex = 1;
+  programs.tmux.prefix = "`";
+
+  programs.tmux.extraConfig = ''
+    set -g mouse on
+    set -g default-terminal "screen-256color"
+
+    bind -n S-Left previous-window
+    bind -n S-Right next-window
+  '';
+
+  programs.tmux.plugins = with pkgs; [
+    tmuxPlugins.cpu
+    tmuxPlugins.battery
+    tmuxPlugins.better-mouse-mode
+    tmuxPlugins.net-speed
+    tmuxPlugins.online-status
+    tmuxPlugins.pain-control
+    tmuxPlugins.tilish
+    tmuxPlugins.yank
+
+    {
+      plugin = tmuxPlugins.resurrect;
+      extraConfig = "set -g @resurrect-strategy-nvim 'session'";
+    }
+    {
+      plugin = tmuxPlugins.continuum;
+      extraConfig = ''
+        set -g @continuum-restore 'on'
+        set -g @continuum-save-interval '15' # minutes
+      '';
+    }
+
+    tokyo-night
+  ];
+}
--- a/machines/nix-book/configuration.nix
+++ b/machines/nix-book/configuration.nix
@@ -12,7 +12,10 @@
  roles = {
    audio.enable = true;
    bluetooth.enable = true;
-    desktop.enable = true;
+    desktop = {
+      enable = true;
+      waylandOnly = true;
+    };
    nfs-mounts.enable = true;
    printing.enable = true;
    spotifyd.enable = true;
--- a/machines/nix-book/hardware-configuration.nix
+++ b/machines/nix-book/hardware-configuration.nix
@@ -29,6 +29,7 @@
  swapDevices =
    [ { device = "/dev/disk/by-uuid/ec1f70ea-27b6-4646-ad3b-eac41bd83e3e"; }
    ];
+  zramSwap.enable = true;

  # 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
--- a/machines/z790prors/hardware-configuration.nix
+++ b/machines/z790prors/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # 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, modulesPath, ... }:
+{ config, lib, modulesPath, pkgs, ... }:

 {
  imports =
@@ -15,6 +15,7 @@
    "nvidia_uvm"
    "nvidia_drm"
  ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
  boot.kernelParams = [
    "nvidia_drm.fbdev=1"
    "nvidia_drm.modeset=1"
@@ -32,7 +33,19 @@
    powerManagement.finegrained = false;
    open = false;
    nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.production;
+    package = config.boot.kernelPackages.nvidiaPackages.latest;
+    #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      #version = "555.58";
+
+      #sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew=";
+      #sha256_aarch64 = lib.fakeSha256;
+      #openSha256 = lib.fakeSha256;
+      #settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M=";
+      #persistencedSha256 = lib.fakeSha256;
+    #};
+  };
+  environment.sessionVariables = {
+    KWIN_DRM_ALLOW_NVIDIA_COLORSPACE = "1";
  };

  fileSystems."/" =
@@ -45,11 +58,6 @@
      fsType = "vfat";
    };

-  fileSystems."/arch" =
-    { device = "/dev/disk/by-label/endeavouros";
-      fsType = "btrfs";
-    };
-
  swapDevices = [ ];

  services.beesd.filesystems = {
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -1,4 +1,6 @@
 { pkgs, ... }:
 {
  nextcloudTalkDesktop = pkgs.callPackage ./nextcloud-talk-desktop {};
+  modrinthNvidia = pkgs.callPackage ./modrinth-nvidia {};
+  vulkanHDRLayer = pkgs.callPackage ./vulkan-hdr-layer {};
 }
--- a/packages/modrinth-nvidia/default.nix
+++ b/packages/modrinth-nvidia/default.nix
@@ -0,0 +1,43 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.stdenv.mkDerivation {
+  pname = "modrinth-nvidia";
+  version = "0.1.0";
+  src = null;
+  dontUnpack = true;
+  dontBuild = true;
+  dontConfigure = true;
+
+  nativeBuildInputs = [ pkgs.makeWrapper
+                        pkgs.modrinth-app ];
+
+  # Propagate the required Java versions so they are available at runtime
+  propagatedBuildInputs = [
+    pkgs.openjdk8
+    pkgs.openjdk17
+    pkgs.openjdk21
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    # Copy the original binary
+    cp ${pkgs.modrinth-app}/bin/ModrinthApp $out/bin/modrinth-nvidia-real
+    chmod +x $out/bin/modrinth-nvidia-real
+
+    # Wrap the binary with makeWrapper, producing a new script at 'modrinth-nvidia'
+    makeWrapper $out/bin/modrinth-nvidia-real $out/bin/modrinth-nvidia \
+      --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
+      --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/modrinth-nvidia.desktop <<EOF
+[Desktop Entry]
+Name=Modrinth (NVIDIA)
+Comment=Launch Modrinth with environment variables tuned for NVIDIA systems
+Exec=$out/bin/modrinth-nvidia
+Icon=modrinth-app
+Terminal=false
+Type=Application
+Categories=Game;
+EOF
+  '';
+}
--- a/packages/nextcloud-talk-desktop/default.nix
+++ b/packages/nextcloud-talk-desktop/default.nix
@@ -1,52 +1,61 @@
-{ lib
-, stdenv
-, fetchzip
-, autoPatchelfHook
-
-, nss
-, cairo
-, xorg
-, libxkbcommon
-, alsa-lib
-, at-spi2-core
-, mesa
-, pango
-, libdrm
-, vivaldi-ffmpeg-codecs
-, gtk3
-, libGL
-, libglvnd
-, systemd
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoPatchelfHook,
+  nss,
+  cairo,
+  xorg,
+  libxkbcommon,
+  alsa-lib,
+  at-spi2-core,
+  mesa,
+  pango,
+  libdrm,
+  vivaldi-ffmpeg-codecs,
+  gtk3,
+  libGL,
+  libglvnd,
+  systemd,
 }:

-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: rec {
  pname = "nextcloud-talk-desktop";
-  version = "0.29.0";
+  version = "0.39.0";

  # Building from source would require building also building Server and Talk components
  # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
  src = fetchzip {
    url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64-${finalAttrs.version}.zip";
-    hash = "sha256-fBIeNv8tfrVTFExLQDBPhIazvbsJ7a76+W9G0cuQDlw=";
+    hash = "sha256-f8X6I2Je9wgstMTuYGaX7AXAqpZC92RUAltDVsHr9Vo=";
    stripRoot = false;
  };

  nativeBuildInputs = [ autoPatchelfHook ];

-  buildInputs = [
-    nss
-    cairo
-    alsa-lib
-    at-spi2-core
-    pango
-    libdrm
-    libxkbcommon
-    gtk3
-    vivaldi-ffmpeg-codecs
-    mesa
-    libGL
-    libglvnd
-  ] ++ (with xorg; [libX11 libXcomposite libXdamage libXrandr libXfixes libXcursor]);
+  buildInputs =
+    [
+      nss
+      cairo
+      alsa-lib
+      at-spi2-core
+      pango
+      libdrm
+      libxkbcommon
+      gtk3
+      vivaldi-ffmpeg-codecs
+      mesa
+      libGL
+      libglvnd
+    ]
+    ++ (with xorg; [
+      libX11
+      libXcomposite
+      libXdamage
+      libXrandr
+      libXfixes
+      libXcursor
+    ]);

  # Required to launch the application and proceed past the zygote_linux fork() process
  # Fixes `Zygote could not fork`
@@ -55,25 +64,23 @@ stdenv.mkDerivation (finalAttrs: {
  preInstall = ''
    mkdir -p $out/bin
    mkdir -p $out/opt
-
    cp -r $src/* $out/opt/
  '';

  installPhase = ''
    runHook preInstall
-
    # Link the application in $out/bin away from contents of `preInstall`
-    ln -s "$out/opt/Nextcloud Talk-linux-x64/Nextcloud Talk" $out/bin/${finalAttrs.pname}
-
+    ln -s "$out/opt/Nextcloud Talk" $out/bin/nextcloud-talk-desktop
    runHook postInstall
  '';

  meta = with lib; {
-    description = "Nextcloud Talk Desktop Client Preview";
+    description = "Nextcloud Talk Desktop Client";
    homepage = "https://github.com/nextcloud/talk-desktop";
    changelog = "https://github.com/nextcloud/talk-desktop/blob/${finalAttrs.version}/CHANGELOG.md";
    license = licenses.agpl3Only;
    maintainers = with maintainers; [ kashw2 ];
-    mainProgram = finalAttrs.pname;
+    mainProgram = "nextcloud-talk-desktop";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
  };
 })
--- a/packages/vulkan-hdr-layer/default.nix
+++ b/packages/vulkan-hdr-layer/default.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, fetchFromGitHub, meson, pkg-config, vulkan-loader, ninja, writeText, vulkan-headers, vulkan-utility-libraries,  jq, libX11, libXrandr, libxcb, wayland, wayland-scanner }:
+
+stdenv.mkDerivation rec {
+  pname = "vulkan-hdr-layer";
+  version = "63d2eec";
+
+  src = (fetchFromGitHub {
+    owner = "Zamundaaa";
+    repo = "VK_hdr_layer";
+    rev = "869199cd2746e7f69cf19955153080842b6dacfc";
+    fetchSubmodules = true;
+    hash = "sha256-xfVYI+Aajmnf3BTaY2Ysg5fyDO6SwDFGyU0L+F+E3is=";
+  }).overrideAttrs (_: {
+    GIT_CONFIG_COUNT = 1;
+    GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
+    GIT_CONFIG_VALUE_0 = "git@github.com:";
+  });
+
+  nativeBuildInputs = [ vulkan-headers meson ninja pkg-config jq ];
+
+  buildInputs = [ vulkan-headers vulkan-loader vulkan-utility-libraries libX11 libXrandr libxcb wayland wayland-scanner ];
+
+  # Help vulkan-loader find the validation layers
+  setupHook = writeText "setup-hook" ''
+    addToSearchPath XDG_DATA_DIRS @out@/share
+  '';
+
+  meta = with lib; {
+    description = "Layers providing Vulkan HDR";
+    homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+}
--- a/roles/default.nix
+++ b/roles/default.nix
@@ -31,16 +31,26 @@ with lib;
    };
    time.timeZone = "America/Los_Angeles";

+    # Don't go to emergency mode if we aren't able to mount filesystems.
+    # This is silly if you have multiple hard drives or partitions
+    # configured on a machine and then one goes away intentionally or
+    # unintentionally. If the system is already booting, let it continue
+    # to try and boot.
+    systemd.enableEmergencyMode = false;
+
    # Enable the OpenSSH daemon.
    services.openssh.enable = true;

    environment.systemPackages = with pkgs; [
-      vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
      git
+      pciutils
+      tree
+      usbutils
+      vim
    ];

    nix = {
-      package = pkgs.nixFlakes;
+      package = pkgs.nix;
      distributedBuilds = true;
      buildMachines = [{
        hostName = "z790prors.oglehome";
@@ -56,9 +66,14 @@ with lib;
        max-jobs = "auto";
        trusted-users = [ "johno" ];
        substituters = [
-          "https://hyprland.cachix.org"
        ];
      };
+
+      gc = {
+        automatic = true;
+        randomizedDelaySec = "14m";
+        options = "--delete-older-than 10d";
+      };
    };

    nixpkgs.config.allowUnfree = true;
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -5,14 +5,21 @@ with lib;
 let
  cfg = config.roles.desktop;

+  customPackages = pkgs.callPackage ../../packages {};
+
  basePackages = with pkgs; [
+    bambu-studio
+    blender
    brightnessctl
    mangohud # Should probably get refactored with steam/gamescope out to a gaming role
-    polonium # auto tiling kwin addon
+    modrinth-app
+    protonup-qt
+
+    #customPackages.vulkanHDRLayer
  ];

  x11BasePackages = with pkgs; [
-
+    customPackages.modrinthNvidia
  ];

  x11OnlyPackages = with pkgs; [
@@ -37,6 +44,10 @@ in
      type = types.bool;
      default = false;
    };
+    waylandOnly = mkOption {
+      type = types.bool;
+      default = false;
+    };
  };

  config = mkIf cfg.enable
@@ -105,6 +116,9 @@ in
        gamescopeSession = {
          enable = true;
        };
+        extraCompatPackages = with pkgs; [
+          proton-ge-bin
+        ];
        #package = pkgs.steam.override {
        #withJava = true;
        #withPrimus = true;
@@ -113,7 +127,7 @@ in
      };
      services.sunshine = {
        enable = true;
-        autoStart = true;
+        autoStart = false;
        capSysAdmin = true;
        openFirewall = true;
      };
@@ -123,11 +137,10 @@ in

      environment.systemPackages = with pkgs; mkMerge [
        basePackages
-        x11BasePackages
+        (mkIf (!cfg.waylandOnly) x11BasePackages)
        (mkIf cfg.x11Only x11OnlyPackages)
-        # TODO: Do we need a "wayland only" mode?
        (mkIf (!cfg.x11Only) waylandBasePackages)
-        (mkIf (!cfg.x11Only) waylandOnlyPackages)
+        (mkIf (cfg.waylandOnly) waylandOnlyPackages)
      ];
    };

--- a/roles/users/default.nix
+++ b/roles/users/default.nix
@@ -25,7 +25,7 @@ in
    users.users.johno = {
      isNormalUser = true;
      description = "John Ogle";
-      extraGroups = [ "wheel" "networkmanager" "audio" ] ++ cfg.extraGroups;
+      extraGroups = [ "wheel" "networkmanager" "audio" "video" ] ++ cfg.extraGroups;
    };

    users.users.eli = mkIf cfg.kids {
Author	SHA1	Message	Date
John Ogle	1f4a72d28c	[tmux] Add tmux	2025-01-03 12:13:17 -08:00
John Ogle	a8f19af989	[nix-book] Compress swap	2025-01-03 10:44:51 -08:00
John Ogle	d4b0fe5b9e	[emacs] Add org/projects agenda directory	2025-01-01 15:27:35 -08:00
John Ogle	09cff42222	[desktop] Add blender	2024-12-24 12:39:05 -08:00
John Ogle	0183e7c823	[default] Add tree	2024-12-22 08:40:01 -08:00
John Ogle	29cdd1e239	[desktop] Add bambu-studio	2024-12-22 08:39:06 -08:00
John Ogle	7ced8f11ba	[hyprland] Remove completely	2024-12-16 12:15:32 -08:00
John Ogle	244b7c0888	[flake] Remove references to chaotic	2024-12-16 11:52:56 -08:00
John Ogle	80744bcbf1	[flake] update	2024-12-16 11:51:54 -08:00
John Ogle	56d03f4228	[desktop] Fix formatting	2024-12-16 11:51:54 -08:00
John Ogle	32d0c7fa5a	[home] Set ENABLE_GAMESCOPE_WSI	2024-12-16 11:51:54 -08:00
John Ogle	1c2aae93b7	[desktop] Don't autostart sunshine	2024-12-16 11:51:54 -08:00
John Ogle	0ab6562694	[desktop] Add vulkan HDR layer, disabled	2024-12-16 11:51:49 -08:00
John Ogle	986ee06a46	[z790prors] Use latest kernel and nvidia driver	2024-12-16 11:51:05 -08:00
John Ogle	34abaeeec9	[users] Add video group	2024-12-16 11:51:05 -08:00
John Ogle	11638cfa1b	[modrinth-nvidia] Install java versions	2024-12-16 11:51:05 -08:00
John Ogle	1ce431b0e5	[emacs] Use external module for doom config	2024-12-16 11:51:05 -08:00
John Ogle	98ef9b1443	[modrinth-nvidia] Fix build from update	2024-12-16 11:51:05 -08:00
John Ogle	4c779663df	[nextcloud-talk-desktop] Update to 0.39.0	2024-12-16 11:51:05 -08:00
John Ogle	e2bb87fcf1	[emacs] Update nerd-fonts usage This was changed in a new version of nix	2024-12-16 11:51:05 -08:00
John Ogle	ef47c5dc9a	[flake] update	2024-12-16 11:51:05 -08:00
John Ogle	7da089daa3	[desktop] Add a waylandOnly option	2024-12-14 15:38:46 -08:00
John Ogle	8134d7cb33	[desktop] modrinth-nvidia for x11 only	2024-12-14 15:29:35 -08:00
John Ogle	24f1a64f3c	[desktop] Add custom package modrinth-nvidia	2024-12-05 21:00:42 -08:00
John Ogle	19531074ca	[desktop] Add modrinth-app	2024-12-05 19:59:46 -08:00
John Ogle	a30c130f21	[flake] update	2024-11-28 12:04:44 -08:00
John Ogle	e088ee2dc8	[desktop] Add protonup	2024-11-28 12:02:56 -08:00
John Ogle	366a7e2ea3	[plasma-manager] Dark theme	2024-11-28 12:02:37 -08:00
John Ogle	9116e44dfe	[plasma-manager] Enable mouse acceleration	2024-11-14 14:43:16 -08:00
John Ogle	e3ef710bdb	[default] Add some common utils	2024-11-12 08:01:49 -08:00
John Ogle	e1a804cfed	[plasma-manager] Update comments	2024-11-10 10:29:17 -08:00
John Ogle	ec59936012	[defaults] Disable systemd emergency mode	2024-11-09 15:11:45 -08:00
John Ogle	844d17a855	[z790prors] Remove arch mount point I had to boot into emergency mode and use systemd runtime masking: ``` systemd mask --runtime arch.mount ``` This allowed the system to boot so that I could remove this entry and run nixos-rebuild	2024-11-09 15:09:04 -08:00
John Ogle	b19dc65c6d	[emacs] Upgrade doom	2024-11-09 13:51:25 -08:00
John Ogle	6db2c78e0b	[emacs] Disable auto nix lsp Especially on underpowered devices, my monolithic nixos config grinds everything to a halt. I'll just manually enable this when the context makes sense.	2024-11-03 11:11:23 -08:00
John Ogle	475aafa33e	[kde] Remove polonium Polonium has been frustrating to use. I'm unsure how much of this I can blame polonium vs kde vs plasma-manager vs nix, but 1. keyboard shortcuts aren't working 2. tiling keeps going in and out for various windows 3. seemingly kde startup time takes forever with it installed The more I'm starting to understand KDE's native window management functions, the more I'm thinking that's the right way to go. I'm going to abandom polonium for now, perhaps with some future return.	2024-11-03 11:08:03 -08:00
John Ogle	09562f0af9	[flake] update	2024-11-03 11:01:07 -08:00
John Ogle	ae543d9628	Revert "[spotifyd] Update to lean in on pulseaudio" This reverts commit `b9097e91d5`.	2024-11-03 09:50:08 -08:00
John Ogle	c7716d2bca	Revert "[audio] Switch to pulseaudio" This reverts commit `abf8fe9ad2`.	2024-11-03 09:49:09 -08:00
John Ogle	54cf339d52	[plasma-manager] Update desktop switching shortcuts	2024-11-03 09:41:04 -08:00
John Ogle	b9097e91d5	[spotifyd] Update to lean in on pulseaudio	2024-10-21 12:31:36 -07:00
John Ogle	abf8fe9ad2	[audio] Switch to pulseaudio This is an attempt to get spotifyd running as a system user working	2024-10-21 12:31:36 -07:00
John Ogle	926b47f07f	[flake] update	2024-10-21 08:43:05 -07:00
John Ogle	749ef988f1	[z790prors] Enable HDR in plasma 6.2	2024-10-21 08:42:46 -07:00
John Ogle	dfa91d327f	[nix] Enable automatic gc	2024-10-21 08:42:26 -07:00
John Ogle	37c455d75e	[plasma-manager] Some shortcut improvements	2024-10-21 08:42:02 -07:00