change the theming to stylix, set a background image, and set cursors automagically

Reviewed-on: https://codeberg.org/Lillian-Violet/NixOS-Config/pulls/1

disko/EDI/default.nix

@@ -57,7 +57,7 @@
             size = "100%FREE";
             content = {
               type = "filesystem";
-              format = "bcachefs";
+              format = "ext4";
               mountpoint = "/";
               mountOptions = [
                 "defaults"

disko/GLaDOS/default.nix

@@ -41,6 +41,23 @@
           };
         };
       };
+      #sdc = {
+        #device = "/dev/disk/by-path/pci-0000:06:00.0-ata-2";
+        #type = "disk";
+        #content = {
+          #type = "gpt";
+          #partitions = {
+            #root = {
+              #size = "100%";
+              #content = {
+                #type = "filesystem";
+                #format = "ext4";
+                #mountpoint = "/media";
+              #};
+            #};
+          #};
+        #};
+      #};
     };
     lvm_vg = {
       pool = {
@@ -57,7 +74,7 @@
             size = "100%FREE";
             content = {
               type = "filesystem";
-              format = "bcachefs";
+              format = "ext4";
               mountpoint = "/";
               mountOptions = [
                 "defaults"

flake.nix

@@ -78,25 +78,14 @@
 
     # Add any other flake you might need
     # hardware.url = "github:nixos/nixos-hardware";
-  };
-  nixConfig = {
-    extra-substituters = [
-      "https://nix-community.cachix.org"
-      "https://nixpkgs-unfree.cachix.org"
-      "https://0uptime.cachix.org"
-      "https://cache.lix.systems"
-    ];
-    extra-trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
-      "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE="
-      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
-    ];
+    # Stylix theming engine
+    stylix.url = "github:danth/stylix";
   };
 
   outputs = {
     self,
     nixpkgs,
+    flake-utils,
     nixpkgs-edge,
     nixos-generators,
     catppuccin,
@@ -110,7 +99,8 @@
     jovian,
     nixos-hardware,
     nix-index-database,
-    conduit,
+    conduwuit,
+    stylix,
     ...
   } @ inputs: let
     inherit (self) outputs;
@@ -168,6 +158,7 @@
           home-manager.nixosModules.home-manager
           nix-index-database.nixosModules.nix-index
           catppuccin.nixosModules.catppuccin
+          stylix.nixosModules.stylix
           {
             home-manager.sharedModules = [
               inputs.catppuccin.homeManagerModules.catppuccin
@@ -190,6 +181,7 @@
           home-manager.nixosModules.home-manager
           nix-index-database.nixosModules.nix-index
           catppuccin.nixosModules.catppuccin
+          stylix.nixosModules.stylix
           {
             home-manager.sharedModules = [
               inputs.catppuccin.homeManagerModules.catppuccin
@@ -210,6 +202,7 @@
           disko.nixosModules.disko
           simple-nixos-mailserver.nixosModule
           catppuccin.nixosModules.catppuccin
+          stylix.nixosModules.stylix
           {
             home-manager.sharedModules = [
               inputs.catppuccin.homeManagerModules.catppuccin
@@ -231,55 +224,56 @@
           jovian.nixosModules.jovian
           home-manager.nixosModules.home-manager
           catppuccin.nixosModules.catppuccin
+          stylix.nixosModules.stylix
           {
             home-manager.sharedModules = [
-              inputs.plasma-manager.homeManagerModules.plasma-manager
               inputs.catppuccin.homeManagerModules.catppuccin
+              inputs.plasma-manager.homeManagerModules.plasma-manager
             ];
           }
         ];
       };
 
-      ISO = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {inherit inputs outputs;};
-        modules = [
-          {_module.args = {inherit pkgs-edge;};}
-          "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix"
-          "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
-          ./nixos/hosts/iso/configuration.nix
-          sops-nix.nixosModules.sops
-          home-manager.nixosModules.home-manager
-          nix-index-database.nixosModules.nix-index
-          catppuccin.nixosModules.catppuccin
-          {
-            home-manager.sharedModules = [
-              inputs.plasma-manager.homeManagerModules.plasma-manager
-              inputs.catppuccin.homeManagerModules.catppuccin
-            ];
-          }
-        ];
-      };
+      # ISO = nixpkgs.lib.nixosSystem {
+      #   system = "x86_64-linux";
+      #   specialArgs = {inherit inputs outputs;};
+      #   modules = [
+      #     {_module.args = {inherit pkgs-edge;};}
+      #     "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix"
+      #     "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
+      #     ./nixos/hosts/iso/configuration.nix
+      #     sops-nix.nixosModules.sops
+      #     home-manager.nixosModules.home-manager
+      #     nix-index-database.nixosModules.nix-index
+      #     catppuccin.nixosModules.catppuccin
+      #     {
+      #       home-manager.sharedModules = [
+      #         inputs.plasma-manager.homeManagerModules.plasma-manager
+      #         inputs.catppuccin.homeManagerModules.catppuccin
+      #       ];
+      #     }
+      #   ];
+      # };
 
-      iso_server = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {inherit inputs outputs;};
-        modules = [
-          {_module.args = {inherit pkgs-edge;};}
-          "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
-          "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
-          ./nixos/hosts/iso_server/configuration.nix
-          sops-nix.nixosModules.sops
-          home-manager.nixosModules.home-manager
-          nix-index-database.nixosModules.nix-index
-          catppuccin.nixosModules.catppuccin
-          {
-            home-manager.sharedModules = [
-              inputs.catppuccin.homeManagerModules.catppuccin
-            ];
-          }
-        ];
-      };
+      # iso_server = nixpkgs.lib.nixosSystem {
+      #   system = "x86_64-linux";
+      #   specialArgs = {inherit inputs outputs;};
+      #   modules = [
+      #     {_module.args = {inherit pkgs-edge;};}
+      #     "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
+      #     "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
+      #     ./nixos/hosts/iso_server/configuration.nix
+      #     sops-nix.nixosModules.sops
+      #     home-manager.nixosModules.home-manager
+      #     nix-index-database.nixosModules.nix-index
+      #     catppuccin.nixosModules.catppuccin
+      #     {
+      #       home-manager.sharedModules = [
+      #         inputs.catppuccin.homeManagerModules.catppuccin
+      #       ];
+      #     }
+      #   ];
+      # };
     };
   };
 }

home-manager/desktop/default.nix

@@ -1,9 +1,6 @@
 {
-  inputs,
-  outputs,
-  lib,
-  config,
   pkgs,
+  lib,
   ...
 }: {
   # You can import other home-manager modules here
@@ -22,6 +19,7 @@
     ./package-configs/foot
   ];
   nixpkgs = {
+    config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2" "cinny-4.2.1" "cinny-unwrapped-4.2.1"];
     # You can add overlays here
     overlays = [
       # You can also add overlays exported from other flakes:
@@ -75,6 +73,8 @@
   # Add stuff for your user as you see fit:
   # programs.neovim.enable = true;
   # home.packages = with pkgs; [ steam ];
+  qt.style.catppuccin.apply = true;
+  programs.freetube.catppuccin.flavor = "macchiato";
 
   home.packages = with pkgs; [
     # Coding:
@@ -87,11 +87,13 @@
 
     # Chat applications:
     signal-desktop
-    webcord-vencord
+    vesktop
+    cinny-desktop
 
     # Gaming:
     prismlauncher
     steam
+    gamescope
 
     # Multimedia:
     freetube
@@ -110,7 +112,7 @@
     nitrokey-app
     protonvpn-gui
     virtualbox
-    watchmate
+    #watchmate
     qbittorrent
 
     # Theming:
@@ -139,8 +141,6 @@
     enable = true;
     package = pkgs.vscodium;
     extensions = with pkgs.vscode-extensions; [
-      catppuccin.catppuccin-vsc
-      catppuccin.catppuccin-vsc-icons
       catppuccin.catppuccin-vsc
       catppuccin.catppuccin-vsc-icons
       charliermarsh.ruff
@@ -151,9 +151,6 @@
       mkhl.direnv
       ms-toolsai.jupyter
       ms-pyright.pyright
-      ms-python.black-formatter
-      ms-python.vscode-pylance
-      ms-vscode-remote.remote-ssh
       oderwat.indent-rainbow
       rust-lang.rust-analyzer
       yzhang.markdown-all-in-one
@@ -201,6 +198,11 @@
     no-autostart = true;
   };
 
+  services.kdeconnect = {
+    package = pkgs.kdePackages.kdeconnect-kde;
+    enable = true;
+  };
+
   # Nicely reload system units when changing configs
   systemd.user.startServices = "sd-switch";
 }

home-manager/desktop/package-configs/firefox.nix

@@ -1,12 +1,8 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.firefox = {
     enable = true;
     nativeMessagingHosts = [pkgs.firefoxpwa];
-    package = pkgs.firefox;
+    package = pkgs.floorp;
     profiles.lillian = {
       isDefault = true;
       settings = {
@@ -28,345 +24,6 @@
         "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
         "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo";
       };
-      userChrome = ''
-              /*
-          Title: Drannex42's FirefoxSidebar / Vertical Tabs
-          Description: Vertical tab design for Firefox with dynamic indentation::
-            Sideberry and TreeStyleTabs (Legacy) themes available!
-          Repository URL: https://github.com/drannex42/FirefoxSidebar
-          Version: 12022.04.17
-        */
-
-        /*
-          Preferences / Settings ::
-          Use this file to set your preferences this will save them in one place for easier future updating
-          =========================================================================
-        */
-
-        /*
-          Preferences / Settings
-          Use this file to set your preferences this will save them in one place for easier future updating
-          =========================================================================
-        */
-
-        :root {
-          --sidebar-width: 50px;
-          --toolbar-height: -12px;
-          --menubar-height: -42px;
-          --sidebar-padding: calc(var(--sidebar-width) + 5px);
-          --toolbar-start-end-padding: 5px !important;
-
-          /* Custom Sidebar/Header Backround ::
-            This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly
-          */
-            /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */
-            --custom-sidebar-header-bg: #000; /* Default: Field (Disabled) */
-
-          /* ====== Extension Settings ====== */
-
-          /* Window Control / Client Side Display Settings ===
-            If you are putting this on the left or right side uncomment the side
-            preferences below and comment the other
-            =========================================================================
-          */
-            --csd-width: 100px;
-            --csd-top: 8px;
-
-            /*
-              CSD - Left Side ===
-              Default: --csd-left: 50px; --csd-margin-left: 92px;
-            */
-
-              /*
-                --csd-left: 50px;
-                --csd-margin-left: 92px;
-              */
-
-            /*
-              CSD - Right Side ===
-              Defaults: --csd-right: 0px; --csd-margin-right: 95px;
-            */
-
-              --csd-right: 36px;
-              --csd-margin-right: 130px;
-
-          /* === END: Window Control / Client Side Display Settings === */
-
-        /* === END: Extension Settings === */
-
-        }
-
-
-        /* ========================================================================= */
-
-        /* Sidebar (Core) :: This file is for the sidebar implementation */
-        /*
-          Extension (Core): Sidebar
-          Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar.
-          Repository URL: https://github.com/drannex42/FirefoxSidebar
-          Version: v12022.11.22 (YYYYY.MM.DD)
-        */
-
-        #main-window #TabsToolbar {
-          visibility: collapse;
-        }
-
-
-
-        #sidebar-box > #browser,
-        #webextpanels-window {
-          background: transparent !important;
-
-        }
-
-        #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]
-          #sidebar-header {
-          /*! display: none; */
-        }
-
-        /*Collapse in default state and add transition*/
-        #sidebar-box {
-          /*! overflow: visible !important; */
-          border-right: none !important; /* border-right: 1px solid var(--sidebar-border-color) !important; */
-          z-index: 2;
-          border-right: none !important;
-          width: 100% !important;
-          background: var(--custom-sidebar-bg, --sidebar-background);
-
-          /* lock sidebar to height by doing the inverse margin of the toolbar element */
-          z-index: 1000 !important;
-          position: relative !important;
-          margin-top: var(--menubar-height) !important;
-          border-right: none;
-          transition: none !important;
-
-          /* lock sidebar to specified width */
-          min-width: var(--sidebar-width) !important;
-          max-width: var(--sidebar-width) !important;
-          overflow: hidden !important;
-          transition-property: width;
-          transition-duration: 0.25s;
-          transition-delay: 0.25s;
-          transition-timing-function: ease-in;
-        }
-
-        #sidebar-box::after {
-          background: var(--sidebar-border-color) !important;
-          margin-left: 207px;
-          z-index: 9999999;
-          position: absolute;
-          content: " ";
-          width: 1px;
-          height: 100%;
-          top: 0;
-          right: 0px;
-        }
-
-        #sidebar-box:hover:after {
-          top: 42px;
-        }
-
-        /*All other sidebar-boxes should be larger on hover*/
-        #sidebar-box:hover, #sidebar-box #sidebar:hover {
-          min-width: 350px !important;
-          max-width: 350px !important;
-          z-index: 999;
-          margin-right: -300px !important;
-        }
-
-        /*Tree Style Tabs && Sideberry specific sidebar width and size*/
-
-        #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]:hover,
-        #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]:hover,
-        #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar:hover {
-          min-width: 260px !important;
-          max-width: 260px !important;
-          margin-right: -210px !important;
-        }
-
-        #sidebar-header {
-          border: none !important;
-          border-right: 1px solid var(--sidebar-border-color);
-          background: var(--custom-sidebar-header-bg, transparent) !important;
-        }
-
-        #sidebar-close,
-        #sidebar-title,
-        #sidebar-switcher-arrow {
-          display: none;
-          border: none;
-        }
-
-        #sidebar-switcher-target {
-          border: none !important;
-          margin-left: 4.5px !important;
-          padding-top: 4px !important;
-          padding-bottom: 6px !important;
-        }
-
-        #sidebar-switcher-target:focus-visible:not(:hover, [open]),
-        #sidebar-close:focus-visible:not(:hover, [open]) {
-          outline: none !important;
-        }
-
-
-
-        .sidebar-splitter {
-          opacity: 0 !important;
-          width: 0px !important;
-          border: none !important;
-          --avatar-image-url: none !important;
-        }
-
-        #sidebarMenu-popup .subviewbutton {
-          min-width: 0px;
-          padding: 0;
-          margin: 0 !important;
-        }
-
-        toolbarseparator {
-          display: none;
-        }
-
-        #nav-bar-customization-target {
-          z-index: 99999;
-          position: relative;
-        }
-
-        .browser-toolbar {
-          padding-left: var(--sidebar-width) !important;
-          position: relative !important;
-        }
-
-        #PersonalToolbar {
-          padding: 2px 5px !important;
-          padding-top: 0px !important;
-          margin-top: 0px !important;
-          padding-left: calc(var(--sidebar-width) + 6px) !important;
-        }
-
-
-        /*
-          Extensions ::
-          To enable/disable specific extensions just comment/uncomment the line below.
-          =========================================================================
-        */
-
-          /* CSD / Window Controls */
-        /*
-          Extension: Window Controls / Client Side Decorations (CSD)
-          Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right.
-          Repository URL: https://github.com/drannex42/FirefoxSidebar
-          Contributors: Mr-nUUb, Xanaxus, Drannex42
-          Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14
-        */
-
-        /* allow the buttons to appear */
-        .browser-toolbar {
-          position: unset !important;
-        }
-
-        /* reserve space for buttons */
-        #nav-bar {
-          padding-right: var(--csd-margin-right) !important;
-          margin-left: var(--csd-margin-left) !important;
-        }
-
-        /* move buttons next to menu button */
-        .titlebar-buttonbox-container {
-          visibility: visible !important;
-          position: fixed !important;
-          display: block;
-          z-index: 999999999;
-          top: var(--csd-top, inherit);
-          right: var(--csd-right, inherit);
-          left: var(--csd-left, inherit);
-          max-width: var(--csd-width);
-        }
-
-        /* hide buttons in fullscreen mode (video player and F11) */
-        #main-window[inFullscreen="true"] .titlebar-buttonbox-container,
-        #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container {
-          visibility: hidden !important;
-        }
-
-        /* remove empty space when in fullscreen mode (F11) */
-        #main-window[inFullscreen="true"] #nav-bar {
-          padding-right: 0px !important;
-          margin-left: 0px !important;
-        }
-        /* END Client Side Decorations / Window Controls */
-
-
-
-        /* --- Prevent enlargement */
-        #urlbar[breakout-extend] {
-          top: calc(
-            (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2
-          ) !important;
-          left: 0 !important;
-          width: 100% !important;
-        }
-
-        #urlbar[breakout-extend] #urlbar-input-container {
-          height: var(--urlbar-height) !important;
-          /* padding: 0px !important; */
-          padding-block: 0px !important;
-          padding-inline: 0px !important;
-        }
-        .urlbarView-row {
-          padding: 0px 2px 0px 2px;
-        }
-        /* END Prevent enlargement --- */
-
-        /*/* --- Reduce row paddings to make them more compact */
-        .urlbarView-row {
-          padding: 2px 0px !important;
-          line-height: 1.2em !important;
-          margin: -1px;
-          margin-bottom: 0px;
-        }
-        .urlbarView-row-inner {
-          padding-bottom: 6px !important;
-        }
-        .urlbarView {
-          margin: 0px !important;
-          width: 100% !important;
-        }
-        /* END Reduce row paddings to make them more compact --- */
-
-        /* Disable Urlbar Animation */
-        #urlbar[breakout][breakout-extend][breakout-extend-animate]
-          > #urlbar-background {
-          animation-name: none !important;
-          animation: none !important;
-        }
-        /* END Disable Urlbar Animation */
-
-        /* --- More compact "Search with Google" rows */
-        .urlbarView-row[dynamicType="onboardTabToSearch"] > .urlbarView-row-inner {
-          min-height: auto !important;
-          width: auto !important;
-        }
-        .urlbarView-row[dynamicType="onboardTabToSearch"]
-          > .urlbarView-row-inner
-          > .urlbarView-no-wrap
-          > .urlbarView-favicon {
-          margin-bottom: -1px;
-        }
-        /* END More compact "Search with Google" rows --- */
-
-        /* Remove active border on the addressbar when in focus */
-        #nav-bar {
-          --toolbar-field-focus-border-color: #ccc;
-        }
-
-        /* Remove box shadow on address bar */
-        #urlbar-background,
-        #searchbar {
-          box-shadow: none !important;
-        }
-      '';
       bookmarks = [
         {
           name = "estrogen production";

home-manager/desktop/package-configs/foot/default.nix

@@ -1,15 +1,9 @@
-{
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: {
+{...}: {
   programs.foot = {
     enable = true;
-    catppuccin.enable = true;
+    # catppuccin.enable = true;
     settings = {
       main = {
-        font = "Fira Code:size=11";
       };
 
       mouse = {

home-manager/desktop/package-configs/konsole/default.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  pkgs,
-  inputs,
-  ...
-}: {
+{...}: {
   home.file = {
     "profile" = {
       source = ./Catppuccin.profile;

home-manager/desktop/package-configs/plasma-desktop.nix

@@ -1,6 +1,107 @@
 {
   programs.plasma = {
     enable = true;
+    desktop.mouseActions.verticalScroll = "switchVirtualDesktop";
+    panels = [
+      {
+        alignment = "left";
+        floating = true;
+        height = 38;
+        location = "top";
+        screen = "all";
+        widgets = [
+          "org.kde.plasma.appmenu"
+          "org.kde.plasma.panelspacer"
+          "org.kde.milou"
+          "org.kde.plasma.panelspacer"
+          "org.kde.plasma.colorpicker"
+          {
+            systemTray.items = {
+              # We explicitly show bluetooth and battery
+              shown = [
+                "org.kde.plasma.volume"
+                "org.kde.plasma.bluetooth"
+                "org.kde.plasma.brightness"
+                "org.kde.plasma.devicenotifier"
+                "org.kde.kscreen"
+                "org.kde.kdeconnect"
+                "org.kde.plasma.networkmanagement"
+                "org.kde.plasma.battery"
+                "org.kde.plasma.clipboard"
+                "org.kde.plasma.mediacontroller"
+                "org.kde.plasma.notifications"
+                "org.kde.plasma.weather"
+              ];
+              # And explicitly hide networkmanagement and volume
+              hidden = [
+                "Xwayland Video Bridge_pipewireToXProxy"
+                "org.kde.plasma.devicenotifier"
+                "org.kde.kscreen"
+                "org.kde.plasma.printmanager"
+                "chrome_status_icon_1"
+                "proton-vpn-app"
+                "Nitrokey App"
+                "qBittorrent"
+                "vlc"
+                "steam"
+              ];
+            };
+          }
+          {
+            digitalClock = {
+              calendar.firstDayOfWeek = "monday";
+              time.format = "24h";
+              date = {
+                enable = true;
+                format = "isoDate";
+                position = "belowTime";
+              };
+              timeZone.selected = ["Europe/Amsterdam"];
+            };
+          }
+          "org.kde.plasma.lock_logout"
+        ];
+      }
+      {
+        alignment = "center";
+        floating = true;
+        height = 44;
+        hiding = "autohide";
+        maxLength = 1920;
+        minLength = 1200;
+        location = "bottom";
+        screen = "all";
+        widgets = [
+          "org.kde.plasma.kickoff"
+          "org.kde.plasma.panelspacer"
+          {
+            name = "org.kde.plasma.icontasks";
+            config = {
+              General = {
+                launchers = [
+                  "applications:floorp.desktop"
+                  "applications:systemsettings.desktop"
+                  "applications:org.kde.dolphin.desktop"
+                  "applications:signal-desktop.desktop"
+                  "applications:vesktop.desktop"
+                  "applications:cinny.desktop"
+                  "applications:steam.desktop"
+                  "applications:noisetorch.desktop"
+                  "applications:org.kde.plasma-systemmonitor.desktop"
+                  "applications:foot.desktop"
+                  "applications:nitrokey-app.desktop"
+                  "applications:codium.desktop"
+                  "applications:freetube.desktop"
+                ];
+              };
+            };
+          }
+          "org.kde.plasma.panelspacer"
+          "org.kde.plasma.minimizeall"
+        ];
+      }
+    ];
+
     shortcuts = {
       "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = [];
       "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L";
@@ -8,7 +109,7 @@
       "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"];
+      "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"];
       "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [];
       "kmix"."decrease_microphone_volume" = "Microphone Volume Down";
       "kmix"."decrease_volume" = "Volume Down";
@@ -16,27 +117,27 @@
       "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"];
+      "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
       "kmix"."mute" = "Volume Mute";
-      "ksmserver"."Halt Without Confirmation" = [];
-      "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"];
+      "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" = [];
-      "ksmserver"."Reboot" = [];
-      "ksmserver"."Reboot Without Confirmation" = [];
-      "ksmserver"."Shut Down" = [];
+      "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"."Cube" = "Meta+C";
       "kwin"."Cycle Overview" = [];
       "kwin"."Cycle Overview Opposite" = [];
-      "kwin"."Decrease Opacity" = [];
+      "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)"];
+      "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" = [];
+      "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";
@@ -46,10 +147,8 @@
       "kwin"."MoveZoomRight" = [];
       "kwin"."MoveZoomUp" = [];
       "kwin"."Overview" = "Meta+W";
-      "kwin"."Setup Window Shortcut" = [];
+      "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut";
       "kwin"."Show Desktop" = "Meta+D";
-      "kwin"."ShowDesktopGrid" = "Meta+F8";
-      "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";
@@ -59,136 +158,136 @@
       "kwin"."Switch Window Right" = "Meta+Alt+Right";
       "kwin"."Switch Window Up" = "Meta+Alt+Up";
       "kwin"."Switch to Desktop 1" = "Ctrl+F1";
-      "kwin"."Switch to Desktop 10" = [];
-      "kwin"."Switch to Desktop 11" = [];
-      "kwin"."Switch to Desktop 12" = [];
-      "kwin"."Switch to Desktop 13" = [];
-      "kwin"."Switch to Desktop 14" = [];
-      "kwin"."Switch to Desktop 15" = [];
-      "kwin"."Switch to Desktop 16" = [];
-      "kwin"."Switch to Desktop 17" = [];
-      "kwin"."Switch to Desktop 18" = [];
-      "kwin"."Switch to Desktop 19" = [];
+      "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" = "Ctrl+F2";
-      "kwin"."Switch to Desktop 20" = [];
+      "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20";
       "kwin"."Switch to Desktop 3" = "Ctrl+F3";
       "kwin"."Switch to Desktop 4" = "Ctrl+F4";
-      "kwin"."Switch to Desktop 5" = [];
-      "kwin"."Switch to Desktop 6" = [];
-      "kwin"."Switch to Desktop 7" = [];
-      "kwin"."Switch to Desktop 8" = [];
-      "kwin"."Switch to Desktop 9" = [];
-      "kwin"."Switch to Next Desktop" = [];
-      "kwin"."Switch to Next Screen" = [];
-      "kwin"."Switch to Previous Desktop" = [];
-      "kwin"."Switch to Previous Screen" = [];
-      "kwin"."Switch to Screen 0" = [];
-      "kwin"."Switch to Screen 1" = [];
-      "kwin"."Switch to Screen 2" = [];
-      "kwin"."Switch to Screen 3" = [];
-      "kwin"."Switch to Screen 4" = [];
-      "kwin"."Switch to Screen 5" = [];
-      "kwin"."Switch to Screen 6" = [];
-      "kwin"."Switch to Screen 7" = [];
-      "kwin"."Switch to Screen Above" = [];
-      "kwin"."Switch to Screen Below" = [];
-      "kwin"."Switch to Screen to the Left" = [];
-      "kwin"."Switch to Screen to the Right" = [];
+      "kwin"."Switch to Desktop 5" = "none,,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" = [];
+      "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower";
       "kwin"."Walk Through Desktop List" = [];
       "kwin"."Walk Through Desktop List (Reverse)" = [];
       "kwin"."Walk Through Desktops" = [];
       "kwin"."Walk Through Desktops (Reverse)" = [];
       "kwin"."Walk Through Windows" = "Alt+Tab";
-      "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab";
-      "kwin"."Walk Through Windows Alternative" = [];
-      "kwin"."Walk Through Windows Alternative (Reverse)" = [];
-      "kwin"."Walk Through Windows of Current Application" = [];
+      "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" = [];
-      "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [];
-      "kwin"."Window Above Other Windows" = [];
-      "kwin"."Window Below Other Windows" = [];
+      "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" = [];
-      "kwin"."Window Grow Horizontal" = [];
-      "kwin"."Window Grow Vertical" = [];
-      "kwin"."Window Lower" = [];
+      "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" = [];
-      "kwin"."Window Maximize Vertical" = [];
+      "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally";
+      "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically";
       "kwin"."Window Minimize" = "Meta+PgDown";
-      "kwin"."Window Move" = [];
-      "kwin"."Window Move Center" = [];
-      "kwin"."Window No Border" = [];
-      "kwin"."Window On All Desktops" = [];
+      "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" = [];
-      "kwin"."Window One Screen Up" = [];
-      "kwin"."Window One Screen to the Left" = [];
-      "kwin"."Window One Screen to the 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" = [];
-      "kwin"."Window Pack Left" = [];
-      "kwin"."Window Pack Right" = [];
-      "kwin"."Window Pack Up" = [];
+      "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" = [];
-      "kwin"."Window Quick Tile Bottom Right" = [];
+      "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" = [];
-      "kwin"."Window Quick Tile Top Right" = [];
-      "kwin"."Window Raise" = [];
-      "kwin"."Window Resize" = [];
-      "kwin"."Window Shade" = [];
-      "kwin"."Window Shrink Horizontal" = [];
-      "kwin"."Window Shrink Vertical" = [];
-      "kwin"."Window to Desktop 1" = [];
-      "kwin"."Window to Desktop 10" = [];
-      "kwin"."Window to Desktop 11" = [];
-      "kwin"."Window to Desktop 12" = [];
-      "kwin"."Window to Desktop 13" = [];
-      "kwin"."Window to Desktop 14" = [];
-      "kwin"."Window to Desktop 15" = [];
-      "kwin"."Window to Desktop 16" = [];
-      "kwin"."Window to Desktop 17" = [];
-      "kwin"."Window to Desktop 18" = [];
-      "kwin"."Window to Desktop 19" = [];
-      "kwin"."Window to Desktop 2" = [];
-      "kwin"."Window to Desktop 20" = [];
-      "kwin"."Window to Desktop 3" = [];
-      "kwin"."Window to Desktop 4" = [];
-      "kwin"."Window to Desktop 5" = [];
-      "kwin"."Window to Desktop 6" = [];
-      "kwin"."Window to Desktop 7" = [];
-      "kwin"."Window to Desktop 8" = [];
-      "kwin"."Window to Desktop 9" = [];
-      "kwin"."Window to Next Desktop" = [];
-      "kwin"."Window to Next Screen" = [];
-      "kwin"."Window to Previous Desktop" = [];
-      "kwin"."Window to Previous Screen" = [];
-      "kwin"."Window to Screen 0" = [];
-      "kwin"."Window to Screen 1" = [];
-      "kwin"."Window to Screen 2" = [];
-      "kwin"."Window to Screen 3" = [];
-      "kwin"."Window to Screen 4" = [];
-      "kwin"."Window to Screen 5" = [];
-      "kwin"."Window to Screen 6" = [];
-      "kwin"."Window to Screen 7" = [];
-      "kwin"."view_actual_size" = "Meta+0";
-      "kwin"."view_zoom_in" = "Meta++";
+      "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" = "none,,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" = "none,,Window to Desktop 2";
+      "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20";
+      "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3";
+      "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4";
+      "kwin"."Window to Desktop 5" = "none,,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\\, ,Meta+0,Zoom to Actual Size";
+      "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
       "kwin"."view_zoom_out" = "Meta+-";
       "mediacontrol"."mediavolumedown" = [];
-      "mediacontrol"."mediavolumeup" = [];
+      "mediacontrol"."mediavolumeup" = "none,,Media volume up";
       "mediacontrol"."nextmedia" = "Media Next";
       "mediacontrol"."pausemedia" = "Media Pause";
-      "mediacontrol"."playmedia" = [];
+      "mediacontrol"."playmedia" = "none,,Play media playback";
       "mediacontrol"."playpausemedia" = "Media Play";
       "mediacontrol"."previousmedia" = "Media Previous";
       "mediacontrol"."stopmedia" = "Media Stop";
@@ -204,9 +303,10 @@
       "org_kde_powerdevil"."Sleep" = "Sleep";
       "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off";
       "org_kde_powerdevil"."Turn Off Screen" = [];
-      "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"];
+      "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" = "Meta+1";
-      "plasmashell"."activate task manager entry 10" = [];
+      "plasmashell"."activate task manager entry 10" = ",Meta+0,Activate Task Manager Entry 10";
       "plasmashell"."activate task manager entry 2" = "Meta+2";
       "plasmashell"."activate task manager entry 3" = "Meta+3";
       "plasmashell"."activate task manager entry 4" = "Meta+4";
@@ -215,23 +315,24 @@
       "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" = [];
+      "plasmashell"."clear-history" = "none,,Clear Clipboard History";
       "plasmashell"."clipboard_action" = "Meta+Ctrl+X";
       "plasmashell"."cycle-panels" = "Meta+Alt+P";
-      "plasmashell"."cycleNextAction" = [];
-      "plasmashell"."cyclePrevAction" = [];
+      "plasmashell"."cycleNextAction" = "none,,Next History Item";
+      "plasmashell"."cyclePrevAction" = "none,,Previous History Item";
       "plasmashell"."edit_clipboard" = [];
       "plasmashell"."manage activities" = "Meta+Q";
-      "plasmashell"."next activity" = "Meta+Tab";
-      "plasmashell"."previous activity" = "Meta+Shift+Tab";
+      "plasmashell"."next activity" = "\\, \\, ,none,Walk through activities";
+      "plasmashell"."previous activity" = ",none,Walk through activities (Reverse)";
       "plasmashell"."repeat_action" = "Meta+Ctrl+R";
       "plasmashell"."show dashboard" = "Ctrl+F12";
-      "plasmashell"."show-barcode" = [];
+      "plasmashell"."show-barcode" = "none,,Show Barcode…";
       "plasmashell"."show-on-mouse-pos" = "Meta+V";
       "plasmashell"."stop current activity" = "Meta+S";
-      "plasmashell"."switch to next activity" = [];
-      "plasmashell"."switch to previous activity" = [];
-      "plasmashell"."toggle do not disturb" = [];
+      "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";
+      "services/org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Ctrl+Shift+Space" "Search"];
       "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc";
       "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"];
       "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#";
@@ -244,22 +345,22 @@
       "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"];
       "services/org.kde.spectacle.desktop"."_launch" = "Print";
       "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc";
-      "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "Meta+Print" "Ctrl+!"];
+      "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"];
       "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#";
-      "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "Ctrl+$" "Shift+Print"];
+      "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"];
       "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^";
       "services/services.org.kde.spectacle.desktop"."RecordWindow" = [];
-      "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "Ctrl+@" "Meta+Shift+Print"];
-      "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"];
+      "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"];
+      "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"];
       "services/services.org.kde.spectacle.desktop"."_launch" = "Print";
       "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc";
