diff --git a/flake.lock b/flake.lock
index 5ef075e..5b92bc0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "emacs": {
       "locked": {
-        "lastModified": 1648981401,
-        "narHash": "sha256-7+L/vxg1g5QRl4XKPO5+awlubD5iRgqY7LG4Ag9Pasw=",
+        "lastModified": 1650684053,
+        "narHash": "sha256-t+EH8O3a+Aajv+uYGzUrF1R1w/6GD4retFAxb23yz90=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8704d61679ea1025fa16f612579f80263c96c321",
+        "rev": "46041a0711e643c8911845878fa4604dc8669a66",
         "type": "github"
       },
       "original": {
@@ -41,26 +41,26 @@
         ]
       },
       "locked": {
-        "lastModified": 1645120126,
-        "narHash": "sha256-bAJO50lRaOUz+lQk+3cd+7Yz8+QGL3YyG8kpeHLtKMc=",
+        "lastModified": 1649622552,
+        "narHash": "sha256-KT5CPoqkB9HZqw/pqynczRzsH/PQTImfaY5Oyyy871I=",
         "ref": "master",
-        "rev": "35e3f54ad63695b2c00e650c17b30280d49e7232",
-        "revCount": 5,
+        "rev": "3d7c14e55cb8374de6fcd40fcc889aa377131ac2",
+        "revCount": 6,
         "type": "git",
-        "url": "https://dev.ostylk.de/NixDistro/FlakeHelper.git"
+        "url": "https://destiny.ostylk.de/gitea/NixDistro/FlakeHelper.git"
       },
       "original": {
         "type": "git",
-        "url": "https://dev.ostylk.de/NixDistro/FlakeHelper.git"
+        "url": "https://destiny.ostylk.de/gitea/NixDistro/FlakeHelper.git"
       }
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1648297722,
-        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
+        "lastModified": 1649676176,
+        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
+        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
         "type": "github"
       },
       "original": {
@@ -134,11 +134,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1648917498,
-        "narHash": "sha256-fdyVHsP6XeyCk9FRyjV6Wv+7qiOzWxykGXdNixadvyg=",
+        "lastModified": 1650478719,
+        "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cfab869fcebc56710be6ec3aca76036b25c04a0d",
+        "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1648078876,
-        "narHash": "sha256-oa3RA0Z0UwEZ1M5kQOT9oUVd4ew3XePOu2oDTenFd98=",
+        "lastModified": 1650478719,
+        "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac9404115362c901ffe5c5c215f76f74b79d5eda",
+        "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644",
         "type": "github"
       },
       "original": {
@@ -229,6 +229,23 @@
         "type": "github"
       }
     },
