flake.nix

@@ -25,15 +25,9 @@
       ...
     }:
     let
-      makeConfig =
+      baseModules = [
-        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
@@ -41,15 +35,14 @@
           ];
         }
       ];
-        });
     in
     {
       nixosConfigurations = {
-        "20212060" = makeConfig ./machines/laptop.nix {
+        "20212060" = nixpkgs.lib.nixosSystem {
-          jan = {
+          system = "x86_64-linux";
-            sudo = true;
+          modules = [
-            configuration = ./users/jan.nix;
+            ./machines/laptop.nix
-          };
+          ] ++ baseModules;
         };
       };
     };

machines/laptop.nix

@@ -22,6 +22,12 @@
       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.interface.name}")
+        config.set("fonts.default_family", "${theme.fonts.monospace.name}")
-        config.set("fonts.default_size", "${toString theme.fonts.interface.recommendedSize}pt")
+        config.set("fonts.default_size", "${toString theme.fonts.monospace.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.interface.name} ${toString (theme.fonts.interface.recommendedSize)}";
+      font = "${theme.fonts.monospace.name} ${toString theme.fonts.monospace.recommendedSize}";
       theme =
         let
           inherit (config.lib.formats.rasi) mkLiteral;

user-modules/theming/default.nix

@@ -243,11 +243,6 @@ 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,29 +49,14 @@ in
         ms-vsliveshare.vsliveshare
       ];
 
-      userSettings =
+      userSettings = {
-        let
-          font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
-          # TODO: Move the conversion factor to theme settings
-          font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px
-        in
-        {
         # Font setup
-          "editor.fontFamily" = font-family;
+        # TODO: Move the conversion factor to theme settings
-          "editor.inlayHints.fontFamily" = font-family;
+        "editor.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
-          "editor.inlineSuggest.fontFamily" = font-family;
+        "editor.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px
-          "editor.fontSize" = font-size;
         "editor.fontLigatures" = true;
-          "terminal.integrated.fontFamily" = font-family;
+        "terminal.integrated.fontFamily" = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
-          "terminal.integrated.fontSize" = font-size;
+        "terminal.integrated.fontSize" = mkForce (cfg.codeFont.recommendedSize); # Convert pt to px
-          "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,7 +114,6 @@
         fonts.sansSerif = fontpkgs."DejaVu Sans";
         fonts.monospace = fontpkgs."Dina";
         fonts.emoji = fontpkgs."Noto Color Emoji";
-        fonts.interface = fontpkgs."Dina";
         fonts.extraFonts = [ ];
 
         # Color scheme