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

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

.envrc

@@ -0,0 +1 @@
+use flake "git+https://git.lillianviolet.dev/Lillian-Violet/dev-templates.git?dir=nix"

.gitignore

@@ -0,0 +1,2 @@
+/result
+.envrc

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"

disko/queen/default.nix

@@ -0,0 +1,45 @@
+{
+  disko.devices = {
+    disk = {
+      nvme0n1 = {
+        type = "disk";
+        device = "/dev/disk/by-path/pci-0000:00:05.0-scsi-0:0:0:0";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [
+                  "defaults"
+                ];
+              };
+            };
+            swap = {
+              size = "16G";
+              content = {
+                type = "swap";
+                resumeDevice = true; # resume from hiberation from this device
+              };
+            };
+            root = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+                mountOptions = [
+                  "defaults"
+                ];
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}

flake.nix

@@ -5,24 +5,44 @@
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    nixpkgs-edge.url = "nixpkgs/master"; # Only used for bleeding edge packages
+
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     # Disko for declaratively setting disk formatting
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
 
+    bcachefs-tools = {
+      url = "github:koverstreet/bcachefs-tools";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
+    };
+
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
+
     # Nixos generators for creating ISOs
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # catpuccin theme
+    catppuccin.url = "github:catppuccin/nix";
+
     # Conduit fork without all the fuss and drama
-    conduit = {
+    conduwuit = {
       url = "github:girlbossceo/conduwuit";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Nix index database files
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+
     # Secret management with sops
     sops-nix.url = "github:Mic92/sops-nix";
 
@@ -52,52 +72,53 @@
     home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
+    zjstatus.url = "github:dj95/zjstatus";
+
     # Fix for steam cursor not being visible under wayland
-    extest.url = "github:chaorace/extest-nix";
 
     # Add any other flake you might need
     # hardware.url = "github:nixos/nixos-hardware";
-
+    # Stylix theming engine
-    # Required for making sure that Pi-hole continues running if the executing user has no active session.
+    stylix.url = "github:danth/stylix";
-    linger = {
-      url = "github:mindsbackyard/linger-flake";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-
-    pihole = {
-      url = "github:mindsbackyard/pihole-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.linger.follows = "linger";
-    };
   };
 
   outputs = {
     self,
     nixpkgs,
+    flake-utils,
+    nixpkgs-edge,
     nixos-generators,
+    catppuccin,
     disko,
     home-manager,
     sops-nix,
     simple-nixos-mailserver,
     plasma-manager,
-    linger,
+    zjstatus,
-    pihole,
     lanzaboote,
     jovian,
     nixos-hardware,
-    conduit,
+    nix-index-database,
+    conduwuit,
+    stylix,
     ...
   } @ inputs: let
     inherit (self) outputs;
+    inherit (inputs) nixpkgs-edge;
     # Supported systems for your flake packages, shell, etc.
     systems = [
-      "armv7l-linux"
       "x86_64-linux"
     ];
     # This is a function that generates an attribute by calling a function you
     # pass to it, with each system as an argument
     forAllSystems = nixpkgs.lib.genAttrs systems;
+    pkgs-edge = import nixpkgs-edge {
+      system = "x86_64-linux";
+      config = {
+        allowUnfree = true;
+        allowUnfreePredicate = _: true;
+      };
+    };
   in {
     # Your custom packages
     # Accessible through 'nix build', 'nix shell', etc
@@ -127,6 +148,7 @@
         system = "x86_64-linux";
         specialArgs = {inherit inputs outputs;};
         modules = [
+          {_module.args = {inherit pkgs-edge;};}
           nixos-hardware.nixosModules.dell-xps-13-7390
           # > Our main nixos configuration file <
           ./nixos/hosts/EDI/configuration.nix
@@ -134,8 +156,14 @@
           lanzaboote.nixosModules.lanzaboote
           disko.nixosModules.disko
           home-manager.nixosModules.home-manager
+          nix-index-database.nixosModules.nix-index
+          catppuccin.nixosModules.catppuccin
+          stylix.nixosModules.stylix
           {
-            home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];
+            home-manager.sharedModules = [
+              inputs.catppuccin.homeManagerModules.catppuccin
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+            ];
           }
         ];
       };
@@ -144,14 +172,21 @@
         system = "x86_64-linux";
         specialArgs = {inherit inputs outputs;};
         modules = [
+          {_module.args = {inherit pkgs-edge;};}
           # > Our main nixos configuration file <
           ./nixos/hosts/GLaDOS/configuration.nix
           sops-nix.nixosModules.sops
-          lanzaboote.nixosModules.lanzaboote
+          #lanzaboote.nixosModules.lanzaboote
           disko.nixosModules.disko
           home-manager.nixosModules.home-manager
+          nix-index-database.nixosModules.nix-index
+          catppuccin.nixosModules.catppuccin
+          stylix.nixosModules.stylix
           {
-            home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];
+            home-manager.sharedModules = [
+              inputs.catppuccin.homeManagerModules.catppuccin
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+            ];
           }
         ];
       };
@@ -160,11 +195,19 @@
         system = "x86_64-linux";
         specialArgs = {inherit inputs outputs;};
         modules = [
+          {_module.args = {inherit pkgs-edge;};}
           # > Our main nixos configuration file <
           ./nixos/hosts/queen/configuration.nix
           sops-nix.nixosModules.sops
           disko.nixosModules.disko
           simple-nixos-mailserver.nixosModule
+          catppuccin.nixosModules.catppuccin
+          stylix.nixosModules.stylix
+          {
+            home-manager.sharedModules = [
+              inputs.catppuccin.homeManagerModules.catppuccin
+            ];
+          }
         ];
       };
 
@@ -172,6 +215,7 @@
         system = "x86_64-linux";
         specialArgs = {inherit inputs outputs;};
         modules = [
+          {_module.args = {inherit pkgs-edge;};}
           # > Our main nixos configuration file <
           ./nixos/hosts/shodan/configuration.nix
           sops-nix.nixosModules.sops
@@ -179,40 +223,57 @@
           disko.nixosModules.disko
           jovian.nixosModules.jovian
           home-manager.nixosModules.home-manager
+          catppuccin.nixosModules.catppuccin
+          stylix.nixosModules.stylix
           {
-            home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];
+            home-manager.sharedModules = [
+              inputs.catppuccin.homeManagerModules.catppuccin
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+            ];
           }
         ];
       };
 
-      ISO = nixpkgs.lib.nixosSystem {
+      # ISO = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
+      #   system = "x86_64-linux";
-        specialArgs = {inherit inputs outputs;};
+      #   specialArgs = {inherit inputs outputs;};
-        modules = [
+      #   modules = [
-          "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix"
+      #     {_module.args = {inherit pkgs-edge;};}
-          "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
+      #     "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix"
-          ./nixos/hosts/iso/configuration.nix
+      #     "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
-          sops-nix.nixosModules.sops
+      #     ./nixos/hosts/iso/configuration.nix
-          home-manager.nixosModules.home-manager
+      #     sops-nix.nixosModules.sops
-          {
+      #     home-manager.nixosModules.home-manager
-            home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];
+      #     nix-index-database.nixosModules.nix-index
-          }
+      #     catppuccin.nixosModules.catppuccin
-        ];
+      #     {
-      };
+      #       home-manager.sharedModules = [
+      #         inputs.plasma-manager.homeManagerModules.plasma-manager
+      #         inputs.catppuccin.homeManagerModules.catppuccin
+      #       ];
+      #     }
+      #   ];
+      # };
 
-      wheatley = nixpkgs.lib.nixosSystem {
+      # iso_server = nixpkgs.lib.nixosSystem {
-        system = "armv7l-linux";
+      #   system = "x86_64-linux";
-        specialArgs = {inherit inputs outputs;};
+      #   specialArgs = {inherit inputs outputs;};
-        modules = [
+      #   modules = [
-          # make the module declared by the linger flake available to our config
+      #     {_module.args = {inherit pkgs-edge;};}
-          #linger.nixosModules."armv7l-linux".default
+      #     "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
-          #pihole.nixosModules."armv7l-linux".default
+      #     "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
-          disko.nixosModules.disko
+      #     ./nixos/hosts/iso_server/configuration.nix
-          # > Our main nixos configuration file <
+      #     sops-nix.nixosModules.sops
-          ./nixos/hosts/wheatley/configuration.nix
+      #     home-manager.nixosModules.home-manager
-          sops-nix.nixosModules.sops
+      #     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
@@ -16,10 +13,13 @@
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
-    ../package-configs/zsh.nix
+    ./package-configs/plasma-desktop.nix
-    ./plasma-desktop
+    ./package-configs/firefox.nix
+    ./package-configs/konsole
+    ./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:
@@ -31,6 +31,32 @@
       #     patches = [ ./change-hello-to-hi.patch ];
       #   });
       # })
+      (final: prev: {
+        catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: {
+          accent = "mauve";
+          boldKeywords = true;
+          italicComments = true;
+          italicKeywords = true;
+          extraBordersEnabled = false;
+          workbenchMode = "default";
+          bracketMode = "rainbow";
+          colorOverrides = {};
+          customUIColors = {};
+        });
+      })
+      (final: prev: {
+        catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: {
+          accent = "mauve";
+          boldKeywords = true;
+          italicComments = true;
+          italicKeywords = true;
+          extraBordersEnabled = false;
+          workbenchMode = "default";
+          bracketMode = "rainbow";
+          colorOverrides = {};
+          customUIColors = {};
+        });
+      })
     ];
     # Configure your nixpkgs instance
     config = {
@@ -47,22 +73,27 @@
   # 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:
     direnv
     git
+    git-credential-manager
+    git-credential-manager
     ruff
     kate
 
     # Chat applications:
-    nheko
     signal-desktop
-    webcord-vencord
+    vesktop
+    cinny-desktop
 
     # Gaming:
     prismlauncher
     steam
+    gamescope
 
     # Multimedia:
     freetube
@@ -70,7 +101,6 @@
 
     # Office applications:
     onlyoffice-bin
-    teams-for-linux
     gimp
     thunderbird
 
@@ -81,15 +111,29 @@
     nextcloud-client
     nitrokey-app
     protonvpn-gui
-    sops
     virtualbox
-    watchmate
+    #watchmate
     qbittorrent
-    zsh
+
+    # Theming:
+    catppuccin-cursors
+    (catppuccin-kde.override {
+      flavour = ["macchiato"];
+      accents = ["mauve"];
+    })
+    catppuccin-sddm-corners
+
+    # Theming:
+    catppuccin-cursors
+    (catppuccin-kde.override {
+      flavour = ["macchiato"];
+      accents = ["mauve"];
+    })
+    catppuccin-sddm-corners
 
     # Web browsing:
-    firefox
+    firefoxpwa
-    librewolf
+    firefoxpwa
     ungoogled-chromium
   ];
 
@@ -97,10 +141,9 @@
     enable = true;
     package = pkgs.vscodium;
     extensions = with pkgs.vscode-extensions; [
-      #arrterian.nix-env-selector
+      catppuccin.catppuccin-vsc
-      #ban.spellright
+      catppuccin.catppuccin-vsc-icons
       charliermarsh.ruff
-      dracula-theme.theme-dracula
       eamodio.gitlens
       github.vscode-pull-request-github
       jnoortheen.nix-ide
@@ -108,13 +151,7 @@
       mkhl.direnv
       ms-toolsai.jupyter
       ms-pyright.pyright
-      ms-python.black-formatter
-      #ms-python.python
-      ms-python.vscode-pylance
-      #ms-vscode-remote.remote-containers
-      ms-vscode-remote.remote-ssh
       oderwat.indent-rainbow
-      #redhat.java
       rust-lang.rust-analyzer
       yzhang.markdown-all-in-one
     ];
@@ -144,6 +181,8 @@
       "*.direnv"
       "*.vscode"
       ".envrc"
+      "venv"
+      "venv"
     ];
   };
 
@@ -159,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

