From db26ccee2f7826487f112098b4b078008464b700 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 19 Aug 2024 18:49:36 -0400 Subject: [PATCH] aly: special sway and hyprland configs for mauville --- homes/aly/windowManagers/default.nix | 24 ++++------------- homes/aly/windowManagers/laptop.nix | 36 ++++++++++++++++++++++++++ homes/aly/windowManagers/ultrawide.nix | 2 ++ 3 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 homes/aly/windowManagers/laptop.nix create mode 100644 homes/aly/windowManagers/ultrawide.nix diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix index 9f8533bf..c6d8f8e4 100644 --- a/homes/aly/windowManagers/default.nix +++ b/homes/aly/windowManagers/default.nix @@ -1,23 +1,20 @@ { config, lib, + osConfig, pkgs, ... }: { + imports = + if (osConfig.networking.hostName == "mauville") + then [./ultrawide.nix] + else [./laptop.nix]; programs.waybar.settings.mainBar."bluetooth" = { "on-click" = lib.mkForce "${lib.getExe pkgs.rofi-bluetooth} -i"; }; wayland.windowManager = { sway.config = { - assigns = { - "workspace 1:web" = [{app_id = "firefox";} {app_id = "brave-browser";}]; - "workspace 2:note" = [{app_id = "obsidian";}]; - "workspace 3:code" = [{app_id = "codium-url-handler";} {app_id = "dev.zed.Zed";}]; - "workspace 4:mail" = [{app_id = "thunderbird";}]; - "workspace 5:work" = [{app_id = "firework";}]; - }; - floating.criteria = [{app_id = "Bitwarden";} {app_id = "org.keepassxc.KeePassXC";}]; gaps = { @@ -33,7 +30,6 @@ }; startup = [ - {command = "sleep 2 && ${lib.getExe' config.wayland.windowManager.sway.package "swaymsg"} workspace 1:web";} {command = lib.getExe config.ar.home.defaultApps.editor;} {command = lib.getExe config.ar.home.defaultApps.webBrowser;} {command = lib.getExe pkgs.fractal;} @@ -77,10 +73,6 @@ dwindle.no_gaps_when_only = "1"; - exec-once = [ - "sleep 2 && hyprctl dispatch workspace 2 && sleep 2 && hyprctl dispatch workspace 3 && sleep 2 && hyprctl dispatch workspace 4 && sleep 2 && hyprctl dispatch workspace 1;" - ]; - input.kb_options = "ctrl:nocaps"; windowrulev2 = [ @@ -90,17 +82,11 @@ "float,class:(org.keepassxc.KeePassXC)" "size 80% 80%,class:(Bitwarden)" "size 80% 80%,class:(org.keepassxc.KeePassXC)" - "workspace 1,class:(brave-browser)" - "workspace 5,class:(firework)" "workspace special:magic,class:(WebCord)" "workspace special:magic,class:(org.gnome.Fractal)" ]; workspace = [ - "1,defaultName:web,on-created-empty:${lib.getExe config.ar.home.defaultApps.webBrowser}" - "2,defaultName:note,on-created-empty:${lib.getExe' pkgs.obsidian "obsidian"}" - "3,defaultName:code,on-created-empty:${lib.getExe config.ar.home.defaultApps.editor}" - "4,defaultName:mail,on-created-empty:${lib.getExe pkgs.thunderbird}" "special:magic,on-created-empty:${lib.getExe pkgs.fractal}" ]; }; diff --git a/homes/aly/windowManagers/laptop.nix b/homes/aly/windowManagers/laptop.nix new file mode 100644 index 00000000..87fe0d3b --- /dev/null +++ b/homes/aly/windowManagers/laptop.nix @@ -0,0 +1,36 @@ +{ + config, + lib, + pkgs, + ... +}: { + wayland.windowManager = { + sway.config = { + assigns = { + "workspace 1:web" = [{app_id = "firefox";} {app_id = "brave-browser";}]; + "workspace 2:note" = [{app_id = "obsidian";}]; + "workspace 3:code" = [{app_id = "codium-url-handler";} {app_id = "dev.zed.Zed";}]; + "workspace 4:mail" = [{app_id = "thunderbird";}]; + "workspace 5:work" = [{app_id = "firework";}]; + }; + + startup = [ + {command = "sleep 2 && ${lib.getExe' config.wayland.windowManager.sway.package "swaymsg"} workspace 1:web";} + ]; + }; + + hyprland.settings = { + exec-once = [ + "sleep 2 && hyprctl dispatch workspace 2 && sleep 2 && hyprctl dispatch workspace 3 && sleep 2 && hyprctl dispatch workspace 4 && sleep 2 && hyprctl dispatch workspace 1;" + ]; + + workspace = [ + "1,defaultName:web,on-created-empty:${lib.getExe config.ar.home.defaultApps.webBrowser}" + "2,defaultName:note,on-created-empty:${lib.getExe' pkgs.obsidian "obsidian"}" + "3,defaultName:code,on-created-empty:${lib.getExe config.ar.home.defaultApps.editor}" + "4,defaultName:mail,on-created-empty:${lib.getExe pkgs.thunderbird}" + "special:magic,on-created-empty:${lib.getExe pkgs.fractal}" + ]; + }; + }; +} diff --git a/homes/aly/windowManagers/ultrawide.nix b/homes/aly/windowManagers/ultrawide.nix new file mode 100644 index 00000000..2c63c085 --- /dev/null +++ b/homes/aly/windowManagers/ultrawide.nix @@ -0,0 +1,2 @@ +{ +}