+    "linux-surface": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648391001,
+        "narHash": "sha256-vi7aCcIcki+ZKXarU5ITKtViaRQyG1rcrbOJyxFnaV0=",
+        "owner": "linux-surface",
+        "repo": "linux-surface",
+        "rev": "4789818ac6bfff23619ee4d590e02e58107be2ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "linux-surface",
+        "ref": "master",
+        "repo": "linux-surface",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": "nixpkgs_5"
@@ -267,11 +284,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1648141026,
-        "narHash": "sha256-h8e3+5EZFbYHTMb0DN2ACuQTJBNHpqigvmEV1w2WIuE=",
+        "lastModified": 1650522846,
+        "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "feceb4d24f582817d8f6e737cd40af9e162dee05",
+        "rev": "6b4ebea9093c997c5f275c820e679108de4871ab",
         "type": "github"
       },
       "original": {
@@ -299,8 +316,9 @@
     },
     "nixpkgs": {
       "locked": {
-        "narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=",
-        "path": "/nix/store/33zgpp4aj1qyfwnlaspj8mypvv0sjpyw-source",
+        "lastModified": 0,
+        "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=",
+        "path": "/nix/store/dir0rn9a585sjc5aw78xs744yvd7ks7n-source",
         "type": "path"
       },
       "original": {
@@ -310,11 +328,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1640540585,
-        "narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=",
+        "lastModified": 1649408932,
+        "narHash": "sha256-JhTW1OtS5fACcRXLqcTTQyYO5vLkO+bceCqeRms13SY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ac169ec6371f0d835542db654a65e0f2feb07838",
+        "rev": "42948b300670223ca8286aaf916bc381f66a5313",
         "type": "github"
       },
       "original": {
@@ -326,11 +344,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1648632716,
-        "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=",
+        "lastModified": 1650161686,
+        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8",
+        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
         "type": "github"
       },
       "original": {
@@ -355,11 +373,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1644750380,
-        "narHash": "sha256-c4LvV88zB9YvM/6rLElbq4e62XtEO9pBINqsrlmH++M=",
+        "lastModified": 1649490789,
+        "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c28fb0a4671ff2715c1922719797615945e5b6a0",
+        "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
         "type": "github"
       },
       "original": {
@@ -445,11 +463,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1649000089,
-        "narHash": "sha256-aY1kwpteyXJ6nT3FibGBpeSIvVHI/6Wskh48HpQpFig=",
+        "lastModified": 1650681389,
+        "narHash": "sha256-76az6Z4umzHZcMi2N9cdL5gJkxagsJEHveO4+l7wAdU=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "1221f32068c2401276c023d91ae7e9fe26f95926",
+        "rev": "bd3cf2bcbd62f3bc66e90c1dd5a00fa933cb861e",
         "type": "github"
       },
       "original": {
@@ -471,11 +489,11 @@
         "tablet-mode": "tablet-mode"
       },
       "locked": {
-        "lastModified": 1645975968,
-        "narHash": "sha256-4OzqrhFNO+xDVfBEVflOq0V4/tclyZjASuwjoUN5G04=",
+        "lastModified": 1649593958,
+        "narHash": "sha256-bxslOpHYGXEDZ91plgMjGls5g8++YtSuuDKhIuStUA0=",
         "ref": "master",
-        "rev": "a1d35e75bf019737281854551d8e5c4aff76e6f7",
-        "revCount": 167,
+        "rev": "04e73c894cf20c4ac1bf6116546c1dab53d6d4e9",
+        "revCount": 171,
         "type": "git",
         "url": "https://destiny.ostylk.de/gitea/NixDistro/Config.git"
       },
@@ -490,16 +508,17 @@
         "flake-utils": "flake-utils_4",
         "home-stable": "home-stable",
         "home-unstable": "home-unstable",
+        "linux-surface": "linux-surface",
         "pkg-stable": "pkg-stable",
         "pkg-unstable": "pkg-unstable",
         "rnix-lsp": "rnix-lsp_2"
       },
       "locked": {
-        "lastModified": 1648314458,
-        "narHash": "sha256-3eJDYivk8g5U4hSaD7c0WkwPcZ743Bc75vwRjTssO9I=",
+        "lastModified": 1650633525,
+        "narHash": "sha256-QJSUeNn56J1PEa211GorvkTMOeNiN55DceeVIhLoVnY=",
         "ref": "master",
-        "rev": "cb9d4eec8d6f27353f906d1d8f3bba90882504c9",
-        "revCount": 57,
+        "rev": "8620fb21d8fb74352ca289c145a8db868e087e75",
+        "revCount": 61,
         "type": "git",
         "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
       },