@@ -0,0 +1,52 @@
+{pkgs, ...}: {
+  programs.firefox = {
+    enable = true;
+    nativeMessagingHosts = [pkgs.firefoxpwa];
+    package = pkgs.floorp;
+    profiles.lillian = {
+      isDefault = true;
+      settings = {
+        "browser.aboutConfig.showWarning" = false;
+        "browser.bookmarks.addedImportButton" = true;
+        "browser.bookmarks.restore_default_bookmarks" = false;
+        "browser.bookmarks.showMobileBookmarks" = true;
+        "browser.ctrlTab.sortByRecentlyUsed" = true;
+        "browser.discovery.enabled" = false;
+        "browser.download.panel.shown" = true;
+        "browser.firefox-view.feature-tour" = "{\"message\":\"FIREFOX_VIEW_FEATURE_TOUR\",\"screen\":\"\",\"complete\":true}";
+        "browser.newtabpage.activity-stream.section.highlights.includePocket" = false;
+        "browser.pageActions.persistedActions" = ''{"ids":["bookmark","_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si"],"idsInUrlbar":["_3c078156-979c-498b-8990-85f7987dd929_","firefoxpwa_filips_si","bookmark"],"idsInUrlbarPreProton":[],"version":1}'';
+        "browser.search.region" = "NL";
+        "browser.uiCustomization.state" = ''{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["jid1-mnnxcxisbpnsxq_jetpack-browser-action","firefoxpwa_filips_si-browser-action","ubo-scope_raymondhill_net-browser-action","treestyletab_piro_sakura_ne_jp-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action"],"nav-bar":["back-button","forward-button","stop-reload-button","urlbar-container","customizableui-special-spring2","downloads-button","_testpilot-containers-browser-action","addon_darkreader_org-browser-action","umatrix_raymondhill_net-browser-action","ublock0_raymondhill_net-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","cookieautodelete_kennydo_com-browser-action","addon_simplelogin-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","unified-extensions-button","reset-pbm-toolbar-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":["tabbrowser-tabs","new-tab-button","alltabs-button","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["save-to-pocket-button","developer-button","treestyletab_piro_sakura_ne_jp-browser-action","addon_darkreader_org-browser-action","_testpilot-containers-browser-action","wayback_machine_mozilla_org-browser-action","plasma-browser-integration_kde_org-browser-action","_c607c8df-14a7-4f28-894f-29e8722976af_-browser-action","kde-connect_0xc0dedbad_com-browser-action","_f209234a-76f0-4735-9920-eb62507a54cd_-browser-action","ublock0_raymondhill_net-browser-action","cookieautodelete_kennydo_com-browser-action","bibitnow018_aqpl_mc2_chalmers_se-browser-action","_09b14d46-21c3-4a7d-b244-e756f497935b_-browser-action","_7fc8ef53-24ec-4205-87a4-1e745953bb0d_-browser-action","woop-noopscoopsnsxq_jetpack-browser-action","_74145f27-f039-47ce-a470-a662b129930a_-browser-action","_800215d6-eff0-4a62-9268-09857c048030_-browser-action","_3579f63b-d8ee-424f-bbb6-6d0ce3285e6a_-browser-action","_b3e677f4-1150-4387-8629-da738260a48e_-browser-action","_d133e097-46d9-4ecc-9903-fa6a722a6e0e_-browser-action","jid1-bofifl9vbdl2zq_jetpack-browser-action","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","myallychou_gmail_com-browser-action","_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action","umatrix_raymondhill_net-browser-action","_cca112bb-1ca6-4593-a2f1-38d808a19dda_-browser-action","gdpr_cavi_au_dk-browser-action","_54da8dcf-a015-4c80-bbb4-db7f226ac7bd_-browser-action","ubo-scope_raymondhill_net-browser-action","jid1-om7ejgwa1u8akg_jetpack-browser-action","_7c1aa46e-b74f-4325-95d2-84c07d19cdce_-browser-action","_3c078156-979c-498b-8990-85f7987dd929_-browser-action","addon_simplelogin-browser-action","7esoorv3_alefvanoon_anonaddy_me-browser-action","jid1-aqqsmbyb0a8adg_jetpack-browser-action","_15b1b2af-e84a-4c70-ac7c-5608b0eeed5a_-browser-action","firefoxpwa_filips_si-browser-action","_b9db16a4-6edc-47ec-a1f4-b86292ed211d_-browser-action","dontfuckwithpaste_raim_ist-browser-action","jid1-mnnxcxisbpnsxq_jetpack-browser-action"],"dirtyAreaCache":["nav-bar","PersonalToolbar","toolbar-menubar","TabsToolbar","unified-extensions-area","widget-overflow-fixed-list"],"currentVersion":20,"newElementCount":14}'';
+        "browser.urlbar.placeholderName" = "DuckDuckGo";
+        "browser.urlbar.placeholderName.private" = "DuckDuckGo";
+        "extensions.webextensions.uuid" = ''{"formautofill@mozilla.org":"ea6a95e0-ef85-453b-afdf-44e57e4ca32c","pictureinpicture@mozilla.org":"41fcca40-5f8a-4182-ace9-e1ff2e6fc210","screenshots@mozilla.org":"8c2c3f97-17a1-4240-b640-c9707e3b917e","webcompat-reporter@mozilla.org":"d2c1a84b-03ff-47c6-92be-a623026b79d9","webcompat@mozilla.org":"bb5b827a-1ad3-40d0-8c16-c7d6db11a62b","default-theme@mozilla.org":"83700f73-6c25-4599-9393-3e071be81fe6","wayback_machine@mozilla.org":"ef76899f-67d6-4ffb-973f-0c198a8369e4","uBlock0@raymondhill.net":"24e7b891-a28c-4555-b072-0ee184115cb4","DontFuckWithPaste@raim.ist":"6dbb9616-e8c9-40ff-a729-01dcd6fe09b4","uBO-Scope@raymondhill.net":"6afd83ed-7f93-41ad-960c-28c5ec5ac9bd","gdpr@cavi.au.dk":"4577a4f9-84e4-400c-a995-9b13640f3620","addon@simplelogin":"e492ff49-9c0e-4c42-ab28-465563e953b9","addons-search-detection@mozilla.com":"63a9d1fb-3c16-4b40-bd69-de186c138c5e","plasma-browser-integration@kde.org":"e655920d-846c-4a72-918e-86ebb25362a6","firefoxpwa@filips.si":"3ce26b62-9349-47cc-beaa-584b0c737979","addon@darkreader.org":"510c480d-7737-47ad-91a0-5b8e8f3745c3","shinigamieyes@shinigamieyes":"8f3b1099-f3b1-4468-915d-60fbfbfda8ce","7esoorv3@alefvanoon.anonaddy.me":"947c1016-2e39-48cd-ae1a-c301a6531d2a","CookieAutoDelete@kennydo.com":"28ccdbbd-d179-472a-8658-ae97d228f958","jid1-MnnxcxisBPnSXQ@jetpack":"f361e1b5-74bf-4073-ae95-245429a12cad","jid1-AQqSMBYb0a8ADg@jetpack":"8f3e6fd5-f009-4d2e-b501-0ec6b18dcf9e","wikipedia@search.mozilla.org":"c615bbc5-9fa2-48ae-a78d-7e5546c1a94e","ddg@search.mozilla.org":"4f7e3183-d053-40f6-b7b2-8f405f033281","{446900e4-71c2-419f-a6a7-df9c091e268b}":"bccbf892-7089-4d89-b886-a667e6fd9a03","{3c078156-979c-498b-8990-85f7987dd929}":"f3f046fa-c1b9-415d-b79b-236109b3926b"}'';
+        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+        "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo";
+      };
+      bookmarks = [
+        {
+          name = "estrogen production";
+          tags = ["chemistry" "oestrogen" "estrogen" "diy"];
+          url = "https://crimethinc.com/2022/12/15/producing-transdermal-estrogen-a-do-it-yourself-guide";
+        }
+        {
+          name = "Nix sites";
+          toolbar = false;
+          bookmarks = [
+            {
+              name = "packages";
+              tags = ["packages" "basic" "nix"];
+              url = "https://search.nixos.org/";
+            }
+            {
+              name = "settings";
+              tags = ["settings" "services" "packages" "nix"];
+              url = "https://mynixos.com";
+            }
+          ];
+        }
+      ];
+    };
+  };
+}

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

@@ -0,0 +1,14 @@
+{...}: {
+  programs.foot = {
+    enable = true;
+    # catppuccin.enable = true;
+    settings = {
+      main = {
+      };
+
+      mouse = {
+        hide-when-typing = "yes";
+      };
+    };
+  };
+}

home-manager/desktop/package-configs/konsole/Catppuccin-Macchiato.colorscheme

@@ -0,0 +1,96 @@
+[Background]
+Color=36,39,58
+
+[BackgroundFaint]
+Color=36,39,58
+
+[BackgroundIntense]
+Color=36,39,58
+
+[Color0]
+Color=110,115,141
+
+[Color0Faint]
+Color=110,115,141
+
+[Color0Intense]
+Color=110,115,141
+
+[Color1]
+Color=237,135,150
+
+[Color1Faint]
+Color=237,135,150
+
+[Color1Intense]
+Color=237,135,150
+
+[Color2]
+Color=166,218,149
+
+[Color2Faint]
+Color=166,218,149
+
+[Color2Intense]
+Color=166,218,149
+
+[Color3]
+Color=238,212,159
+
+[Color3Faint]
+Color=238,212,159
+
+[Color3Intense]
+Color=238,212,159
+
+[Color4]
+Color=138,173,244
+
+[Color4Faint]
+Color=138,173,244
+
+[Color4Intense]
+Color=138,173,244
+
+[Color5]
+Color=198,160,246
+
+[Color5Faint]
+Color=198,160,246
+
+[Color5Intense]
+Color=198,160,246
+
+[Color6]
+Color=137,220,227
+
+[Color6Faint]
+Color=137,220,227
+
+[Color6Intense]
+Color=137,220,227
+
+[Color7]
+Color=202,211,245
+
+[Color7Faint]
+Color=202,211,245
+
+[Color7Intense]
+Color=202,211,245
+
+[Foreground]
+Color=202,211,245
+
+[ForegroundFaint]
+Color=202,211,245
+
+[ForegroundIntense]
+Color=202,211,245
+
+[General]
+Blur=false
+ColorRandomization=false
+Description=Catppuccin Macchiato
+Opacity=1
+Wallpaper=

home-manager/desktop/package-configs/konsole/Catppuccin.profile

@@ -0,0 +1,8 @@
+[Appearance]
+ColorScheme=Catppuccin-Macchiato
+
+[General]
+Name=Catppuccin
+Parent=FALLBACK/
+StartInCurrentSessionDir=true
+TerminalRows=30

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

@@ -0,0 +1,20 @@
+{...}: {
+  home.file = {
+    "profile" = {
+      source = ./Catppuccin.profile;
+      target = ".local/share/konsole/Catppuccin.profile";
+    };
+  };
+  home.file = {
+    "colorscheme" = {
+      source = ./Catppuccin-Macchiato.colorscheme;
+      target = ".local/share/konsole/Catppuccin-Macchiato.colorscheme";
+    };
+  };
+  home.file = {
+    "konsolerc" = {
+      source = ./konsolerc;
+      target = ".config/konsolerc";
+    };
+  };
+}

home-manager/desktop/package-configs/konsole/konsolerc

@@ -0,0 +1,17 @@
+[Desktop Entry]
+DefaultProfile=Catppuccin.profile
+
+[General]
+ConfigVersion=1
+
+[KonsoleWindow]
+RememberWindowSize=false
+
+[MainWindow]
+1920x1080 screen: Height=512
+1920x1080 screen: Width=911
+State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAvsAAAAcAFMAUwBIAE0AYQBuAGEAZwBlAHIARABvAGMAawAAAAAA/////wAAAREA////+wAAACIAUQB1AGkAYwBrAEMAbwBtAG0AYQBuAGQAcwBEAG8AYwBrAAAAAAD/////AAABcgD///8AAAOPAAACDAAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAAAAAAD/////AAAAAAAAAAA=
+ToolBarsMovable=Disabled
+
+[UiSettings]
+ColorScheme=

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

@@ -1,13 +1,107 @@
 {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   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";
@@ -15,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";
@@ -23,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"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation";
-      "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"];
+      "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"];
       "ksmserver"."Log Out" = "Ctrl+Alt+Del";
-      "ksmserver"."Log Out Without Confirmation" = [];
+      "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation";
-      "ksmserver"."Reboot" = [];
+      "ksmserver"."LogOut" = "none,,Log Out";
-      "ksmserver"."Reboot Without Confirmation" = [];
+      "ksmserver"."Reboot" = "none,,Reboot";
-      "ksmserver"."Shut Down" = [];
+      "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";
@@ -53,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";
@@ -66,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 10" = "none,,Switch to Desktop 10";
-      "kwin"."Switch to Desktop 11" = [];
+      "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11";
-      "kwin"."Switch to Desktop 12" = [];
+      "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12";
-      "kwin"."Switch to Desktop 13" = [];
+      "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13";
-      "kwin"."Switch to Desktop 14" = [];
+      "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14";
-      "kwin"."Switch to Desktop 15" = [];
+      "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15";
-      "kwin"."Switch to Desktop 16" = [];
+      "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16";
-      "kwin"."Switch to Desktop 17" = [];
+      "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17";
-      "kwin"."Switch to Desktop 18" = [];
+      "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18";
-      "kwin"."Switch to Desktop 19" = [];
+      "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 5" = "none,,Switch to Desktop 5";
-      "kwin"."Switch to Desktop 6" = [];
+      "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6";
-      "kwin"."Switch to Desktop 7" = [];
+      "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7";
-      "kwin"."Switch to Desktop 8" = [];
+      "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8";
-      "kwin"."Switch to Desktop 9" = [];
+      "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9";
-      "kwin"."Switch to Next Desktop" = [];
+      "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop";
-      "kwin"."Switch to Next Screen" = [];
+      "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen";
-      "kwin"."Switch to Previous Desktop" = [];
+      "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop";
-      "kwin"."Switch to Previous Screen" = [];
+      "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen";
-      "kwin"."Switch to Screen 0" = [];
+      "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0";
-      "kwin"."Switch to Screen 1" = [];
+      "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1";
-      "kwin"."Switch to Screen 2" = [];
+      "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2";
-      "kwin"."Switch to Screen 3" = [];
+      "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3";
-      "kwin"."Switch to Screen 4" = [];
+      "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4";
-      "kwin"."Switch to Screen 5" = [];
+      "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5";
-      "kwin"."Switch to Screen 6" = [];
+      "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6";
-      "kwin"."Switch to Screen 7" = [];
+      "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7";
-      "kwin"."Switch to Screen Above" = [];
+      "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above";
-      "kwin"."Switch to Screen Below" = [];
+      "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below";
-      "kwin"."Switch to Screen to the Left" = [];
+      "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left";
-      "kwin"."Switch to Screen to the Right" = [];
+      "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 (Reverse)" = "Alt+Shift+Tab";
-      "kwin"."Walk Through Windows Alternative" = [];
+      "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative";
-      "kwin"."Walk Through Windows Alternative (Reverse)" = [];
+      "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)";
-      "kwin"."Walk Through Windows of Current Application" = [];
+      "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" = "none,,Walk Through Windows of Current Application Alternative";
-      "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [];
+      "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)";
-      "kwin"."Window Above Other Windows" = [];
+      "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others";
-      "kwin"."Window Below Other Windows" = [];
+      "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others";
       "kwin"."Window Close" = "Alt+F4";
-      "kwin"."Window Fullscreen" = [];
+      "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen";
-      "kwin"."Window Grow Horizontal" = [];
+      "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally";
-      "kwin"."Window Grow Vertical" = [];
+      "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically";
-      "kwin"."Window Lower" = [];
+      "kwin"."Window Lower" = "none,,Lower Window";
       "kwin"."Window Maximize" = "Meta+PgUp";
-      "kwin"."Window Maximize Horizontal" = [];
+      "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally";
-      "kwin"."Window Maximize Vertical" = [];
+      "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically";
       "kwin"."Window Minimize" = "Meta+PgDown";
-      "kwin"."Window Move" = [];
+      "kwin"."Window Move" = "none,,Move Window";
-      "kwin"."Window Move Center" = [];
+      "kwin"."Window Move Center" = "none,,Move Window to the Center";
-      "kwin"."Window No Border" = [];
+      "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame";
-      "kwin"."Window On All Desktops" = [];
+      "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 Down" = "none,,Move Window One Screen Down";
-      "kwin"."Window One Screen Up" = [];
+      "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up";
-      "kwin"."Window One Screen to the Left" = [];
+      "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left";
-      "kwin"."Window One Screen to the Right" = [];
+      "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 Down" = "none,,Move Window Down";
-      "kwin"."Window Pack Left" = [];
+      "kwin"."Window Pack Left" = "none,,Move Window Left";
-      "kwin"."Window Pack Right" = [];
+      "kwin"."Window Pack Right" = "none,,Move Window Right";
-      "kwin"."Window Pack Up" = [];
+      "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 Left" = "none,,Quick Tile Window to the Bottom Left";
-      "kwin"."Window Quick Tile Bottom Right" = [];
+      "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 Left" = "none,,Quick Tile Window to the Top Left";
-      "kwin"."Window Quick Tile Top Right" = [];
+      "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right";
-      "kwin"."Window Raise" = [];
+      "kwin"."Window Raise" = "none,,Raise Window";
-      "kwin"."Window Resize" = [];
+      "kwin"."Window Resize" = "none,,Resize Window";
-      "kwin"."Window Shade" = [];
+      "kwin"."Window Shade" = "none,,Shade Window";
-      "kwin"."Window Shrink Horizontal" = [];
+      "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally";
-      "kwin"."Window Shrink Vertical" = [];
+      "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically";
-      "kwin"."Window to Desktop 1" = [];
+      "kwin"."Window to Desktop 1" = "none,,Window to Desktop 1";
-      "kwin"."Window to Desktop 10" = [];
+      "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10";
-      "kwin"."Window to Desktop 11" = [];
+      "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11";
-      "kwin"."Window to Desktop 12" = [];
+      "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12";
-      "kwin"."Window to Desktop 13" = [];
+      "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13";
-      "kwin"."Window to Desktop 14" = [];
+      "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14";
-      "kwin"."Window to Desktop 15" = [];
+      "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15";
-      "kwin"."Window to Desktop 16" = [];
+      "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16";
-      "kwin"."Window to Desktop 17" = [];
+      "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17";
-      "kwin"."Window to Desktop 18" = [];
+      "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18";
-      "kwin"."Window to Desktop 19" = [];
+      "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19";
-      "kwin"."Window to Desktop 2" = [];
+      "kwin"."Window to Desktop 2" = "none,,Window to Desktop 2";
-      "kwin"."Window to Desktop 20" = [];
+      "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20";
-      "kwin"."Window to Desktop 3" = [];
+      "kwin"."Window to Desktop 3" = "none,,Window to Desktop 3";
-      "kwin"."Window to Desktop 4" = [];
+      "kwin"."Window to Desktop 4" = "none,,Window to Desktop 4";
-      "kwin"."Window to Desktop 5" = [];
+      "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5";
-      "kwin"."Window to Desktop 6" = [];
+      "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6";
-      "kwin"."Window to Desktop 7" = [];
+      "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7";
-      "kwin"."Window to Desktop 8" = [];
+      "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8";
-      "kwin"."Window to Desktop 9" = [];
+      "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9";
-      "kwin"."Window to Next Desktop" = [];
+      "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop";
-      "kwin"."Window to Next Screen" = [];
+      "kwin"."Window to Next Screen" = "Meta+Shift+Right";
-      "kwin"."Window to Previous Desktop" = [];
+      "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop";
-      "kwin"."Window to Previous Screen" = [];
+      "kwin"."Window to Previous Screen" = "Meta+Shift+Left";
-      "kwin"."Window to Screen 0" = [];
+      "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0";
-      "kwin"."Window to Screen 1" = [];
+      "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1";
-      "kwin"."Window to Screen 2" = [];
+      "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2";
-      "kwin"."Window to Screen 3" = [];
+      "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3";
-      "kwin"."Window to Screen 4" = [];
+      "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4";
-      "kwin"."Window to Screen 5" = [];
+      "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5";
-      "kwin"."Window to Screen 6" = [];
+      "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6";
-      "kwin"."Window to Screen 7" = [];
+      "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7";
-      "kwin"."view_actual_size" = "Meta+0";
+      "kwin"."view_actual_size" = "\\, Meta+0\\, ,Meta+0,Zoom to Actual Size";
-      "kwin"."view_zoom_in" = ["Meta++" "Meta+="];
+      "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";
@@ -211,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";
@@ -222,41 +315,53 @@
       "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"."cycleNextAction" = "none,,Next History Item";
-      "plasmashell"."cyclePrevAction" = [];
+      "plasmashell"."cyclePrevAction" = "none,,Previous History Item";
       "plasmashell"."edit_clipboard" = [];
       "plasmashell"."manage activities" = "Meta+Q";
-      "plasmashell"."next activity" = "Meta+Tab";
+      "plasmashell"."next activity" = "\\, \\, ,none,Walk through activities";
-      "plasmashell"."previous activity" = "Meta+Shift+Tab";
+      "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 next activity" = "none,,Switch to Next Activity";
-      "plasmashell"."switch to previous activity" = [];
+      "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity";
-      "plasmashell"."toggle do not disturb" = [];
+      "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb";
-      "services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc";
+      "services/org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Ctrl+Shift+Space" "Search"];
-      "services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"];
+      "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc";
-      "services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#";
+      "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"];
-      "services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"];
+      "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#";
-      "services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^";
+      "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"];
-      "services.org.kde.spectacle.desktop"."RecordWindow" = [];
+      "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^";
-      "services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"];
+      "services/org.kde.spectacle.desktop"."RecordRegion" = [];
-      "services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"];
+      "services/org.kde.spectacle.desktop"."RecordScreen" = [];
-      "services.org.kde.spectacle.desktop"."_launch" = "Print";
+      "services/org.kde.spectacle.desktop"."RecordWindow" = [];
-      "services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc";
+      "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"];
-      "services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "Meta+Print" "Ctrl+!"];
+      "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"];
-      "services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#";
+      "services/org.kde.spectacle.desktop"."_launch" = "Print";
-      "services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "Ctrl+$" "Shift+Print"];
+      "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc";
-      "services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^";
+      "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"];
-      "services.services.org.kde.spectacle.desktop"."RecordWindow" = [];
+      "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#";
-      "services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "Ctrl+@" "Meta+Shift+Print"];
+      "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"];
-      "services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "Meta+Ctrl+Print" "Ctrl+%"];
+      "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^";
-      "services.services.org.kde.spectacle.desktop"."_launch" = "Print";
+      "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"."_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"."CurrentMonitorScreenShot" = "Ctrl+#";
+      "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"."_launch" = "Print";
     };
     configFile = {
       "baloofilerc"."General"."dbVersion" = 2;
@@ -264,26 +369,162 @@
       "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;
       "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16;
       "dolphinrc"."PreviewSettings"."Plugins" = "mobithumbnail,fontthumbnail,ebookthumbnail,kraorathumbnail,jpegthumbnail,windowsexethumbnail,comicbookthumbnail,djvuthumbnail,opendocumentthumbnail,windowsimagethumbnail,exrthumbnail,audiothumbnail,cursorthumbnail,svgthumbnail,blenderthumbnail,gsthumbnail,rawthumbnail,ffmpegthumbs,imagethumbnail,directorythumbnail";
+      "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;
+      "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;
+      "kcminputrc"."Mouse"."cursorSize" = 32;
       "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize";
       "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;
@@ -313,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;
@@ -806,50 +1036,46 @@
       "khotkeysrc"."Data_3_9Triggers"."TriggersCount" = 1;
       "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1";
       "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE";
-      "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]" = "";
+      "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions" = "";
-      "khotkeysrc"."General"."BrowserApplication[$d]" = "";
+      "khotkeysrc"."General"."BrowserApplication" = "";
-      "khotkeysrc"."General"."ColorSchemeHash[$d]" = "";
-      "khotkeysrc"."General"."ColorScheme[$d]" = "";
       "khotkeysrc"."Gestures"."Disabled" = true;
       "khotkeysrc"."Gestures"."MouseButton" = 2;
       "khotkeysrc"."Gestures"."Timeout" = 300;
       "khotkeysrc"."GesturesExclude"."Comment" = "";
       "khotkeysrc"."GesturesExclude"."WindowsCount" = 0;
-      "khotkeysrc"."Icons"."Theme[$d]" = "";
+      "khotkeysrc"."KDE"."AnimationDurationFactor" = "";
-      "khotkeysrc"."KDE"."AnimationDurationFactor[$d]" = "";
+      "khotkeysrc"."KDE"."ShowDeleteCommand" = "";
-      "khotkeysrc"."KDE"."LookAndFeelPackage[$d]" = "";
+      "khotkeysrc"."KDE"."SingleClick" = "";
-      "khotkeysrc"."KDE"."ShowDeleteCommand[$d]" = "";
+      "khotkeysrc"."KDE"."widgetStyle" = "";
-      "khotkeysrc"."KDE"."SingleClick[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Allow Expansion" = "";
-      "khotkeysrc"."KDE"."widgetStyle[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension" = "";
-      "khotkeysrc"."KFileDialog Settings"."Allow Expansion[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation" = "";
-      "khotkeysrc"."KFileDialog Settings"."Automatically select filename extension[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Decoration position" = "";
-      "khotkeysrc"."KFileDialog Settings"."Breadcrumb Navigation[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode" = "";
-      "khotkeysrc"."KFileDialog Settings"."Decoration position[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode" = "";
-      "khotkeysrc"."KFileDialog Settings"."LocationCombo Completionmode[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Show Bookmarks" = "";
-      "khotkeysrc"."KFileDialog Settings"."PathCombo Completionmode[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Show Full Path" = "";
-      "khotkeysrc"."KFileDialog Settings"."Show Bookmarks[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Show Inline Previews" = "";
-      "khotkeysrc"."KFileDialog Settings"."Show Full Path[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Show Preview" = "";
-      "khotkeysrc"."KFileDialog Settings"."Show Inline Previews[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Show Speedbar" = "";
-      "khotkeysrc"."KFileDialog Settings"."Show Preview[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Show hidden files" = "";
-      "khotkeysrc"."KFileDialog Settings"."Show Speedbar[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Sort by" = "";
-      "khotkeysrc"."KFileDialog Settings"."Show hidden files[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Sort directories first" = "";
-      "khotkeysrc"."KFileDialog Settings"."Sort by[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Sort hidden files last" = "";
-      "khotkeysrc"."KFileDialog Settings"."Sort directories first[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Sort reversed" = "";
-      "khotkeysrc"."KFileDialog Settings"."Sort hidden files last[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."Speedbar Width" = "";
-      "khotkeysrc"."KFileDialog Settings"."Sort reversed[$d]" = "";
+      "khotkeysrc"."KFileDialog Settings"."View Style" = "";
-      "khotkeysrc"."KFileDialog Settings"."Speedbar Width[$d]" = "";
+      "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size" = "";
-      "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = "";
-      "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = "";
       "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321";
       "khotkeysrc"."Main"."Disabled" = false;
-      "khotkeysrc"."PreviewSettings"."MaximumRemoteSize[$d]" = "";
+      "khotkeysrc"."PreviewSettings"."MaximumRemoteSize" = "";
       "khotkeysrc"."Voice"."Shortcut" = "";
-      "khotkeysrc"."WM"."activeBackground[$d]" = "";
+      "khotkeysrc"."WM"."activeBackground" = "";
-      "khotkeysrc"."WM"."activeBlend[$d]" = "";
+      "khotkeysrc"."WM"."activeBlend" = "";
-      "khotkeysrc"."WM"."activeForeground[$d]" = "";
+      "khotkeysrc"."WM"."activeForeground" = "";
-      "khotkeysrc"."WM"."inactiveBackground[$d]" = "";
+      "khotkeysrc"."WM"."inactiveBackground" = "";
-      "khotkeysrc"."WM"."inactiveBlend[$d]" = "";
+      "khotkeysrc"."WM"."inactiveBlend" = "";
-      "khotkeysrc"."WM"."inactiveForeground[$d]" = "";
+      "khotkeysrc"."WM"."inactiveForeground" = "";
       "kiorc"."Confirmations"."ConfirmDelete" = true;
       "kiorc"."Confirmations"."ConfirmEmptyTrash" = true;
       "kiorc"."Confirmations"."ConfirmTrash" = false;
@@ -871,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";
@@ -888,10 +1115,15 @@
       "kwinrc"."Plugins"."diminactiveEnabled" = true;
       "kwinrc"."Plugins"."dimscreenEnabled" = true;
       "kwinrc"."Plugins"."wobblywindowsEnabled" = true;
-      "kwinrc"."Tiling"."padding" = 4;
+      "kwinrc"."Tiling"."padding" = 0;
-      "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}";
+      "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\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}";
+      "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\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}],\"width\":1}]}";
+      "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\":[{\"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;
@@ -904,7 +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)
-{
+{pkgs, ...}: {
-  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):
@@ -19,11 +12,12 @@
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
     ../../desktop
+    ../../shared
   ];
 
   home.packages = with pkgs; [
   ];
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 }

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)
-{
+{pkgs, ...}: {
-  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):
@@ -19,18 +12,20 @@
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
     ../../desktop
+    ../../shared
   ];
 
   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.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 }

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)
-{
+{pkgs, ...}: {
-  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):
@@ -19,11 +12,12 @@
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
     ../../desktop
+    ../../shared
   ];
 
   home.packages = with pkgs; [
   ];
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 }

