diff options
| -rw-r--r-- | common-workstation.nix | 3 | ||||
| -rw-r--r-- | common.nix | 2 | ||||
| -rw-r--r-- | modules/i3/default.nix | 4 | ||||
| -rw-r--r-- | modules/module-list.nix | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/common-workstation.nix b/common-workstation.nix index fc071d00..5d952677 100644 --- a/common-workstation.nix +++ b/common-workstation.nix @@ -4,7 +4,6 @@ imports = [ ./common.nix <nixpkgs/nixos/modules/programs/virtualbox.nix> - ./modules/i3 ]; boot.kernelParams = [ "zswap.enabled=1" ]; @@ -31,6 +30,8 @@ ]; }; + vuizvui.i3.enable = true; + services = { openssh = { enable = true; diff --git a/common.nix b/common.nix index a3ceef6d..f3137969 100644 --- a/common.nix +++ b/common.nix @@ -1,6 +1,8 @@ { config, pkgs, ... }: { + imports = import ./modules/module-list.nix; + nix = { package = pkgs.nixUnstable; useChroot = true; diff --git a/modules/i3/default.nix b/modules/i3/default.nix index 1d88a6e7..05e468f0 100644 --- a/modules/i3/default.nix +++ b/modules/i3/default.nix @@ -35,6 +35,8 @@ let in { options.vuizvui.i3 = { + enable = mkEnableOption "i3"; + workspaces = mkOption { type = types.attrsOf (types.submodule ./workspace.nix); default = listToAttrs (imap mkDefaultWorkspace wsNumberSymbols); @@ -62,7 +64,7 @@ in config.vuizvui.i3.workspaces = defaultWorkspaces; - config.services.xserver.windowManager = { + config.services.xserver.windowManager = mkIf config.vuizvui.i3.enable { default = "i3"; i3.enable = true; diff --git a/modules/module-list.nix b/modules/module-list.nix new file mode 100644 index 00000000..84cd81e1 --- /dev/null +++ b/modules/module-list.nix @@ -0,0 +1,3 @@ +[ + ./i3 +] |