atlas generation 6 kernel version 6.18.5 at 12:23:13 2026-01-15 rebuilding

modules/boot.nix

@@ -1,9 +1,15 @@
+## Controls the bootloader
+
 { inputs, config, pkgs, variables, ... }:
 {
+  # Enables systemd-boot, I dislike Grub
   boot.loader.systemd-boot.enable = true;
+  # Allows the bootloader to touch things in UEFI and such
   boot.loader.efi.canTouchEfiVariables = true;
+  # Allows the firmware updater to work
   services.fwupd.enable = true;
 
+  # Controls the TUI greeter
   services.greetd = {
     enable = true;
     useTextGreeter = true;

modules/index.nix

@@ -6,7 +6,6 @@ imports =
       ./packages.nix
       ./services.nix
       ./net.nix
-      ./nvim.nix
       ./vars.nix
       ./stable.nix
     ];

modules/net.nix

@@ -1,19 +1,13 @@
+## Controls networking
+
 { inputs, config, pkgs, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    # signal-cli
-    # vesktop
-    # discordchatexporter-cli
-    # discordo
-	  # mullvad-vpn
-  ];
-
   networking = {
     networkmanager = {
       enable = true;
     };
-    nameservers = [ "9.9.9.9" ];
-    enableIPv6 = false;
+    nameservers = [ "9.9.9.9" ]; # Backup is 1s for Cloudflare
+    enableIPv6 = false; # IPv6 has been fucky every single time I've tried to use it
     nat = {
       enable = true;
       internalInterfaces = [ "ve-+" ];
@@ -24,21 +18,25 @@
       # open ports in firewall below
         # allowedTCPPorts = [ ... ];
         # allowedUDPPorts = [ ... ];
+    };
   };
-};
-  services.avahi = { # LAN discovery
-          enable = true;
-          nssmdns4 = true;
-          openFirewall = true;
-      };
-  services.mullvad-vpn.enable = true;
-  services.blueman.enable = false; # bluetooth, change to true if needed
-  hardware.bluetooth.enable = false; # bluetooth, change to true if needed
-  hardware.bluetooth.powerOnBoot = false; # bluetooth on boot
-  services.printing = {
-          enable = true;
-          drivers = [ pkgs.gutenprint pkgs.hplip];
-      };
-  programs.mtr.enable = true; # network diagnostics tool
-
+  services = {
+    # LAN discovery, necessary for printing
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+    # VPN
+    mullvad-vpn.enable = true;
+    # Bluetooth
+    blueman.enable = false;
+    # Printing
+    printing = {
+      enable = true;
+      drivers = [ pkgs.gutenprint pkgs.cnijfilter2 pkgs.hplip pkgs.hplipWithPlugin];
+  }; 
+  # Bluetooth hardware
+  hardware.bluetooth.enable = false; 
+  hardware.bluetooth.powerOnBoot = false;
 }

modules/nvim.nix

@@ -1,28 +0,0 @@
-{ inputs, config, pkgs, variables, ... }:
-{
-  environment.systemPackages = with pkgs;
-  [
-    neovide
-    vimPlugins.neo-tree-nvim
-    vimPlugins.nvim-web-devicons
-    vimPlugins.snacks-nvim
-    vimPlugins.plenary-nvim
-    vimPlugins.nui-nvim
-    vimPlugins.resession-nvim
-    lazygit
-    python315
-    nodejs_24
-    direnv
-    ripgrep
-    gnumake
-  ];
-  programs.neovim.enable = true;
-  programs.neovim.vimAlias = true;
-  programs.neovim.configure = {
-  	customRC = ''
-		require('neo-tree').setup({
-			--options go here
-		})
-	'';
-  };
-}

modules/packages.nix

