common: restructure config, update tmux and wezterm

nix-config/shared/default.nix

@@ -1,5 +1,10 @@
 isHm:
-{ lib, materusArgs, config, ... }:
+{
+  lib,
+  materusArgs,
+  config,
+  ...
+}:
 {
 
   options.mkk.dir = lib.mkOption {
@@ -8,15 +13,17 @@ isHm:
   };
 
   options.mkk.var = lib.mkOption {
-    default = {};
+    default = { };
     type = lib.types.attrs;
   };
 
   imports = [
-    (import ./nvim.nix isHm)
     ./nix.nix
-  ];
-  config.mkk.var = import ./private/variables.nix;
+  ]
+  ++ lib.optionals isHm [ ./hm ]
+  ++ lib.optionals (!isHm) [ ./os ];
+
+  config.mkk.var = import ./private/variables.nix {};
   config._module.args.mkk = config.mkk.var;
 
 }

nix-config/shared/hm/default.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ./nvim.nix ];
+}

nix-config/shared/hm/nvim.nix

@@ -0,0 +1,39 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  options.mkk.neovim = {
+    enable = lib.mkOption {
+      default = false;
+      type = lib.types.bool;
+    };
+  };
+  config =
+    # Home Manager
+    lib.mkIf config.mkk.neovim.enable {
+      xdg.configFile."nvim/lua/materus".source = "${config.mkk.dir}/config/editor/neovim/lua/materus";
+      programs.neovim = {
+        enable = true;
+        withRuby = true;
+        withPython3 = true;
+        plugins = [
+          pkgs.vimPlugins.nvim-treesitter.withAllGrammars
+        ];
+
+        initLua = lib.mkAfter ''
+          MATERUS = {
+            NIXOS = 1
+          }
+          require("materus")
+        '';
+      };
+      home.packages = [
+        pkgs.fd
+        pkgs.ripgrep
+        pkgs.tree-sitter
+      ];
+    };
+}

nix-config/shared/nvim.nix

@@ -1,48 +0,0 @@
-isHm:
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  options.mkk.neovim = {
-    enable = lib.mkOption {
-      default = false;
-      type = lib.types.bool;
-    };
-  };
-  config =
-    if isHm then
-      # Home Manager
-      lib.mkIf config.mkk.neovim.enable {
-        xdg.configFile."nvim/lua/materus".source = "${config.mkk.dir}/config/editor/neovim/lua/materus";
-        programs.neovim = {
-          enable = true;
-          withRuby = true;
-          withPython3 = true;
-          plugins = [
-            pkgs.vimPlugins.nvim-treesitter.withAllGrammars
-          ];
-
-          initLua = lib.mkAfter ''
-            MATERUS = {
-              NIXOS = 1
-            }
-            require("materus")
-          '';
-        };
-        home.packages = [
-          pkgs.fd
-          pkgs.ripgrep
-          pkgs.tree-sitter
-        ];
-      }
-    else
-      # NixOS
-      lib.mkIf config.mkk.neovim.enable {
-        environment.systemPackages = [
-          pkgs.neovim
-        ];
-      };
-}

nix-config/shared/os/default.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ];
+}