diff options
| -rw-r--r-- | accounts/gkleen@sif/default.nix | 4 | ||||
| -rw-r--r-- | accounts/gkleen@sif/niri/default.nix | 9 | ||||
| -rw-r--r-- | flake.lock | 26 | ||||
| -rw-r--r-- | 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 { | |||
| 508 | [Unit] | 508 | [Unit] |
| 509 | Before=graphical-session-pre.target | 509 | Before=graphical-session-pre.target |
| 510 | ''; | 510 | ''; |
| 511 | "pdfpc/pdfpcrc".text = '' | ||
| 512 | mouse 8 prev | ||
| 513 | mouse 9 next | ||
| 514 | ''; | ||
| 511 | }; | 515 | }; |
| 512 | 516 | ||
| 513 | xdg.dataFile = { | 517 | 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 | |||
| 75 | jq --arg active_workspace "$active_workspace" -c "$action" <<<"$workspace_json" | tee /dev/stderr | socat STDIO "$NIRI_SOCKET" | 75 | jq --arg active_workspace "$active_workspace" -c "$action" <<<"$workspace_json" | tee /dev/stderr | socat STDIO "$NIRI_SOCKET" |
| 76 | ''; | 76 | ''; |
| 77 | }; | 77 | }; |
| 78 | with-adjacent-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_adjacent_workspace) "^pwctl|kpxc|bmgr|edit|term$"; | 78 | with-adjacent-workspace-action = config.lib.niri.actions.spawn (lib.getExe with_adjacent_workspace) "^pwctl|eff|kpxc|bmgr|edit|term$"; |
| 79 | focus-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"FocusWorkspace":{"reference":{"Id": .id}}}}''; | 79 | focus-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"FocusWorkspace":{"reference":{"Id": .id}}}}''; |
| 80 | move-column-to-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}}}}''; | 80 | move-column-to-adjacent-workspace = direction: with-adjacent-workspace-action direction ''{"Action":{"MoveColumnToWorkspace":{"reference":{"Id": .id}}}}''; |
| 81 | 81 | ||
| @@ -255,6 +255,7 @@ in { | |||
| 255 | "003" = { name = "bmgr"; open-on-output = "eDP-1"; }; | 255 | "003" = { name = "bmgr"; open-on-output = "eDP-1"; }; |
| 256 | "004" = { name = "term"; open-on-output = "eDP-1"; }; | 256 | "004" = { name = "term"; open-on-output = "eDP-1"; }; |
| 257 | "005" = { name = "edit"; open-on-output = "eDP-1"; }; | 257 | "005" = { name = "edit"; open-on-output = "eDP-1"; }; |
| 258 | "006" = { name = "eff"; open-on-output = "eDP-1"; }; | ||
| 258 | "101".name = "comm"; | 259 | "101".name = "comm"; |
| 259 | "102".name = "web"; | 260 | "102".name = "web"; |
| 260 | # "104".name = "read"; | 261 | # "104".name = "read"; |
| @@ -277,6 +278,11 @@ in { | |||
| 277 | open-maximized = true; | 278 | open-maximized = true; |
| 278 | } | 279 | } |
| 279 | { | 280 | { |
| 281 | matches = [ { app-id = "^com\.github\.wwmm\.easyeffects$"; } ]; | ||
| 282 | open-on-workspace = "eff"; | ||
| 283 | open-maximized = true; | ||
| 284 | } | ||
| 285 | { | ||
| 280 | matches = [ { app-id = "^\.blueman-manager-wrapped$"; } ]; | 286 | matches = [ { app-id = "^\.blueman-manager-wrapped$"; } ]; |
| 281 | open-on-workspace = "bmgr"; | 287 | open-on-workspace = "bmgr"; |
| 282 | open-maximized = true; | 288 | open-maximized = true; |
| @@ -600,6 +606,7 @@ in { | |||
| 600 | "Mod+Comma".action = spawn makoctl "restore"; | 606 | "Mod+Comma".action = spawn makoctl "restore"; |
| 601 | 607 | ||
| 602 | "Mod+Control+A".action = focus-or-spawn-action-app_id "com.saivert.pwvucontrol" "pwctl" "pwvucontrol"; | 608 | "Mod+Control+A".action = focus-or-spawn-action-app_id "com.saivert.pwvucontrol" "pwctl" "pwvucontrol"; |
| 609 | "Mod+Control+O".action = focus-or-spawn-action-app_id "com.github.wwmm.easyeffects" "eff" "easyeffects"; | ||
| 603 | "Mod+Control+P".action = focus-or-spawn-action-app_id "org.keepassxc.KeePassXC" "kpxc" "keepassxc"; | 610 | "Mod+Control+P".action = focus-or-spawn-action-app_id "org.keepassxc.KeePassXC" "kpxc" "keepassxc"; |
| 604 | "Mod+Control+B".action = focus-or-spawn-action-app_id ".blueman-manager-wrapped" "bmgr" "blueman-manager"; | 611 | "Mod+Control+B".action = focus-or-spawn-action-app_id ".blueman-manager-wrapped" "bmgr" "blueman-manager"; |
| 605 | "Mod+Control+Return".action = focus-or-spawn-action-app_id "kitty-scratch" "term" "kitty" "--app-id" "kitty-scratch"; | 612 | "Mod+Control+Return".action = focus-or-spawn-action-app_id "kitty-scratch" "term" "kitty" "--app-id" "kitty-scratch"; |
| @@ -397,11 +397,11 @@ | |||
| 397 | "xwayland-satellite-unstable": "xwayland-satellite-unstable" | 397 | "xwayland-satellite-unstable": "xwayland-satellite-unstable" |
| 398 | }, | 398 | }, |
| 399 | "locked": { | 399 | "locked": { |
| 400 | "lastModified": 1737840481, | 400 | "lastModified": 1737961005, |
| 401 | "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", | 401 | "narHash": "sha256-b4hqJNgyx8lnngz7NFcJ1W+59xQnMQYF0EK5g0IOy7c=", |
| 402 | "owner": "sodiboo", | 402 | "owner": "sodiboo", |
| 403 | "repo": "niri-flake", | 403 | "repo": "niri-flake", |
| 404 | "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", | 404 | "rev": "e98ae62893568dd31e7a7e4e75e1dbbf23f759a0", |
| 405 | "type": "github" | 405 | "type": "github" |
| 406 | }, | 406 | }, |
| 407 | "original": { | 407 | "original": { |
| @@ -472,11 +472,11 @@ | |||
| 472 | ] | 472 | ] |
| 473 | }, | 473 | }, |
| 474 | "locked": { | 474 | "locked": { |
| 475 | "lastModified": 1737257306, | 475 | "lastModified": 1737861961, |
| 476 | "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", | 476 | "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", |
| 477 | "owner": "Mic92", | 477 | "owner": "Mic92", |
| 478 | "repo": "nix-index-database", | 478 | "repo": "nix-index-database", |
| 479 | "rev": "744d330659e207a1883d2da0141d35e520eb87bd", | 479 | "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", |
| 480 | "type": "github" | 480 | "type": "github" |
| 481 | }, | 481 | }, |
| 482 | "original": { | 482 | "original": { |
| @@ -630,11 +630,11 @@ | |||
| 630 | }, | 630 | }, |
| 631 | "nixpkgs-stable_2": { | 631 | "nixpkgs-stable_2": { |
| 632 | "locked": { | 632 | "locked": { |
| 633 | "lastModified": 1737672001, | 633 | "lastModified": 1737885640, |
| 634 | "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", | 634 | "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", |
| 635 | "owner": "NixOS", | 635 | "owner": "NixOS", |
| 636 | "repo": "nixpkgs", | 636 | "repo": "nixpkgs", |
| 637 | "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", | 637 | "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", |
| 638 | "type": "github" | 638 | "type": "github" |
| 639 | }, | 639 | }, |
| 640 | "original": { | 640 | "original": { |
| @@ -678,11 +678,11 @@ | |||
| 678 | }, | 678 | }, |
| 679 | "nixpkgs_2": { | 679 | "nixpkgs_2": { |
| 680 | "locked": { | 680 | "locked": { |
| 681 | "lastModified": 1737842646, | 681 | "lastModified": 1737885589, |
| 682 | "narHash": "sha256-Bw3D+zXAGxcaS32BgXv3A/uLDEXn6/a18cX41USsv+M=", | 682 | "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", |
| 683 | "owner": "nixos", | 683 | "owner": "NixOS", |
| 684 | "repo": "nixpkgs", | 684 | "repo": "nixpkgs", |
| 685 | "rev": "34995559351f3b61c122e5566f1903d500e9b890", | 685 | "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", |
| 686 | "type": "github" | 686 | "type": "github" |
| 687 | }, | 687 | }, |
| 688 | "original": { | 688 | "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 { | |||
| 589 | }; | 589 | }; |
| 590 | 590 | ||
| 591 | nvidia = { | 591 | nvidia = { |
| 592 | open = true; | 592 | open = false; |
| 593 | modesetting.enable = true; | 593 | modesetting.enable = true; |
| 594 | powerManagement.enable = true; | 594 | powerManagement.enable = true; |
| 595 | # prime = { | 595 | # prime = { |
