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

2024-08-04 19:07:44 -05:00
parent 7b67f63295 ed7f397903
commit 042c3a5a6b
39 changed files with 93 additions and 139 deletions
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
@@ -11,11 +11,10 @@ let
 		tox
 	]);
 in {
-	imports = [
-		../../vscodium.nix
-	];
-
-	greg.pypackage = py;
+	greg = {
+		pypackage = py;
+		vscodium = true;
+	};
 	home = {
 		packages = with pkgs; [
 			aacs
@@ -1,4 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-}
@@ -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/";
 }
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
@@ -1,4 +0,0 @@
-{ ... }:
-{
-
-}
@@ -1,4 +0,0 @@
-{ ... }:
-
-{
-}
@@ -1,9 +1,7 @@
 { pkgs, ... }:

 {
-	imports = [
-		../../vscodium.nix
-	];
+	greg.vscodium.enable = true;

 	home.packages = with pkgs; [
 		brew
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}