diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/home-manager/personal/gui/x/i3/default.nix | 76 | ||||
| -rw-r--r-- | modules/home-manager/personal/gui/x/i3/startup.nix | 3 | ||||
| -rw-r--r-- | modules/home-manager/personal/identities.nix | 2 |
3 files changed, 51 insertions, 30 deletions
diff --git a/modules/home-manager/personal/gui/x/i3/default.nix b/modules/home-manager/personal/gui/x/i3/default.nix index 443606d..17019cb 100644 --- a/modules/home-manager/personal/gui/x/i3/default.nix +++ b/modules/home-manager/personal/gui/x/i3/default.nix @@ -1,14 +1,20 @@ -{ config, lib, pkgs, ... }@extraArgs: - -let cfg = config.personal.x.i3; +{ + config, + lib, + pkgs, + ... +} @ extraArgs: let + cfg = config.personal.x.i3; in { - imports = [ ./bar ./keybindings.nix ./startup.nix ]; + imports = [./bar ./keybindings.nix ./startup.nix]; options.personal.x.i3 = { - enable = lib.mkEnableOption "i3" // { - default = - extraArgs.osConfig.services.xserver.windowManager.i3.enable or false; - }; + enable = + lib.mkEnableOption "i3" + // { + default = + extraArgs.osConfig.services.xserver.windowManager.i3.enable or false; + }; }; config = lib.mkIf cfg.enable { @@ -17,26 +23,36 @@ in { package = lib.mkDefault pkgs.i3-gaps; config = { - assigns = lib.optionalAttrs (config.personal.profiles.multimedia - && (extraArgs.osConfig.programs.steam.enable or true)) { + assigns = + lib.optionalAttrs (config.personal.profiles.multimedia + && (extraArgs.osConfig.programs.steam.enable or true)) { "8: multimedia" = [ - { class = "^Steam$"; } - { title = "Netflix"; } - { title = "MUBI"; } - { title = "Deezer"; } + {class = "^Steam$";} + {title = "Netflix";} + {title = "MUBI";} + {title = "Deezer";} ]; - } // lib.optionalAttrs config.personal.profiles.social { - "9: social" = [ { class = "^Mail$"; } { class = "^thunderbird$"; } ] + } + // lib.optionalAttrs config.personal.profiles.social { + "9: social" = + [{class = "^Mail$";} {class = "^thunderbird$";}] ++ lib.optionals config.personal.identities.personal [ - { class = "^signal$"; } - { class = "^Signal$"; } - { title = "^Signal"; } + {class = "^signal$";} + {class = "^Signal$";} + {title = "^Signal";} + ] + ++ lib.optionals config.personal.identities.work [ + {class = "^zulip";} + {class = "^Zulip";} ]; - } // { - "10: passwords" = [{ - # matches <some db>.kbdx [Locked] - KeePassXC - title = ".*\\.kbdx \\[Locked\\] - KeePassXC$"; - }]; + } + // { + "10: passwords" = [ + { + # matches <some db>.kbdx [Locked] - KeePassXC + title = ".*\\.kbdx \\[Locked\\] - KeePassXC$"; + } + ]; }; workspaceAutoBackAndForth = lib.mkDefault true; @@ -47,11 +63,13 @@ in { }; floating = { titlebar = lib.mkDefault false; - border = lib.mkDefault (if config.services.picom.enable - && config.services.picom.shadow then - 0 - else - lib.mkOptionDefault); + border = lib.mkDefault ( + if + config.services.picom.enable + && config.services.picom.shadow + then 0 + else lib.mkOptionDefault + ); }; gaps = { inner = lib.mkDefault 15; diff --git a/modules/home-manager/personal/gui/x/i3/startup.nix b/modules/home-manager/personal/gui/x/i3/startup.nix index dc52fb0..1afe2cb 100644 --- a/modules/home-manager/personal/gui/x/i3/startup.nix +++ b/modules/home-manager/personal/gui/x/i3/startup.nix @@ -21,5 +21,8 @@ ++ autostartIf (config.personal.profiles.social && config.personal.identities.personal) { command = "signal-desktop"; + } + ++ autostartIf config.personal.identities.work { + command = "zulip"; }; } diff --git a/modules/home-manager/personal/identities.nix b/modules/home-manager/personal/identities.nix index feddc2f..f1fb445 100644 --- a/modules/home-manager/personal/identities.nix +++ b/modules/home-manager/personal/identities.nix @@ -90,7 +90,7 @@ in { } (lib.mkIf cfg.work { home = { - packages = with pkgs; [zotero evince]; + packages = with pkgs; [zotero evince zulip]; file.".latexmkrc".source = lib.mkDefault config.personal.home.dotfiles.latexmkrc; }; |