From 9e324f0b8319f935c0bd33ef444c5ea432dd100d Mon Sep 17 00:00:00 2001 From: traxys Date: Thu, 8 Aug 2024 21:45:14 +0200 Subject: [PATCH] gui: Split `wm` module out of the `gui` module Allowing to use DEs on select machines --- flake.nix | 2 ++ gui/hm.nix | 24 +----------------------- gui/nixos.nix | 15 --------------- gui/{wm => }/terminal/default.nix | 0 gui/{wm => }/terminal/foot.nix | 0 gui/{wm => }/terminal/kitty.nix | 0 hostconfig/ZeNixComputa/default.nix | 2 ++ hostconfig/ZeNixLaptop/default.nix | 2 ++ hostconfig/gandalf/default.nix | 2 ++ hostconfig/thinkpad-nixos/default.nix | 3 +++ gui/wm/default.nix => wm/hm.nix | 27 +++++++++++++++++++++++---- {gui/wm => wm}/i3.nix | 0 {gui/wm => wm}/i3like-utils.nix | 0 {gui/wm => wm}/i3like.nix | 0 wm/nixos.nix | 18 ++++++++++++++++++ {gui/wm => wm}/sway.nix | 0 {gui/wm => wm}/waybar-khal.py | 0 {gui/wm => wm}/waybar.css | 0 18 files changed, 53 insertions(+), 42 deletions(-) rename gui/{wm => }/terminal/default.nix (100%) rename gui/{wm => }/terminal/foot.nix (100%) rename gui/{wm => }/terminal/kitty.nix (100%) rename gui/wm/default.nix => wm/hm.nix (92%) rename {gui/wm => wm}/i3.nix (100%) rename {gui/wm => wm}/i3like-utils.nix (100%) rename {gui/wm => wm}/i3like.nix (100%) create mode 100644 wm/nixos.nix rename {gui/wm => wm}/sway.nix (100%) rename {gui/wm => wm}/waybar-khal.py (100%) rename {gui/wm => wm}/waybar.css (100%) diff --git a/flake.nix b/flake.nix index e967b29..56e2cbb 100644 --- a/flake.nix +++ b/flake.nix @@ -180,6 +180,7 @@ }; personal-cli = import ./personal-cli/hm.nix; gui = import ./gui/hm.nix; + wm = import ./wm/hm.nix; personal-gui = import ./personal-gui/hm.nix; gaming = import ./gaming/hm.nix; work = import ./hostconfig/thinkpad-nixos/work.nix; @@ -189,6 +190,7 @@ minimal = import ./minimal/nixos.nix { inherit extraInfo; }; personal-cli = import ./personal-cli/nixos.nix; gui = import ./gui/nixos.nix; + wm = import ./wm/nixos.nix; personal-gui = import ./personal-gui/nixos.nix; roaming = import ./roaming/nixos.nix; gaming = import ./gaming/nixos.nix; diff --git a/gui/hm.nix b/gui/hm.nix index 67b28b5..d2c35ea 100644 --- a/gui/hm.nix +++ b/gui/hm.nix @@ -5,23 +5,7 @@ ... }: { - imports = [ ./wm ]; - - xdg.portal = { - enable = true; - config = { - sway = { - default = "gtk"; - "org.freedesktop.impl.portal.Screenshot" = "wlr"; - "org.freedesktop.impl.portal.ScreenCast" = "wlr"; - }; - }; - - extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - ]; - }; + imports = [ ./terminal ]; home.packages = with pkgs; [ # IM @@ -69,10 +53,4 @@ }; programs.zathura.enable = true; - - programs.rofi = { - enable = true; - theme = "solarized_alternate"; - terminal = "${config.terminal.command}"; - }; } diff --git a/gui/nixos.nix b/gui/nixos.nix index 5aa69f0..e82823f 100644 --- a/gui/nixos.nix +++ b/gui/nixos.nix @@ -9,21 +9,6 @@ services.gnome.gnome-keyring.enable = true; services.flatpak.enable = true; - xdg.portal = { - enable = true; - config = { - sway = { - default = "gtk"; - "org.freedesktop.impl.portal.Screenshot" = "wlr"; - "org.freedesktop.impl.portal.ScreenCast" = "wlr"; - }; - }; - - extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - ]; - }; security.rtkit.enable = true; services.pipewire = { diff --git a/gui/wm/terminal/default.nix b/gui/terminal/default.nix similarity index 100% rename from gui/wm/terminal/default.nix rename to gui/terminal/default.nix diff --git a/gui/wm/terminal/foot.nix b/gui/terminal/foot.nix similarity index 100% rename from gui/wm/terminal/foot.nix rename to gui/terminal/foot.nix diff --git a/gui/wm/terminal/kitty.nix b/gui/terminal/kitty.nix similarity index 100% rename from gui/wm/terminal/kitty.nix rename to gui/terminal/kitty.nix diff --git a/hostconfig/ZeNixComputa/default.nix b/hostconfig/ZeNixComputa/default.nix index 0f5f3fa..f09fa54 100644 --- a/hostconfig/ZeNixComputa/default.nix +++ b/hostconfig/ZeNixComputa/default.nix @@ -12,6 +12,7 @@ gui personal-gui gaming + wm ]; hmModules = with self.hmModules; [ ./extra_info.nix @@ -21,6 +22,7 @@ gui personal-gui gaming + wm ]; unfreePackages = [ "cnijfilter2" diff --git a/hostconfig/ZeNixLaptop/default.nix b/hostconfig/ZeNixLaptop/default.nix index 1b2191d..f78fc29 100644 --- a/hostconfig/ZeNixLaptop/default.nix +++ b/hostconfig/ZeNixLaptop/default.nix @@ -9,6 +9,7 @@ minimal personal-cli gui + wm gaming ]; hmModules = with self.hmModules; [ @@ -17,6 +18,7 @@ minimal personal-cli gui + wm gaming ]; }; diff --git a/hostconfig/gandalf/default.nix b/hostconfig/gandalf/default.nix index 746703c..88ec7f3 100644 --- a/hostconfig/gandalf/default.nix +++ b/hostconfig/gandalf/default.nix @@ -10,6 +10,7 @@ minimal personal-cli gui + wm personal-gui ]; hmModules = with self.hmModules; [ @@ -18,6 +19,7 @@ minimal personal-cli gui + wm personal-gui ]; unfreePackages = [ diff --git a/hostconfig/thinkpad-nixos/default.nix b/hostconfig/thinkpad-nixos/default.nix index 881dbe7..1a3149f 100644 --- a/hostconfig/thinkpad-nixos/default.nix +++ b/hostconfig/thinkpad-nixos/default.nix @@ -18,6 +18,7 @@ minimal personal-cli gui + wm ]; hmModules = with self.hmModules; [ ./extra_info.nix @@ -25,6 +26,7 @@ minimal personal-cli gui + wm ]; }; @@ -35,6 +37,7 @@ work personal-cli gui + wm ]) ++ [ ./extra_info.nix diff --git a/gui/wm/default.nix b/wm/hm.nix similarity index 92% rename from gui/wm/default.nix rename to wm/hm.nix index ce84126..02ac7aa 100644 --- a/gui/wm/default.nix +++ b/wm/hm.nix @@ -5,10 +5,23 @@ ... }: { - imports = [ - ./terminal - ./i3like.nix - ]; + xdg.portal = { + enable = true; + config = { + sway = { + default = "gtk"; + "org.freedesktop.impl.portal.Screenshot" = "wlr"; + "org.freedesktop.impl.portal.ScreenCast" = "wlr"; + }; + }; + + extraPortals = with pkgs; [ + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + ]; + }; + + imports = [ ./i3like.nix ]; gtk = { enable = true; @@ -100,6 +113,12 @@ EXA_COLORS = "xx=38;5;8"; }; + programs.rofi = { + enable = true; + theme = "solarized_alternate"; + terminal = "${config.terminal.command}"; + }; + wm = let mod = config.wm.modifier; diff --git a/gui/wm/i3.nix b/wm/i3.nix similarity index 100% rename from gui/wm/i3.nix rename to wm/i3.nix diff --git a/gui/wm/i3like-utils.nix b/wm/i3like-utils.nix similarity index 100% rename from gui/wm/i3like-utils.nix rename to wm/i3like-utils.nix diff --git a/gui/wm/i3like.nix b/wm/i3like.nix similarity index 100% rename from gui/wm/i3like.nix rename to wm/i3like.nix diff --git a/wm/nixos.nix b/wm/nixos.nix new file mode 100644 index 0000000..68f1b34 --- /dev/null +++ b/wm/nixos.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: +{ + xdg.portal = { + enable = true; + config = { + sway = { + default = "gtk"; + "org.freedesktop.impl.portal.Screenshot" = "wlr"; + "org.freedesktop.impl.portal.ScreenCast" = "wlr"; + }; + }; + + extraPortals = with pkgs; [ + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + ]; + }; +} diff --git a/gui/wm/sway.nix b/wm/sway.nix similarity index 100% rename from gui/wm/sway.nix rename to wm/sway.nix diff --git a/gui/wm/waybar-khal.py b/wm/waybar-khal.py similarity index 100% rename from gui/wm/waybar-khal.py rename to wm/waybar-khal.py diff --git a/gui/wm/waybar.css b/wm/waybar.css similarity index 100% rename from gui/wm/waybar.css rename to wm/waybar.css