-      "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"];
+      "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "" "Meta+Print" "Ctrl+!"];
       "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#";
-      "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"];
+      "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "" "Ctrl+$" "Shift+Print"];
       "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^";
       "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = [];
-      "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"];
-      "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"];
+      "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"];
+      "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"];
       "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print";
     };
     configFile = {
@@ -268,8 +369,11 @@
       "baloofilerc"."General"."exclude filters version" = 8;
       "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560;
       "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024;
-      "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/";
+      "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540;
+      "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260;
+      "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/";
       "dolphinrc"."General"."RememberOpenedTabs" = false;
+      "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273";
       "dolphinrc"."IconsMode"."PreviewSize" = 80;
       "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false;
       "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22;
@@ -278,6 +382,128 @@
       "dolphinrc"."Search"."Location" = "Everywhere";
       "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default";
       "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12";
+      "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 Document"."Allow End of Line Detection" = true;
+      "katerc"."KTextEditor Document"."Auto Detect Indent" = true;
+      "katerc"."KTextEditor Document"."Auto Reload If State Is In Version Control" = true;
+      "katerc"."KTextEditor Document"."Auto Save" = false;
+      "katerc"."KTextEditor Document"."Auto Save Interval" = 0;
+      "katerc"."KTextEditor Document"."Auto Save On Focus Out" = false;
+      "katerc"."KTextEditor Document"."BOM" = false;
+      "katerc"."KTextEditor Document"."Backup Local" = false;
+      "katerc"."KTextEditor Document"."Backup Prefix" = "";
+      "katerc"."KTextEditor Document"."Backup Remote" = false;
+      "katerc"."KTextEditor Document"."Backup Suffix" = "~";
+      "katerc"."KTextEditor Document"."Camel Cursor" = true;
+      "katerc"."KTextEditor Document"."Encoding" = "UTF-8";
+      "katerc"."KTextEditor Document"."End of Line" = 0;
+      "katerc"."KTextEditor Document"."Indent On Backspace" = true;
+      "katerc"."KTextEditor Document"."Indent On Tab" = true;
+      "katerc"."KTextEditor Document"."Indent On Text Paste" = false;
+      "katerc"."KTextEditor Document"."Indentation Mode" = "normal";
+      "katerc"."KTextEditor Document"."Indentation Width" = 4;
+      "katerc"."KTextEditor Document"."Keep Extra Spaces" = false;
+      "katerc"."KTextEditor Document"."Line Length Limit" = 10000;
+      "katerc"."KTextEditor Document"."Newline at End of File" = true;
+      "katerc"."KTextEditor Document"."On-The-Fly Spellcheck" = false;
+      "katerc"."KTextEditor Document"."Overwrite Mode" = false;
+      "katerc"."KTextEditor Document"."PageUp/PageDown Moves Cursor" = false;
+      "katerc"."KTextEditor Document"."Remove Spaces" = 1;
+      "katerc"."KTextEditor Document"."ReplaceTabsDyn" = true;
+      "katerc"."KTextEditor Document"."Show Spaces" = 0;
+      "katerc"."KTextEditor Document"."Show Tabs" = true;
+      "katerc"."KTextEditor Document"."Smart Home" = true;
+      "katerc"."KTextEditor Document"."Swap Directory" = "";
+      "katerc"."KTextEditor Document"."Swap File Mode" = 1;
+      "katerc"."KTextEditor Document"."Swap Sync Interval" = 15;
+      "katerc"."KTextEditor Document"."Tab Handling" = 2;
+      "katerc"."KTextEditor Document"."Tab Width" = 4;
+      "katerc"."KTextEditor Document"."Trailing Marker Size" = 1;
+      "katerc"."KTextEditor Document"."Word Wrap" = false;
+      "katerc"."KTextEditor Document"."Word Wrap Column" = 80;
+      "katerc"."KTextEditor Editor"."Encoding Prober Type" = 1;
+      "katerc"."KTextEditor Editor"."Fallback Encoding" = "ISO 8859-15";
+      "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false;
+      "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true;
+      "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Macchiato";
+      "katerc"."KTextEditor Renderer"."Font" = "Hack,10,-1,7,50,0,0,0,0,0";
+      "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"."Word Wrap Marker" = false;
+      "katerc"."KTextEditor View"."Allow Mark Menu" = true;
+      "katerc"."KTextEditor View"."Auto Brackets" = true;
+      "katerc"."KTextEditor View"."Auto Center Lines" = 0;
+      "katerc"."KTextEditor View"."Auto Completion" = true;
+      "katerc"."KTextEditor View"."Auto Completion Preselect First Entry" = true;
+      "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false;
+      "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0;
+      "katerc"."KTextEditor View"."Bracket Match Preview" = false;
+      "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}x5bx5d'\"";
+      "katerc"."KTextEditor View"."Default Mark Type" = 1;
+      "katerc"."KTextEditor View"."Dynamic Word Wrap" = true;
+      "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80;
+      "katerc"."KTextEditor View"."Dynamic Word Wrap At Static Marker" = false;
+      "katerc"."KTextEditor View"."Dynamic Word Wrap Indicators" = 1;
+      "katerc"."KTextEditor View"."Dynamic Wrap not at word boundaries" = false;
+      "katerc"."KTextEditor View"."Enable Tab completion" = false;
+      "katerc"."KTextEditor View"."Fold First Line" = false;
+      "katerc"."KTextEditor View"."Folding Bar" = true;
+      "katerc"."KTextEditor View"."Folding Preview" = true;
+      "katerc"."KTextEditor View"."Icon Bar" = false;
+      "katerc"."KTextEditor View"."Input Mode" = 0;
+      "katerc"."KTextEditor View"."Keyword Completion" = true;
+      "katerc"."KTextEditor View"."Line Modification" = true;
+      "katerc"."KTextEditor View"."Line Numbers" = true;
+      "katerc"."KTextEditor View"."Max Clipboard History Entries" = 20;
+      "katerc"."KTextEditor View"."Maximum Search History Size" = 100;
+      "katerc"."KTextEditor View"."Mouse Paste At Cursor Position" = false;
+      "katerc"."KTextEditor View"."Multiple Cursor Modifier" = 134217728;
+      "katerc"."KTextEditor View"."Persistent Selection" = false;
+      "katerc"."KTextEditor View"."Scroll Bar Marks" = false;
+      "katerc"."KTextEditor View"."Scroll Bar Mini Map All" = true;
+      "katerc"."KTextEditor View"."Scroll Bar Mini Map Width" = 60;
+      "katerc"."KTextEditor View"."Scroll Bar MiniMap" = true;
+      "katerc"."KTextEditor View"."Scroll Bar Preview" = true;
+      "katerc"."KTextEditor View"."Scroll Past End" = false;
+      "katerc"."KTextEditor View"."Search/Replace Flags" = 140;
+      "katerc"."KTextEditor View"."Shoe Line Ending Type in Statusbar" = false;
+      "katerc"."KTextEditor View"."Show Documentation With Completion" = true;
+      "katerc"."KTextEditor View"."Show File Encoding" = true;
+      "katerc"."KTextEditor View"."Show Focus Frame Around Editor" = true;
+      "katerc"."KTextEditor View"."Show Folding Icons On Hover Only" = true;
+      "katerc"."KTextEditor View"."Show Line Count" = false;
+      "katerc"."KTextEditor View"."Show Scrollbars" = 0;
+      "katerc"."KTextEditor View"."Show Statusbar Dictionary" = true;
+      "katerc"."KTextEditor View"."Show Statusbar Highlighting Mode" = true;
+      "katerc"."KTextEditor View"."Show Statusbar Input Mode" = true;
+      "katerc"."KTextEditor View"."Show Statusbar Line Column" = true;
+      "katerc"."KTextEditor View"."Show Statusbar Tab Settings" = true;
+      "katerc"."KTextEditor View"."Show Word Count" = false;
+      "katerc"."KTextEditor View"."Smart Copy Cut" = true;
+      "katerc"."KTextEditor View"."Statusbar Line Column Compact Mode" = true;
+      "katerc"."KTextEditor View"."Text Drag And Drop" = true;
+      "katerc"."KTextEditor View"."User Sets Of Chars To Enclose Selection" = "";
+      "katerc"."KTextEditor View"."Vi Input Mode Steal Keys" = false;
+      "katerc"."KTextEditor View"."Vi Relative Line Numbers" = false;
+      "katerc"."KTextEditor View"."Word Completion" = true;
+      "katerc"."KTextEditor View"."Word Completion Minimal Word Length" = 3;
+      "katerc"."KTextEditor View"."Word Completion Remove Tail" = true;
+      "katerc"."KTextEditor::Search"."Search History" = "uuid";
+      "katerc"."filetree"."editShade" = "93,62,114";
+      "katerc"."filetree"."listMode" = false;
+      "katerc"."filetree"."shadingEnabled" = true;
+      "katerc"."filetree"."showCloseButton" = false;
+      "katerc"."filetree"."showFullPathOnRoots" = false;
+      "katerc"."filetree"."showToolbar" = true;
+      "katerc"."filetree"."sortRole" = 0;
+      "katerc"."filetree"."viewShade" = "101,69,143";
       "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true;
       "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true;
       "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true;
@@ -289,10 +515,16 @@
       "kded5rc"."Module-browserintegrationreminder"."autoload" = false;
       "kded5rc"."Module-device_automounter"."autoload" = false;
       "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1;
+      "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "960,540";
       "kdeglobals"."General"."AccentColor" = "184,117,220";
       "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true;
       "kdeglobals"."General"."BrowserApplication" = "firefox.desktop";
       "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220";
+      "kdeglobals"."General"."TerminalApplication" = "foot";
+      "kdeglobals"."General"."TerminalService" = "org.codeberg.dnkl.foot.desktop";
+      "kdeglobals"."General"."XftAntialias" = true;
+      "kdeglobals"."General"."XftHintStyle" = "hintslight";
+      "kdeglobals"."General"."XftSubPixel" = "rgb";
       "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475;
       "kdeglobals"."KDE"."ShowDeleteCommand" = false;
       "kdeglobals"."KDE"."SingleClick" = false;
@@ -322,17 +554,6 @@
       "kdeglobals"."WM"."inactiveBackground" = "42,46,50";
       "kdeglobals"."WM"."inactiveBlend" = "161,169,177";
       "kdeglobals"."WM"."inactiveForeground" = "161,169,177";
-      "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager";
-      "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher";
-      "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility";
-      "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad";
-      "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service";
-      "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume";
-      "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management";
-      "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin";
-      "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller";
-      "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System";
-      "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell";
       "khotkeysrc"."Data"."DataCount" = 3;
       "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts";
       "khotkeysrc"."Data_1"."DataCount" = 1;
@@ -876,6 +1097,7 @@
       "kservicemenurc"."Show"."setAsWallpaper" = true;
       "kservicemenurc"."Show"."slideshowfileitemaction" = true;
       "kservicemenurc"."Show"."tagsfileitemaction" = true;
+      "ksmserverrc"."General"."loginMode" = "restoreSavedSession";
       "kwalletrc"."Wallet"."First Use" = false;
       "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755";
       "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6";
@@ -897,9 +1119,11 @@
       "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}";
       "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}";
       "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}";
+      "kwinrc"."Tiling/250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.4989583333333353},{\"width\":0.5010416666666646}]}";
       "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}";
-      "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}";
+      "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}";
       "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}";
+      "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}";
       "kwinrc"."Xwayland"."Scale" = 1;
       "kxkbrc"."Layout"."Options" = "compose:caps";
       "kxkbrc"."Layout"."ResetOldOptions" = true;
@@ -912,8 +1136,135 @@
       "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8";
       "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8";
       "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8";
+      "plasmanotifyrc"."Applications/firefox"."Seen" = true;
+      "plasmanotifyrc"."Applications/floorp"."Seen" = true;
+      "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true;
+      "plasmanotifyrc"."Applications/vesktop"."Seen" = true;
+      "plasmanotifyrc"."Applications/webcord"."Seen" = true;
       "plasmarc"."Wallpapers"."usersWallpapers" = "";
+      "spectaclerc"."Annotations"."annotationToolType" = 9;
+      "spectaclerc"."ImageSave"."lastImageSaveLocation" = "file:///home/lillian/Pictures/Screenshots/Screenshot_20241017_154815.png";
+      "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots";
+      "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts";
       "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16;
     };
