2 files changed, 58 insertions, 49 deletions

diff --git a/systems/default.nix b/systems/default.nix
index 1cd1037..94bb592 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -12,11 +12,13 @@
     ../programs/openvpn.nix
   ];
 
+  #Default boot parameters.
   boot = {
     tmp.cleanOnBoot = true;
     initrd.verbose = false;
   };
 
+  #Nix package manager configs.
   nix = {
     registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
 
@@ -30,17 +32,19 @@
     gc = {
       automatic = true;
       dates = "weekly";
-      options = "--delete-older-than 7d"
+      options = "--delete-older-than 7d";
     };
   };
 
+  #Networking
   networking.hostName = hostname; # Define your hostname.
   networking.useDHCP = lib.mkDefault true;
   networking.networkmanager.enable = true;
 
-  # Set your time zone.
+  #Timezone
   time.timeZone = "America/New_York";
 
+  #Locale & Fonts
   i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "en_US.UTF-8";
@@ -53,27 +57,17 @@
     LC_TELEPHONE = "en_US.UTF-8";
     LC_TIME = "en_US.UTF-8";
   };
-
-  # Configure X11
-  services.xserver = {
-    enable = true;
-    layout = "us";
-    xkbVariant = "";
-
-    displayManager = {
-      sddm.enable = true;
-      defaultSession = "none+awesome";
-    };
-
-    windowManager.awesome = {
-      enable = true;
-      luaModules = with pkgs.luaPackages; [
-	luarocks
-	luadbi-mysql
-      ];
-    };
-  };
-
+  fonts.packages = with pkgs; [
+    fira-code
+    fira-code-symbols
+    font-awesome
+    liberation_ttf
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    (nerdfonts.override { fonts = [ "FiraCode" ]; } )
+  ];
+  
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -81,12 +75,12 @@
     pulse.enable = true;
   };
 
+  #Security
   security.rtkit.enable = true;
+  security.polkit.enable = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
+  #Default packages for QOL
   environment.systemPackages = with pkgs; [
-    arandr
     binutils
     clang-tools
     gcc
@@ -96,26 +90,14 @@
     unzip
     wget
   ];
-
-  fonts.packages = with pkgs; [
-    fira-code
-    fira-code-symbols
-    font-awesome
-    liberation_ttf
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    (nerdfonts.override { fonts = [ "FiraCode" ]; } )
-  ];
-
   programs.zsh.enable = true;
   users.defaultUserShell = pkgs.zsh;
-
   programs.neovim = {
     enable = true;
     defaultEditor = true;
   };
 
+  #MPD
   services.mpd = {
     enable = true;
     musicDirectory = "/var/mus";
@@ -131,19 +113,14 @@ audio_output {
     network.listenAddress = "any";
   };
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
+  #GPG
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
   };
 
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
+  #SSH
   services.openssh.enable = true;
-
   environment.shellInit = ''
 gpg-connect-agent /bye
 export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
diff --git a/systems/jonbox/default.nix b/systems/jonbox/default.nix
index 16cf6a2..c894497 100644
--- a/systems/jonbox/default.nix
+++ b/systems/jonbox/default.nix
@@ -8,6 +8,7 @@
     ../bluetooth.nix
   ];
 
+  #Unfree-packages.
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [
     "nvidia-x11"
@@ -15,6 +16,7 @@
     "nvidia-persistenced"
   ];
 
+  #Bootloader
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
@@ -23,14 +25,38 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
+  #SSD-optimization
+  services.fstrim.enable = true;
+
+  #OpenGL
   hardware.opengl = {
     enable = true;
     driSupport = true;
     driSupport32Bit = true;
   };
+  
+  #X11 Server
+  services.xserver = {
+    enable = true;
+    layout = "us";
+    xkbVariant = "";
+    videoDrivers = [ "nvidia" ];
 
-  services.xserver.videoDrivers = [ "nvidia" ];
+    displayManager = {
+      sddm.enable = true;
+      defaultSession = "none+awesome";
+    };
 
+    windowManager.awesome = {
+      enable = true;
+      luaModules = with pkgs.luaPackages; [
+	luarocks
+	luadbi-mysql
+      ];
+    };
+  };
+
+  #NVidia
   hardware.nvidia = {
     modesetting.enable = true;
     powerManagement.enable = false;
@@ -40,8 +66,14 @@
     package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
-  services.fstrim.enable = true;
-  nix.settings.auto-optimize-store = true;
+  #Virtualization
+  virtualisation.libvirtd.enable = true;
+  programs.dconf.enable = true;
+  environment.systemPackages = with pkgs; [ 
+    virt-manager
+    libguestfs
+    guestfs-tools
+  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;