diff --git a/home-manager/GLaDOS-Lillian.nix b/home-manager/GLaDOS-Lillian.nix
index 50db1ee..9fe9080 100644
--- a/home-manager/GLaDOS-Lillian.nix
+++ b/home-manager/GLaDOS-Lillian.nix
@@ -44,6 +44,10 @@
       allowUnfree = true;
       # Workaround for https://github.com/nix-community/home-manager/issues/2942
       allowUnfreePredicate = _: true;
+
+      permittedInsecurePackages = [
+        "electron-22.3.27"
+      ];
     };
   };
 
@@ -64,7 +68,7 @@
     # Chat applications:
     element-desktop
     signal-desktop
-    webcord-vencord
+    webcord
 
     # Gaming:
     prismlauncher
@@ -106,7 +110,7 @@
       jnoortheen.nix-ide
       kamadorueda.alejandra
       ms-toolsai.jupyter
-      ms-python.python
+      #ms-python.python
       rust-lang.rust-analyzer
       yzhang.markdown-all-in-one
     ];
@@ -114,6 +118,18 @@
 
   programs.zsh = {
     enable = true;
+    plugins = [
+      {
+        name = "zsh-nix-shell";
+        file = "nix-shell.plugin.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "chisui";
+          repo = "zsh-nix-shell";
+          rev = "v0.7.0";
+          sha256 = "149zh2rm59blr2q458a5irkfh82y3dwdich60s9670kl3cl5h2m1";
+        };
+      }
+    ];
     enableAutosuggestions = true;
     enableCompletion = true;
     historySubstringSearch.enable = true;
@@ -178,7 +194,6 @@
         "web-search"
         "zsh-interactive-cd"
         "zsh-navigation-tools"
-        "zsh-nix-shell"
       ];
       theme = "jtriley";
     };
@@ -186,8 +201,11 @@
 
   # Enable home-manager and git
   programs.home-manager.enable = true;
-  programs.git.enable = true;
-
+  programs.git = {
+    enable = true;
+    userEmail = "git@gladtherescake.eu";
+    userName = "Lillian-Violet";
+  };
   # Nicely reload system units when changing configs
   systemd.user.startServices = "sd-switch";
 
diff --git a/nixos/EDI/configuration.nix b/nixos/EDI/configuration.nix
index 59f17d1..95630c4 100644
--- a/nixos/EDI/configuration.nix
+++ b/nixos/EDI/configuration.nix
@@ -89,6 +89,7 @@
     alejandra
     git-filter-repo
     home-manager
+    kirigami
     libsForQt5.discover
     libsForQt5.kdepim-addons
     libsForQt5.packagekit-qt
diff --git a/nixos/GLaDOS/configuration.nix b/nixos/GLaDOS/configuration.nix
index a58d23e..a88005f 100644
--- a/nixos/GLaDOS/configuration.nix
+++ b/nixos/GLaDOS/configuration.nix
@@ -10,6 +10,8 @@
 }: {
   # You can import other NixOS modules here
   imports = [
+    # Import home-manager's NixOS module
+    inputs.home-manager.nixosModules.home-manager
     # If you want to use modules your own flake exports (from modules/nixos):
     # outputs.nixosModules.example
 
@@ -24,6 +26,14 @@
     ./hardware-configuration.nix
   ];
 
+  home-manager = {
+    extraSpecialArgs = {inherit inputs outputs;};
+    users = {
+      # Import your home-manager configuration
+      lillian = import ../../home-manager/GLaDOS-Lillian.nix;
+    };
+  };
+
   nixpkgs = {
     # You can add overlays here
     overlays = [
@@ -46,6 +56,9 @@
     config = {
       # Disable if you don't want unfree packages
       allowUnfree = true;
+      permittedInsecurePackages = [
+        "electron-22.3.27"
+      ];
     };
   };
 
@@ -72,10 +85,11 @@
   };
 
   environment.systemPackages = with pkgs; [
-    rage
+    age
     alejandra
     git-filter-repo
     home-manager
+    kirigami
     libsForQt5.discover
     libsForQt5.kdepim-addons
     libsForQt5.packagekit-qt
@@ -154,7 +168,7 @@
     enable = true;
   };
 
-  networking.hostName = "EDI";
+  networking.hostName = "GLaDOS";
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.configurationLimit = 3;