From 730002f924999a0658a720b75bfbf080dc5c16c6 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 27 Jan 2025 16:53:18 +0100 Subject: ... --- accounts/gkleen@sif/default.nix | 4 ++++ accounts/gkleen@sif/niri/default.nix | 9 ++++++++- flake.lock | 26 +++++++++++++------------- hosts/sif/default.nix | 2 +- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 8a418dc5..b0c495e9 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -508,6 +508,10 @@ in { [Unit] Before=graphical-session-pre.target ''; + "pdfpc/pdfpcrc".text = '' + mouse 8 prev + mouse 9 next + ''; }; xdg.dataFile = { diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix index bf124211..b895645e 100644 --- a/accounts/gkleen@sif/niri/default.nix +++ b/accounts/gkleen@sif/niri/default.nix @@ -75,7 +75,7 @@ let jq --arg active_workspace "$active_workspace" -c "$action" <<<"$workspace_json" | tee /dev/stderr | socat STDIO "$NIRI_SOCKET" ''; }; - with-adjacent-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_adjacent_workspace) "^pwctl|kpxc|bmgr|edit|term$"; + with-adjacent-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_adjacent_workspace) "^pwctl|eff|kpxc|bmgr|edit|term$"; focus-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"FocusWorkspace":{"reference":{"Id": .id}}}}''; move-column-to-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}}}}''; @@ -255,6 +255,7 @@ in { "003" = { name = "bmgr"; open-on-output = "eDP-1"; }; "004" = { name = "term"; open-on-output = "eDP-1"; }; "005" = { name = "edit"; open-on-output = "eDP-1"; }; + "006" = { name = "eff"; open-on-output = "eDP-1"; }; "101".name = "comm"; "102".name = "web"; # "104".name = "read"; @@ -276,6 +277,11 @@ in { open-on-workspace = "pwctl"; open-maximized = true; } + { + matches = [ { app-id = "^com\.github\.wwmm\.easyeffects$"; } ]; + open-on-workspace = "eff"; + open-maximized = true; + } { matches = [ { app-id = "^\.blueman-manager-wrapped$"; } ]; open-on-workspace = "bmgr"; @@ -600,6 +606,7 @@ in { "Mod+Comma".action = spawn makoctl "restore"; "Mod+Control+A".action = focus-or-spawn-action-app_id "com.saivert.pwvucontrol" "pwctl" "pwvucontrol"; + "Mod+Control+O".action = focus-or-spawn-action-app_id "com.github.wwmm.easyeffects" "eff" "easyeffects"; "Mod+Control+P".action = focus-or-spawn-action-app_id "org.keepassxc.KeePassXC" "kpxc" "keepassxc"; "Mod+Control+B".action = focus-or-spawn-action-app_id ".blueman-manager-wrapped" "bmgr" "blueman-manager"; "Mod+Control+Return".action = focus-or-spawn-action-app_id "kitty-scratch" "term" "kitty" "--app-id" "kitty-scratch"; diff --git a/flake.lock b/flake.lock index 1764d172..876ebecf 100644 --- a/flake.lock +++ b/flake.lock @@ -397,11 +397,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737840481, - "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", + "lastModified": 1737961005, + "narHash": "sha256-b4hqJNgyx8lnngz7NFcJ1W+59xQnMQYF0EK5g0IOy7c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", + "rev": "e98ae62893568dd31e7a7e4e75e1dbbf23f759a0", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1737257306, - "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", + "lastModified": 1737861961, + "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "744d330659e207a1883d2da0141d35e520eb87bd", + "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1737885640, + "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "type": "github" }, "original": { @@ -678,11 +678,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737842646, - "narHash": "sha256-Bw3D+zXAGxcaS32BgXv3A/uLDEXn6/a18cX41USsv+M=", - "owner": "nixos", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "34995559351f3b61c122e5566f1903d500e9b890", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index 14f08ed5..32651e14 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix @@ -589,7 +589,7 @@ in { }; nvidia = { - open = true; + open = false; modesetting.enable = true; powerManagement.enable = true; # prime = { -- cgit v1.2.3