Add home-manager entry for Marie

flake.nix

@@ -111,7 +111,7 @@
           ./modules/scanner.nix
           self.nixosModules.thinkpad-p1-gen3
           home-manager.nixosModules.home-manager
-          self.nixosModules.home-manager
+          self.nixosModules.home-manager-config
           self.nixosModules.x86_64-linux-basics
         ];
 
@@ -186,7 +186,9 @@
 
       trochulus-hispidus = { pkgs, ... }: {
         imports = [
+          home-manager.nixosModules.home-manager
           self.nixosModules.x86_64-linux-basics
+          self.nixosModules.home-manager-config
           ./hosts/trochulus-hispidus.nix
           ./hardware/latitude-e7440.nix
         ];
@@ -204,19 +206,10 @@
       ];
     };
 
-    homeManagerConfigurations.malte =
-      home-manager.lib.homeManagerConfiguration {
-        system = "x86_64-linux";
-        username = "malte";
-        configuration = ./malte/home.nix;
-        homeDirectory = "/home/malte";
-      };
-
-    nixosModules.home-manager = { ... }: {
+    nixosModules.home-manager-config = { ... }: {
       home-manager.verbose = true;
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
-      home-manager.users.malte.imports = [ ./malte/home.nix ];
     };
 
     # Necessary for flakes to work

hosts/helix-texta.nix

@@ -137,6 +137,7 @@ in {
       shell = pkgs.fish;
     };
   };
+  home-manager.users.malte.imports = [ ../malte/home.nix ];
 
   programs.fish.enable = true;
 

hosts/trochulus-hispidus.nix

@@ -46,6 +46,7 @@
         "$6$Fo/q41zf1/tI4dgX$.Y1bnBkGjwkRCOM2gg1yZtAjFQadjAVX8Eq8Llw5Y12ENOycBWtNaCVPli2P7gwNpLSg3p80iG.Zy.T1GR0NG0";
     };
   };
+  home-manager.users.marie.imports = [ ../marie/home.nix ];
 
   fonts = {
     enableDefaultFonts = true;

marie/home.nix

@@ -0,0 +1,34 @@
+{ pkgs, lib, ... }:
+
+let mkTuple = lib.hm.gvariant.mkTuple;
+in {
+  home.packages = with pkgs; [
+    firefox
+    git
+    ungoogled-chromium
+    evolution
+    element-desktop
+    signal-desktop
+    tdesktop
+    libreoffice-fresh
+    skypeforlinux
+    zoom-us
+    bitwarden
+  ];
+
+  dconf.settings = {
+    "org/gnome/desktop/peripherals/touchpad" = {
+      tap-to-click = true;
+      two-finger-scrolling-enabled = true;
+    };
+    "org/gnome/desktop/input-sources" = {
+      per-window = false;
+      sources = [ (mkTuple [ "xkb" "de" ]) (mkTuple [ "xkb" "us+workman" ]) ];
+      xkb-options = [ "compose:rctrl" ];
+    };
+    "org/gnome/desktop/interface" = {
+      enable-hot-corners = false;
+      show-battery-percentage = true;
+    };
+  };
+}