diff --git a/configuration.nix b/configuration.nix
index a0b725b..65903b7 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -94,6 +94,7 @@
     curl
     alacritty
     dmenu
+    cmake
 
     acpilight # For setting Backlight.
     dbus
diff --git a/flake.lock b/flake.lock
index 8d5de2a..31ed856 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,18 +2,17 @@
   "nodes": {
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1717408969,
-        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
         "type": "github"
       },
       "original": {
@@ -76,11 +75,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
         "type": "github"
       },
       "original": {
@@ -118,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719994518,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
         "type": "github"
       },
       "original": {
@@ -136,11 +135,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -199,11 +198,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720524665,
-        "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
+        "lastModified": 1723202784,
+        "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
+        "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
         "type": "github"
       },
       "original": {
@@ -229,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720524665,
-        "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
+        "lastModified": 1723202784,
+        "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
+        "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
         "type": "github"
       },
       "original": {
@@ -353,11 +352,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720734513,
-        "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
         "type": "github"
       },
       "original": {
@@ -374,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720734513,
-        "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
         "type": "github"
       },
       "original": {
@@ -399,11 +398,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720861673,
-        "narHash": "sha256-gh34LtCLvXCd/Xyk33mgQU3QqNyJ7ZwJj59c4Qdad78=",
+        "lastModified": 1723796332,
+        "narHash": "sha256-V1eO+6leWxL4etUpgxi81kC9mOUIPo/gy4GXPqcgQ6E=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "34b8101a10dfb4cb38832a17ef33281d59e2b2b3",
+        "rev": "b67c560eb553aa29f7e4efa729af61ff4d45c786",
         "type": "github"
       },
       "original": {
@@ -415,11 +414,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1720816717,
-        "narHash": "sha256-C8bdG2wrI29afHI1705W37M7CPudz5117YafiBlW0Y4=",
+        "lastModified": 1723747612,
+        "narHash": "sha256-e7QFAYeZSjhQ1H0mk2awv2KcXlsepzXki3uYEUBXZ8Q=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "10256bb760fcab0dc25f7eb5b0b45966cb771939",
+        "rev": "fd65422b99c7cc69e5053a852244cfc9d46d7b65",
         "type": "github"
       },
       "original": {
@@ -436,11 +435,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720845312,
-        "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
+        "lastModified": 1722924007,
+        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
+        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
         "type": "github"
       },
       "original": {
@@ -451,11 +450,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720768451,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
+        "lastModified": 1723637854,
+        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
+        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
         "type": "github"
       },
       "original": {
@@ -496,8 +495,8 @@
     "nixpkgs_4": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
-        "path": "/nix/store/qmh8bas1qni03drm0lnjas2azh7h87cn-source",
+        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
+        "path": "/nix/store/7v6l2v247fmdgfpbs3w91mf6rinai4yk-source",
         "type": "path"
       },
       "original": {
@@ -516,14 +515,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1720910388,
-        "narHash": "sha256-gCudumUXHH+o0KFemXecDYySVCzjz7jYDGjdJbrN7gA=",
+        "lastModified": 1723778908,
+        "narHash": "sha256-pWxo0rqf6qf2IHtomEASq5gEzkSB78dD1wizytvU/EM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "ac9a1cbf9c7145687e66a1c033d68fc72eca3fd8",
+        "rev": "6ab17b1b2e6bc2c10718025105d452dd929cc058",
         "type": "github"
       },
       "original": {
@@ -534,11 +534,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1720967851,
-        "narHash": "sha256-djULb8ir/nVD8GXBx7E5TUPi4TkGivFUZHRW4pBv/yE=",
+        "lastModified": 1723815900,
+        "narHash": "sha256-USeM2VAo6DDN8yq6Ve02+ZQB8bqqSBqBfOfkuOmtzUE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "fff3685a7baa7c385a78977335196a7a2408f74b",
+        "rev": "4b5ae3627ff2bbe71adc1502f1321fcbb52006da",
         "type": "github"
       },
       "original": {
@@ -547,6 +547,28 @@
         "type": "github"
       }
     },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723367906,