@@ -526,11 +545,11 @@
     },
     "pkg-unstable": {
       "locked": {
-        "lastModified": 1648069223,
-        "narHash": "sha256-BXzQV8p/RR440EB9qY0ULYfTH0zSW1stjUCYeP4SF+E=",
+        "lastModified": 1650161686,
+        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1d08ea2bd83abef174fb43cbfb8a856b8ef2ce26",
+        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
         "type": "github"
       },
       "original": {
@@ -621,17 +640,17 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1645650704,
-        "narHash": "sha256-bAY4EDC2nLE10vz5nPTtky9Ri7RCu9N2yfCrPcjIQFs=",
+        "lastModified": 1645816436,
+        "narHash": "sha256-lK69qpgDWE92aQgvG502bU+pGMaHI+y7O3A/AgsUfxI=",
         "ref": "master",
-        "rev": "5046236ea223d00ea0e2c0d8d2b856d3f0d01454",
-        "revCount": 12,
+        "rev": "eeafcf0d0cc3713727697f6a2badc5eea706c81c",
+        "revCount": 19,
         "type": "git",
-        "url": "https://dev.ostylk.de/NixDistro/tablet-mode.git"
+        "url": "https://destiny.ostylk.de/gitea/NixDistro/tablet-mode.git"
       },
       "original": {
         "type": "git",
-        "url": "https://dev.ostylk.de/NixDistro/tablet-mode.git"
+        "url": "https://destiny.ostylk.de/gitea/NixDistro/tablet-mode.git"
       }
     },
     "tablet-mode_2": {
diff --git a/flake.nix b/flake.nix
index 209b84c..4acdd82 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,6 @@
     
     nixosConfigurations = {
       miku = mkSystem {
-        bluray = true;
         hostConfigFile = ./hosts/miku.nix;
       };
       mashu = mkSystem {
diff --git a/hosts/miku.nix b/hosts/miku.nix
index e5d22b3..eb506ba 100644
--- a/hosts/miku.nix
+++ b/hosts/miku.nix
@@ -43,6 +43,8 @@
     gnome-podcasts
     #psst
 
+    evolution
+    
     # Proprietary stuff (yikes)
     discord-wrapped discord-app-wrapped spotify-wrapped
   ];
@@ -97,6 +99,7 @@
   programs = {
     adb.enable = true;
     gnupg.agent.pinentryFlavor = "qt";
+    evolution.enable = true;
   };
 
   virtualisation = {
diff --git a/modules/programs/emacs/default.nix b/modules/programs/emacs/default.nix
index 1abcdc8..5913e38 100644
--- a/modules/programs/emacs/default.nix
+++ b/modules/programs/emacs/default.nix
@@ -9,6 +9,7 @@ let
     rev = "e89a63a62e071180c9cdd9067679fadc3f7bf796";
     sha256 = "0gxlz9b7fvbjkqxsyb4l75g7jsxyms0i1vpnb6y499hl115akcaz";
   };
+
 in {
   options.ptw.programs.emacs = {
     enable = lib.mkEnableOption "Configure emacs";
@@ -20,7 +21,8 @@ in {
 
     home-manager.users."${config.ptw.system.singleUser}" = {
       home.file = {
-        ".emacs".source = ./dotemacs;
+        #".emacs".text = builtins.replaceStrings [ "%%DARTLANG_ANALYSIS_SERVER_PATH%%" "" ] (builtins.readFile ./dotemacs);
+        ".emace".source = ./dotemacs;
         ".emacs.d/mu4e.el".source = ./mu4e.el;
         ".emacs.d/themes/weyland-yutani-theme.el".source = "${weyland-yutani}/weyland-yutani-theme.el";
       };
diff --git a/modules/programs/emacs/dotemacs b/modules/programs/emacs/dotemacs
index 9c11580..9f62372 100644
--- a/modules/programs/emacs/dotemacs
+++ b/modules/programs/emacs/dotemacs
@@ -213,6 +213,13 @@
       lsp-signature-auto-activate nil
       company-minimum-prefix-length 1
       read-process-output-max (* 1024 1024))
+(use-package lsp-mode
+      :init
+      (setq lsp-keymap-prefix "C-c l")
+      :hook (
+      	    (dart-mode . lsp)
+      )
+      :commands lsp)
 
 ;; Debugging
 ;(use-package explain-pause-mode
diff --git a/modules/users/alexander.nix b/modules/users/alexander.nix
index fb5b89b..d029d21 100644
--- a/modules/users/alexander.nix
+++ b/modules/users/alexander.nix
@@ -42,11 +42,10 @@
             hostname = "github.com";
             identityFile = "~/.ssh/github_polynomdivision";
           };
-          "minecraft" = {
-            port = sshPort;
-            user = "alexander";
-            hostname = "49.12.33.24";
-            identityFile = "~/.ssh/polynom.me";
+          "codeberg.org" = {
+            user = "git";
+            hostname = "codeberg.org";
+            identityFile = "~/.ssh/codeberg_papatutuwawa";
           };
         };
       };
diff --git a/packages/applications/networking/instant-messengers/gajim/default.nix b/packages/applications/networking/instant-messengers/gajim/default.nix
index 0443094..b327056 100644
--- a/packages/applications/networking/instant-messengers/gajim/default.nix
+++ b/packages/applications/networking/instant-messengers/gajim/default.nix
@@ -19,14 +19,14 @@
 }:
 
 let
-  commit = "b3449635ac737d7c87640d0cdae93f1423571b97";
+  commit = "2bbd96644828c43def6c95555f33dfb011df1f5f";
 in python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
   version = "1.4.0";
   
   src = fetchurl {
     url = "https://dev.gajim.org/gajim/gajim/-/archive/${commit}/gajim-${commit}.tar.gz";
-    sha256 = "sha256-9FTuZKhd0lC1r3nEQlqzBBQ5gyp3H/rpwUpN6+eDAL8=";
+    sha256 = "sha256-8VfV8BU5U9idQ0lP7lZSUUxe8nxXT4X/C2xKegjiHkA=";
   };
 
   buildInputs = [