Merge branch 'main' of github.com:bloxx12/nichts

hosts/default.nix

@@ -4,11 +4,11 @@ let
   inherit (self) lib;
 in {
   # Vali
-  vali = lib.nixosSystem {
+  mars = lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = { inherit lib inputs self; };
     modules = [
-        ./vali
+        ./vali/mars
         ../modules
         inputs.home-manager.nixosModules.home-manager
         inputs.agenix.nixosModules.default

hosts/vali/mars/configuration.nix

@@ -9,8 +9,9 @@
   myOptions = {
       other = {
           system = {
-              hostname = "nixos";
+              hostname = "mars";
               username = "vali";
+              gitPath = "/home/vali/Git/nichts";
           };
           home-manager = {
               enable = true;

hosts/vali/mars/i3.nix

@@ -7,7 +7,7 @@ in {
   config = mkIf cfg.enable {
     services.xserver = {
       enable = true;
-      layout =  "de";
+      xkb.layout =  "de";
       windowManager = {
           bspwm.enable = true;
           i3.enable = true;

hosts/vali/mars/profile.nix

@@ -0,0 +1,11 @@
+_: {
+    imports = [
+        ../../../options/boot/grub-boot.nix
+        ../../../options/desktop/fonts.nix
+        ../../../options/common/networking.nix
+        ../../../options/common/gpu/nvidia.nix
+#        ../../options/common/pin-registry.nix
+#        ../../options/common/preserve-system.nix
+        #../../options/
+    ];
+}

hosts/vali/profile.nix

@@ -1,11 +0,0 @@
-_: {
-    imports = [
-        ../../options/boot/grub-boot.nix
-        ../../options/desktop/fonts.nix
-        ../../options/common/networking.nix
-        ../../options/common/gpu/nvidia.nix
-#        ../../options/common/pin-registry.nix
-#        ../../options/common/preserve-system.nix
-        #../../options/
-    ];
-}

modules/cli/zsh.nix

@@ -16,19 +16,19 @@ in {
             description = "enable zsh profiling";
             default = false;
         };
-	oh-my-zsh = {
+        ohmyzsh = {
-	    enable = mkEnableOption "oh-my-zsh";
+	          enable = mkEnableOption "ohmyzsh";
-	    theme = mkOption {
+	          theme = mkOption {
-	        type = types.str;
+	              type = types.str;
-		description = "oh-my-zsh theme";
+        	      description = "oh-my-zsh theme";
-		default = "alanpeabody";
+	              default = "alanpeabody";
-	    };
+	          };
-	    plugins = mkOption {
+	          plugins = mkOption {
-	        type = types.listOf(types.str);
+	              type = types.listOf(types.str);
-		description = "oh-my-zsh plugins (like git)";
+                description = "oh-my-zsh plugins (like git)";
-		default = ["git"];
+	              default = [ git ];
-	    };
+	          };
-	};
+	      };
     };
 
     config = mkIf cfg.enable {
@@ -55,7 +55,7 @@ in {
                     cd = "z";
                     nv = "nvim";
                     #TODO fix hardcoding of git repo path and profile name
-                    update = "sudo -p 'password: ' echo 'Your daughter is just a fork of your wife.' && sudo nixos-rebuild switch --flake \"${gitPath}#${config.myOptions.other.system.hostname}\" --log-format internal-json |& nom --json";
+                    update = "sudo -p 'password: ' echo 'Your daughter is just a fork of your wife.' && sudo nixos-rebuild switch --flake \"${gitPath}#mars\" --log-format internal-json |& nom --json";
 
                 } // cfg.extraAliases;
                 initExtraFirst = mkIf cfg.profiling "zmodload zsh/zprof";
@@ -83,11 +83,11 @@ in {
                       };
                   }
                 ];
-	       oh-my-zsh = mkIf cfg.oh-my-zsh.enable {
+	              oh-my-zsh = mkIf cfg.ohmyzsh.enable {
-	           enable = cfg.oh-my-zsh.enable;
+	                  programs.oh-my-zsh.enable = true;
-		   theme = cfg.oh-my-zsh.theme;
+                    theme = cfg.ohmyzsh.theme;
-		   plugins = cfg.oh-my-zsh.plugins;
+            		    plugins = cfg.ohmyzsh.plugins;
-	       };
+	              };
             };
         };
       };

modules/other/default.nix

@@ -2,6 +2,6 @@ _: {
     imports = [
         ./home-manager.nix
         ./system.nix
-#        ./xdg.nix
+        ./xdg.nix
     ];
 }

modules/other/xdg.nix

@@ -14,7 +14,7 @@
     text_editor = "nvim.desktop";
 in {
 
-    environment.sessionVariables = {
+/*    environment.sessionVariables = {
         CARGO_HOME = "${hmCfg.xdg.dataHome}/cargo";
         GOPATH = "${hmCfg.xdg.dataHome}/go";
         GNUPGHOME = "${hmCfg.xdg.dataHome}/gnupg";
@@ -30,14 +30,13 @@ in {
         WINEPREFIX = "${hmCfg.xdg.dataHome}/wine";
         XAUTHORITY = "\$XDG_RUNTIME_DIR/Xauthority";
     };
-
+*/
     myOptions.programs.zsh.extraAliases = {
         gdb = "gdb -n -x ${hmCfg.xdg.configHome}/gdb/init";
         pidgin = "pidgin --config=${hmCfg.xdg.dataHome}/purple";
         svn = "svn --config-dir ${hmCfg.xdg.configHome}/subversion";
         wget = "wget --hsts-file=\"${hmCfg.xdg.dataHome}/wget-hsts\"";
     };
-
     home-manager.users.${username} = {
         xdg.configFile."npm/npmrc".text = ''
             prefix=${hmCfg.xdg.dataHome}/npm

notes.md

@@ -1,2 +1 @@
-## Used Stuff
+# Used Stuff
-I think it'd be nice to use flake-parts, they make our config more sane.