flake.lock

@@ -74,11 +74,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
+        "lastModified": 1734366194,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735478292,
+        "lastModified": 1733570843,
-        "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=",
+        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac",
+        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1735471104,
+        "lastModified": 1734424634,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1735531152,
+        "lastModified": 1734323986,
-        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
+        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
+        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
         "type": "github"
       },
       "original": {

flake.nix

@@ -69,9 +69,7 @@
             home-manager.nixosModules.home-manager {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users = {
+              home-manager.users."felixalb" = import ./hosts/${name}/home.nix;
-                "felixalb" = import ./hosts/${name}/home.nix;
-              } // config.home-manager-users or { };
             }
           ] ++ config.modules or [ ];
         };
@@ -106,9 +104,7 @@
         malcolm = normalSys "malcolm" { };
 
         # Home desktop
-        sisko = normalSys "sisko" {
+        sisko = normalSys "sisko" { };
-          home-manager-users."amalieem" = import ./home/amalieem;
-        };
       };
 
       # Daily driver macbook

home/amalieem/default.nix

@@ -1,44 +0,0 @@
-{ 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";
-}

home/neovim.nix

@@ -106,8 +106,6 @@ 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>

hosts/sisko/configuration.nix

@@ -33,11 +33,6 @@
     remotePlay.openFirewall = true;
   };
 
-  users.users."amalieem" = {
-   isNormalUser = true;
-   home = "/home/amalieem";
-  };
-
   nixpkgs.config = {
     allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
       "copilot.vim"

hosts/sisko/home.nix

@@ -21,7 +21,6 @@
     prismlauncher
     swayimg
     spotify
-    thunderbird
 
     # Window Manager Extras
     bibata-cursors
@@ -44,7 +43,6 @@
     catimg
     dante
     dig
-    go
     hunspellDicts.en_US
     hunspellDicts.nb_NO
     jq
@@ -114,7 +112,6 @@
       "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 (