Moved user configuration to flake from machine

flake.nix

@@ -25,9 +25,15 @@
       ...
     }:
     let
-      baseModules = [
+      makeConfig =
+        machineConfig: userConfig:
+        (nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [
+            machineConfig
             home-manager.nixosModules.home-manager
             {
+              machine.users = userConfig;
               home-manager.sharedModules = [
                 stylix.homeManagerModules.stylix
                 nixvim.homeManagerModules.nixvim
@@ -35,14 +41,15 @@
               ];
             }
           ];
+        });
     in
     {
       nixosConfigurations = {
-        "20212060" = nixpkgs.lib.nixosSystem {
+        "20212060" = makeConfig ./machines/laptop.nix {
-          system = "x86_64-linux";
+          jan = {
-          modules = [
+            sudo = true;
-            ./machines/laptop.nix
+            configuration = ./users/jan.nix;
-          ] ++ baseModules;
+          };
         };
       };
     };

machines/laptop.nix

@@ -22,12 +22,6 @@
       wpa_supplicant.enable = true;
     };
 
-    # User accounts
-    machine.users.jan = {
-      sudo = true;
-      configuration = ../users/jan.nix;
-    };
-
     # Hardware configuration
     hardware.enableRedistributableFirmware = true;
     boot.initrd.availableKernelModules = [

user-modules/browser/qutebrowser/default.nix

@@ -43,8 +43,8 @@ in
         # config.set("completion.web_history.max_items", 30)
         config.set("colors.webpage.darkmode.enabled", False)
         config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}")
-        config.set("fonts.default_family", "${theme.fonts.monospace.name}")
+        config.set("fonts.default_family", "${theme.fonts.interface.name}")
-        config.set("fonts.default_size", "${toString theme.fonts.monospace.recommendedSize}pt")
+        config.set("fonts.default_size", "${toString theme.fonts.interface.recommendedSize}pt")
       '';
     };
   };

user-modules/rofi/default.nix

@@ -19,7 +19,7 @@ in
       enable = true;
       terminal = config.default.terminal;
       package = pkgs.rofi-wayland;
-      font = "${theme.fonts.monospace.name} ${toString theme.fonts.monospace.recommendedSize}";
+      font = "${theme.fonts.interface.name} ${toString (theme.fonts.interface.recommendedSize)}";
       theme =
         let
           inherit (config.lib.formats.rasi) mkLiteral;

user-modules/theming/default.nix

@@ -243,6 +243,11 @@ in
           description = "Default emoji font.";
         };
 
+        interface = mkOption {
+          type = fontModule;
+          description = "Default emoji font.";
+        };
+
         extraFonts = mkOption {
           type = types.listOf fontModule;
           default = [ ];

user-modules/vscode/default.nix

@@ -49,14 +49,29 @@ in
         ms-vsliveshare.vsliveshare
       ];
 
-      userSettings = {
+      userSettings =
-        # Font setup
+        let
+          font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
           # TODO: Move the conversion factor to theme settings
-        "editor.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
+          font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px
-        "editor.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px
+        in
+        {
+          # Font setup
+          "editor.fontFamily" = font-family;
+          "editor.inlayHints.fontFamily" = font-family;
+          "editor.inlineSuggest.fontFamily" = font-family;
+          "editor.fontSize" = font-size;
           "editor.fontLigatures" = true;
-        "terminal.integrated.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
+          "terminal.integrated.fontFamily" = font-family;
-        "terminal.integrated.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px
+          "terminal.integrated.fontSize" = font-size;
+          "chat.editor.fontFamily" = font-family; # TODO: Change this font to the standard UI font
+          "chat.editor.fontSize" = font-size;
+          "debug.console.fontFamily" = font-family;
+          "debug.console.fontSize" = font-size;
+          "scm.inputFontFamily" = font-family; # TODO: Change this font to the standard UI font
+          "scm.inputFontSize" = font-size;
+          "markdown.preview.fontFamily" = mkForce theme.fonts.sansSerif.name; # TODO: Change this font to the standard UI font
+          "markdown.preview.fontSize" = mkForce theme.fonts.sansSerif.recommendedSize;
 
           # Formatting
           "editor.formatOnSave" = true;

users/jan.nix

@@ -114,6 +114,7 @@
         fonts.sansSerif = fontpkgs."DejaVu Sans";
         fonts.monospace = fontpkgs."Dina";
         fonts.emoji = fontpkgs."Noto Color Emoji";
+        fonts.interface = fontpkgs."Dina";
         fonts.extraFonts = [ ];
 
         # Color scheme