README.md

@@ -1,5 +1,3 @@
-# System Configurations
-
 This repository contains configuration files for my NixOS, macOS, and WSL
 hosts.
 
@@ -8,31 +6,31 @@ configuration may be difficult to translate to a non-Nix system.
 
 However, some of the configurations are easier to lift directly:
 
-- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/common/neovim/config)
+- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/neovim/config)
-- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/common/shell/fish/functions)
+- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/shell/fish/functions)
-- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/fish/default.nix)
+- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/shell/fish/default.nix)
-- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/git.nix)
+- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/shell/git.nix)
 - [Hammerspoon](https://github.com/nmasur/dotfiles/tree/master/modules/darwin/hammerspoon)
 
-Try out my Neovim config (requires [nix](https://nixos.org/download.html)):
+Try out my Neovim config:
 
 ```bash
 nix run github:nmasur/dotfiles#neovim
 ```
 
-Or build it as a package (requires [nix](https://nixos.org/download.html)):
+Or build it as a package:
 
 ```bash
 nix build github:nmasur/dotfiles#neovim
 ```
 
 If you already have a Neovim configuration, you may need to move it out of
-`~/.config/nvim` or set `XDG_CONFIG_HOME` to another value; otherwise both
+`~/.config/nvim` or set `XDG_CONFIG_HOME` to another value; otherwise, both
 configs might conflict with each other.
 
 ---
 
-# Full Installation
+# Installation
 
 ## NixOS - From Live Disk
 
@@ -44,7 +42,7 @@ installer disk:
 ```bash
 lsblk # Choose the disk you want to wipe
 nix-shell -p nixVersions.stable
-nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest
+nix run github:nmasur/dotfiles#installer -- nvme0n1 desktop
 ```
 
 ## NixOS - From Existing System
@@ -65,7 +63,7 @@ the WSL configuration:
 
 ```
 nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#hydra
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#flame
 ```
 
 You should also download the

apps/default.nix

@@ -57,7 +57,7 @@
   neovim = {
     type = "app";
     program = "${
-        (import ../modules/common/neovim/package {
+        (import ../modules/neovim/package {
           inherit pkgs;
           colors =
             import ../colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };

darwin/default.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{ config, ... }: {
 
   imports = [
     ./alacritty.nix

darwin/utilities.nix

@@ -34,7 +34,7 @@ in {
       ipcalc # Make IP network calculations
       (mkScript {
         name = "ocr";
-        file = ../../modules/common/shell/bash/scripts/ocr.sh;
+        file = ../modules/shell/bash/scripts/ocr.sh;
         env = [ tesseract ];
       })
     ];

flake.nix

@@ -94,7 +94,7 @@
 
   };
 
-  outputs = { nixpkgs, ... }@inputs:
+  outputs = { self, nixpkgs, ... }@inputs:
 
     let
 
@@ -161,7 +161,7 @@
         };
 
         neovim = let pkgs = import nixpkgs { inherit system overlays; };
-        in import ./modules/common/neovim/package {
+        in import ./modules/neovim/package {
           inherit pkgs;
           colors =
             import ./colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };

generators/aws/default.nix

@@ -15,16 +15,16 @@ nixos-generators.nixosGenerate {
       gitEmail = globals.gitEmail;
       networking.hostName = "sheep";
       gui.enable = false;
-      colorscheme = (import ../colorscheme/gruvbox);
+      colorscheme = (import ../modules/colorscheme/gruvbox);
       passwordHash = null;
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
       # AWS settings require this
       permitRootLogin = "prohibit-password";
     }
-    ../../modules/common
+    ../../hosts/common.nix
     ../../modules/nixos
-    ../../modules/common/services/sshd.nix
+    ../../modules/services/sshd.nix
   ] ++ [
     # Required to fix diskSize errors during build
     ({ ... }: { amazonImage.sizeMB = 16 * 1024; })

generators/staff/default.nix

@@ -1,7 +1,7 @@
 # The Staff
 # ISO configuration for my USB drive
 
-{ inputs, system, ... }:
+{ inputs, globals, system, overlays, ... }:
 
 with inputs;
 

hosts/flame/default.nix

@@ -13,8 +13,8 @@ nixpkgs.lib.nixosSystem {
   specialArgs = { };
   modules = [
     ./hardware-configuration.nix
-    ../../modules/common
+    ../../modules
-    ../../modules/nixos
+    ../../nixos
     (removeAttrs globals [ "mail.server" ])
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

hosts/flame/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];

hosts/hydra/default.nix

@@ -9,8 +9,8 @@ nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
   modules = [
-    ../../modules/common
+    ../../modules
-    ../../modules/nixos
+    ../../nixos
     globals
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

hosts/lookingglass/default.nix

@@ -9,8 +9,8 @@ darwin.lib.darwinSystem {
   system = "x86_64-darwin";
   specialArgs = { };
   modules = [
-    ../../modules/common
+    ../../modules
-    ../../modules/darwin
+    ../../darwin
     (globals // {
       user = "Noah.Masur";
       gitName = "Noah-Masur_1701";

hosts/swan/default.nix

@@ -10,8 +10,8 @@ nixpkgs.lib.nixosSystem {
   specialArgs = { };
   modules = [
     ./hardware-configuration.nix
-    ../../modules/common
+    ../../modules
-    ../../modules/nixos
+    ../../nixos
     (removeAttrs globals [ "mail.server" ])
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

hosts/tempest/default.nix

@@ -10,8 +10,8 @@ nixpkgs.lib.nixosSystem {
   specialArgs = { };
   modules = [
     ./hardware-configuration.nix
-    ../../modules/common
+    ../../modules
-    ../../modules/nixos
+    ../../nixos
     globals
     wsl.nixosModules.wsl
     home-manager.nixosModules.home-manager

hosts/tempest/hardware-configuration.nix

@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@@ -15,12 +15,12 @@
   services.xserver.videoDrivers = [ "amdgpu" ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
+    device = "/dev/disk/by-uuid/f0313f58-971a-46e3-9191-909fe5eb7f7e";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-label/boot";
+    device = "/dev/disk/by-uuid/FB26-799C";
     fsType = "vfat";
   };
 
@@ -34,7 +34,7 @@
   # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
 
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.amd.updateMicrocode =
     lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

modules/neovim/config/syntax.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }: {
 
   plugins = [
-    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
+    (pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins:
       with pkgs.tree-sitter-grammars; [
         tree-sitter-hcl
         tree-sitter-python

modules/neovim/package/default.nix

@@ -13,16 +13,16 @@
 # in pkgs.neovimBuilder {
 #   package = pkgs.neovim-unwrapped;
 #   imports = [
-#     ./modules/common/neovim/plugins/bufferline.nix
+#     ./modules/neovim/plugins/bufferline.nix
-#     ./modules/common/neovim/plugins/completion.nix
+#     ./modules/neovim/plugins/completion.nix
-#     ./modules/common/neovim/plugins/gitsigns.nix
+#     ./modules/neovim/plugins/gitsigns.nix
-#     ./modules/common/neovim/plugins/lsp.nix
+#     ./modules/neovim/plugins/lsp.nix
-#     ./modules/common/neovim/plugins/misc.nix
+#     ./modules/neovim/plugins/misc.nix
-#     ./modules/common/neovim/plugins/statusline.nix
+#     ./modules/neovim/plugins/statusline.nix
-#     ./modules/common/neovim/plugins/syntax.nix
+#     ./modules/neovim/plugins/syntax.nix
-#     ./modules/common/neovim/plugins/telescope.nix
+#     ./modules/neovim/plugins/telescope.nix
-#     ./modules/common/neovim/plugins/toggleterm.nix
+#     ./modules/neovim/plugins/toggleterm.nix
-#     ./modules/common/neovim/plugins/tree.nix
+#     ./modules/neovim/plugins/tree.nix
 #   ] ++ extraConfig;
 # }
 

modules/programming/default.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{ config, pkgs, lib, ... }: {
 
   imports = [
     ./haskell.nix

modules/programming/haskell.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }: {
+{ config, pkgs, lib, ... }: {
 
   options.haskell.enable = lib.mkEnableOption "Haskell programming language.";
 

modules/shell/fish/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
 
   users.users.${config.user}.shell = pkgs.fish;
   programs.fish.enable =