+    dataFile = {
+      "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true;
+      "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"."katesqlplugin" = 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"."tabswitcherplugin" = true;
+      "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true;
+      "kate/anonymous.katesession"."MainWindow0"."2 screens: Window-Maximized" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,2514,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" = 1287;
+      "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" = 1287;
+      "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" = 2514;
+      "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" = 2560;
+      "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,1285,0";
+      "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled";
+      "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled";
+      "kate/anonymous.katesession"."MainWindow0 Settings"."2 screens: Window-Maximized" = true;
+      "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled";
+      "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled";
+      "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10;
+      "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" = 2514;
+      "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 0;
+      "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = "";
+      "kate/anonymous.katesession"."Open Documents"."Count" = 0;
+      "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"."UseRegExp" = false;
+    };
   };
 }

home-manager/hosts/EDI/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix

home-manager/hosts/EDI/lillian.nix

@@ -1,13 +1,6 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):

home-manager/hosts/GLaDOS/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix

home-manager/hosts/GLaDOS/lillian.nix

@@ -1,13 +1,6 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
@@ -25,11 +18,12 @@
   home.packages = with pkgs; [
     heroic
     r2modman
+    ryujinx
   ];
 
   programs.mangohud = {
     enable = true;
-    enableSessionWide = true;
+    # enableSessionWide = true;
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

home-manager/hosts/iso/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix

home-manager/hosts/iso/lillian.nix

@@ -1,13 +1,6 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):

