diff --git a/flake.nix b/flake.nix
index 662fde5..014bab0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,10 @@
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
     firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
     nixvim.url = "github:nix-community/nixvim";
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -29,6 +33,7 @@
       agenix,
       zellij-switch,
       nixvim,
+      noctalia,
       ...
     }@inputs:
     let
diff --git a/home/linux.nix b/home/linux.nix
index fa21ebd..cfc4d75 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -1,4 +1,4 @@
-{ _config, pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   home.username = "dennis";
@@ -43,26 +43,26 @@
   ];
 
   imports = [
+    inputs.nixvim.homeModules.nixvim
+    inputs.noctalia.homeModules.default
     ../modules/ssh
     ../modules/git
     ../modules/zoxide
     ../modules/direnv
-    ../modules/nvim
     ../modules/ghostty/linux.nix
     ../modules/fish
     ../modules/tmux
     ../modules/tmuxinator/personal.nix
     ../modules/zen
     ../modules/firefox
-    ../modules/wm/swaync
     ../modules/wm/cliphist
-    ../modules/wm/awww
     ../modules/wm/fuzzel
-    ../modules/wm/waybar
     ../modules/wm/niri
+    ../modules/wm/noctalia
   ];
 
   programs.home-manager.enable = true;
+  programs.nixvim.imports = [ ../modules/nixvim ];
 
   # Appearance
   fonts.fontconfig = {
diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix
index afad38b..1b11b65 100644
--- a/hosts/dnsc-machine/default.nix
+++ b/hosts/dnsc-machine/default.nix
@@ -74,6 +74,8 @@
   # Enable some services that do not need configuration
   services.openssh.enable = true;
   services.udisks2.enable = true;
+  services.tuned.enable = true;
+  services.upower.enable = true;
 
   system.stateVersion = "25.05";
 }
diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json
index 218e0a1..b891305 100644
--- a/modules/nvim/config/lazy-lock.json
+++ b/modules/nvim/config/lazy-lock.json
@@ -1,20 +1,20 @@
 {
   "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
-  "codecompanion.nvim": { "branch": "main", "commit": "f61dbb22439386585a514d15be713c355f830e49" },
-  "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
+  "codecompanion.nvim": { "branch": "main", "commit": "a8c696d1fc4268085e4306d54af39b07be884b17" },
+  "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
   "follow-md-links.nvim": { "branch": "main", "commit": "728d96d268eef9666f0ee77a083e7e2f0b44f607" },
-  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitportal.nvim": { "branch": "main", "commit": "0c3e1c1d518c9e42e61e8df35ea0c0582a278a65" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "gitportal.nvim": { "branch": "main", "commit": "2420f27c6269184f13d018f347f36eb120403110" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" },
-  "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" },
-  "nvim-treesitter": { "branch": "main", "commit": "4967fa48b0fe7a7f92cee546c76bb4bb61bb14d5" },
-  "oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" },
+  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
+  "mini.pairs": { "branch": "main", "commit": "b316e68f2d242d5bd010deaab645daa27ed86297" },
+  "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "schemastore.nvim": { "branch": "main", "commit": "9b6a3ab14cecc7da9f3aa4fa0ae2a7390748aca5" },
-  "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
+  "schemastore.nvim": { "branch": "main", "commit": "eed1834170f343c14a6768f085b26b3571a55302" },
+  "snacks.nvim": { "branch": "main", "commit": "3c5c23ba91e608bd89bb36d76cb005aa63d20dbf" },
   "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" },
   "vim-cool": { "branch": "master", "commit": "9ea940c0d537e55de0de4c0298c04b976960fb12" },
   "vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" },
diff --git a/modules/wm/default.nix b/modules/wm/default.nix
index 7e61ab0..06cb4b7 100644
--- a/modules/wm/default.nix
+++ b/modules/wm/default.nix
@@ -3,8 +3,8 @@
     ./awww
     ./cliphist
     ./fuzzel
-    ./waybar
     ./niri
     ./swaync
+    ./noctalia
   ];
 }
diff --git a/modules/wm/noctalia/default.nix b/modules/wm/noctalia/default.nix
new file mode 100644
index 0000000..0056a9a
--- /dev/null
+++ b/modules/wm/noctalia/default.nix
@@ -0,0 +1,72 @@
+{ ... }:
+
+{
+  programs.noctalia-shell = {
+    enable = true;
+    systemd.enable = true;
+    settings = {
+      # configure noctalia here
+      bar = {
+        density = "compact";
+        position = "left";
+        floating = true;
+        marginHorizontal = 4;
+        marginVertical = 4;
+        showCapsule = false;
+        widgets = {
+          left = [
+            {
+              id = "ControlCenter";
+              useDistroLogo = true;
+            }
+            {
+              id = "Network";
+            }
+            {
+              id = "Bluetooth";
+            }
+          ];
+          center = [
+            {
+              hideUnoccupied = false;
+              id = "Workspace";
+              labelMode = "none";
+            }
+          ];
+          right = [
+            {
+              alwaysShowPercentage = false;
+              id = "Battery";
+              warningThreshold = 30;
+            }
+            {
+              formatHorizontal = "HH:mm";
+              formatVertical = "HH mm";
+              id = "Clock";
+              useMonospacedFont = true;
+              usePrimaryColor = true;
+            }
+          ];
+        };
+      };
+      colorSchemes.predefinedScheme = "Monochrome";
+      general = {
+        avatarImage = "/home/drfoobar/.face";
+        radiusRatio = 0.2;
+      };
+      location = {
+        monthBeforeDay = true;
+        name = "Munich, Germany";
+      };
+    };
+  };
+
+  home.file.".cache/noctalia/wallpapers.json" = {
+    text = builtins.toJSON {
+      defaultWallpaper = "~/Pictures/Wallpapers/safe/dark/mountain.jpg";
+      wallpapers = {
+        "DP-1" = "~/Pictures/Wallpapers/safe/dark/mountain.jpg";
+      };
+    };
+  };
+}