diff --git a/apps/de/default.nix b/apps/de/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f431eb849994e7f5eb74e7a9bab764b39ff06b12
--- /dev/null
+++ b/apps/de/default.nix
@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+{
+  imports = [ ./gtk.nix ];
+  dconf.settings =
+    let
+      wallpaper = pkgs.fetchurl {
+        url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png";
+        hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ=";
+      };
+    in
+    {
+      "org/cinnamon/desktop/background" = {
+        picture-uri = "file://${wallpaper}";
+      };
+      "org/cinnamon/desktop/interface" = {
+        font-name = "Monaspace Neon 10";
+      };
+      "org/cinnamon/desktop/wm/preferences" = {
+        titlebar-font = "Monaspace Neon Bold 10";
+      };
+      "org/gnome/desktop/interface" = {
+        document-font-name = "Monaspace Xenon 10";
+        monospace-font-name = "Monaspace Argon 10";
+      };
+    };
+
+}

diff --git a/apps/gui/default.nix b/apps/gui/default.nix
index a80195f6ad62e7b817db092a4f6aa0df3714ee50..d52d3479a1c1b7204dcbafa543ff87f939f93cd9 100644
--- a/apps/gui/default.nix
+++ b/apps/gui/default.nix
@@ -5,9 +5,7 @@     ../nogui
     ./firefox.nix
     ./flameshot.nix
     ./ghostty.nix
-    ./gtk.nix
     ./spotify.nix
-    #./tiny.nix
     ./wezterm.nix
     ./zed.nix
   ];
@@ -19,34 +17,10 @@       delve
       discord
       obsidian
 {
-{ pkgs, ... }:
-{
 {
       # LSPs
       marksman
       nodePackages.yaml-language-server
     ];
   };
-  dconf.settings =
-    let
-      wallpaper = pkgs.fetchurl {
-        url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png";
-        hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ=";
-      };
-    in
-    {
-      "org/cinnamon/desktop/background" = {
-        picture-uri = "file://${wallpaper}";
-      };
-      "org/cinnamon/desktop/interface" = {
-        font-name = "Monaspace Neon 10";
-      };
-      "org/cinnamon/desktop/wm/preferences" = {
-        titlebar-font = "Monaspace Neon Bold 10";
-      };
-      "org/gnome/desktop/interface" = {
-        document-font-name = "Monaspace Xenon 10";
-        monospace-font-name = "Monaspace Argon 10";
-      };
-    };
 }

diff --git a/apps/gui/gtk.nix b/apps/de/gtk.nix
rename from apps/gui/gtk.nix
rename to apps/de/gtk.nix

diff --git a/apps/gui/spotify.nix b/apps/gui/spotify.nix
index e6ed0673b0c81dbc4a98e0302691949c41bc66e6..23f7e7e68c1de92c9698f033a2b73ff888c401e4 100644
--- a/apps/gui/spotify.nix
+++ b/apps/gui/spotify.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  home.packages = [ pkgs.spotify-player ];
   xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (
     pkgs.fetchFromGitHub {
       owner = "catppuccin";

diff --git a/apps/gui/tiny.nix b/apps/gui/tiny.nix
deleted file mode 100644
index edf264fade688d0c1dcac705884ccd2d4a25fd47..0000000000000000000000000000000000000000
--- a/apps/gui/tiny.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, ... }:
-{
-  programs.tiny = {
-    enable = true;
-    settings = {
-      servers = [
-        {
-          addr = "irc.libera.chat";
-          port = 6697;
-          tls = true;
-          realname = "jolheiser";
-          nicks = [ "jolheiser" ];
-          alias = "LiberaChat";
-          join = [
-            "#gitea"
-            "#gitea-devel"
-          ];
-          sasl = {
-            username = "jolheiser";
-            password = {
-              command = "cat ${config.age.secrets.irc-pw.path}";
-            };
-          };
-        }
-      ];
-      defaults = {
-        nicks = [ "jolheiser" ];
-        realname = "jolheiser";
-      };
-      key_map = {
-        alt_left = "tab_prev";
-        alt_right = "tab_next";
-      };
-    };
-  };
-}

diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index 9ddc6eea1af37d10214f79d5adc8f7c3edfd6738..392d2efa6c4456ce379dfe1831b5ba5d8b506144 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -69,6 +69,6 @@     } // sshSigning;
     difftastic = {
       enable = true;
     };
-    includes = [ { path = config.age.secrets.git-send-email.path; } ];
+    includes = [ { inherit (config.age.secrets.git-send-email) path; } ];
   };
 }

diff --git a/flake.nix b/flake.nix
index f7c317e0acb2f73d49dbed0f6310579ec086557a..1590511f73082befc89737f469b245a75606c3ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -206,7 +206,7 @@       homeConfigurations = {
         "jolheiser" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 {
-  inputs = {
+      url = "github:nix-community/home-manager";
   description = "jolheiser's nixos config";
         };
       };