home-manager/hosts/iso_server/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix

home-manager/hosts/iso_server/lillian.nix

@@ -1,13 +1,6 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):

home-manager/hosts/queen/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix

home-manager/hosts/queen/lillian.nix

@@ -1,13 +1,6 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):

home-manager/hosts/shodan/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix

home-manager/hosts/shodan/lillian.nix

@@ -1,13 +1,6 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
@@ -52,7 +45,7 @@
 
   home.packages = with pkgs; [
     #Chat:
-    webcord-vencord
+    vesktop
 
     #Gaming:
     prismlauncher
@@ -73,7 +66,7 @@
     nitrokey-app
     protonvpn-gui
     sops
-    watchmate
+    #watchmate
     qbittorrent
     zsh
 

home-manager/hosts/wheatley/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     ./lillian.nix

home-manager/hosts/wheatley/lillian.nix

@@ -1,13 +1,6 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):

home-manager/shared/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./shell/helix
     ./shell/zellij
@@ -19,10 +12,55 @@
     homeDirectory = "/home/lillian";
   };
 
+  # catppuccin = {
+  #   enable = true;
+  #   flavor = "macchiato";
+  # };
+
   home.packages = with pkgs; [
     # System tools:
+    vscode-langservers-extracted
     sops
     zsh
     bat
+    btop
+    broot
+    lazygit
+    navi
+    nil
   ];