@@ -1,3 +1,5 @@
+## Most if not all packages
+
 { inputs, config, pkgs, variables, ... }:
 {
   environment.systemPackages = with pkgs;
@@ -6,7 +8,6 @@
     wget
     unzip
     zip
-    neovim 
     bash
     kitty # terminal
     inputs.oxide_timer.packages.${pkgs.system}.default # imports morrigan's timer
@@ -21,6 +22,20 @@
     speedcrunch # gui calculator
     wofi # menu
     eww # widget util
+  #### WORKFLOW-NVIM ####
+    neovide
+    vimPlugins.neo-tree-nvim
+    vimPlugins.nvim-web-devicons
+    vimPlugins.snacks-nvim
+    vimPlugins.plenary-nvim
+    vimPlugins.nui-nvim
+    vimPlugins.resession-nvim
+    lazygit
+    python315
+    nodejs_24
+    direnv
+    ripgrep
+    gnumake
   #### UNCORE UTILS ####
     wget
     unzip
@@ -91,11 +106,27 @@
 ];
 
   programs = {
-    steam.enable = true;
+    # Workflow
     git.enable = true;
+    neovim = {
+      enable = true;
+      vimAlias = true;
+      configure = {
+      	customRC = ''
+	    	  require('neo-tree').setup({
+			    --options go here
+	    	  })
+	      '';
+      };
+    };
+    # Steam 
+    steam.enable = true;
+    # Hypr
     hyprland.enable = true;
     # hyprlock.enable = true;
     iio-hyprland.enable = true;
+    # Network diagnostics
+    mtr.enable = true
     # nix-ld.enable = true;
     # nix-ld.libraries = with pkgs; [
       # Add any missing dynamic libraries for unpackaged programs here,

modules/services.nix

@@ -1,7 +1,9 @@
+## Controls the bulk of system services other than bootloader and networking
+
 { inputs, config, pkgs, variables, ... }:
 {
+  # Enables graphics
   hardware.graphics.enable = true;
-
   services = {
     # Automatically mount removable media to /media
     udisks2.enable = true;
@@ -9,41 +11,43 @@
     # Schedulers
     cron.enable = true;
     atd.enable = true;
-    # Not certain if this one is necessary, it gens thumbnails
-    tumbler.enable = true;
     # Power stuff
     upower.enable = true;
     logind.settings.Login = {
       HandleLidSwitch = "suspend-then-hibernate";
       HandlePowerKey = "poweroff";
     };
-    # Other stuff
+    # VFS stuff
     envfs.enable = true;
-    flatpak.enable = true;
     gvfs.enable = true;
+    # Audio
     pipewire = {
-		enable = true;
-		audio.enable = true;
-		alsa.enable = true;
-		alsa.support32Bit = true;
-		pulse.enable = true;
-		jack.enable = true;
-		wireplumber.enable = true;
-	};
-	locate = {
-		enable = true;
-		package = pkgs.plocate;
-	};
-	xserver = {
-      enable = true;
-      xkb.layout = "us";
-      xkb.variant = "";
-    };
+		  enable = true;
+		  audio.enable = true;
+		  alsa.enable = true;
+		  alsa.support32Bit = true;
+		  pulse.enable = true;
+		  jack.enable = true;
+		  wireplumber.enable = true;
+	  };
+  	# Location services
+  	locate = {
+	  	enable = false;
+		  package = pkgs.plocate;
+	  };
+    # Temp management
+    thermald.enable = true; 
+    # X11
+	  #  xserver = {
+    #  enable = true;
+    #  xkb.layout = "us";
+    #  xkb.variant = "";
+    # };
   };
-
+  # Allows sudo stuff with fuse for mounting shit
   programs.fuse.userAllowOther = true;
+  # Power management
   powerManagement.enable = true;
-
   # if you ever need appimages this is magic code that does magic
   boot.binfmt.registrations.appimage = {
 		wrapInterpreterInShell = false;
@@ -53,19 +57,17 @@
 		mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
 		magicOrExtension = ''\x7fELF....AI\x02'';
   };
-
+  # Security & encryption
   security.polkit.enable = true;
-  services.thermald.enable = true; # temp manager, likely unnecessary but better safe than sorry
-  security.rtkit.enable = true; # realtime scheduling for user processes, needed for pipewire
+  security.rtkit.enable = true;
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
   };
-
+  # Themeing
   qt = {
     enable = true;
     platformTheme = "gtk2";
     style = "gtk2";
   };
-
 }

modules/stable.nix

@@ -1,7 +1,6 @@
-{ inputs, config, pkgs, ... }:
-
 ## Pulls packages specifically from stable repo, rather than the default unstable.
 
+{ inputs, config, pkgs, ... }:
 {
   environment.systemPackages = with inputs.nixpkgs-stable.legacyPackages.${pkgs.system}; [
     vesktop