diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index 7af74d8..121b685 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -14,32 +14,28 @@
       "$HOME/.cargo/bin"
     ];
     shellAliases = {
-      ls = "eza";
-      la = "eza -la";
-      l = "eza -l";
-      cat = "bat";
-      please = "sudo !!";
+      # cat = "bat";
+      # please = "sudo !!";
       gaa = "git add .";
       gcm = "git commit -m";
       gpom = "git push -u origin main";
     };
     packages = with pkgs; [
       wineWowPackages.unstable
-      eza
-      bat
-      networkmanagerapplet
       comic-mono
       maple-mono
       jetbrains-mono
       (nerdfonts.override {fonts = ["FiraMono"]; } )
+      gnupg
       pandoc
       jdk20
       pdftk
       git
+      git-crypt
       (writeShellScriptBin "hs-way" ''
-        home-manager --flake $HOME/nix-config/#tacocat switch
-        GEN=$(home-manager generations | head -1 | awk '{print $NF}')
-        "$GEN/specialisation/wayland/activate"
+        home-manager --flake $HOME/nix-config/#tacocat build
+        # GEN=$(home-manager generations | head -1 | awk '{print $NF}')
+        "$HOME/nix-config/result/specialisation/wayland/activate"
       '')
     ];
   };
@@ -50,6 +46,7 @@
 
   imports = [
     ./programs
+    ./services
     ./shell
     ./helix
     ./emacs
diff --git a/users/tacocat/programs/default.nix b/users/tacocat/programs/default.nix
index 7b8cdbf..642acb3 100644
--- a/users/tacocat/programs/default.nix
+++ b/users/tacocat/programs/default.nix
@@ -2,4 +2,12 @@
   imports = [
     ./kitty.nix
   ];
+  programs.eza = {
+    enable = true;
+    enableAliases = true;
+    git = true;
+  };
+  programs.bat = {
+    enable = true;
+  };
 }
diff --git a/users/tacocat/services/default.nix b/users/tacocat/services/default.nix
new file mode 100644
index 0000000..7843f12
--- /dev/null
+++ b/users/tacocat/services/default.nix
@@ -0,0 +1,44 @@
+{pkgs, ...}:
+{
+  services.network-manager-applet.enable = true;
+
+  services.blueman-applet.enable = true;
+
+  services.nextcloud-client = {
+    enable = true;
+    startInBackground = true;
+  };
+
+  services.gammastep = {
+    enable = true;
+    dawnTime = "8:00-9:30";
+    duskTime = "22:30-0:00";
+    tray = true;
+  };
+
+  services.dunst = {
+    enable = true;
+    iconTheme = {
+      package = pkgs.papirus-icon-theme;
+      name = "Papirus";
+    };
+    settings = {
+      global = {
+        geometry = "1870x5-25+45";
+        width = 350;
+        separator_height = 5;
+        padding = 24;
+        horizontal_padding = 24;
+        frame_width = 3;
+        idle_threshold = 120;
+        alignment = "center";
+        word_wrap = "yes";
+        transparency = 5;
+        format = "<b>%s</b>: %b";
+        markup = "full";
+        min_icon_size = 32;
+        max_icon_size = 128;
+      };
+    };
+  };
+}
diff --git a/users/tacocat/wayland/river/process b/users/tacocat/wayland/river/process
index 02abb8e..6ea77e0 100755
--- a/users/tacocat/wayland/river/process
+++ b/users/tacocat/wayland/river/process
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
 waybar &
-nm-applet --indicator &
-dunst &
 
 # void linux specific setup
 if test -f ~/.config/river/void-setup; then