Improve layout structure more

nix/flake.nix

@@ -15,10 +15,10 @@
         home-manager.nixosModules.home-manager
         ./modules/g810-led.nix
         ./main/fonts.nix
+        ./main/general.nix
         ./main/kernel.nix
         ./main/packages.nix
         ./main/printing.nix
-        # ./main/general.nix
         # ./main/hardware.nix
         # ./main/misc.nix
         # ./main/networking.nix

nix/home/default.nix

@@ -2,9 +2,7 @@
 
 {
 
-  home = {
+  home = { sessionVariables = { EDITOR = "vim"; }; };
-    sessionVariables = { EDITOR = "vim"; };
-  };
 
   services = {
     gpg-agent = {

nix/machines/hephaestus/configuration.nix

@@ -3,15 +3,6 @@
 {
   imports = [ ./hardware.nix ];
 
-  nixpkgs.config.allowUnfree = true;
-
-  nix = {
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -19,9 +10,6 @@
   networking.hostName = "hephaestus"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
-  # Set your time zone.
-  time.timeZone = "America/Toronto";
-
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
   # Per-interface useDHCP will be mandatory in the future, so this generated config
   # replicates the default behaviour.
@@ -52,15 +40,6 @@
   hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
   hardware.pulseaudio.support32Bit = 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;
-  };
-
-  environment.systemPackages = with pkgs; [ gnome3.gnome-tweaks ];
-
   virtualisation.docker.enable = true;
 
   programs.gnupg.agent = {
@@ -71,9 +50,6 @@
   # Open ports in the firewall.
   networking.firewall.enable = true;
 
-  system.stateVersion = "unstable";
-  system.autoUpgrade.enable = true;
-
   # systemd.services.g810-led = {
   #   description = "Set Logitech G810 Led Profile";
   #   serviceConfig = {

nix/main/fonts.nix

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

nix/modules/g810-led.nix

@@ -2,10 +2,8 @@
 
 with lib;
 
-let
+let cfg = config.hardware.g810-led;
-  cfg = config.hardware.g810-led;
+in {
-in
-{
   options.hardware.g810-led = {
     enable = mkOption {
       type = types.bool;
@@ -36,9 +34,8 @@ in
 
   config = mkIf cfg.enable {
 
-    services.udev.packages = [
+    services.udev.packages =
-      (pkgs.g810-led.override { profile = cfg.profile; })
+      [ (pkgs.g810-led.override { profile = cfg.profile; }) ];
-    ];
 
     # Workaround mentioned here:
     # https://github.com/MatMoul/g810-led/blob/14e331ad2ab7c5ffb546e0c14dd6164b517ff9ca/PROFILES.md