home-manager/hosts/iso_server/default.nix

@@ -0,0 +1,6 @@
+{...}: {
+  # You can import other home-manager modules here
+  imports = [
+    ./lillian.nix
+  ];
+}

home-manager/hosts/iso_server/lillian.nix

@@ -0,0 +1,22 @@
+# This is your home-manager configuration file
+# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
+{pkgs, ...}: {
+  # You can import other home-manager modules here
+  imports = [
+    # If you want to use modules your own flake exports (from modules/home-manager):
+    # outputs.homeManagerModules.example
+
+    # Or modules exported from other flakes (such as nix-colors):
+    # inputs.nix-colors.homeManagerModules.default
+
+    # You can also split up your configuration and import pieces of it here:
+    # ./nvim.nix
+    ../../shared
+  ];
+
+  home.packages = with pkgs; [
+  ];
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  home.stateVersion = "24.11";
+}

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):
@@ -18,7 +11,7 @@
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
-    ../../package-configs/zsh.nix
+    ../../shared
   ];
 
   nixpkgs = {
@@ -42,5 +35,5 @@
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 }

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)
-{
+{pkgs, ...}: {
-  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):
@@ -18,8 +11,12 @@
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
-    ../../package-configs/zsh.nix
+
-    ../../desktop/plasma-desktop
+    ../../desktop/package-configs/plasma-desktop.nix
+    ../../desktop/package-configs/firefox.nix
+    ../../desktop/package-configs/konsole
+    ../../desktop/package-configs/foot
+    ../../shared
   ];
   nixpkgs = {
     # You can add overlays here
@@ -48,7 +45,7 @@
 
   home.packages = with pkgs; [
     #Chat:
-    webcord-vencord
+    vesktop
 
     #Gaming:
     prismlauncher
@@ -69,12 +66,21 @@
     nitrokey-app
     protonvpn-gui
     sops
-    watchmate
+    #watchmate
     qbittorrent
     zsh
 
+    # Theming:
+    catppuccin-cursors
+    (catppuccin-kde.override {
+      flavour = ["macchiato"];
+      accents = ["mauve"];
+    })
+    catppuccin-plymouth
+    catppuccin-sddm-corners
+
     # Web browsing:
-    librewolf
+    firefox
     ungoogled-chromium
   ];
 
@@ -96,5 +102,5 @@
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "24.05";
+  home.stateVersion = "24.11";
 }

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):
@@ -19,6 +12,7 @@
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
     ../../package-configs/zsh.nix
