Compare commits

...

2 Commits

Author SHA1 Message Date
42a34a6c40 [nix-book] Update sway scale factor 2024-09-10 11:09:44 -07:00
5e029720ef [i3+sway] Add optionality to configs 2024-09-10 11:09:37 -07:00
2 changed files with 30 additions and 12 deletions

View File

@@ -5,4 +5,8 @@
./home-default.nix ./home-default.nix
./modules/hyprland/nix-book.nix ./modules/hyprland/nix-book.nix
]; ];
home.i3_sway.extraSwayConfig = {
output.eDP-1.scale = "1.75";
};
} }

View File

@@ -1,27 +1,41 @@
{ config, lib, pkgs, ... }: { config, lib, ... }:
with lib; with lib;
let let
shared_config = { cfg = config.home.i3_sway;
shared_config = recursiveUpdate {
modifier = "Mod4"; modifier = "Mod4";
terminal = "kitty"; terminal = "kitty";
defaultWorkspace = "workspace number 1"; defaultWorkspace = "workspace number 1";
}; } cfg.extraSharedConfig;
in { in {
xsession.windowManager.i3 = { options.home.i3_sway = {
enable = true; extraSharedConfig = mkOption {};
config = shared_config; extraI3Config = mkOption {};
extraSwayConfig = mkOption {};
}; };
wayland.windowManager.sway = { config = {
xsession.windowManager.i3 = let
base_i3_config = recursiveUpdate shared_config {};
in {
enable = true; enable = true;
config = recursiveUpdate shared_config { config = recursiveUpdate base_i3_config cfg.extraI3Config;
};
wayland.windowManager.sway = let
base_sway_config = recursiveUpdate shared_config {
input = { input = {
"type:keyboard" = { "type:keyboard" = {
xkb_options = "caps:escape"; xkb_options = "caps:escape";
}; };
}; };
}; };
in {
enable = true;
config = recursiveUpdate base_sway_config cfg.extraSwayConfig;
};
}; };
} }