diff --git a/#home.nix# b/#home.nix#
deleted file mode 100644
index eddbcc6..0000000
--- a/#home.nix#
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-let
-  inherit (lib.systems.elaborate { system = builtins.currentSystem; }) isLinux isDarwin;
-in
-rec {
-  home.stateVersion = "22.05";
-  
-  home.packages = import ./packages.nix { inherit lib config pkgs isDarwin; };
-  
-  programs = import ./programs.nix { inherit lib config pkgs isDarwin; };
-  
-  home.file."${programs.gpg.homedir}/gpg-agent.conf" = {
-    source = pkgs.writeTextFile {
-      name = "gpg-agent-conf";
-      text = ''
-        pinentry-program ${pkgs.pinentry_mac.out}/${pkgs.pinentry_mac.binaryPath}
-      '';
-    };
-  };
-}  
diff --git a/.#home.nix b/.#home.nix
deleted file mode 120000
index 21ed879..0000000
--- a/.#home.nix
+++ /dev/null
@@ -1 +0,0 @@
-willem@zeus.61424
\ No newline at end of file
diff --git a/darwin-configuration.nix b/darwin-configuration.nix
deleted file mode 100644
index 5a1e9a0..0000000
--- a/darwin-configuration.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-  user = builtins.getEnv "USER";
-  unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
-  cask2nixTarball = fetchTarball https://github.com/matthewbauer/cask2nix/archive/v0.1.tar.gz;
-  nurTarball = fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz";
-in
-{
-  imports = [ <home-manager/nix-darwin> ];
-
-  # List of packages to be installed in the system profile.
-  environment.systemPackages = [
-    pkgs.iterm2
-    pkgs.discord
-  ];
-
-  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
-  environment.darwinConfig = "$HOME/.config/nixpkgs/darwin-configuration.nix";
-
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-
-  nix = {
-    package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-
-  nixpkgs.config = {
-    allowUnfree = true;
-    packageOverrides = pkgs: {
-      unstable = import unstableTarball {
-        config = config.nixpkgs.config;
-      };
-      nur = import nurTarball { inherit pkgs; };
-    };
-  };
-  
-  # Create /etc/zshrc that loads the nix-darwin environment.
-  programs.zsh.enable = true;
-
-  programs.gnupg.agent.enable = true;
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 4;
-
-  users.users.${user} = {
-    home = "/Users/${user}";
-    name = "${user}";
-  };
-
-  services.emacs.enable = true;
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.users.${user} = import ./home.nix { inherit lib config pkgs; };
-}
diff --git a/home.nix b/home.nix
index eddbcc6..f8719bc 100644
--- a/home.nix
+++ b/home.nix
@@ -2,13 +2,40 @@
 
 let
   inherit (lib.systems.elaborate { system = builtins.currentSystem; }) isLinux isDarwin;
+  user = builtins.getEnv "USER";
+  homeDir = builtins.getEnv "HOME";
+  unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz;
+  nurTarball = fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz";
 in
 rec {
-  home.stateVersion = "22.05";
+  nix = {
+    package = pkgs.nixUnstable;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
   
-  home.packages = import ./packages.nix { inherit lib config pkgs isDarwin; };
+  nixpkgs.config = {
+    allowUnfree = true;
+    packageOverrides = pkgs: {
+      unstable = import unstableTarball {
+        config = config.nixpkgs.config;
+      };
+      nur = import nurTarball {
+        inherit pkgs;
+        config = config.nixpkgs.config;
+      };
+    };
+  };
   
-  programs = import ./programs.nix { inherit lib config pkgs isDarwin; };
+  home = {
+    username = user;
+    homeDirectory = homeDir;
+    stateVersion = "22.11";
+    packages = import ./packages.nix { inherit lib config pkgs isDarwin; };
+  };
+  
+  programs = import ./programs.nix { inherit lib config pkgs isDarwin homeDir; };
   
   home.file."${programs.gpg.homedir}/gpg-agent.conf" = {
     source = pkgs.writeTextFile {
diff --git a/packages.nix b/packages.nix
index 77e38c3..b871c1e 100644
--- a/packages.nix
+++ b/packages.nix
@@ -7,6 +7,13 @@ let
     rev = "v1.4.0";
     sha256 = "02zh0zn0yibbgn26r0idcsv8nl7pxlnq545qas0fzj5l70hdgyhh";
   })).default;
+
+  rnix-lsp = (import (pkgs.fetchFromGitHub {
+    owner = "nix-community";
+    repo = "rnix-lsp";
+    rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
+    sha256 = "197s5qi0yqxl84axziq3pcpf5qa9za82siv3ap6v3rcjmndk8jqp";
+  }));
   
   darwinPackages = with pkgs; [
     coreutils
@@ -14,6 +21,11 @@ let
     spoof-mac
     colima
     pinentry_mac
+    iterm2
+  ];
+
+  guiPackages = with pkgs; [
+    discord
   ];
   
   dockerPackages = with pkgs; [
@@ -25,6 +37,7 @@ let
     black
     shellcheck
     plantuml
+    rnix-lsp
     texlive.combined.scheme-full
   ];
   
@@ -51,7 +64,6 @@ let
     jq
     nmap
     unzip
-    yt-dlp
     rsync
     openssh
     tldr
@@ -60,6 +72,7 @@ let
 in
 sharedPackages
 ++ (lib.optionals isDarwin darwinPackages)
+++ guiPackages
 ++ editingPackages
 ++ nodePackages
 ++ dockerPackages
diff --git a/programs.nix b/programs.nix
index b63316f..7cc40eb 100644
--- a/programs.nix
+++ b/programs.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, isDarwin, ... }:
+{ lib, config, pkgs, isDarwin, homeDir, ... }:
 
 {
   direnv = {
@@ -10,7 +10,7 @@
   
   gpg = {
     enable = true;
-    homedir = "${config.users.users.willem.home}/.gnupg";
+    homedir = "${homeDir}/.gnupg";
     settings = {
       use-agent = true;
       default-key = "860B5C62BF1FCE4272D26BF8C3DE5DF6198DACBD";