+    ../../package-configs/helix.nix
   ];
 
   nixpkgs = {

home-manager/shared/default.nix

@@ -0,0 +1,66 @@
+{pkgs, ...}: {
+  imports = [
+    ./shell/helix
+    ./shell/zellij
+    ./shell/zsh.nix
+    ./shell/starship.nix
+    ./shell/eza.nix
+    ./shell/hyfetch.nix
+  ];
+  home = {
+    username = "lillian";
+    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

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

home-manager/shared/shell/eza.nix

@@ -0,0 +1,7 @@
+{...}: {
+  programs.eza = {
+    enable = true;
+    enableZshIntegration = true;
+    git = true;
+  };
+}

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

@@ -0,0 +1,214 @@
+{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"; # 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;
+        lsp.display-inlay-hints = true;
+        cursor-shape = {
+          insert = "bar";
+          normal = "block";
+          select = "underline";
+        };
+        cursorline = true;
+        bufferline = "always";
+        color-modes = true;
+        soft-wrap = {
+          enable = true;
+          max-wrap = 25;
+          wrap-indicator = "";
+        };
+      };
+    };
+    languages = {
+      language = [
+        {
+          name = "python";
+          language-id = "python";
+          auto-format = true;
+          file-types = ["py"];
+          language-servers = ["ruff" "scls" "pylsp"];
+        }
+        {
+          name = "typst";
+          language-id = "typst";
+          auto-format = false;
+          file-types = ["typ"];
+          language-servers = ["typst-lsp" "scls"];
+        }
+        {
+          name = "rust";
+          language-id = "rust";
+          auto-format = true;
+          file-types = ["rs"];
+          roots = ["Cargo.lock"];
+          language-servers = ["rust-analyzer" "scls"];
+        }
+        {
+          name = "stub";
+          scope = "text.stub";
+          file-types = [];
+          shebangs = [];
+          roots = [];
+          auto-format = false;
+          language-servers = ["scls"];
+        }
+        {
+          name = "nix";
+          language-id = "nix";
+          auto-format = true;
+          file-types = ["nix"];
+          roots = ["flake.lock" "flake.nix"];
+          language-servers = ["nil" "scls"];
+          formatter = {
+            command = "alejandra";
+            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";
+        };
+        typst-lsp = {
+          command = "typst-lsp";
+        };
+        rust-analyzer = {
+          command = "rust-analyzer";
+        };
+        nil = {
+          command = "nil";
+        };
+        scls = {
+          command = "simple-completion-language-server";
+          config = {
+            max_completion_items = 20;
+            snippets_first = true;
+            feature_words = true;
+            feature_snippets = true;
+            feature_unicode_input = true;
+            feature_paths = true;
+          };
+        };
+      };
+    };
+  };
+  home.file = {
+    "helix" = {
+      source = ./snippets.toml;
+      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/helix/snippets.toml

@@ -0,0 +1,3 @@
+[[sources]] # list of sources to load
+name = "friendly-snippets"  # optional name shown on snippet description
+git = "https://github.com/rafamadriz/friendly-snippets.git" # git repo with snippets collections

home-manager/shared/shell/hyfetch.nix

@@ -0,0 +1,15 @@
+{...}: {
+  programs.hyfetch = {
+    enable = true;
+    settings = {
+      preset = "transgender";
+      mode = "rgb";
+      light_dark = "dark";
+      lightness = 0.65;
+      color_align = {
+        mode = "horizontal";
+      };
+      backend = "neofetch";
+    };
+  };
+}

home-manager/shared/shell/starship.nix

@@ -0,0 +1,50 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  programs.starship = let
+    flavor = "macchiato"; # One of `latte`, `frappe`, `macchiato`, or `mocha`
+  in {
+    enable = true;
+    settings =
+      {
+        add_newline = true;
+        format = lib.concatStrings [
+          "$sudo"
+          "$all"
+        ];
+        character.success_symbol = "[➜](bold purple)";
+        package.disabled = true;
+        sudo = {
+          symbol = "witch ";
+          style = "bold blue";
+          format = "[$symbol]($style)";
+          disabled = false;
+        };
+        hostname = {
+          ssh_only = false;
+          format = "[$hostname](bold yellow)[$ssh_symbol](bold blue):";
+          trim_at = "";
+          disabled = false;
+        };
+        username = {
+          show_always = true;
+          format = "[$user]($style)@";
+        };
+        git_branch.style = "bold blue";
+        directory.style = "bold blue";
+        direnv.disabled = false;
+        palette = "catppuccin_${flavor}";
+      }
+      // builtins.fromTOML (builtins.readFile
+        (pkgs.fetchFromGitHub
+          {
+            owner = "catppuccin";
+            repo = "starship";
+            rev = "5629d23"; # Replace with the latest commit hash
+            sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
+          }
+          + /palettes/${flavor}.toml));
+  };
+}

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

@@ -0,0 +1,228 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: let
+  layout =
+    pkgs.writeText "default.kdl"
+    ''
+      layout {
+        tab {
+          pane
+        }
+
+        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" {
+              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" {
+              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"
+          }
+        }
+      }
+    '';
+in {
+  programs.zellij = {
+    # This autostarts zellij on zsh start
+    # 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 = {
+    "layout" = {
+      source = "${layout}";
+      target = ".config/zellij/layouts/default.kdl";
+    };
+  };
+  home.file = {
+    "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/zellij/zellij.kdl

@@ -0,0 +1,31 @@
+session_serialization true
+theme "catppuccin-macchiato"
+
+themes {
+    catppuccin-mocha {
+        bg "#585b70" // Surface2
+        fg "#cdd6f4"
+        red "#f38ba8"
+        green "#a6e3a1"
+        blue "#89b4fa"
+        yellow "#f9e2af"
+        magenta "#f5c2e7" // Pink
+        orange "#fab387" // Peach
+        cyan "#89dceb" // Sky
+        black "#181825" // Mantle
+        white "#cdd6f4"
+    }
+    catppuccin-macchiato {
+        bg "#5b6078" // Surface2
+        fg "#cad3f5"
+        red "#ed8796"
+        green "#a6da95"
+        blue "#8aadf4"
+        yellow "#eed49f"
+        magenta "#f5bde6" // Pink
+        orange "#f5a97f" // Peach
+        cyan "#91d7e3" // Sky
+        black "#1e2030" // Mantle
+        white "#cad3f5"
+    }
+}

home-manager/shared/shell/zsh.nix

@@ -1,16 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  # Enable starship
-  programs.starship = {
-    enable = true;
-  };
-
   programs.zoxide = {
     enable = true;
   };
@@ -20,7 +8,13 @@
     shellAliases = {
       cd = "z";
       code = "codium ./";
+      ls = "eza";
       lh = "ls -lah";
+      cat = "bat";
+      tree = "tre";
+      neofetch = "hyfetch";
+      shutdown = "shutdown 0";
+      reboot = "reboot 0";
     };
     plugins = [
       {
@@ -33,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;
@@ -43,64 +46,25 @@
       enable = true;
       plugins = [
         "git"
-        "adb"
-        "battery"
-        "branch"
-        "coffee"
         "colored-man-pages"
         "colorize"
-        "command-not-found"
-        "common-aliases"
-        "compleat"
-        "composer"
-        "copypath"
-        "copybuffer"
-        "copyfile"
-        "cp"
         "dirhistory"
         "dirpersist"
-        "docker"
-        "docker-compose"
-        "extract"
-        "fancy-ctrl-z"
-        "fastfile"
-        "frontend-search"
-        "git-auto-fetch"
-        "git-escape-magic"
-        "git-extras"
-        "git-flow"
-        "github"
-        "gitignore"
-        "gnu-utils"
-        "gpg-agent"
         "history"
         "history-substring-search"
+        "fancy-ctrl-z"
+        "git-flow"
         "isodate"
-        "jsontools"
+        "z"
-        "keychain"
-        "man"
-        "nanoc"
-        "pip"
-        "pipenv"
-        "pyenv"
-        "python"
-        "rsync"
-        "rvm"
-        "screen"
-        "sdk"
-        "sfdx"
-        "shell-proxy"
-        "sudo"
-        "systemadmin"
-        "systemd"
-        "themes"
-        "urltools"
-        "web-search"
         "zsh-interactive-cd"
         "zsh-navigation-tools"
-        "z"
       ];
-      theme = "jtriley";
     };
+    # 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,20 +1,24 @@
 # This is your system's configuration file.
 # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
 {
-  inputs,
   outputs,
   lib,
   config,
   pkgs,
+  pkgs-edge,
   ...
 }: {
   imports = [
     # Import shared packages
     ../shared
+    ./package-configs
   ];
   nixpkgs = {
     # You can add overlays here
     overlays = [
+      #(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
@@ -25,52 +29,73 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
+  # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently
-    # Custom tools
+  programs.command-not-found.enable = lib.mkForce false;
-    dvd
+  programs.nix-index.enable = true;
-    dvt
+  programs.nix-index-database.comma.enable = true;
-    servo
-    restart
 
-    # System tools
+  environment.systemPackages =
-    aha
+    (with pkgs; [
-    bcachefs-tools
+      # Custom tools
-    direnv
+      dvd
-    git-filter-repo
+      dvt
-    gnupg
+      servo
-    pciutils
+      restart
-    podman
-    podman-compose
-    sbctl
-    tpm2-tools
-    tpm2-tss
-    waydroid
-    xwaylandvideobridge
-    yubikey-personalization
-    zsh
 
-    # KDE/QT
+      # System tools
-    krunner-translator
+      aha
-    kdePackages.discover
+      #bcachefs-tools
-    kdePackages.kcalc
+      clinfo
-    kdePackages.kdepim-addons
+      comma
-    kdePackages.kirigami
+      direnv
-    kdePackages.kdeconnect-kde
+      exfat
-    # kdePackages.krunner-ssh
+      exfatprogs
-    # kdePackages.krunner-symbols
+      git-filter-repo
-    kdePackages.packagekit-qt
+      gnupg
-    kdePackages.plasma-pa
+      pciutils
-    kdePackages.sddm-kcm
+      podman
-    kdePackages.dolphin-plugins
+      podman-compose
-    libportal-qt5
+      sbctl
-    libportal
+      tpm2-tools
+      tpm2-tss
+      virtualgl
+      vulkan-tools
+      # waydroid
+      waypipe
+      wayland-utils
+      xwaylandvideobridge
+      yubikey-personalization
+      zsh
 
-    # User tools
+      # KDE/QT
-    noisetorch
+      krunner-translator
-    qjackctl
+      kdePackages.discover
-    wireplumber
+      kdePackages.filelight
-    rustdesk
+      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
+
+      # User tools
+      noisetorch
+      qjackctl
+      wireplumber
+      #rustdesk
+    ])
+    ++ (with pkgs-edge; [
+      # list of latest packages from nixpkgs master
+      # Can be used to install latest version of some packages
+    ]);
 
   programs.direnv = {
     enable = true;
@@ -83,8 +108,9 @@
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
     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
 
   # Set your time zone.
   time.timeZone = "Europe/Amsterdam";
@@ -93,10 +119,12 @@
   services.xserver.enable = true;
 
   # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.wayland.enable = true;
+  services.displayManager.sddm = {
-  services.xserver.displayManager.sddm.enable = true;
+    enable = true;
+    wayland.enable = true;
+  };
+  services.displayManager.defaultSession = "plasma";
   services.desktopManager.plasma6.enable = true;
-  services.xserver.displayManager.defaultSession = "plasma";
   programs.kdeconnect.enable = true;
 
   # Enable flatpak support
@@ -120,7 +148,6 @@
   services.fwupd.enable = true;
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -148,12 +175,12 @@
 
   # FIXME: re-enable virtual camera loopback when it build again.
   boot.bootspec.enable = true;
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
+  #boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
-  boot.supportedFilesystems = ["bcachefs"];
+  #boot.supportedFilesystems = ["bcachefs"];
-  # boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out];
+  boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out];
   boot.kernelModules = [
     # Virtual Camera
-    # "v4l2loopback"
+    "v4l2loopback"
     # Virtual Microphone, built-in
     "snd-aloop"
   ];
@@ -162,7 +189,7 @@
     # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming
     # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams
     # https://github.com/umlaeute/v4l2loopback
-    # options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
+    options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
   '';
   boot.loader.systemd-boot.configurationLimit = 3;
   boot.loader.efi.canTouchEfiVariables = true;

nixos/desktop/package-configs/default.nix

@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./firefox
+  ];
+}

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

@@ -0,0 +1,174 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.firefox = {
+    enable = true;
+    package = pkgs.floorp;
+    policies = {
+      DisableTelemetry = true;
+      DisableFirefoxStudies = true;
+      DisablePocket = true;
+      DisableFirefoxAccounts = true;
+      DisableAccounts = true;
+      DisableProfileImport = true;
+      OverrideFirstRunPage = "";
+      OverridePostUpdatePage = "";
+      DontCheckDefaultBrowser = true;
+      DisplayBookmarksToolbar = "newtab";
+      ManualAppUpdateOnly = true;
+      OfferToSaveLogins = false;
+      PasswordManagerEnabled = false;
+      DownloadDirectory = "\${home}/Downloads";
+      EnableTrackingProtection = {
+        Value = true;
+        Cryptomining = true;
+        Fingerprinting = true;
+      };
+      ExtensionSettings = {
+        # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below
+        # 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";
+        #};
+        # Privacy Badger:
+        "jid1-MnnxcxisBPnSXQ@jetpack" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Bitwarden:
+        "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Libredirect:
+        "7esoorv3@alefvanoon.anonaddy.me" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/libredirect/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # DarkReader:
+        "addon@darkreader.org" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # SimpleLogin:
+        "addon@simplelogin" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/simplelogin/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Cookie Auto Delete:
+        "CookieAutoDelete@kennydo.com" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/cookie-autodelete/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Don't fuck with paste:
+        "DontFuckWithPaste@raim.ist" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/don-t-fuck-with-paste/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Firefox pwas:
+        "firefoxpwa@filips.si" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/pwas-for-firefox/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Consent o matic:
+        "gdpr@cavi.au.dk" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/consent-o-matic/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Mailvelope:
+        "jid1-AQqSMBYb0a8ADg@jetpack" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/mailvelope/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # KDE connect:
+        "kde-connect@0xc0dedbad.com" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/kde-connect/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Plasma browser integration:
+        "plasma-browser-integration@kde.org" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/plasma-integration/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Shinigami eyes:
+        "shinigamieyes@shinigamieyes" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/shinigami-eyes/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # uBlock Origin:
+        "uBlock0@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # uBlock Scope:
+        "uBO-Scope@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ubo-scope/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        # Wayback machine:
+        "wayback_machine@mozilla.org" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi";
+          installation_mode = "force_installed";
+        };
+      };
+      FirefoxHome = {
+        Search = true;
+        TopSites = false;
+        SponsoredTopSites = false;
+        Highlights = false;
+        Pocket = false;
+        SponsoredPocket = false;
+        Snippets = false;
+      };
+      FirefoxSuggest = {
+        WebSuggestions = false;
+        SponsoredSuggestions = false;
+        ImproveSuggest = false;
+      };
+      Preferences = {
+        "browser.compactmode.show" = true;
+        "browser.uidensity" = 0;
+        # "browser.newtabpage.activity-stream.feeds.topsites" = 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
+      # Bookmarks = [
+      #   {
+      #     Title = "NixOS wiki";
+      #     Placement = "toolbar";
+      #     URL = "https://nixos.wiki/";
+      #   }
+      #   {
+      #     Title = "NixOS options";
+      #     Placement = "toolbar";
+      #     URL = "https://nixos.org/manual/nixos/stable/options";
+      #   }
+      #   {
+      #     Title = "NixOS home-manager options";
+      #     Placement = "toolbar";
+      #     URL = "https://nix-community.github.io/home-manager/options.xhtml";
+      #   }
+      # ];
+    };
+  };
+}

nixos/hosts/EDI/configuration.nix

@@ -4,7 +4,6 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
   ...
 }: {
@@ -58,5 +57,5 @@
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "unstable";
+  system.stateVersion = "24.11";
 }

nixos/hosts/EDI/hardware-configuration.nix

@@ -1,17 +1,20 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
-    ];
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.initrd.kernelModules = ["dm-snapshot"];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
 
   #fileSystems."/" =
   #  { device = "UUID=65956905-b7a5-4573-81fe-622c42cabdf5";

nixos/hosts/GLaDOS/configuration.nix

@@ -3,8 +3,6 @@
 {
   inputs,
   outputs,
-  lib,
-  config,
   pkgs,
   ...
 }: {
@@ -38,11 +36,11 @@
   services.xserver.videoDrivers = ["amdgpu"];
 
   # Add vulkan support to GPU
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.graphics.extraPackages = with pkgs; [
     amdvlk
   ];
   # For 32 bit applications
-  hardware.opengl.extraPackages32 = with pkgs; [
+  hardware.graphics.extraPackages32 = with pkgs; [
     driversi686Linux.amdvlk
   ];
 
@@ -67,12 +65,12 @@
     };
   };
 
-  boot.loader.systemd-boot.enable = lib.mkForce false;
+  boot.loader.systemd-boot.enable = true;
 
-  boot.lanzaboote = {
+  # boot.lanzaboote = {
-    enable = true;
+  #   enable = true;
-    pkiBundle = "/etc/secureboot";
+  #   pkiBundle = "/etc/secureboot";
-  };
+  # };
 
   users.users.lillian.extraGroups = ["gamemode"];
 
@@ -84,8 +82,9 @@
     };
   };
 
