From d3ff309fd9000275eb99948960a154ae6220529a Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 25 Mar 2024 18:19:31 +0100 Subject: [PATCH] Restructure wm configuration for future expansion --- modules/home/default.nix | 2 +- modules/home/dm/default.nix | 5 +++++ .../home/{qtile/files => dm/qtile}/background-image | Bin modules/home/{ => dm}/qtile/default.nix | 8 ++++---- modules/home/{qtile/files => dm/qtile}/qtile.py | 0 users/seb/home.nix | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 modules/home/dm/default.nix rename modules/home/{qtile/files => dm/qtile}/background-image (100%) rename modules/home/{ => dm}/qtile/default.nix (74%) rename modules/home/{qtile/files => dm/qtile}/qtile.py (100%) diff --git a/modules/home/default.nix b/modules/home/default.nix index 59a497e..0c1c003 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./qtile + ./dm ./vscode.nix ./shell.nix ./theming.nix diff --git a/modules/home/dm/default.nix b/modules/home/dm/default.nix new file mode 100644 index 0000000..81d8ba4 --- /dev/null +++ b/modules/home/dm/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./qtile + ]; +} diff --git a/modules/home/qtile/files/background-image b/modules/home/dm/qtile/background-image similarity index 100% rename from modules/home/qtile/files/background-image rename to modules/home/dm/qtile/background-image diff --git a/modules/home/qtile/default.nix b/modules/home/dm/qtile/default.nix similarity index 74% rename from modules/home/qtile/default.nix rename to modules/home/dm/qtile/default.nix index 94cb318..2f01931 100644 --- a/modules/home/qtile/default.nix +++ b/modules/home/dm/qtile/default.nix @@ -5,9 +5,9 @@ osConfig, ... }: { - options.myConfig.qtile.enable = lib.mkEnableOption ""; + options.myConfig.dm.qtile.enable = lib.mkEnableOption ""; - config = lib.mkIf config.myConfig.qtile.enable { + config = lib.mkIf config.myConfig.dm.qtile.enable { assertions = [ { assertion = osConfig.services.xserver.windowManager.qtile.enable; @@ -15,8 +15,8 @@ } ]; - home.file.".config/qtile/config.py".source = ./files/qtile.py; - home.file.".background-image".source = ./files/background-image; + home.file.".config/qtile/config.py".source = ./qtile.py; + home.file.".background-image".source = ./background-image; home.packages = [ # Widget dependencies diff --git a/modules/home/qtile/files/qtile.py b/modules/home/dm/qtile/qtile.py similarity index 100% rename from modules/home/qtile/files/qtile.py rename to modules/home/dm/qtile/qtile.py diff --git a/users/seb/home.nix b/users/seb/home.nix index 5bd690b..bcf90e7 100644 --- a/users/seb/home.nix +++ b/users/seb/home.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { myConfig = { - qtile.enable = true; + dm.qtile.enable = true; vscode.enable = true; shell = { bash.enable = true;