Merge branch 'main' of gh:greg-hellings/nixos-config

home/home.nix

@@ -7,18 +7,11 @@ let
 	system = pkgs.system;
 in
 {
+	nixpkgs.config.allowUnfreePredicate = (_: true);
 	imports = [
 		inputs.nixvim.homeManagerModules.default
 		./modules
-		./ansible.nix
-		./bash.nix
-		./direnv.nix
-		./git.nix
-		./ssh.nix
-		./vim.nix
-		./xonsh.nix
-		./hosts/${host}
-	];
+	] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
 
 
 	programs.tmux = {

home/hosts/genesis/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}

home/hosts/hosea/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}

home/hosts/iso/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}

home/hosts/ivr/default.nix

@@ -11,11 +11,10 @@ let
 		tox
 	]);
 in {
-	imports = [
-		../../vscodium.nix
-	];
-
-	greg.pypackage = py;
+	greg = {
+		pypackage = py;
+		vscodium = true;
+	};
 	home = {
 		packages = with pkgs; [
 			aacs

home/hosts/jeremiah/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-}

home/hosts/jude/default.nix

@@ -1,16 +1,16 @@
 { pkgs, ... }:
 
 {
-	imports = [
-		../../vscodium.nix
-	];
 	home.packages = with pkgs; [
 		(mumble.override { pulseSupport = true; })
-		logseq
+		#logseq
 	];
-	greg.gui = true;
-	greg.sway = false;
-	greg.gnome = false;
+	greg = {
+		gui = true;
+		sway = false;
+		gnome = false;
+		vscodium = true;
+	};
 
 	programs.xonsh.sessionVariables.EFI_DIR = "${pkgs.OVMF.fd}/FV/";
 }

home/hosts/linode/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}

home/hosts/ls23003/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-
-}

home/hosts/myself/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-
-{
-}

home/hosts/work/default.nix

@@ -1,9 +1,7 @@
 { pkgs, ... }:
 
 {
-	imports = [
-		../../vscodium.nix
-	];
+	greg.vscodium.enable = true;
 
 	home.packages = with pkgs; [
 		brew

home/hosts/wsl/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}

home/modules/baseline/default.nix

@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+	imports = [
+		./ansible.nix
+		./bash.nix
+		./direnv.nix
+		./git.nix
+		./ssh.nix
+		./vim.nix
+		./xonsh.nix
+	];
+}

home/modules/baseline/xonsh_footer.xsh

@@ -44,6 +44,10 @@ def _cfetch(args):
     $CIRCLECI_CLI_TOKEN=$(bw get password CircleCI) 
     compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache/fetch/cmd/fetch:fetch
 
+def _aws_creds(args):
+    $AWS_ACCESS_KEY_ID=$(bw get username "AWS Access Key")
+    $AWS_SECRET_ACCESS_KEY=$(bw get password "AWS Access Key")
+
 def _rebuild(args):
     system = uname()
     if system.sysname == 'Darwin':
@@ -92,6 +96,7 @@ def _bake(args):
         git clone src:greg/copier-templates.git ~/.copier-templates
     copier copy @(str(templates / args[0])) .
 
+aliases['aws_creds'] = _aws_creds
 aliases['glrestart'] = _glrestart
 aliases['bake'] = _bake
 aliases['unlock'] = _unlock

home/modules/default.nix

@@ -2,11 +2,13 @@
 
 {
 	imports = [
+		./baseline
 		./development.nix
 		./gnome.nix
 		./gui.nix
 		./python.nix
 		./sway.nix
+		./vscodium.nix
 		./xonsh.nix
 	];
 }

home/modules/gui.nix

@@ -56,7 +56,7 @@ in {
 
 		programs.firefox = {
 			enable = (! pkgs.stdenv.hostPlatform.isDarwin);
-			package = ffPkgs;
+			#package = ffPkgs;
 			profiles = {
 				default = {
 					settings = {

home/modules/vscodium.nix

@@ -0,0 +1,32 @@
+{ pkgs, config, lib, ... }:
+
+let
+	cfg = config.greg.vscodium;
+in {
+	options.greg.vscodium = lib.mkEnableOption "Enable installation of VSCodium on the host";
+
+	config = lib.mkIf cfg {
+		home.packages = with pkgs; [
+			buildifier
+			gopls
+		];
+
+		# An alternative editor to vim, when I need it for some things
+		programs.vscode = {
+			enable = true;
+			package = pkgs.vscodium;
+			extensions = with pkgs.vscode-extensions; [
+				arrterian.nix-env-selector
+				asvetliakov.vscode-neovim
+				bungcip.better-toml
+				golang.go
+				jnoortheen.nix-ide
+				mkhl.direnv
+				ms-python.python
+				vscjava.vscode-java-test
+				vscjava.vscode-java-dependency
+				vscjava.vscode-java-debug
+			];
+		};
+	};
+}

home/vscodium.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-
-{
-	home.packages = with pkgs; [
-		buildifier
-		gopls
-	];
-
-	# An alternative editor to vim, when I need it for some things
-	programs.vscode = {
-		enable = true;
-		package = pkgs.vscodium;
-		extensions = with pkgs.vscode-extensions; [
-			arrterian.nix-env-selector
-			asvetliakov.vscode-neovim
-			bungcip.better-toml
-			golang.go
-			jnoortheen.nix-ide
-			mkhl.direnv
-			ms-python.python
-			vscjava.vscode-java-test
-			vscjava.vscode-java-dependency
-			vscjava.vscode-java-debug
-		];
-	};
-}