+  # virtualisation.waydroid.enable = false;
   networking.hostName = "GLaDOS";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "unstable";
+  system.stateVersion = "24.11";
 }

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 = [
@@ -19,6 +17,10 @@
     ../../shared
   ];
 
+  programs.command-not-found.enable = lib.mkForce false;
+  programs.nix-index.enable = true;
+  programs.nix-index-database.comma.enable = true;
+
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = false;
   networking.domain = "";
@@ -146,5 +148,5 @@
   boot.supportedFilesystems = lib.mkForce ["bcachefs" "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"];
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "unstable";
+  system.stateVersion = "24.11";
 }

nixos/hosts/iso_server/configuration.nix

@@ -0,0 +1,125 @@
+{
+  inputs,
+  outputs,
+  lib,
+  pkgs,
+  ...
+}: {
+  imports = [
+    # If you want to use modules your own flake exports (from modules/home-manager):
+    # outputs.homeManagerModules.example
+    # outputs.nixosModules.contabo.wan
+    inputs.home-manager.nixosModules.home-manager
+    # Or modules exported from other flakes (such as nix-colors):
+    # inputs.nix-colors.homeManagerModules.defaults
+
+    # Import shared settings
+    ../../shared
+  ];
+
+  programs.command-not-found.enable = lib.mkForce false;
+  programs.nix-index.enable = true;
+  programs.nix-index-database.comma.enable = true;
+
+  boot.tmp.cleanOnBoot = true;
+  zramSwap.enable = false;
+  networking.domain = "";
+  services.openssh = {
+    enable = true;
+    # require public key authentication for better security
+    settings.PasswordAuthentication = false;
+    settings.KbdInteractiveAuthentication = false;
+  };
+
+  nixpkgs = {
+    # You can add overlays here
+    overlays = [
+    ];
+    # Configure your nixpkgs instance
+    config = {
+      # Disable if you don't want unfree packages
+      allowUnfree = true;
+    };
+  };
+
+  #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys
+  sops.defaultSopsFile = ./secrets/sops.yaml;
+
+  environment.systemPackages = with pkgs; [
+    # Custom tools
+    dvd
+    dvt
+    servo
+    restart
+    install-nix
+
+    # System tools
+    aha
+    direnv
+    efitools
+    git-filter-repo
+    gnupg
+    pciutils
+    sbctl
+    tpm2-tools
+    tpm2-tss
+    zsh
+  ];
+
+  # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53"
+
+  networking.firewall.enable = true;
+
+  networking.firewall.allowedTCPPorts = [22];
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+    options = "terminate:ctrl_alt_bksp,compose:caps_toggle";
+  };
+
+  security.tpm2.enable = true;
+  security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so
+  security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables
+  users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices
+
+  # Set your time zone.
+  time.timeZone = "Europe/Amsterdam";
+
+  programs.git = {
+    enable = true;
+  };
+
+  programs.direnv = {
+    enable = true;
+  };
+
+  # Enable completion of system packages by zsh
+  environment.pathsToLink = ["/share/zsh"];
+
+  # kde power settings do not turn off screen
+  systemd = {
+    services.sshd.wantedBy = pkgs.lib.mkForce ["multi-user.target"];
+    targets = {
+      sleep.enable = false;
+      suspend.enable = false;
+      hibernate.enable = false;
+      hybrid-sleep.enable = false;
+    };
+  };
+
+  home-manager = {
+    extraSpecialArgs = {inherit inputs outputs;};
+    users = {
+      # Import your home-manager configuration
+      lillian = import ../../../home-manager/hosts/iso_server;
+    };
+  };
+
+  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
+  boot.supportedFilesystems = lib.mkForce ["bcachefs" "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"];
+
+  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
+  system.stateVersion = "unstable";
+}

