From a4988db714a5c6dbf8a5f55fb3863b2eebd5e1c6 Mon Sep 17 00:00:00 2001 From: installer Date: Wed, 18 Dec 2024 18:44:43 +0100 Subject: [PATCH] feat: updates --- dotfiles/hyprland.conf | 6 +++++- modules/home-manager/waybar.nix | 28 ++++++++++++++++++---------- modules/nixos/desktop-apps.nix | 2 ++ modules/nixos/gaming.nix | 3 +-- modules/nixos/window-manager.nix | 1 - 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dotfiles/hyprland.conf b/dotfiles/hyprland.conf index 61a7805..71e9f65 100644 --- a/dotfiles/hyprland.conf +++ b/dotfiles/hyprland.conf @@ -172,6 +172,11 @@ misc { disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( } +binds { + workspace_back_and_forth = true + allow_workspace_cycles = true +} + ############# ### INPUT ### ############# @@ -206,7 +211,6 @@ device { sensitivity = -0.5 } - ################### ### KEYBINDINGS ### ################### diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index cfc8c6d..8abaf78 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -11,6 +11,20 @@ in { }; config = lib.mkIf config.myHome.waybar.enable { + services.swaync = { + enable = true; + package = pkgs.swaynotificationcenter; + settings = { + "widgets" = [ + "dnd" + "mpris" + "volume" + "title" + "notifications" + ]; + }; + }; + programs.waybar = { enable = true; package = pkgs.waybar; @@ -32,7 +46,6 @@ in { "idle_inhibitor" ]; modules-right = [ - "custom/hyprbindings" "custom/notification" "custom/exit" "battery" @@ -128,13 +141,7 @@ in { "custom/startmenu" = { tooltip = false; format = ""; - # exec = "rofi -show drun"; - on-click = "sleep 0.1 && rofi-launcher"; - }; - "custom/hyprbindings" = { - tooltip = false; - format = "󱕴"; - on-click = "sleep 0.1 && list-hypr-bindings"; + on-click = "sleep 0.1 && rofi -show drun -modi run,drun,filebrowser,window"; }; "idle_inhibitor" = { format = "{icon}"; @@ -145,7 +152,7 @@ in { tooltip = "true"; }; "custom/notification" = { - tooltip = false; + tooltip = true; format = "{icon} {}"; format-icons = { notification = ""; @@ -160,7 +167,8 @@ in { return-type = "json"; exec-if = "which swaync-client"; exec = "swaync-client -swb"; - on-click = "sleep 0.1 && task-waybar"; + on-click = "sleep 0.1 && ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw"; + on-click-right = "sleep 0.1 && ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw"; escape = true; }; "battery" = { diff --git a/modules/nixos/desktop-apps.nix b/modules/nixos/desktop-apps.nix index 40afd09..29d7419 100644 --- a/modules/nixos/desktop-apps.nix +++ b/modules/nixos/desktop-apps.nix @@ -24,6 +24,8 @@ in brightnessctl spotify # cura + obs-studio + prusa-slicer ]; programs = { firefox.enable = true; diff --git a/modules/nixos/gaming.nix b/modules/nixos/gaming.nix index 22a57d7..293aa0c 100644 --- a/modules/nixos/gaming.nix +++ b/modules/nixos/gaming.nix @@ -14,9 +14,8 @@ in environment.systemPackages = with pkgs; [ bottles steam - discord + discord openttd - nile ]; programs.steam.enable = true; programs.gamemode.enable = true; diff --git a/modules/nixos/window-manager.nix b/modules/nixos/window-manager.nix index 3e2bbe3..c067a09 100644 --- a/modules/nixos/window-manager.nix +++ b/modules/nixos/window-manager.nix @@ -20,7 +20,6 @@ in waybar pavucontrol libnotify - swaynotificationcenter wl-clipboard hyprpaper libnotify