Improve layout structure more

nix/main/fonts.nix

@@ -1,4 +1,3 @@
-
 { pkgs, ... }:
 
 {
@@ -22,18 +21,9 @@
 
   # Set default fonts.
   fonts.fontconfig.defaultFonts = {
-    sansSerif = [
-      "Noto Sans"
-    ];
-    serif = [
-      "Noto Serif"
-    ];
-    monospace = [
-      "MesloLGS Nerd Font"
-      "Noto Sans Mono"
-    ];
-    emoji = [
-      "Noto Color Emoji"
-    ];
+    sansSerif = [ "Noto Sans" ];
+    serif = [ "Noto Serif" ];
+    monospace = [ "MesloLGS Nerd Font" "Noto Sans Mono" ];
+    emoji = [ "Noto Color Emoji" ];
   };
 }

nix/main/general.nix

@@ -0,0 +1,39 @@
+{ pkgs, ... }:
+
+{
+  system.stateVersion = "unstable";
+  system.autoUpgrade.enable = true;
+
+  # Automatically optimize the Nix store.
+  nix.autoOptimiseStore = true;
+
+  # Enable Nix flake support.
+  nix.package = pkgs.nixUnstable;
+  nix.extraOptions = "experimental-features = nix-command flakes";
+
+  nixpkgs.config.allowUnfree = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.dave = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "docker" ];
+    shell = pkgs.zsh;
+  };
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
+  # Set your time zone.
+  time.timeZone = "America/Toronto";
+
+  # Set keyboard layout.
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "altgr-intl";
+    xkbOptions = "caps:escape";
+  };
+}

nix/main/packages.nix

@@ -120,18 +120,6 @@
         python38Packages.setuptools
         python38Packages.virtualenv
 
-        # fonts
-        dejavu_fonts
-        fira-code
-        fira-code-symbols
-        fira-mono
-        font-awesome
-        google-fonts
-        noto-fonts
-        noto-fonts-cjk
-        noto-fonts-emoji
-        noto-fonts-extra
-
         # misc
         asciinema
         github-cli
@@ -149,6 +137,9 @@
         xdg_utils
         zathura
 
+        # gnome
+        gnome3.gnome-tweaks
+
         # overlays
         # lpass
         # rfd