nixos/hosts/iso_server/secrets/sops.yaml

@@ -0,0 +1,21 @@
+lillian-password: ENC[AES256_GCM,data:kDP9LpmtLR2UEjCY0kgcdHmYAYLipOd/9I3NuiRHzLDhCX44M5QGfbQrle7bi9EOVD4eNB3uNtk+oBClr7cc21E9YtMIp5vg2g==,iv:EWB/hMRtWZfEn48Qmjo/V30BtSLrOsmo/cuEKnfW6Wk=,tag:vjiOkVga18BLKjf3GnZM2Q==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age12e00qvf4shtmsfq3ujamyaa72pjvad2qhrxkvpl9hryrjvgxev4sjhmkxz
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTFI5MDRiUkp1TGF2eHlG
+            VmwyVEdXQVR4dFJaZTNxeTRXQXZNbkN6T1dRClZyMU1LbFFmY0RwK1pmNDNWY0hW
+            bUJGYXI5ZEFIdDhUak1kMzF1WTE2SGsKLS0tIHpUQUVEWml1a251RmhQSGt1dm5E
+            a1hsN3NaVzNvRXlwcEpPd0RVQndiZk0KJ7/cnWzw1zSmgn+bOJn4Y1xRHqlk+zRM
+            Om0p+V9tUCCS5yGzacp8pFCa2DQNj0OVdyB2ZpjAiOzK7vWY8EU5XA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-05-03T14:29:41Z"
+    mac: ENC[AES256_GCM,data:ezq0K/lFSNSog0UzvsVNNpCewzBKmKJdsXlkWzZ8nhXN7/1lHeoONQnoEooNhNhpmFF1yCvcArZ6Suy7+R4UuybKBky+6r62fyz0BKrAO9y0Xb/HFiAJPAYwP7/5sRFq/jDdtMAbjLxJhoH128md5LoHXhUUc3sws/SIQvdan4I=,iv:/IxAO3rw4lc8ZzDWUtfJb3siGCtzCxid5NfhEnad01Q=,tag:IRg7LV7hnFmWl5WhWD2ZSg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1

nixos/hosts/queen/configuration.nix

@@ -2,9 +2,7 @@
   inputs,
   outputs,
   lib,
-  config,
   pkgs,
-  nixpkgs-stable,
   ...
 }: {
   imports = [
@@ -24,6 +22,9 @@
 
     # Import server settings
     ../../server
+
+    # Import disko
+    # ../../../disko/queen
   ];
 
   boot.tmp.cleanOnBoot = true;
@@ -43,6 +44,7 @@
     ];
     # Configure your nixpkgs instance
     config = {
+      allowBroken = true;
       # Disable if you don't want unfree packages
       allowUnfree = true;
     };
@@ -52,7 +54,6 @@
   sops.defaultSopsFile = ./secrets/sops.yaml;
 
   environment.systemPackages = with pkgs; [
-    akkoma
     fzf
     matrix-conduit
     docker
@@ -70,9 +71,11 @@
     nextcloud28
     nginx
     onlyoffice-documentserver
+    openssl
+    phanpy
     postgresql_16
-    python3
+    python310
-    python311Packages.nbconvert
+    python310Packages.nbconvert
     jupyter
     rabbitmq-server
     roundcube
@@ -87,22 +90,38 @@
   ];
 
   # Create an auto-update systemd service that runs every day
-  system.autoUpgrade = {
+  # system.autoUpgrade = {
-    flake = "git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git";
+  # flake = "git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git";
-    dates = "daily";
+  # dates = "daily";
-    enable = true;
+  # enable = true;
-  };
+  # };
 
-  systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug";
+  # systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug";
   # Enable networking
-  networking.networkmanager.enable = true;
+  # networking.networkmanager.enable = true;
-  networking.nat.enable = true;
+  # networking.nat.enable = true;
-  networking.nat.internalInterfaces = ["ve-+"];
+  # networking.nat.internalInterfaces = ["ve-+"];
-  networking.nat.externalInterface = "ens18";
+  # networking.nat.externalInterface = "ens18";
   networking.enableIPv6 = lib.mkForce true;
-  networking.nameservers = ["1.1.1.1"];
+  networking.nameservers = ["2a02:c207::1:53" "2a02:c207::2:53"];
 
-  # Contabo ipv6 nameservers: "2a02:c207::1:53" "2a02:c207::2:53"
+  # networking.interfaces.ens18.ipv4.addresses = [
+  #   {
+  #     address = "62.171.160.195";
+  #     prefixLength = 32;
+  #   }
+  # ];
+
+  networking.interfaces.ens18.ipv6.addresses = [
+    {
+      address = "2a02:c207:2063:2448::1";
+      prefixLength = 64;
+    }
+  ];
+  networking.defaultGateway6 = {
+    address = "fe80::1";
+    interface = "ens18";
+  };
 
   # Open ports in the firewall.
   networking.firewall = {
@@ -168,5 +187,5 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "unstable";
+  system.stateVersion = "24.11";
 }

nixos/hosts/queen/hardware-configuration.nix

@@ -1,18 +1,25 @@
 {
-  config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {
   imports = [(modulesPath + "/profiles/qemu-guest.nix")];
   boot.loader.grub.device = "/dev/sda";
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
+  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"];
   boot.initrd.kernelModules = ["nvme"];
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  networking.useDHCP = lib.mkDefault true;
+
   fileSystems."/" = {
-    device = "/dev/sda3";
+    device = "/dev/disk/by-uuid/dc10d09c-9394-4854-acd5-93ceccd2f448";
     fsType = "ext4";
   };
-  swapDevices = [{device = "/dev/sda2";}];
+
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  fileSystems."/nix/store" = {
+    device = "/nix/store";
+    fsType = "none";
+    options = ["bind"];
+  };
+
+  swapDevices = [];
 }

nixos/hosts/queen/secrets/sops.yaml

@@ -9,6 +9,10 @@ rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8u
 wg-private: ENC[AES256_GCM,data:6BEuNqqG//p5UhRmQ4RPEze6jZdvzK4PEXxlbX2ANYIhFpacj0aZnCr9o/A=,iv:tPlwYdV4I5oA8qG+bfVi1Dpbf7xedByantqsmylZXKQ=,tag:k1BqKqlayOWz5QW1XiAjqQ==,type:str]
 lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW7IUpjHMyS7YP+pmmvDCzM9afIXMxyPFHGNRwiCmxqstiiNeSeLdo6rDw==,iv:sGeu9aNTgdpThv+0Z/nZKIrat1xNgM0t/KTGPaFbsdI=,tag:kZBHF4X0KO9znog61NwU+Q==,type:str]
 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: []
@@ -24,8 +28,8 @@ sops:
             KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz
             NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-24T19:25:02Z"
+    lastmodified: "2024-08-16T13:34:43Z"
-    mac: ENC[AES256_GCM,data:Bd2CcyaZk3C5hOFzCo54dKpBduR2fEr6J78pS3bBVvIDMWAL574k2mtYwzixaXPGbUdPMccRhYZcYyhq6x0A+g99kcZYqDV1lRRBUfg6mJ/eEDLcoD3rYd3XgWFzen6PKTsg/rL35EG2EVVSndZKTx4AI0213lcv6BYeb7cZt/0=,iv:UOxGbO07FTcaknwoUMBwlG+AR4EmZeAd3KJkpPwDJL4=,tag:uyoRQVZ3hM6TWsQB3Lin9g==,type:str]
+    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 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  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,
   ...
 }: {
@@ -15,8 +14,9 @@
     # Or modules exported from other flakes (such as nix-colors):
     # inputs.nix-colors.homeManagerModules.default
 
-    # Import the locale settings
+    # Import the shared settings
     ../../shared
+    ../../desktop/package-configs/firefox
 
     # You can also split up your configuration and import pieces of it here:
     # ./nvim.nix
@@ -35,7 +35,6 @@
   nixpkgs = {
     # You can add overlays here
     overlays = [
-      inputs.extest.overlays.default
     ];
     # Configure your nixpkgs instance
     config = {
@@ -52,27 +51,20 @@
     auto-mount
 
     #System:
-    alejandra
     btrfs-progs
+    decky-loader
     efitools
-    extest
-    git
-    git-filter-repo
-    home-manager
-    htop
     jq
     noto-fonts
     noto-fonts-emoji-blob-bin
     noto-fonts-emoji
-    oh-my-zsh
+    #rustdesk
-    rsync
-    rustdesk
     sbctl
-    steam
     udisks
     util-linux
-    wget
+    waypipe
-    zsh
+    python3
+    protonup-qt
 
     #KDE:
     krunner-translator
@@ -90,42 +82,36 @@
     #Gaming:
     heroic
     legendary-gl
+    protontricks
     rare
   ];
 
-  #Enable steam deck steam interface
+  jovian = {
-  jovian.steam.enable = true;
+    steam = {
-
+      enable = true;
-  #Autostart this inteface at login
+      autoStart = true;
-  jovian.steam.autoStart = true;
+      user = "lillian";
-
+      desktopSession = "plasma";
-  #What desktop to start when switching to desktop session
+    };
-  jovian.steam.desktopSession = "plasma";
+    decky-loader = {
-
+      enable = true;
-  jovian.steam.user = "lillian";
+      package = pkgs.decky-loader-prerelease;
-
+      extraPackages = [pkgs.python3];
-  #Enable gyro service for CEMU
+    };
-  jovian.devices.steamdeck.enableGyroDsuService = true;
+    devices.steamdeck = {
-
+      enable = true;
-  #Enable steam deck specific services
+      autoUpdate = true;
-  jovian.devices.steamdeck.enable = true;
+      enableGyroDsuService = true;
-
+    };
-  #Enable auto updates for the BIOS and controller firmware
+  };
-  jovian.devices.steamdeck.autoUpdate = true;
-
-  jovian.decky-loader.enable = true;
-
-  jovian.hardware.has.amd.gpu = true;
 
   programs.steam = lib.mkForce {
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-    package = pkgs.steam.override {
+    extest.enable = true;
-      extraProfile = ''export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD'';
-    };
   };
-  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;
@@ -134,7 +120,9 @@
   services.desktopManager.plasma6.enable = true;
   programs.kdeconnect.enable = true;
 
-  services.xserver.displayManager.sddm.settings = {
+  services.displayManager.defaultSession = "plasma";
+  services.displayManager.sddm.wayland.enable = lib.mkForce true;
+  services.displayManager.sddm.settings = {
     Autologin = {
       Session = "plasma.desktop";
       User = "lillian";
@@ -177,7 +165,6 @@
   services.fwupd.enable = true;
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -234,5 +221,5 @@
   boot.plymouth.enable = true;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "unstable";
+  system.stateVersion = "24.11";
 }

nixos/hosts/shodan/hardware-configuration.nix

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

nixos/hosts/wheatley/armv7l.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  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, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   users.users.aria2.group = "aria2";
   users.groups.aria2 = {};
   users.users.aria2.isSystemUser = true;

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

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

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

@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  services.nginx = {
+    enable = true;
+    virtualHosts = {
+      "cinny.gladtherescake.eu" = {
+        root = "${pkgs.cinny}";
+        ## Force HTTP redirect to HTTPS
+        forceSSL = true;
+        ## LetsEncrypt
+        enableACME = true;
+        locations."/" = {
+          index = "index.html";
+        };
+      };
+    };
+  };
+}

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

@@ -2,7 +2,6 @@
   config,
   pkgs,
   inputs,
-  lib,
   ...
 }: let
   # You'll need to edit these values
@@ -36,7 +35,7 @@ in {
 
     # This causes NixOS to use the flake defined in this repository instead of
     # the build of Conduit built into nixpkgs.
-    package = inputs.conduit.packages.${pkgs.system}.default;
+    package = inputs.conduwuit.packages.${pkgs.system}.default;
 
     settings.global = {
       inherit server_name;
@@ -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";
+      };
     };
   };
 
@@ -63,7 +66,6 @@ in {
   # Configure NGINX as a reverse proxy
   services.nginx = {
     enable = true;
-    recommendedProxySettings = true;
 
     virtualHosts = {
       "${server_name}" = {
@@ -123,6 +125,15 @@ in {
             add_header Access-Control-Allow-Origin "*";
           '';
         };
+        locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = {
+          proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync";
+          proxyWebsockets = true;
+          recommendedProxySettings = false;
+          extraConfig = ''
+            proxy_set_header Host $host;
+            proxy_buffering off;
+          '';
+        };
 
         extraConfig = ''
           merge_slashes off;

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

@@ -1,21 +1,16 @@
-{
+{config, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   sops.secrets."coturn-auth-secret".mode = "0440";
   sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name;
   users.users.nginx.extraGroups = ["turnserver"];
   services.coturn = {
     enable = true;
-    lt-cred-mech = true;
     use-auth-secret = true;
-    static-auth-secret-file = config.sops.secrets."coturn-auth-secret".path;
+    static-auth-secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT";
     realm = "turn.gladtherescake.eu";
     relay-ips = [
       "62.171.160.195"
+      "2a02:c207:2063:2448::1"
     ];
-    no-tcp-relay = true;
     extraConfig = "
       cipher-list=\"HIGH\"
       no-loopback-peers

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

@@ -0,0 +1,8 @@
+{...}: {
+  imports = [
+    ./grafana
+    #./loki
+    ./prometheus
+    ./telegraf
+  ];
+}

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

@@ -0,0 +1,44 @@
+{config, ...}: {
+  # grafana configuration
+  services.grafana = {
+    enable = true;
+    settings.server = {
+      domain = "grafana.lillianviolet.dev";
+      http_port = 2342;
+      http_addr = "127.0.0.1";
+    };
+    provision = {
+      datasources.settings = {
+        apiVersion = 1;
+        datasources = [
+          {
+            name = "Prometheus";
+            type = "prometheus";
+            access = "proxy";
+            url = "http://localhost:${toString config.services.prometheus.port}";
+            isDefault = true;
+          }
+          # {
+          #   name = "Loki";
+          #   type = "loki";
+          #   access = "proxy";
+          #   url = "http://localhost:${config.services.loki.port}";
+          #   isDefault = true;
+          # }
+        ];
+      };
+    };
+  };
+
+  # nginx reverse proxy
+  services.nginx.virtualHosts.${config.services.grafana.settings.server.domain} = {
+    ## Force HTTP redirect to HTTPS
+    forceSSL = true;
+    ## LetsEncrypt
+    enableACME = true;
+    locations."/" = {
+      proxyPass = "http://${toString config.services.grafana.settings.server.http_addr}:${toString config.services.grafana.settings.server.http_port}";
+      proxyWebsockets = true;
+    };
+  };
+}

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

@@ -0,0 +1,6 @@
+{...}: {
+  services.loki = {
+    enable = true;
+    configFile = ./loki.yaml;
+  };
+}

nixos/server/package-configs/dashboard/loki/loki.yaml

@@ -0,0 +1,40 @@
+# Enables authentication through the X-Scope-OrgID header, which must be present
+# if true. If false, the OrgID will always be set to "fake".
+auth_enabled: false
+
+server:
+  http_listen_address: "0.0.0.0"
+  http_listen_port: 3100
+
+ingester:
+  lifecycler:
+    address: "127.0.0.1"
+    ring:
+      kvstore:
+        store: inmemory
+      replication_factor: 1
+    final_sleep: 0s
+  chunk_idle_period: 5m
+  chunk_retain_period: 30s
+
+schema_config:
+  configs:
+  - from: 2020-05-15
+    store: boltdb
+    object_store: filesystem
+    schema: v11
+    index:
+      prefix: index_
+      period: 168h
+
+storage_config:
+  boltdb:
+    directory: /tmp/loki/index
+
+  filesystem:
+    directory: /tmp/loki/chunks
+
+limits_config:
+  enforce_metric_name: false
+  reject_old_samples: true
+  reject_old_samples_max_age: 168h

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

@@ -0,0 +1,34 @@
+{...}: {
+  services.prometheus = {
+    enable = true;
+    port = 9001;
+    # Export the current system metrics
+    exporters = {
+      node = {
+        enable = true;
+        enabledCollectors = ["systemd"];
+        port = 9002;
+      };
+    };
+    scrapeConfigs = [
+      # Scrape the current system
+      {
+        job_name = "GrafanaService system";
+        static_configs = [
+          {
+            targets = ["127.0.0.1:9002"];
+          }
+        ];
+      }
+      # Scrape the Loki service
+      # {
+      #   job_name = "Loki service";
+      #   static_configs = [
+      #     {
+      #       targets = ["127.0.0.1:3100"];
+      #     }
+      #   ];
+      # }
+    ];
+  };
+}

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

@@ -0,0 +1,49 @@
+{config, ...}: {
+  sops.secrets."grafana-telegraf-key".mode = "0440";
+  sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name;
+  services.telegraf = {
+    enable = true;
+    extraConfig = {
+      agent = {
+        interval = "10s";
+        round_interval = true;
+        metric_batch_size = 1000;
+        metric_buffer_limit = 10000;
+        collection_jitter = "0s";
+        flush_interval = "10s";
+        flush_jitter = "0s";
+        precision = "";
+        debug = false;
+        quiet = false;
+        logfile = "";
+        hostname = "queen";
+        omit_hostname = false;
+      };
+      inputs = {
+        cpu = {
+          percpu = true;
+          totalcpu = true;
+          collect_cpu_time = false;
+          report_active = false;
+          core_tags = false;
+        };
+        disk = {
+          ignore_fs = ["tmpfs" "devtmpfs" "devfs" "overlay" "aufs" "squashfs"];
+        };
+        diskio = {};
+        kernel = {};
+        mem = {};
+        system = {};
+      };
+      outputs = {
+        websocket = {
+          url = "ws://localhost:${toString config.services.prometheus.port}/api/live/push/telegraf";
+          data_format = "influx";
+          headers = {
+            Authorisation = "Bearer glsa_lqpcKV34Pp0d7eIhKN79E2HTwzWWwN4m_fe64e398";
+          };
+        };
+      };
+    };
+  };
+}

nixos/server/package-configs/default.nix

@@ -1,19 +1,17 @@
-{
+{...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
     ./conduit
     ./forgejo
     ./gotosocial
     ./mail-server
     ./nextcloud
+    ./phanpy
     ./postgres
     ./roundcube
     ./coturn
+    ./dashboard
+    #./cinny
+    #./firefox-sync
+    ./writefreely
   ];
 }

nixos/server/package-configs/firefox-sync/default.nix

@@ -0,0 +1,30 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  port = 5126;
+in {
+  sops.secrets."sync-secrets".mode = "0440";
+  sops.secrets."sync-secrets".owner = config.users.users.firefox-syncserver.name;
+
+  users.groups.firefox-syncserver = {};
+  users.users.firefox-syncserver = {
+    isSystemUser = true;
+    group = "firefox-syncserver";
+    extraGroups = [config.users.groups.keys.name];
+  };
+
+  services.mysql.package = pkgs.mariadb;
+  services.firefox-syncserver = {
+    enable = true;
+    secrets = config.sops.secrets."sync-secrets".path;
+    singleNode = {
+      enable = true;
+      hostname = "sync.gladtherescake.eu";
+      url = "http://localhost:${toString port}";
+      enableNginx = true;
+      enableTLS = true;
+    };
+  };
+}

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

@@ -1,39 +1,14 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   imports = [];
-  #users.groups.gitea = {};
-  #users.users = {
-  #  gitea = {
-  #    openssh.authorizedKeys.keys = [
-  #      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnYgErCnva8fvLvsmTMC6dHJp2Fvwja0BYL8K/58ugDxNA0PVGj5PpEMar5yhi4AFGGYL4EgD75tRgI/WQU87ZiKjJ6HFIhgX9curncB2kIJ0JoA+FIQMNOT72GFuhjcO4svanrobsMrRmcn193suXY/N6m6F+3pitxBfHPWuPKKjlZqVBzpqCdz9pXoGOk48OSYv7Zyw8roVsUw3fqJqs68LRLM/winWVhVSPabXGyX7PAAW51Nbv6M64REs+V1a+wGvK5sGhRy7lIBAIuD22tuL4/PZojST1hasKN+7cSp7F1QTi4u0yeQ2+gIclQNuhfvghzl6zcVEpOycFouSIJaJjo8jyuHkbm4I2XfALVTFHe7sLpYNNS7Mf6E6i5rHvAvtXI4UBx/LjgPOj7RWZFaotxQRk1D+N0y2xNrO4ft6mS+hrJ/+ybp1XTGdtlkpUDKjiTZkV7Z4fq9J0jtijvtxRfcPhjia50IIHtZ28wVBMCCwYzh5pR15F/XbvKCc= lillian@EDI"
-  #      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS"
-  #    ];
-  #    isSystemUser = true;
-  #    isNormalUser = false;
-  #    group = "gitea";
-  #    extraGroups = ["virtualMail"];
-  #  };
-  #};
 
   #sops.secrets."mailpassunhash".mode = "0440";
   #sops.secrets."mailpassunhash".owner = config.users.users.virtualMail.name;
 
   services.forgejo = {
     enable = true;
-    #user = "gitea";
-    #group = "gitea";
-    #stateDir = "/var/lib/gitea";
     #TODO: different mail passwords for different services
     #mailerPasswordFile = config.sops.secrets."mailpassunhash".path;
     database = {
-      #user = "gitea";
-      #name = "gitea";
       type = "postgres";
     };
     settings = {
@@ -64,13 +39,21 @@
         ROOT_URL = "https://git.lillianviolet.dev/";
         HTTP_PORT = 3218;
       };
-      markup.jupyter = "
+      "markup.jupyter" = {
         ENABLED = true;
-        FILE_EXTENSIONS = .ipynb
+        FILE_EXTENSIONS = ".ipynb";
-        RENDER_COMMAND = jupyter nbconvert --stdout --to html --template full 
+        RENDER_COMMAND = "${pkgs.jupyter}/bin/jupyter nbconvert --stdout --to html --template full";
-        IS_INPUT_FILE = true
+        IS_INPUT_FILE = true;
-        RENDER_CONTENT_MODE = no-sanitizer
+        RENDER_CONTENT_MODE = "no-sanitizer";
-      ";
+      };
+      "markup.sanitizer.jupyter0" = {
+        ELEMENT = "div";
+        ALLOW_ATTR = "class";
+        REGEXP = "";
+      };
+      "markup.sanitizer.jupyter0.img" = {
+        ALLOW_DATA_URI_IMAGES = true;
+      };
     };
   };
 

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

@@ -1,11 +1,4 @@
-{
+{pkgs, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  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 @@
-{
+{config, ...}: {
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
   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.nextcloud28;
+    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

@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  services.nginx = {
+    enable = true;
+    virtualHosts = {
+      "phanpy.gladtherescake.eu" = {
+        root = "${pkgs.phanpy}";
+        ## Force HTTP redirect to HTTPS
+        forceSSL = true;
+        ## LetsEncrypt
+        enableACME = true;
+        locations."/" = {
+          index = "index.html";
+        };
+      };
+    };
+  };
+}

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

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  config,
-  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,6 +1,5 @@
 {
   inputs,
-  outputs,
   lib,
   config,
   pkgs,
@@ -13,8 +12,12 @@
   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.nixFlakes;
+    package = pkgs.lix;
     gc = {
       automatic = true;
       dates = "weekly";
@@ -33,17 +36,36 @@
       experimental-features = "nix-command flakes";
       # Deduplicate and optimize nix store
       auto-optimise-store = true;
+      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;
+
+  # console.catppuccin.enable = true;
+
+  home-manager.backupFileExtension = "backup";
+
   users.users.lillian = {
     isNormalUser = true;
     extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"];
     shell = pkgs.zsh;
     hashedPasswordFile = config.sops.secrets."lillian-password".path;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS"
     ];
   };
 
@@ -51,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,9 +1,7 @@
 {
-  inputs,
   outputs,
-  lib,
-  config,
   pkgs,
+  pkgs-edge,
   ...
 }: {
   nixpkgs = {
@@ -15,39 +13,60 @@
     ];
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages =
-    # Custom tools
+    (with pkgs; [
-    rebuild
+      # Custom tools
-    rebuild-no-inhibit
+      rebuild
-    install-nix
+      rebuild-no-inhibit
-    update
+      install-nix
-    upgrade
+      install-nix-no-inhibit
+      update
+      upgrade
+      # simple-completion-language-server
 
-    # System tools
+      # System tools
-    age
+      age
-    alejandra
+      alejandra
-    e2fsprogs
+      e2fsprogs
-    git
+      git
-    git-filter-repo
+      git-filter-repo
-    home-manager
+      helix
-    htop
+      home-manager
-    killall
+      htop
-    libnotify
+      just
-    neofetch
+      killall
-    oh-my-zsh
+      oh-my-zsh
-    rsync
+      rsync
-    helix
+      tre-command
-    wget
+      wget
-    zsh
+      zsh
-    tldr
+      tldr
 
-    # System libraries
+      # System libraries
-  ];
+    ])
+    ++ (with pkgs-edge; [
+      # list of latest packages from nixpkgs master
+      # Can be used to install latest version of some packages
+    ]);
 
-  # fonts.packages = with pkgs; [
+  # fonts = {
-  #   noto-fonts
+  #   packages = with pkgs; [
-  #   noto-fonts-emoji-blob-bin
+  #     noto-fonts-emoji-blob-bin
-  #   noto-fonts-emoji
+  #     cantarell-fonts
-  #   (nerdfonts.override {fonts = ["FiraCode" "DroidSansMono"];})
+  #     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;
+  # };
 }

overlays/default.nix

@@ -4,9 +4,9 @@
   # You can change versions, add patches, set compilation flags, anything really.
   # https://nixos.wiki/wiki/Overlays
   modifications = final: prev: {
-    steam = prev.steam.override {
+    # steam = prev.steam.override {
-      extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD'';
+    #   extraProfile = ''export LD_PRELOAD=${inputs.extest}/lib/libextest.so:$LD_PRELOAD'';
-    };
+    # };
   };
 
   # This one brings our custom packages from the 'pkgs' directory

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/cinny/default.nix

@@ -0,0 +1,50 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  pkgs,
+}: let
+  port = 2143;
+  configFile =
+    pkgs.writeText "config.json"
+    ''
+      {
+          "defaultHomeserver": 0,
+          "homeserverList": [
+              "matrix.gladtherescake.eu"
+          ],
+          "allowCustomHomeservers": false
+      }
+    '';
+in
+  buildNpmPackage rec {
+    pname = "cinny";
+    version = "09a0a2d";
+
+    src = fetchFromGitHub {
+      owner = "cinnyapp";
+      repo = pname;
+      rev = "${version}";
+      hash = "sha256-ee8YOJ0fGy26OWXb2Uumzy68M4UpERHH3ni0q+tDY14=";
+    };
+
+    npmDepsHash = "sha256-zelk15/rXXjhWuHj1GsSevnyXVBeDkMJ0qZfPyejq4A=";
+
+    # The prepack script runs the build script, which we'd rather do in the build phase.
+    npmPackFlags = ["--ignore-scripts" "--max_old_space_size=4096"];
+
+    installPhase = ''
+      mkdir $out
+      npm run build
+      cp -r dist/* $out
+      mkdir $out/app
+      cp ${configFile} $out/app/config.json
+    '';
+
+    meta = with lib; {
+      description = "Yet another matrix client";
+      homepage = "https://cinny.in/";
+      license = licenses.agpl3O;
+      maintainers = with maintainers; [Lillian-Violet];
+    };
+  }

pkgs/default.nix

@@ -11,5 +11,7 @@ pkgs: {
   update = pkgs.callPackage ./update {};
   upgrade = pkgs.callPackage ./upgrade {};
   restart = pkgs.callPackage ./restart {};
+  phanpy = pkgs.callPackage ./phanpy {};
   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,
@@ -16,7 +14,7 @@ writeShellApplication
     set -e
     pushd /tmp > /dev/null
     rm -rf ./install-nix
-    git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./install-nix
+    git clone https://codeberg.org/Lillian-Violet/NixOS-Config.git ./install-nix
     pushd ./install-nix/nixos/hosts > /dev/null
     echo "Please choose the hostname you are installing to from the following list:"
     i=1
@@ -39,9 +37,11 @@ writeShellApplication
         "./disko/''${dir}/default.nix"
     echo "NixOS Installing..."
     sudo nixos-install --flake .#"''${dir}"
+    sudo nixos-install --flake .#"''${dir}"
     popd > /dev/null
     echo "Cleaning up repository in '/tmp/install-nix'..."
     rm -rf ./install-nix
+    rm -rf ./install-nix
     popd > /dev/null
     echo "NixOS Install Succeeded!"
   '';

pkgs/install-nix/default.nix

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

pkgs/phanpy/default.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+buildNpmPackage rec {
+  pname = "phanpy";
+  version = "2024.04.19.5145730";
+
+  src = fetchFromGitHub {
+    owner = "cheeaun";
+    repo = pname;
+    rev = "${version}";
+    hash = "sha256-+/VtvDYBRy5Y6ZmqNH3id4hph1p3323G2zeE1bqfT1Y=";
+  };
+
+  npmDepsHash = "sha256-9tcZ3jQg+mHeI2K/dNFs0C1k7CfHwxbx+/+I8pdO/wQ=";
+
+  # The prepack script runs the build script, which we'd rather do in the build phase.
+  npmPackFlags = ["--ignore-scripts"];
+
+  installPhase = ''
+    export PHANPY_CLIENT_NAME="Phanpy on gladtherescake.eu"
+    export PHANPY_WEBSITE="phanpy.gladtherescake.eu"
+    mkdir $out
+    npm run build
+    cp -r dist/* $out
+  '';
+
+  meta = with lib; {
+    description = "Minimalistic opinionated Mastodon web client.";
+    homepage = "https://phanpy.social/";
+    license = licenses.mit;
+    maintainers = with maintainers; [Lillian-Violet];
+  };
+}

pkgs/rebuild-no-inhibit/default.nix

@@ -1,8 +1,4 @@
-{
+{writeShellApplication}:
-  lib,
-  stdenv,
-  writeShellApplication,
-}:
 writeShellApplication
 {
   name = "rebuild-no-inhibit";
@@ -15,7 +11,7 @@ writeShellApplication
     set -e
     pushd /tmp > /dev/null
     rm -rf ./rebuild
-    git clone https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git ./rebuild
+    git clone https://codeberg.org/Lillian-Violet/NixOS-Config.git ./rebuild
     pushd ./rebuild > /dev/null
     echo "NixOS Rebuilding..."
     sudo nixos-rebuild switch --flake .#

pkgs/rebuild/default.nix

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