Refactor the whole structure

README.md

@@ -0,0 +1,7 @@
+# NixOS Configs
+
+This repository tracks my NixOS config.  Generally, this is just for me, and is public for the purpose of global accessibility without authentication moreso than for the benefit of anyone other than me.  That said, anyone is welcome to browse if they feel so inspired.
+
+## Organization
+
+**Top level** - Root configurations and anything you'd want to point a `/etc/nixos/configuration.nix` or `~/.config/nixpkgs/home.nix` at.  These are the entrypoints to the configuration.

configs/filesystems.nix

@@ -1,5 +1,5 @@
 { config, lib, pkgs, modulesPath, ... }:
-let systemInformation = import ./system-information.nix; in
+let systemInformation = import ../system/system-information.nix; in
 {
 	boot.initrd.luks.devices = {
 		cryptoroot = {

configs/home.full.nix

@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+	imports = [./home.nogui.nix]
+	home.packages = with pkgs; [
+		clapper
+	];
+	home.sessionVariables = {
+		MOZ_ENABLE_WAYLAND = "1";
+	};
+	programs.kitty = import programs/kitty.nix pkgs;
+	programs.firefox = import programs/firefox.nix pkgs;
+}

configs/home.nogui.nix

@@ -3,7 +3,6 @@
 		NNN_FIFO = "/tmp/nnn.fifo";
 		LANG = "en_US.UTF-8";
 		EDITOR = "nvim";
-		MOZ_ENABLE_WAYLAND = "1";
 	};
 	home.keyboard.layout = "us";
 	home.keyboard.variant = "3l";
@@ -11,7 +10,6 @@
 		restic
 		ripgrep
 		libqalculate
-		clapper
 		git-annex
 		git-annex-remote-rclone
 		qrencode
@@ -62,13 +60,11 @@
 			pull.rebase = false;
 		};
 	};
-	programs.kitty = import programs/kitty.nix pkgs;
 	programs.password-store = {
 		enable = true;
 		package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
 	};
 	programs.fish = import programs/fish.nix pkgs;
-	programs.firefox = import programs/firefox.nix pkgs;
 	programs.nnn = {
 		enable = true;
 		plugins.mappings = {
@@ -106,4 +102,4 @@
 	dconf.settings = import ./dconf.nix;
 	home.stateVersion = "22.11";
 	targets.genericLinux.enable = true;
-}
+}

configs/programs/neovim.nix

@@ -137,13 +137,13 @@ pkgs: {
 				command = "coc#pum#visible() ? coc#pum#prev(1) : \"\\<C-h>\"";
 				expr = true;
 			}
-			{
-				mode = "i";
-				binding = "<CR>";
-				command = "coc#pum#visible() ? coc#pum#confirm() : \"\\<C-g>u\\<CR>\\<c-r>=coc#on_enter()\\<CR>\"";
-				silent = true;
-				expr = true;
-			}
+#			{
+#				mode = "i";
+#				binding = "<CR>";
+#				command = "coc#pum#visible() ? coc#pum#confirm() : \"\\<C-g>u\\<CR>\\<c-r>=coc#on_enter()\\<CR>\"";
+#				silent = true;
+#				expr = true;
+#			}
 			{
 				mode = "n";
 				binding = "<C-Space>";

configs/programs/neovim/init.vim

@@ -28,4 +28,6 @@ function! ShowDocumentation()
   else
     call feedkeys('K', 'in')
   endif
-endfunction
+endfunction
+
+inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"

home.full.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }:
+{
+	imports =
+		[
+			./configs/home.full.nix
+		];
+
+	programs.home-manager.enable = true;
+}

home.nogui.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }:
+{
+	imports =
+		[
+			./configs/home.nogui.nix
+		];
+
+	programs.home-manager.enable = true;
+}

nixos.nix

@@ -1,15 +1,15 @@
 # sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware
 # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
 
-let systemInformation = import ./system-information.nix; in
+let systemInformation = import ./system/system-information.nix; in
 { config, pkgs, lib, ... }:
 {
 	networking.hostName = "kudzu";
 
 	imports =
 		[
-			./filesystems.nix
-			./hardware-requirements.nix
+			./configs/filesystems.nix
+			./system/hardware-requirements.nix
 			<home-manager/nixos>
 		];
 
@@ -152,7 +152,7 @@ let systemInformation = import ./system-information.nix; in
 		extraGroups = [ "networkmanager" "wheel" ];
 		shell = pkgs.fish;
 	};
-	home-manager.users.ember = import ./home.nix;
+	home-manager.users.ember = import ./configs/home.nix;
 
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;