+        "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
@@ -626,11 +648,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720818892,
-        "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=",
+        "lastModified": 1723454642,
+        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f",
+        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
         "type": "github"
       },
       "original": {
@@ -641,11 +663,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1720768451,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
+        "lastModified": 1723637854,
+        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
+        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
         "type": "github"
       },
       "original": {
@@ -663,11 +685,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1720797332,
-        "narHash": "sha256-e4w1aU6loZXUgGqocD1rdm/ey2wmzclwO2pSHhbydZk=",
+        "lastModified": 1722260997,
+        "narHash": "sha256-FPV2mSUEvzKtH/z0Dhwg6aqqX/NNmxS/5tPJFubkmaA=",
         "owner": "danyspin97",
         "repo": "wpaperd",
-        "rev": "430244a9a52898c6d48d1203adbdcd86fca37aa1",
+        "rev": "0e23789330b806666af9de5f02beb89340e4a046",
         "type": "github"
       },
       "original": {
@@ -684,11 +706,11 @@
         "unstable": "unstable"
       },
       "locked": {
-        "lastModified": 1720848077,
-        "narHash": "sha256-dZy3yMWknD+oAQZmNSYO7oa++Iblzyu4iAzO7P+EHaY=",
+        "lastModified": 1722277235,
+        "narHash": "sha256-fuEgR51OPzwff+ygFhBqJm51oA17rR0KtPfuDLv0Fp0=",
         "owner": "xmonad",
         "repo": "xmonad",
-        "rev": "b1d9884d2d310b4d1287b52534777dfe402acda8",
+        "rev": "a58ccac7ba46414915de6c7f2b4da08b37784016",
         "type": "github"
       },
       "original": {
@@ -707,11 +729,11 @@
         "xmonad": "xmonad"
       },
       "locked": {
-        "lastModified": 1720848091,
-        "narHash": "sha256-q56df5nVl/YozC25j34yCzs9w4ZlZ8oHtw4oUyMjsu0=",
+        "lastModified": 1722984780,
+        "narHash": "sha256-S9IivsvYeWD/AtAgKUHH0amVfug0qOAPXjNvXbafXag=",
         "owner": "xmonad",
         "repo": "xmonad-contrib",
-        "rev": "0dcecb41c57d0ea6ac177ff16511f0db0eb703b8",
+        "rev": "ec5c751b35c1c9b07bd4361617f7c4076aeaa85f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 359359d..d29b2bd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,7 +68,7 @@
         eliasDesktop = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
-            ./machines/configuration-desktop2.nix
+            ./machines/configuration-desktop.nix
             ./home/services/pipewire.nix
             nur.nixosModules.nur
             home-manager.nixosModules.home-manager
@@ -77,7 +77,7 @@
                 useGlobalPkgs = true;
                 useUserPackages = true;
                 extraSpecialArgs = { inherit inputs; };
-                users.elias = import ./home/default-laptop.nix;
+                users.elias = import ./home/default-desktop.nix;
               };
               nixpkgs.overlays = [
                 (final: prev: {
diff --git a/home/default-desktop.nix b/home/default-desktop.nix
index 1b47fc7..c7d4cc5 100644
--- a/home/default-desktop.nix
+++ b/home/default-desktop.nix
@@ -1,5 +1,5 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./programs/default-desktop.nix ./services ./default.nix ];
+  imports = [ ./programs/default-desktop.nix ./default.nix ];
 }
diff --git a/home/default.nix b/home/default.nix
index 03393ac..a807e27 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -20,7 +20,7 @@
       pavucontrol
       sshfs
 
-      obsidian
+      ##obsidian
       lean4
 
       firefox
diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix
index 53bb9b8..c5bc7ba 100644
--- a/home/programs/neovim/default.nix
+++ b/home/programs/neovim/default.nix
@@ -48,7 +48,6 @@ in {
       nvim-treesitter-textobjects
       nvim-ts-context-commentstring
       nvim-web-devicons
-      obsidian-nvim
       oil-nvim
       plenary-nvim
       rainbow-delimiters-nvim
diff --git a/home/programs/neovim/lua/plugins/obsidian-nvim.lua b/home/programs/neovim/lua/plugins/obsidian-nvim.lua
deleted file mode 100644
index 06a53ea..0000000
--- a/home/programs/neovim/lua/plugins/obsidian-nvim.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-return {
-  {
-    "epwalsh/obsidian.nvim",
-    lazy = true,
-    event = {
-      "BufReadPre /home/elias/Dropbox/IJB/IJB-Notes/*",
-      "BufNewFile /home/elias/Dropbox/IJB/IJB-Notes/*",
-    },
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "hrsh7th/nvim-cmp",
-      "nvim-telescope/telescope.nvim",
-      "nvim-treesitter",
-    },
-    config = function()
-      vim.opt.conceallevel = 2
-      require("obsidian").setup({
-        workspaces = {
-          {
-            name = "IJB-Notes",
-            path = "/home/elias/Dropbox/IJB/IJB-Notes",
-          },
-        },
-      })
-    end,
-  },
-}
diff --git a/machines/configuration-desktop.nix b/machines/configuration-desktop.nix
index 56708cf..57ce0d1 100644
--- a/machines/configuration-desktop.nix
+++ b/machines/configuration-desktop.nix
@@ -7,15 +7,8 @@
   # Hostname
   networking.hostName = "eliasDesktop";
 
-  systemd.user.services.autorandr = {
-    description = "autorandr profile loader";
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = "yes";
-    };
-    script = ''
-      ${pkgs.autorandr}/bin/autorandr --change --default desktop-dual
-    '';
-    wantedBy = [ "graphical-session.target" ];
-  };
+  environment.systemPackages = with pkgs; [
+    gnome.networkmanager-vpnc
+    networkmanagerapplet
+  ];
 }
diff --git a/machines/configuration-desktop2.nix b/machines/configuration-desktop2.nix
deleted file mode 100644
index 129a735..0000000
--- a/machines/configuration-desktop2.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  # Import general Configs
-  imports = [ ./../hardware-configuration-desktop.nix ./../configuration.nix ];
-
-  # Hostname
-  networking.hostName = "eliasDesktop";
-  services.blueman.enable = true;
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-
-  environment.systemPackages = with pkgs; [
-    gnome.networkmanager-vpnc
-    networkmanagerapplet
-  ];
-}