+  programs.navi.enable = true;
+  programs.yazi = {
+    enable = true;
+    package = pkgs.yazi.override {
+      _7zz = pkgs._7zz.override {useUasm = true;};
+    };
+  };
+  # stylix = {
+  #   enable = true;
+  #   autoEnable = true;
+  #   base16Scheme = {
+  #     scheme = "Catppuccin Macchiato";
+  #     author = "https://github.com/catppuccin/catppuccin";
+  #     base00 = "24273a";
+  #     base01 = "1e2030";
+  #     base02 = "363a4f";
+  #     base03 = "494d64";
+  #     base04 = "5b6078";
+  #     base05 = "cad3f5";
+  #     base06 = "f4dbd6";
+  #     base07 = "b7bdf8";
+  #     base08 = "ed8796";
+  #     base09 = "f5a97f";
+  #     base0A = "eed49f";
+  #     base0B = "a6da95";
+  #     base0C = "8bd5ca";
+  #     base0D = "8aadf4";
+  #     base0E = "c6a0f6";
+  #     base0F = "f0c6c6";
+  #   };
+  #   image = ./background.jpg;
+  #   cursor.package = pkgs.catppuccin-cursors;
+  #   cursor.name = "macchiatoMauve";
+  # };
 }

home-manager/shared/shell/bat.nix

@@ -1,11 +1,7 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.bat = {
     enable = true;
     extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch];
-    catppuccin.enable = true;
+    # catppuccin.enable = true;
   };
 }

home-manager/shared/shell/eza.nix

