diff --git a/flake.nix b/flake.nix
index 7fab52e..3776be2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,7 +69,9 @@
             home-manager.nixosModules.home-manager {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users."felixalb" = import ./hosts/${name}/home.nix;
+              home-manager.users = {
+                "felixalb" = import ./hosts/${name}/home.nix;
+              } // config.home-manager-users or { };
             }
           ] ++ config.modules or [ ];
         };
@@ -104,7 +106,9 @@
         malcolm = normalSys "malcolm" { };
 
         # Home desktop
-        sisko = normalSys "sisko" { };
+        sisko = normalSys "sisko" {
+          home-manager-users."amalieem" = import ./home/amalieem;
+        };
       };
 
       # Daily driver macbook
diff --git a/home/amalieem/default.nix b/home/amalieem/default.nix
new file mode 100644
index 0000000..bb0f9b3
--- /dev/null
+++ b/home/amalieem/default.nix
@@ -0,0 +1,44 @@
+{ pkgs, lib, ... }:
+{
+  imports = [
+    ./../alacritty.nix
+  ];
+
+  home = {
+    packages = with pkgs; [
+      papers
+      kitty
+      pavucontrol
+
+      # Window Manager Extras
+      bibata-cursors
+      hyprcursor
+      hypridle
+      hyprlock
+      hyprpaper
+      hyprshot
+      nautilus
+      networkmanager
+      swaynotificationcenter
+      waybar
+      wl-clipboard
+    ];
+
+    sessionVariables = {
+      EDITOR = "nvim";
+      VISUAL = "nvim";
+    };
+  };
+
+  programs = {
+    alacritty = {
+      enable = true;
+      settings.window.opacity = 0.92;
+    };
+    firefox.enable = true;
+    neovim.plugins = with pkgs.vimPlugins; [ copilot-vim ];
+    wofi.enable = true;
+  };
+
+  home.stateVersion = "24.11";
+}
diff --git a/home/neovim.nix b/home/neovim.nix
index 5820fc1..2a2b304 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -106,6 +106,8 @@ in {
         autocmd VimEnter * wincmd p " Unselect nerdtree window
       endif
 
+      autocmd Filetype go setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4
+
       " List and switch buffers on Ctrl+k
       " nnoremap <C-k> :set nomore <Bar> :ls <Bar> :set more <CR>:b<Space>
       nnoremap <silent> <C-k> !echo "Did you mean C-a?"<CR>
diff --git a/hosts/sisko/configuration.nix b/hosts/sisko/configuration.nix
index 6d2ee7f..48c90d4 100644
--- a/hosts/sisko/configuration.nix
+++ b/hosts/sisko/configuration.nix
@@ -33,6 +33,11 @@
     remotePlay.openFirewall = true;
   };
 
+  users.users."amalieem" = {
+   isNormalUser = true;
+   home = "/home/amalieem";
+  };
+
   nixpkgs.config = {
     allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
       "copilot.vim"
diff --git a/hosts/sisko/home.nix b/hosts/sisko/home.nix
index 9b9775a..b09a287 100644
--- a/hosts/sisko/home.nix
+++ b/hosts/sisko/home.nix
@@ -21,6 +21,7 @@
     prismlauncher
     swayimg
     spotify
+    thunderbird
 
     # Window Manager Extras
     bibata-cursors
@@ -43,6 +44,7 @@
     catimg
     dante
     dig
+    go
     hunspellDicts.en_US
     hunspellDicts.nb_NO
     jq
@@ -112,6 +114,7 @@
       "x-scheme-handler/about" = "firefox.desktop";
       "x-scheme-handler/unknown" = "firefox.desktop";
 
+      "inode/directory" = "org.gnome.Nautilus.desktop";
       "application/pdf" = "org.gnome.Papers.desktop";
 
     } // builtins.listToAttrs (