From 6ccf8f9ca6398a019dd9d36fabc9a51ce079cd43 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 4 Nov 2023 20:08:55 +0000 Subject: [PATCH] Cleanup some more config Remove music/spotify workspace Remove using firefox by default, remove zathura --- flake.nix | 2 - home/hyprland/config.nix | 70 +++++++++++++------------------- home/hyprland/waybar/default.nix | 9 ++-- home/zathura.nix | 9 ---- system/hyprland.nix | 1 - 5 files changed, 32 insertions(+), 59 deletions(-) delete mode 100644 home/zathura.nix diff --git a/flake.nix b/flake.nix index df389301..10e827f2 100644 --- a/flake.nix +++ b/flake.nix @@ -44,11 +44,9 @@ ./home/nyxt/default.nix ./home/alacritty.nix ./home/default.nix - ./home/firefox.nix ./home/kdeconnect.nix ./home/media.nix ./home/pass.nix - ./home/zathura.nix ]; stateVersion = "23.05"; }; diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index cb3a5f62..a660aad0 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -108,7 +108,7 @@ in '' bind = SUPER ALT, E, exec, [workspace 2] emacs bind = SUPER ALT, W, exec, [workspace 3] nyxt bind = SUPER ALT, F, exec, [workspace 4] thunar - bind = SUPER ALT, S, exec, [workspace 5] alacritty -e ncspot + bind = SUPER ALT, C, exec, [workspace 5] fractal # Misc useful binds bind=,XF86Calculator,exec,rofi -replace -show calc @@ -151,13 +151,13 @@ in '' windowrule = stayfocused,(org.kde.polkit-kde-authentication-agent-1) windowrule = float,(pavucontrol) windowrule = size 800 600,(pavucontrol) - windowrule = move 100%-820 10%,(pavucontrol) + windowrule = move onscreen 100% 7%,(pavucontrol) windowrule = float,(.blueman-manager-wrapped) windowrule = size 800 600,(.blueman-manager-wrapped) - windowrule = move 100%-820 10%,(.blueman-manager-wrapped) + windowrule = move onscreen 100% 7%,(.blueman-manager-wrapped) windowrule = float,(nm-connection-editor) windowrule = size 800 600,(nm-connection-editor) - windowrule = move 100%-820 10%,(nm-connection-editor) + windowrule = move onscreen 100% 7%,(nm-connection-editor) windowrule = float,(.protonvpn-wrapped) windowrule = center,(.protonvpn-wrapped) windowrule = float,(Pinentry) @@ -172,30 +172,21 @@ in '' windowrule = nofullscreenrequest,(Nxplayer.bin) windowrule = nomaximizerequest,(Nxplayer.bin) windowrule = group set always,(Nxplayer.bin) - windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox) - windowrulev2 = float,title:^(Extension.*)$,class:(firefox) - windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox) - windowrulev2 = pin,title:^(Extension.*)$,class:(firefox) - windowrulev2 = center,title:(File|Picture-in-Picture),class:(firefox) - windowrulev2 = center,title:^(Extension.*)$,class:(firefox) - windowrulev2 = nofullscreenrequest,title:^(Extension.*)$,class:(firefox) - windowrulev2 = nomaximizerequest,title:^(Extension.*)$,class:(firefox) - windowrulev2 = workspace special silent, title:^(Firefox — Sharing Indicator)$,class:(firefox) - windowrulev2 = workspace special silent, title:^(.*is sharing (your screen|a window)\.)$,class:(firefox) windowrulev2 = float,title:(Open),class:(soffice) windowrulev2 = float,title:(Friends List),class:(steam) windowrulev2 = float,title:(Steam Settings),class:(steam) # Workspace definitions - # 1: [t]erminal - bind = SUPER, T, moveworkspacetomonitor, 1 current - bind = SUPER, T, workspace, 1 - bind = SUPER SHIFT, T, movetoworkspace, 1 + # 1: [d]efault + bind = SUPER, D, moveworkspacetomonitor, 1 current + bind = SUPER, D, workspace, 1 + bind = SUPER SHIFT, D, movetoworkspace, 1 - # 2: [e]ditor + # 2: [e]ditor (let's be honest, it's [e]macs) bind = SUPER, E, moveworkspacetomonitor, 2 current bind = SUPER, E, workspace, 2 bind = SUPER SHIFT, E, movetoworkspace, 2 + windowrule = workspace 2, (emacs) # 3: [w]eb browser bind = SUPER, W, moveworkspacetomonitor, 3 current @@ -203,37 +194,32 @@ in '' bind = SUPER SHIFT, W, movetoworkspace, 3 windowrule = workspace 3, (nyxt) windowrule = workspace 3, (chromium-browser) - windowrule = workspace 3, (firefox) # 4: [f]iles bind = SUPER, F, moveworkspacetomonitor, 4 current bind = SUPER, F, workspace, 4 bind = SUPER SHIFT, F, movetoworkspace, 4 + windowrule = workspace 4, (thunar) - # 5: [s]ongs - bind = SUPER, S, moveworkspacetomonitor, 5 current - bind = SUPER, S, workspace, 5 - bind = SUPER SHIFT, S, movetoworkspace, 5 + # 5: [c]hat + bind = SUPER, C, moveworkspacetomonitor, 5 current + bind = SUPER, C, workspace, 5 + bind = SUPER SHIFT, C, movetoworkspace, 5 + windowrule = workspace 5, (fractal) + windowrule = workspace 5, (discord) + windowrule = workspace 5, (teams-for-linux) - # 6: [c]hat - bind = SUPER, C, moveworkspacetomonitor, 6 current - bind = SUPER, C, workspace, 6 - bind = SUPER SHIFT, C, movetoworkspace, 6 - windowrule = workspace 6, (fractal) - windowrule = workspace 6, (discord) - windowrule = workspace 6, (teams-for-linux) + # 6: [g]aming + bind = SUPER, G, moveworkspacetomonitor, 6 current + bind = SUPER, G, workspace, 6 + bind = SUPER SHIFT, G, movetoworkspace, 6 + windowrule = workspace 6, (steam) - # 7: [g]aming - bind = SUPER, G, moveworkspacetomonitor, 7 current - bind = SUPER, G, workspace, 7 - bind = SUPER SHIFT, G, movetoworkspace, 7 - windowrule = workspace 7, (steam) - - # 8: [r]emote - bind = SUPER, R, moveworkspacetomonitor, 8 current - bind = SUPER, R, workspace, 8 - bind = SUPER SHIFT, R, movetoworkspace, 8 - windowrule = workspace 8, (Nxplayer.bin) + # 7: [r]emote + bind = SUPER, R, moveworkspacetomonitor, 7 current + bind = SUPER, R, workspace, 7 + bind = SUPER SHIFT, R, movetoworkspace, 7 + windowrule = workspace 7, (Nxplayer.bin) # Special workspaces bind = SUPER, comma, workspace, m-1 diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix index 23e34f66..470b03c7 100644 --- a/home/hyprland/waybar/default.nix +++ b/home/hyprland/waybar/default.nix @@ -60,10 +60,9 @@ "2" = "󰳼"; # [e]ditor "3" = "󰖟"; # [w]eb browser "4" = "󰝰"; # [f]iles - "5" = "󰲸"; # [s]ongs - "6" = "󰭹"; # [c]hat - "7" = "󰊗"; # [g]aming - "8" = "󰢹"; # [r]emote + "5" = "󰭹"; # [c]hat + "6" = "󰊗"; # [g]aming + "7" = "󰢹"; # [r]emote default = "󰛡"; special = "󰓎"; urgent = "󰣘"; @@ -118,7 +117,7 @@ warning = 30; critical = 15; }; - format = "{icon}"; + format = "{capacity}% {icon}"; format-charging = "󰂄"; format-plugged = "󰚥"; tooltip-format = "{time} {capacity}%"; diff --git a/home/zathura.nix b/home/zathura.nix deleted file mode 100644 index 44314fdc..00000000 --- a/home/zathura.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ tokyonight-folke, ... }: - -{ - programs.zathura = { - enable = true; - extraConfig = builtins.readFile - "${tokyonight-folke}/extras/zathura/tokyonight_night.zathurarc"; - }; -} diff --git a/system/hyprland.nix b/system/hyprland.nix index f50be280..680d2de6 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -40,6 +40,5 @@ enable = true; plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]; }; - firefox.package = pkgs.firefox-wayland; }; }