@@ -1,4 +1,4 @@
-{lib, ...}: {
+{...}: {
   programs.eza = {
     enable = true;
     enableZshIntegration = true;

home-manager/shared/shell/helix/default.nix

@@ -1,15 +1,55 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: let
+  yazi =
+    pkgs.writeText "open_in_helix_from_yazi.zsh"
+    ''
+      #! ~/.nix-profile/bin/zsh
+      files=(''${(fqq)"$( yazi --chooser-file=/dev/stdout | cat )"})
+      zellij action toggle-floating-panes
+      zellij action write 27 # send escape-key
+      zellij action write-chars ":open $files"
+      zellij action write 13 # send enter-key
+      zellij action toggle-floating-panes
+      zellij action close-pane
+    '';
+  jupyter =
+    pkgs.writeText "run_jupyter_from_helix.zsh"
+    ''
+      #! ~/.nix-profile/bin/zsh
+      is_new() {
+        new=1;
+        touch /tmp/rjh;
+        while IFS="" read -r p || [ -n "$p" ]; do
+            if [ $(pwd) = $p ]; then
+              new=0;
+            fi
+          done < /tmp/rjh
+          return $new
+      }
+
+      send_to_jupyter() {
+        is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 && zellij action write 17
+        pwd >> /tmp/rjh
+        zellij action write 29 25
+        zellij action write 17
+        cat | just send
+      }
+      send_to_jupyter
+    '';
+in {
   programs.helix = {
     enable = true;
     defaultEditor = true;
 
     settings = {
-      theme = "catppuccin_macchiato";
+      # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us
+      keys.normal.backspace = {
+        b = ":sh zellij run -f -n 'build code' -- direnv exec . just build";
+        r = ":sh zellij run -f -n 'run code' -- direnv exec . just run";
+        t = ":sh zellij run -f -n 'test code' -- direnv exec . just test";
+        g = ":sh zellij run -fc -n 'lazygit' -- lazygit";
+        f = ":sh zellij run --floating -n 'yazi picker' -- zsh ~/.config/helix/open_in_helix_from_yazi.zsh ";
+        j = ":pipe-to just jupyter";
+      };
       editor = {
         line-number = "relative";
         lsp.display-messages = true;
@@ -36,7 +76,7 @@
           language-id = "python";
           auto-format = true;
           file-types = ["py"];
-          language-servers = ["ruff" "scls"];
+          language-servers = ["ruff" "scls" "pylsp"];
         }
         {
           name = "typst";
@@ -74,8 +114,58 @@
             args = ["-q"];
           };
         }
+        {
+          name = "html";
+          language-id = "html";
+          auto-format = true;
+          file-types = ["htm" "html"];
+          language-servers = ["vscode-html-language-server" "vscode-eslint-language-server"];
+        }
+        {
+          name = "css";
+          language-id = "css";
+          auto-format = true;
+          file-types = ["css"];
+          language-servers = ["vscode-css-language-server" "vscode-eslint-language-server"];
+        }
+        {
+          name = "json";
+          language-id = "json";
+          auto-format = true;
+          file-types = ["json"];
+          language-servers = ["vscode-json-language-server" "vscode-eslint-language-server"];
+        }
       ];
       language-server = {
+        vscode-html-language-server = {
+          command = "vscode-html-language-server";
+        };
+        vscode-css-language-server = {
+          command = "vscode-css-language-server";
+        };
+        vscode-eslint-language-server = {
+          command = "vscode-eslint-language-server";
+        };
+        vscode-json-language-server = {
+          command = "vscode-json-language-server";
+        };
+        pylsp = {
+          config.pylsp.plugins = {
+            flake8 = {enabled = false;};
+            autopep8 = {enabled = false;};
+            mccabe = {enabled = false;};
+            pycodestyle = {enabled = false;};
+            pyflakes = {enabled = false;};
+            pylint = {enabled = false;};
+            yapf = {enabled = false;};
+            ruff = {
+              enabled = true;
+              select = ["E" "F" "UP" "B" "SIM" "I" "PD" "NPY" "PERF" "FURB" "DOC" "TRY" "W" "R" "PL" "TCH" "Q" "PT" "ICN" "C4" "COM" "FBT" "S" "N"];
+              ignore = ["F401"];
+              lineLength = 120;
+            };
+          };
+        };
         ruff = {
           command = "ruff-lsp";
         };
@@ -108,4 +198,17 @@
       target = ".config/helix/external-snippets.toml";
     };
   };
+
+  home.file = {
+    "yazi" = {
+      source = "${yazi}";
+      target = ".config/helix/open_in_helix_from_yazi.zsh";
+    };
+  };
+  home.file = {
+    "jupyter" = {
+      source = "${jupyter}";
+      target = ".config/helix/run_jupyter_from_helix.zsh";
+    };
+  };
 }

home-manager/shared/shell/helix/helix.nix

@@ -0,0 +1,45 @@
+{
+  fetchzip,
+  lib,
+  rustPlatform,
+  git,
+  installShellFiles,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "helix";
+  version = "24.07";
+
+  # This release tarball includes source code for the tree-sitter grammars,
+  # which is not ordinarily part of the repository.
+  src = fetchzip {
+    url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
+    hash = "";
+    stripRoot = false;
+  };
+
+  cargoHash = "";
+
+  nativeBuildInputs = [git installShellFiles];
+
+  env.HELIX_DEFAULT_RUNTIME = "${placeholder "out"}/lib/runtime";
+
+  postInstall = ''
+    # not needed at runtime
+    rm -r runtime/grammars/sources
+
+    mkdir -p $out/lib
+    cp -r runtime $out/lib
+    installShellCompletion contrib/completion/hx.{bash,fish,zsh}
+    mkdir -p $out/share/{applications,icons/hicolor/256x256/apps}
+    cp contrib/Helix.desktop $out/share/applications
+    cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
+  '';
+
+  meta = with lib; {
+    description = "Post-modern modal text editor";
+    homepage = "https://helix-editor.com";
+    license = licenses.mpl20;
+    mainProgram = "hx";
+    maintainers = with maintainers; [danth yusdacra zowoq];
+  };
+}

home-manager/shared/shell/hyfetch.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+{...}: {
   programs.hyfetch = {
     enable = true;
     settings = {

home-manager/shared/shell/zellij/default.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   inputs,
   ...
@@ -54,6 +53,89 @@
           }
         }
 
+        default_tab_template {
+          pane size=1 borderless=true {
+            plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" {
+              format_left  "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}"
+              format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]"
+
+              mode_locked "#[fg=magenta,bold] {name} "
+              mode_normal "#[fg=green,bold] {name} "
+              mode_resize "#[fg=orange,bold] {name} "
+              mode_default_to_mode "resize"
+
+              tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]"
+              tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]"
+
+              tab_sync_indicator       " "
+              tab_fullscreen_indicator "□ "
+              tab_floating_indicator   "󰉈 "
+
+              datetime        "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} "
+              datetime_format "%Y-%m-%d %H:%M"
+              datetime_timezone "Europe/Amsterdam"
+            }
+          }
+          children
+          pane size=2 borderless=true {
+            plugin location="status-bar"
+          }
+        }
+      }
+    '';
+  helix_zellij =
+    pkgs.writeText "helix.kdl"
+    ''
+      layout {
+        tab {
+          pane {
+            command "hx"
+            args "."
+          }
+          pane split_direction="vertical" size="20%" {}
+        }
+        swap_tiled_layout name="vertical" {
+          tab max_panes=5 {
+            pane split_direction="vertical" {
+              pane
+              pane { children; }
+            }
+          }
+          tab max_panes=8 {
+            pane split_direction="vertical" {
+              pane { children; }
+              pane { pane; pane; pane; pane; }
+            }
+          }
+          tab max_panes=12 {
+            pane split_direction="vertical" {
+              pane { children; }
+              pane { pane; pane; pane; pane; }
+              pane { pane; pane; pane; pane; }
+            }
+          }
+        }
+
+        swap_tiled_layout name="horizontal" {
+          tab max_panes=5 {
+            pane
+            pane
+          }
+          tab max_panes=8 {
+            pane {
+              pane split_direction="vertical" { children; }
+              pane split_direction="vertical" { pane; pane; pane; pane; }
+            }
+          }
+          tab max_panes=12 {
+            pane {
+              pane split_direction="vertical" { children; }
+              pane split_direction="vertical" { pane; pane; pane; pane; }
+              pane split_direction="vertical" { pane; pane; pane; pane; }
+            }
+          }
+        }
+
         default_tab_template {
           pane size=1 borderless=true {
             plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" {
@@ -90,6 +172,39 @@ in {
     # TODO find specific settings for vscode to avoid
     enable = true;
     enableZshIntegration = true;
+    settings = {
+      session_serialization = true;
+      # theme = "catppuccin-macchiato";
+
+      themes = {
+        catppuccin-mocha = {
+          bg = "#585b70";
+          fg = "#cdd6f4";
+          red = "#f38ba8";
+          green = "#a6e3a1";
+          blue = "#89b4fa";
+          yellow = "#f9e2af";
+          magenta = "#f5c2e7";
+          orange = "#fab387";
+          cyan = "#89dceb";
+          black = "#181825";
+          white = "#cdd6f4";
+        };
+        catppuccin-macchiato = {
+          bg = "#5b6078";
+          fg = "#cad3f5";
+          red = "#ed8796";
+          green = "#a6da95";
+          blue = "#8aadf4";
+          yellow = "#eed49f";
+          magenta = "#f5bde6";
+          orange = "#f5a97f";
+          cyan = "#91d7e3";
+          black = "#1e2030";
+          white = "#cad3f5";
+        };
+      };
+    };
   };
 
   home.file = {
@@ -99,9 +214,15 @@ in {
     };
   };
   home.file = {
-    "config" = {
-      source = ./zellij.kdl;
-      target = ".config/zellij/config.kdl";
+    "helix_zellij" = {
+      source = "${helix_zellij}";
+      target = ".config/zellij/layouts/helix.kdl";
     };
   };
+  #home.file = {
+  #  "config" = {
+  #    source = ./zellij.kdl;
+  #    target = ".config/zellij/config.kdl";
+  #  };
+  #};
 }

home-manager/shared/shell/zsh.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.zoxide = {
     enable = true;
   };
@@ -34,6 +27,15 @@
           sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM=";
         };
       }
+      {
+        name = "terraform";
+        src = pkgs.fetchFromGitHub {
+          owner = "macunha1";
+          repo = "zsh-terraform";
+          rev = "fd1471d3757f8ed13f56c4426f88616111de2a87";
+          sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc";
+        };
+      }
     ];
     autosuggestion.enable = true;
     enableCompletion = true;
@@ -58,10 +60,11 @@
         "zsh-navigation-tools"
       ];
     };
-    # stuff for zoxide & tre
+    # Extra commands that take more complex forms
     initExtra = ''
       eval "$(zoxide init --cmd cd zsh)"
       tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; }
+      zhx() { command zellij action new-tab --layout $HOME/.config/zellij/layouts/helix.kdl; }
     '';
   };
 }

justfile

@@ -0,0 +1,15 @@
+build:
+    sudo nixos-rebuild switch --flake .# --show-trace
+
+run:
+    nix-repl -f flake:nixpkgs
+
+test:
+    sudo nix flake check --show-trace
+
+update:
+    nix flake update
+
+clean:
+    sudo nix-collect-garbage
+    sudo nix-store --optimise

nixos/board/package-configs/pi-hole/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   services.pihole = {
     enable = true;
     hostConfig = {

nixos/desktop/default.nix

@@ -1,7 +1,6 @@
 # This is your system's configuration file.
 # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
 {
-  inputs,
   outputs,
   lib,
   config,
@@ -17,9 +16,9 @@
   nixpkgs = {
     # You can add overlays here
     overlays = [
-      (final: prev: {
-        bcachefs-tools = pkgs-edge.bcachefs-tools;
-      })
+      #(final: prev: {
+      #bcachefs-tools = pkgs-edge.bcachefs-tools;
+      #})
       # Add overlays your own flake exports (from overlays and pkgs dir):
       outputs.overlays.additions
       outputs.overlays.modifications
@@ -45,10 +44,12 @@
 
       # System tools
       aha
-      bcachefs-tools
+      #bcachefs-tools
       clinfo
       comma
       direnv
+      exfat
+      exfatprogs
       git-filter-repo
       gnupg
       pciutils
@@ -59,7 +60,7 @@
       tpm2-tss
       virtualgl
       vulkan-tools
-      waydroid
+      # waydroid
       waypipe
       wayland-utils
       xwaylandvideobridge
@@ -69,16 +70,19 @@
       # KDE/QT
       krunner-translator
       kdePackages.discover
+      kdePackages.filelight
       kdePackages.kcalc
       kdePackages.kdepim-addons
       kdePackages.kirigami
       kdePackages.kdeconnect-kde
+      kdePackages.konsole
       # kdePackages.krunner-ssh
       # kdePackages.krunner-symbols
       kdePackages.packagekit-qt
       kdePackages.plasma-pa
       kdePackages.sddm-kcm
       kdePackages.dolphin-plugins
+      kdePackages.qtstyleplugin-kvantum
       libportal-qt5
       libportal
 
@@ -86,7 +90,7 @@
       noisetorch
       qjackctl
       wireplumber
-      rustdesk
+      #rustdesk
     ])
     ++ (with pkgs-edge; [
       # list of latest packages from nixpkgs master
@@ -144,7 +148,6 @@
   services.fwupd.enable = true;
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -172,8 +175,8 @@
 
   # FIXME: re-enable virtual camera loopback when it build again.
   boot.bootspec.enable = true;
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
-  boot.supportedFilesystems = ["bcachefs"];
+  #boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
+  #boot.supportedFilesystems = ["bcachefs"];
   boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out];
   boot.kernelModules = [
     # Virtual Camera

nixos/desktop/package-configs/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   imports = [
     ./firefox
   ];

nixos/desktop/package-configs/firefox/default.nix

@@ -5,7 +5,7 @@
 }: {
   programs.firefox = {
     enable = true;
-    package = pkgs.firefox;
+    package = pkgs.floorp;
     policies = {
       DisableTelemetry = true;
       DisableFirefoxStudies = true;
@@ -28,16 +28,16 @@
       };
       ExtensionSettings = {
         # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below
-        # Catppuccin Macchiato - Lavender theme:
-        "{6396519b-0923-41a4-948a-3cb54a3918b3}" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender/latest.xpi";
+        # Catppuccin Macchiato - Mauve theme:
+        "{55750c61-e5f3-4d9a-898d-0643b3093678}" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-mauve/latest.xpi";
           installation_mode = "force_installed";
         };
         # Sideberry:
-        "{3c078156-979c-498b-8990-85f7987dd929}" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi";
-          installation_mode = "force_installed";
-        };
+        #"{3c078156-979c-498b-8990-85f7987dd929}" = {
+        #  install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi";
+        #  installation_mode = "force_installed";
+        #};
         # Privacy Badger:
         "jid1-MnnxcxisBPnSXQ@jetpack" = {
           install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
@@ -137,11 +137,18 @@
         "browser.compactmode.show" = true;
         "browser.uidensity" = 0;
         # "browser.newtabpage.activity-stream.feeds.topsites" = false;
-        # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+        "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+        "browser.newtabpage.activity-stream.showSponsored" = false;
+        "browser.newtabpage.activity-stream.system.showSponsored" = false;
         "font.name.serif.x-western" = "Crimson";
         "font.name.sans-serif.x-western" = "Atkinson Hyperlegible";
         "font.name.monospace.x-western" = "FiraCode Nerd Font";
         "font.size.variable.x-western" = 14;
+        "floorp.browser.sidebar.useIconProvider" = "duckduckgo";
+        "floorp.browser.tabbar.settings" = 2;
+        "floorp.browser.tabs.verticaltab" = true;
+        "floorp.tabbar.style" = 2;
+        "floorp.browser.user.interface" = 8;
         "signon.rememberSignons" = true;
       };
       # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks

nixos/hosts/EDI/configuration.nix

@@ -4,7 +4,6 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
   ...
 }: {

nixos/hosts/EDI/hardware-configuration.nix

@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/hosts/GLaDOS/configuration.nix

@@ -3,8 +3,6 @@
 {
   inputs,
   outputs,
-  lib,
-  config,
   pkgs,
   ...
 }: {
@@ -84,6 +82,7 @@
     };
   };
 
+  # virtualisation.waydroid.enable = false;
   networking.hostName = "GLaDOS";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

nixos/hosts/GLaDOS/hardware-configuration.nix

@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/hosts/iso/configuration.nix

@@ -2,9 +2,7 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
-  nixpkgs-stable,
   ...
 }: {
   imports = [

nixos/hosts/iso_server/configuration.nix

@@ -2,9 +2,7 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
-  nixpkgs-stable,
   ...
 }: {
   imports = [

nixos/hosts/queen/configuration.nix

@@ -2,9 +2,7 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
-  nixpkgs-stable,
   ...
 }: {
   imports = [
@@ -73,6 +71,7 @@
     nextcloud28
     nginx
     onlyoffice-documentserver
+    openssl
     phanpy
     postgresql_16
     python310

nixos/hosts/queen/hardware-configuration.nix

@@ -1,7 +1,5 @@
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/hosts/queen/secrets/sops.yaml

@@ -11,6 +11,8 @@ lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW
 coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYisHejmycgT8a2mWpk+5r3HkFmBNcLDeNlfnhIif5oLHGuHyw==,iv:M2GdNDxP4xpP35FJPTgljbcKpOm6DmEEnIYRItAxDVI=,tag:IiiNXeTi6Yja5PrnKRkhdA==,type:str]
 grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str]
 sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str]
+writefreely: ENC[AES256_GCM,data:QOj5h/rHCxmgpPNhu3IS4eyruhQokHTJxW6yQM9YDgQ=,iv:qAd+/rAAanzL9FTIX22M+2kwI0WI2d3i86cJrn8MFBo=,tag:3zvpqnovDEoJdvK/qcFDuQ==,type:str]
+writefreelymysql: ENC[AES256_GCM,data:1JZwIX04O3DBAo7JvEkeNrFcSdcmk/u4WUf/kkbr2JA=,iv:8H8MR8w1iLfl2r62EbxPnLzs4qWFmwB5gNKEaly8q6c=,tag:K01oKMXkeMOFs3u7frMs0Q==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -26,8 +28,8 @@ sops:
             KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz
             NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-04T16:38:10Z"
-    mac: ENC[AES256_GCM,data:KqkNjZe/rMhiWNS3SeYHm+b23u1LD1jq3f0+jB/BVmy6pDQDTNgA/wWHF/HcorU2Z7TOdjofJPuvRuF6C8ec4RCtTxX2ubIYWV4H3BynYxrEuEsIN8EnPJDcFFc92n9PKzoWnHo2NK1a4ZX+DxYVjDDdjhOMWj/kqWRWZRU+qEw=,iv:rarq3mCSfDFzbIdSIe+3mTNTnoZwFZ2uPkYMGt/xqos=,tag:rCD6SUpwOktRo7fM3Irv7g==,type:str]
+    lastmodified: "2024-08-16T13:34:43Z"
+    mac: ENC[AES256_GCM,data:IdQmx7/Y2fdQ9gBgKYCUZQuAVRqbP5KWG4EplO6pYqA8b5xzGnmCSCwyYIXU+3NExEZCEKEfX68mdYlWPRTKUdamOBdN+fQrGXwr5lw5dpKe03ccGw7Hayi0B4O8WbLEjw1RU50v2eoK9MpD5FPrUu1AzGz3+txxzV3hoxg6Sp0=,iv:WXvxAvg+sAKYbzjaz1QKDgVrnMraO3EtIgC12zb9Xi0=,tag:FmH84rGBotouvjCOq+xL8w==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0

nixos/hosts/shodan/auto-mount.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   services.udev.extraRules = ''
     KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service"
     KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service"
@@ -16,7 +9,7 @@
   '';
 
   systemd.services."external-drive-mount@" = {
-    path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount steam];
+    path = with pkgs; [util-linux udisks bash auto-mount steam jq];
     enable = true;
     serviceConfig = {
       ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i";

nixos/hosts/shodan/configuration.nix

@@ -2,7 +2,6 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
   ...
 }: {
@@ -25,7 +24,7 @@
 
     ../../../disko/shodan
 
-    # ./auto-mount.nix
+    ./auto-mount.nix
   ];
 
   boot.tmp.cleanOnBoot = true;
@@ -49,7 +48,7 @@
 
   environment.systemPackages = with pkgs; [
     # Custom tools
-    # auto-mount
+    auto-mount
 
     #System:
     btrfs-progs
@@ -59,12 +58,13 @@
     noto-fonts
     noto-fonts-emoji-blob-bin
     noto-fonts-emoji
-    rustdesk
+    #rustdesk
     sbctl
     udisks
     util-linux
     waypipe
     python3
+    protonup-qt
 
     #KDE:
     krunner-translator
@@ -82,6 +82,7 @@
     #Gaming:
     heroic
     legendary-gl
+    protontricks
     rare
   ];
 
@@ -110,7 +111,7 @@
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     extest.enable = true;
   };
-  hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses
+  hardware.graphics.enable32Bit = true; # Enables support for 32bit libs that steam uses
 
   # Enable the X11 windowing system.
   services.xserver.enable = true;
@@ -164,7 +165,6 @@
   services.fwupd.enable = true;
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {

nixos/hosts/shodan/hardware-configuration.nix

@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/hosts/wheatley/armv7l.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   boot.kernelPatches = [
     rec {
       name = "compat_uts_machine";

nixos/hosts/wheatley/hardware-configuration.nix

@@ -2,9 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {

nixos/server/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # You can import other home-manager modules here
   imports = [
     ./package-configs

nixos/server/package-configs/akkoma/default.nix

@@ -1,7 +1,4 @@
 {
-  inputs,
-  outputs,
-  lib,
   config,
   pkgs,
   ...

nixos/server/package-configs/aria2/container.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   users.users.aria2.group = "aria2";
   users.groups.aria2 = {};
   users.users.aria2.isSystemUser = true;

nixos/server/package-configs/aria2/default.nix

@@ -1,10 +1,4 @@
-{
-  inputs,
-  outputs,
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   users.users.aria2.group = "aria2";
   users.groups.aria2 = {};
   users.users.aria2.isSystemUser = true;

nixos/server/package-configs/cinny/default.nix

@@ -1,10 +1,4 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   services.nginx = {
     enable = true;
     virtualHosts = {

nixos/server/package-configs/conduit/default.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   inputs,
-  lib,
   ...
 }: let
   # You'll need to edit these values
@@ -44,6 +43,10 @@ in {
       allow_registration = false;
       turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"];
       turn_secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT";
+      well_known = {
+        server = "matrix.gladtherescake.eu:443";
+        client = "https://matrix.gladtherescake.eu";
+      };
     };
   };
 
@@ -123,7 +126,7 @@ in {
           '';
         };
         locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = {
-          proxyPass = "http://backend_conduit/client/unstable/org.matrix.msc3575/sync";
+          proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync";
           proxyWebsockets = true;
           recommendedProxySettings = false;
           extraConfig = ''

nixos/server/package-configs/coturn/default.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   sops.secrets."coturn-auth-secret".mode = "0440";
   sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name;
   users.users.nginx.extraGroups = ["turnserver"];

nixos/server/package-configs/dashboard/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   imports = [
     ./grafana
     #./loki

nixos/server/package-configs/dashboard/grafana/default.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   # grafana configuration
   services.grafana = {
     enable = true;

nixos/server/package-configs/dashboard/loki/default.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   services.loki = {
     enable = true;
     configFile = ./loki.yaml;

nixos/server/package-configs/dashboard/prometheus/default.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   services.prometheus = {
     enable = true;
     port = 9001;

nixos/server/package-configs/dashboard/telegraf/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  user,
-  ...
-}: {
+{config, ...}: {
   sops.secrets."grafana-telegraf-key".mode = "0440";
   sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name;
   services.telegraf = {

nixos/server/package-configs/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   imports = [
     ./conduit
     ./forgejo
@@ -17,7 +10,8 @@
     ./roundcube
     ./coturn
     ./dashboard
-    ./cinny
-    ./firefox-sync
+    #./cinny
+    #./firefox-sync
+    ./writefreely
   ];
 }

nixos/server/package-configs/forgejo/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [];
 
   #sops.secrets."mailpassunhash".mode = "0440";

nixos/server/package-configs/gotosocial/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   users.users.gotosocial.extraGroups = ["virtualMail"];
 
   services.nginx = {

nixos/server/package-configs/jellyfin/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   users.users.jellyfin.extraGroups = ["nextcloud" "aria2"];
 
   services.nginx = {

nixos/server/package-configs/mail-server/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{config, ...}: {
   sops.secrets."mailpass".mode = "0440";
   sops.secrets."mailpass".owner = config.users.users.virtualMail.name;
 

nixos/server/package-configs/nextcloud/default.nix

@@ -49,7 +49,7 @@
     enable = true;
     hostName = "nextcloud.gladtherescake.eu";
 
-    package = pkgs.nextcloud29;
+    package = pkgs.nextcloud30;
 
     # Use HTTPS for links
     https = true;

nixos/server/package-configs/ombi/default.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   users.users = {
     ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"];
   };

nixos/server/package-configs/phanpy/default.nix

@@ -1,10 +1,4 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   services.nginx = {
     enable = true;
     virtualHosts = {

nixos/server/package-configs/postgres/default.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   services.postgresql = {
     # https://nixos.org/manual/nixos/stable/#module-postgresql
     package = pkgs.postgresql_16;

nixos/server/package-configs/roundcube/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: {
   # TODO: Figure out how to create packages for some plugins for roundcube!

nixos/server/package-configs/writefreely/default.nix

@@ -0,0 +1,39 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  sops.secrets."writefreely".mode = "0440";
+  sops.secrets."writefreely".owner = config.users.users.writefreely.name;
+  sops.secrets."writefreelymysql".mode = "0440";
+  sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name;
+  services.writefreely = {
+    enable = true;
+    host = "writefreely.gladtherescake.eu";
+    nginx.enable = true;
+    nginx.forceSSL = true;
+    acme.enable = true;
+    # database = {
+    #   type = "mysql";
+    #   createLocally = true;
+    #   passwordFile = config.sops.secrets."writefreelymysql".path;
+    # };
+    admin = {
+      initialPasswordFile = config.sops.secrets."writefreely".path;
+      name = "GLaDTheresCake";
+    };
+    settings = {
+      app = {
+        min_username_len = 2;
+        max_blogs = 100;
+        default_visibility = "public";
+        federation = true;
+        local_timeline = true;
+      };
+      server.port = 1212;
+    };
+  };
+  systemd.services.writefreely = {
+    path = [pkgs.openssl];
+  };
+}

nixos/shared/default.nix

@@ -1,10 +1,8 @@
 {
   inputs,
-  outputs,
   lib,
   config,
   pkgs,
-  pkgs-edge,
   ...
 }: {
   imports = [
@@ -14,6 +12,10 @@
   sops.age.keyFile = ../../../../../../var/secrets/keys.txt;
   sops.secrets."lillian-password".neededForUsers = true;
 
+  #TODO: remove this when unneeded for freetube
+  nixpkgs.config.permittedInsecurePackages = [
+    "python3.12-youtube-dl-2021.12.17"
+  ];
   nix = {
     package = pkgs.lix;
     gc = {
@@ -34,15 +36,25 @@
       experimental-features = "nix-command flakes";
       # Deduplicate and optimize nix store
       auto-optimise-store = true;
-      extra-substituters = ["https://cache.lix.systems"];
-      trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="];
+      extra-substituters = [
+        "https://cache.lix.systems"
+        "https://nix-community.cachix.org"
+        "https://nixpkgs-unfree.cachix.org"
+        "https://0uptime.cachix.org"
+      ];
+      trusted-public-keys = [
+        "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
+        "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE="
+      ];
     };
   };
 
-  catppuccin.flavor = "macchiato";
-  catppuccin.enable = true;
+  # catppuccin.flavor = "macchiato";
+  # catppuccin.enable = true;
 
-  console.catppuccin.enable = true;
+  # console.catppuccin.enable = true;
 
   home-manager.backupFileExtension = "backup";
 
@@ -52,8 +64,8 @@
     shell = pkgs.zsh;
     hashedPasswordFile = config.sops.secrets."lillian-password".path;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS"
     ];
   };
 
@@ -61,6 +73,56 @@
     enable = true;
   };
 
+  stylix = {
+    enable = true;
+    autoEnable = true;
+    base16Scheme = {
+      scheme = "Catppuccin Macchiato";
+      author = "https://github.com/catppuccin/catppuccin";
+      base00 = "24273a";
+      base01 = "1e2030";
+      base02 = "363a4f";
+      base03 = "494d64";
+      base04 = "5b6078";
+      base05 = "cad3f5";
+      base06 = "f4dbd6";
+      base07 = "b7bdf8";
+      base08 = "ed8796";
+      base09 = "f5a97f";
+      base0A = "eed49f";
+      base0B = "a6da95";
+      base0C = "8bd5ca";
+      base0D = "8aadf4";
+      base0E = "c6a0f6";
+      base0F = "f0c6c6";
+    };
+    image = ./background.jpg;
+    cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
+    cursor.name = "catppuccin-macchiato-mauve-cursors";
+    homeManagerIntegration.followSystem = true;
+    fonts = {
+      serif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Serif";
+      };
+
+      monospace = {
+        package = pkgs.nerdfonts;
+        name = "Fira Code nerd Font Mono";
+      };
+
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+
+      emoji = {
+        package = pkgs.noto-fonts-emoji-blob-bin;
+        name = "Blobmoji";
+      };
+    };
+  };
+
   # Enable completion of system packages by zsh
   environment.pathsToLink = ["/share/zsh"];
 

nixos/shared/locale/default.nix

@@ -1,11 +1,4 @@
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 

nixos/shared/packages/default.nix

@@ -1,8 +1,5 @@
 {
-  inputs,
   outputs,
-  lib,
-  config,
   pkgs,
   pkgs-edge,
   ...
@@ -22,9 +19,10 @@
       rebuild
       rebuild-no-inhibit
       install-nix
+      install-nix-no-inhibit
       update
       upgrade
-      simple-completion-language-server
+      # simple-completion-language-server
 
       # System tools
       age
@@ -35,6 +33,7 @@
       helix
       home-manager
       htop
+      just
       killall
       oh-my-zsh
       rsync
@@ -50,20 +49,24 @@
       # Can be used to install latest version of some packages
     ]);
 
-  fonts = {
-    packages = with pkgs; [
-      cantarell-fonts
-      dejavu_fonts
-      fira-code
-      noto-fonts
-      noto-fonts-cjk-sans
-      noto-fonts-cjk-serif
-      paratype-pt-sans
-      paratype-pt-mono
-      paratype-pt-serif
-      roboto
-      twemoji-color-font
-    ];
-    enableDefaultPackages = false;
-  };
+  # fonts = {
+  #   packages = with pkgs; [
+  #     noto-fonts-emoji-blob-bin
+  #     cantarell-fonts
+  #     dejavu_fonts
+  #     fira-code
+  #     noto-fonts
+  #     noto-fonts-cjk-sans
+  #     noto-fonts-cjk-serif
+  #     paratype-pt-sans
+  #     paratype-pt-mono
+  #     paratype-pt-serif
+  #     roboto
+  #     twemoji-color-font
+  #     font-awesome
+  #     atkinson-hyperlegible
+  #     fira-code-nerdfont
+  #   ];
+  #   enableDefaultPackages = false;
+  # };
 }

pkgs/auto-mount/default.nix

@@ -1,13 +1,5 @@
 {
-  lib,
-  stdenv,
-  system,
   pkgs,
-  jq,
-  coreutils,
-  udisks,
-  toybox,
-  util-linux,
   writeShellApplication,
 }:
 writeShellApplication
@@ -16,7 +8,7 @@ writeShellApplication
 
   name = "auto-mount";
 
-  runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest];
+  runtimeInputs = [pkgs.steam];
 
   text = ''
     set -euo pipefail
@@ -76,7 +68,7 @@ writeShellApplication
             # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent
             # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess
             echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt
-            systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}"
+            systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}"
         else
             echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running"
         fi

pkgs/default.nix

@@ -12,6 +12,6 @@ pkgs: {
   upgrade = pkgs.callPackage ./upgrade {};
   restart = pkgs.callPackage ./restart {};
   phanpy = pkgs.callPackage ./phanpy {};
-  # auto-mount = pkgs.callPackage ./auto-mount {};
+  auto-mount = pkgs.callPackage ./auto-mount {};
   simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {};
 }

pkgs/dvd/default.nix

@@ -1,6 +1,4 @@
 {
-  lib,
-  stdenv,
   direnv,
   writeShellApplication,
 }:

pkgs/dvt/default.nix

@@ -1,6 +1,4 @@
 {
-  lib,
-  stdenv,
   direnv,
   writeShellApplication,
 }:

pkgs/install-nix-no-inhibit/default.nix

@@ -1,6 +1,4 @@
 {
-  lib,
-  stdenv,
   git,
   gum,
   writeShellApplication,

pkgs/install-nix/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
+{writeShellApplication}:
 writeShellApplication
 {
   name = "install-nix";

pkgs/rebuild-no-inhibit/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
+{writeShellApplication}:
 writeShellApplication
 {
   name = "rebuild-no-inhibit";

pkgs/rebuild/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
+{writeShellApplication}:
 writeShellApplication
 {
   name = "rebuild";

pkgs/restart/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
+{writeShellApplication}:
 writeShellApplication
 {
   name = "restart";

pkgs/simple-completion-language-server/result

@@ -1 +0,0 @@
-/nix/store/3l0wgxsvf5sz2q9sgyj0blc1ivzg808b-simple-completion-language-server-ff9f90bc96c347f284571bc6310bc31f95508d55

pkgs/update/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
+{writeShellApplication}:
 writeShellApplication
 {
   name = "update";

pkgs/upgrade/default.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
+{writeShellApplication}:
 writeShellApplication
 {
   name = "upgrade";