| author | |
| committer | |
| log | 607eb868eec0b819acf61cf1e131e0d5bb05a12f |
| tree | 4d1797925cbb7aecca120c12f24bb7a617d81df5 |
| parent | c9045e8b43c787d7d9936b846d1a3483936580f6 |
| signature | Commit is signed but in an unrecognized format. |
14 files changed, 129 insertions(+), 94 deletions(-)
flake.lock+43-27| ... | @@ -367,11 +367,11 @@ | ... | @@ -367,11 +367,11 @@ |
| 367 | ] | 367 | ] |
| 368 | }, | 368 | }, |
| 369 | "locked": { | 369 | "locked": { |
| 370 | "lastModified": 1767909183, | 370 | "lastModified": 1767930051, |
| 371 | "narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=", | 371 | "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=", |
| 372 | "owner": "nix-community", | 372 | "owner": "nix-community", |
| 373 | "repo": "home-manager", | 373 | "repo": "home-manager", |
| 374 | "rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509", | 374 | "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb", |
| 375 | "type": "github" | 375 | "type": "github" |
| 376 | }, | 376 | }, |
| 377 | "original": { | 377 | "original": { |
| ... | @@ -456,11 +456,11 @@ | ... | @@ -456,11 +456,11 @@ |
| 456 | "xdph": "xdph" | 456 | "xdph": "xdph" |
| 457 | }, | 457 | }, |
| 458 | "locked": { | 458 | "locked": { |
| 459 | "lastModified": 1767907620, | 459 | "lastModified": 1768074837, |
| 460 | "narHash": "sha256-zpQr4jkAoARBI22dFDnRekUagdRt6Mfc+ThpSSHm90s=", | 460 | "narHash": "sha256-40JgzyxRdB7Je46J3YpZel+eb6G9m7DmWuapf8WqrG0=", |
| 461 | "owner": "hyprwm", | 461 | "owner": "hyprwm", |
| 462 | "repo": "Hyprland", | 462 | "repo": "Hyprland", |
| 463 | "rev": "5b1b79c29c5e0ea974b2a9da5d122dd0f3bedca6", | 463 | "rev": "8f8b31e7a66acb4eb3836aa2fe6d751e5889bdaa", |
| 464 | "type": "github" | 464 | "type": "github" |
| 465 | }, | 465 | }, |
| 466 | "original": { | 466 | "original": { |
| ... | @@ -569,26 +569,6 @@ | ... | @@ -569,26 +569,6 @@ |
| 569 | "type": "github" | 569 | "type": "github" |
| 570 | } | 570 | } |
| 571 | }, | 571 | }, |
| 572 | "hyprsplit": { | ||
| 573 | "inputs": { | ||
| 574 | "hyprland": [ | ||
| 575 | "hyprland" | ||
| 576 | ] | ||
| 577 | }, | ||
| 578 | "locked": { | ||
| 579 | "lastModified": 1767392626, | ||
| 580 | "narHash": "sha256-sb9VGbCmtOf1UXKQzgoJnyekIiaXaZPb+fifaE4Dgig=", | ||
| 581 | "owner": "shezdy", | ||
| 582 | "repo": "hyprsplit", | ||
| 583 | "rev": "d8585473531b24c23794b060d9fe2f5f89b05563", | ||
| 584 | "type": "github" | ||
| 585 | }, | ||
| 586 | "original": { | ||
| 587 | "owner": "shezdy", | ||
| 588 | "repo": "hyprsplit", | ||
| 589 | "type": "github" | ||
| 590 | } | ||
| 591 | }, | ||
| 592 | "hyprtoolkit": { | 572 | "hyprtoolkit": { |
| 593 | "inputs": { | 573 | "inputs": { |
| 594 | "aquamarine": [ | 574 | "aquamarine": [ |
| ... | @@ -788,6 +768,21 @@ | ... | @@ -788,6 +768,21 @@ |
| 788 | "type": "github" | 768 | "type": "github" |
| 789 | } | 769 | } |
| 790 | }, | 770 | }, |
| 771 | "nix-filter": { | ||
| 772 | "locked": { | ||
| 773 | "lastModified": 1693833173, | ||
| 774 | "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", | ||
| 775 | "owner": "numtide", | ||
| 776 | "repo": "nix-filter", | ||
| 777 | "rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b", | ||
| 778 | "type": "github" | ||
| 779 | }, | ||
| 780 | "original": { | ||
| 781 | "owner": "numtide", | ||
| 782 | "repo": "nix-filter", | ||
| 783 | "type": "github" | ||
| 784 | } | ||
| 785 | }, | ||
| 791 | "nix-index-database": { | 786 | "nix-index-database": { |
| 792 | "inputs": { | 787 | "inputs": { |
| 793 | "nixpkgs": [ | 788 | "nixpkgs": [ |
| ... | @@ -974,13 +969,13 @@ | ... | @@ -974,13 +969,13 @@ |
| 974 | "darwin": "darwin", | 969 | "darwin": "darwin", |
| 975 | "home-manager": "home-manager", | 970 | "home-manager": "home-manager", |
| 976 | "hyprland": "hyprland", | 971 | "hyprland": "hyprland", |
| 977 | "hyprsplit": "hyprsplit", | ||
| 978 | "moonlight": "moonlight", | 972 | "moonlight": "moonlight", |
| 979 | "nix-index-database": "nix-index-database", | 973 | "nix-index-database": "nix-index-database", |
| 980 | "nix-options-search": "nix-options-search", | 974 | "nix-options-search": "nix-options-search", |
| 981 | "nixpkgs": "nixpkgs_3", | 975 | "nixpkgs": "nixpkgs_3", |
| 982 | "nvf": "nvf", | 976 | "nvf": "nvf", |
| 983 | "rust-overlay": "rust-overlay", | 977 | "rust-overlay": "rust-overlay", |
| 978 | "split-monitor-workspaces": "split-monitor-workspaces", | ||
| 984 | "zen-browser": "zen-browser", | 979 | "zen-browser": "zen-browser", |
| 985 | "zig": "zig", | 980 | "zig": "zig", |
| 986 | "zls": "zls" | 981 | "zls": "zls" |
| ... | @@ -1090,6 +1085,27 @@ | ... | @@ -1090,6 +1085,27 @@ |
| 1090 | "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" | 1085 | "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" |
| 1091 | } | 1086 | } |
| 1092 | }, | 1087 | }, |
| 1088 | "split-monitor-workspaces": { | ||
| 1089 | "inputs": { | ||
| 1090 | "hyprland": [ | ||
| 1091 | "hyprland" | ||
| 1092 | ], | ||
| 1093 | "nix-filter": "nix-filter" | ||
| 1094 | }, | ||
| 1095 | "locked": { | ||
| 1096 | "lastModified": 1767711026, | ||
| 1097 | "narHash": "sha256-yTuyde8TpBR3NhNnOcK4uOGukvMCwrH3otP8E04e9X0=", | ||
| 1098 | "owner": "Duckonaut", | ||
| 1099 | "repo": "split-monitor-workspaces", | ||
| 1100 | "rev": "764548c3aa22c9f4cb436ec7243d21795eb6ebec", | ||
| 1101 | "type": "github" | ||
| 1102 | }, | ||
| 1103 | "original": { | ||
| 1104 | "owner": "Duckonaut", | ||
| 1105 | "repo": "split-monitor-workspaces", | ||
| 1106 | "type": "github" | ||
| 1107 | } | ||
| 1108 | }, | ||
| 1093 | "systems": { | 1109 | "systems": { |
| 1094 | "locked": { | 1110 | "locked": { |
| 1095 | "lastModified": 1681028828, | 1111 | "lastModified": 1681028828, |
flake.nix+24-3| ... | @@ -25,9 +25,9 @@ | ... | @@ -25,9 +25,9 @@ |
| 25 | moonlight.inputs.nixpkgs.follows = "nixpkgs"; | 25 | moonlight.inputs.nixpkgs.follows = "nixpkgs"; |
| 26 | 26 | ||
| 27 | hyprland.url = "github:hyprwm/Hyprland"; | 27 | hyprland.url = "github:hyprwm/Hyprland"; |
| 28 | hyprsplit = { | 28 | split-monitor-workspaces = { |
| 29 | url = "github:shezdy/hyprsplit"; | 29 | url = "github:Duckonaut/split-monitor-workspaces"; |
| 30 | inputs.hyprland.follows = "hyprland"; | 30 | inputs.hyprland.follows = "hyprland"; # <- make sure this line is present for the plugin to work as intended |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | zen-browser = { | 33 | zen-browser = { |
| ... | @@ -72,6 +72,27 @@ | ... | @@ -72,6 +72,27 @@ |
| 72 | }; | 72 | }; |
| 73 | }); | 73 | }); |
| 74 | }) | 74 | }) |
| 75 | # https://github.com/NixOS/nixpkgs/issues/476669#issuecomment-3707850520 | ||
| 76 | (_: prev: { | ||
| 77 | vesktop = prev.vesktop.overrideAttrs (_: { | ||
| 78 | preBuild = '' | ||
| 79 | cp -r ${prev.electron.dist} electron-dist | ||
| 80 | chmod -R u+w electron-dist | ||
| 81 | ''; | ||
| 82 | buildPhase = '' | ||
| 83 | runHook preBuild | ||
| 84 | |||
| 85 | pnpm build | ||
| 86 | pnpm exec electron-builder \ | ||
| 87 | --dir \ | ||
| 88 | -c.asarUnpack="**/*.node" \ | ||
| 89 | -c.electronDist="electron-dist" \ | ||
| 90 | -c.electronVersion=${prev.electron.version} | ||
| 91 | |||
| 92 | runHook postBuild | ||
| 93 | ''; | ||
| 94 | }); | ||
| 95 | }) | ||
| 75 | 96 | ||
| 76 | # custom packages | 97 | # custom packages |
| 77 | (_: pkgs: { | 98 | (_: pkgs: { |
modules/neovim/default.nix-8| ... | @@ -84,14 +84,6 @@ | ... | @@ -84,14 +84,6 @@ |
| 84 | treesitter = { | 84 | treesitter = { |
| 85 | enable = true; | 85 | enable = true; |
| 86 | addDefaultGrammars = true; | 86 | addDefaultGrammars = true; |
| 87 | # this is buggy and keybind.nix overwrites its keymaps anyways | ||
| 88 | incrementalSelection.enable = false; | ||
| 89 | mappings.incrementalSelection = { | ||
| 90 | decrementByNode = null; | ||
| 91 | incrementByNode = null; | ||
| 92 | incrementByScope = null; | ||
| 93 | init = null; | ||
| 94 | }; | ||
| 95 | }; | 87 | }; |
| 96 | debugger.nvim-dap = { | 88 | debugger.nvim-dap = { |
| 97 | enable = true; | 89 | enable = true; |
modules/shared/nix.nix+3| ... | @@ -28,11 +28,14 @@ | ... | @@ -28,11 +28,14 @@ |
| 28 | "https://nix-community.cachix.org" | 28 | "https://nix-community.cachix.org" |
| 29 | # For haskell | 29 | # For haskell |
| 30 | "https://cache.iog.io" | 30 | "https://cache.iog.io" |
| 31 | |||
| 32 | "https://hyprland.cachix.org" | ||
| 31 | ]; | 33 | ]; |
| 32 | trusted-public-keys = [ | 34 | trusted-public-keys = [ |
| 33 | "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" | 35 | "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" |
| 34 | # For haskell | 36 | # For haskell |
| 35 | "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" | 37 | "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" |
| 38 | "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" | ||
| 36 | ]; | 39 | ]; |
| 37 | }; | 40 | }; |
| 38 | gc = { | 41 | gc = { |
users/fish/vim/languages.nix-3| ... | @@ -69,9 +69,6 @@ | ... | @@ -69,9 +69,6 @@ |
| 69 | enable = true; | 69 | enable = true; |
| 70 | fold = true; | 70 | fold = true; |
| 71 | addDefaultGrammars = true; | 71 | addDefaultGrammars = true; |
| 72 | highlight = { | ||
| 73 | additionalVimRegexHighlighting = true; | ||
| 74 | }; | ||
| 75 | 72 | ||
| 76 | grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ | 73 | grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ |
| 77 | markdown_inline | 74 | markdown_inline |
users/natalie/desktop/configuration.nix+8-8| ... | @@ -19,10 +19,10 @@ | ... | @@ -19,10 +19,10 @@ |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | programs = { | 21 | programs = { |
| 22 | hyprland = { | 22 | # hyprland = { |
| 23 | enable = true; | 23 | # enable = true; |
| 24 | withUWSM = true; | 24 | # withUWSM = true; |
| 25 | }; | 25 | # }; |
| 26 | gamemode.enable = true; | 26 | gamemode.enable = true; |
| 27 | 27 | ||
| 28 | _1password.enable = true; | 28 | _1password.enable = true; |
| ... | @@ -87,10 +87,10 @@ | ... | @@ -87,10 +87,10 @@ |
| 87 | xdgOpenUsePortal = true; | 87 | xdgOpenUsePortal = true; |
| 88 | config = { | 88 | config = { |
| 89 | common.default = [ "gtk" ]; | 89 | common.default = [ "gtk" ]; |
| 90 | hyprland.default = [ | 90 | # hyprland.default = [ |
| 91 | "gtk" | 91 | # "gtk" |
| 92 | "hyprland" | 92 | # "hyprland" |
| 93 | ]; | 93 | # ]; |
| 94 | }; | 94 | }; |
| 95 | 95 | ||
| 96 | extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; | 96 | extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; |
users/natalie/home/default.nix+3-3| ... | @@ -2,11 +2,11 @@ | ... | @@ -2,11 +2,11 @@ |
| 2 | { | 2 | { |
| 3 | imports = [ | 3 | imports = [ |
| 4 | ./tmux.nix | 4 | ./tmux.nix |
| 5 | ./hyprland | 5 | # ./hyprland |
| 6 | ./vicinae.nix | 6 | ./vicinae.nix |
| 7 | ./swaync.nix | 7 | # ./swaync.nix |
| 8 | ./gtk.nix | 8 | ./gtk.nix |
| 9 | ./waybar | 9 | # ./waybar |
| 10 | ./scripts | 10 | ./scripts |
| 11 | ]; | 11 | ]; |
| 12 | } | 12 | } |
users/natalie/home/hyprland/binds.nix+23-23| ... | @@ -72,29 +72,29 @@ | ... | @@ -72,29 +72,29 @@ |
| 72 | "CTRL ALT, down, exec, hyprctl dispatch focuswindow tiled" | 72 | "CTRL ALT, down, exec, hyprctl dispatch focuswindow tiled" |
| 73 | 73 | ||
| 74 | # switch workspace | 74 | # switch workspace |
| 75 | "$mainMod, 1, workspace, 1" | 75 | "$mainMod, 1, split-workspace, 1" |
| 76 | "$mainMod, 2, workspace, 2" | 76 | "$mainMod, 2, split-workspace, 2" |
| 77 | "$mainMod, 3, workspace, 3" | 77 | "$mainMod, 3, split-workspace, 3" |
| 78 | "$mainMod, 4, workspace, 4" | 78 | "$mainMod, 4, split-workspace, 4" |
| 79 | "$mainMod, 5, workspace, 5" | 79 | "$mainMod, 5, split-workspace, 5" |
| 80 | "$mainMod, 6, workspace, 6" | 80 | "$mainMod, 6, split-workspace, 6" |
| 81 | "$mainMod, 7, workspace, 7" | 81 | "$mainMod, 7, split-workspace, 7" |
| 82 | "$mainMod, 8, workspace, 8" | 82 | "$mainMod, 8, split-workspace, 8" |
| 83 | "$mainMod, 9, workspace, 9" | 83 | "$mainMod, 9, split-workspace, 9" |
| 84 | "$mainMod, 0, workspace, 10" | 84 | "$mainMod, 0, split-workspace, 10" |
| 85 | 85 | ||
| 86 | # same as above, but switch to the workspace | 86 | # same as above, but switch to the workspace |
| 87 | "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent | 87 | "$mainMod SHIFT, 1, split-movetoworkspacesilent, 1" # movetoworkspacesilent |
| 88 | "$mainMod SHIFT, 2, movetoworkspacesilent, 2" | 88 | "$mainMod SHIFT, 2, split-movetoworkspacesilent, 2" |
| 89 | "$mainMod SHIFT, 3, movetoworkspacesilent, 3" | 89 | "$mainMod SHIFT, 3, split-movetoworkspacesilent, 3" |
| 90 | "$mainMod SHIFT, 4, movetoworkspacesilent, 4" | 90 | "$mainMod SHIFT, 4, split-movetoworkspacesilent, 4" |
| 91 | "$mainMod SHIFT, 5, movetoworkspacesilent, 5" | 91 | "$mainMod SHIFT, 5, split-movetoworkspacesilent, 5" |
| 92 | "$mainMod SHIFT, 6, movetoworkspacesilent, 6" | 92 | "$mainMod SHIFT, 6, split-movetoworkspacesilent, 6" |
| 93 | "$mainMod SHIFT, 7, movetoworkspacesilent, 7" | 93 | "$mainMod SHIFT, 7, split-movetoworkspacesilent, 7" |
| 94 | "$mainMod SHIFT, 8, movetoworkspacesilent, 8" | 94 | "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8" |
| 95 | "$mainMod SHIFT, 9, movetoworkspacesilent, 9" | 95 | "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9" |
| 96 | "$mainMod SHIFT, 0, movetoworkspacesilent, 10" | 96 | "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10" |
| 97 | "$mainMod CTRL, c, movetoworkspace, empty" | 97 | "$mainMod CTRL, c, split-movetoworkspace, empty" |
| 98 | 98 | ||
| 99 | # window control | 99 | # window control |
| 100 | "$mainMod SHIFT, left, movewindow, l" | 100 | "$mainMod SHIFT, left, movewindow, l" |
| ... | @@ -131,8 +131,8 @@ | ... | @@ -131,8 +131,8 @@ |
| 131 | ",XF86AudioPrev,exec, playerctl previous" | 131 | ",XF86AudioPrev,exec, playerctl previous" |
| 132 | ",XF86AudioStop,exec, playerctl stop" | 132 | ",XF86AudioStop,exec, playerctl stop" |
| 133 | 133 | ||
| 134 | "$mainMod, mouse_down, workspace, e-1" | 134 | "$mainMod, mouse_down, split-workspace, e-1" |
| 135 | "$mainMod, mouse_up, workspace, e+1" | 135 | "$mainMod, mouse_up, split-workspace, e+1" |
| 136 | 136 | ||
| 137 | # clipboard manager | 137 | # clipboard manager |
| 138 | "$mainMod, V, exec, vicinae vicinae://extensions/vicinae/clipboard/history" | 138 | "$mainMod, V, exec, vicinae vicinae://extensions/vicinae/clipboard/history" |
users/natalie/home/hyprland/hyprland.nix+10-3| ... | @@ -1,4 +1,9 @@ | ... | @@ -1,4 +1,9 @@ |
| 1 | { config, pkgs, ... }: | 1 | { |
| 2 | inputs, | ||
| 3 | config, | ||
| 4 | pkgs, | ||
| 5 | ... | ||
| 6 | }: | ||
| 2 | { | 7 | { |
| 3 | home.packages = with pkgs; [ | 8 | home.packages = with pkgs; [ |
| 4 | swww | 9 | swww |
| ... | @@ -23,8 +28,10 @@ | ... | @@ -23,8 +28,10 @@ |
| 23 | # ]; | 28 | # ]; |
| 24 | wayland.windowManager.hyprland = { | 29 | wayland.windowManager.hyprland = { |
| 25 | enable = true; | 30 | enable = true; |
| 26 | package = null; | 31 | package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; |
| 27 | portalPackage = null; | 32 | # make sure to also set the portal package, so that they are in sync |
| 33 | portalPackage = | ||
| 34 | inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; | ||
| 28 | 35 | ||
| 29 | xwayland = { | 36 | xwayland = { |
| 30 | enable = true; | 37 | enable = true; |
users/natalie/home/hyprland/plugins.nix+3-3| ... | @@ -2,12 +2,12 @@ | ... | @@ -2,12 +2,12 @@ |
| 2 | { | 2 | { |
| 3 | wayland.windowManager.hyprland = { | 3 | wayland.windowManager.hyprland = { |
| 4 | plugins = [ | 4 | plugins = [ |
| 5 | inputs.hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.hyprsplit | 5 | inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces |
| 6 | ]; | 6 | ]; |
| 7 | settings = { | 7 | settings = { |
| 8 | plugin = { | 8 | plugin = { |
| 9 | hyprsplit = { | 9 | split-monitor-workspaces = { |
| 10 | num_workspaces = 5; | 10 | count = 5; |
| 11 | }; | 11 | }; |
| 12 | }; | 12 | }; |
| 13 | }; | 13 | }; |
users/natalie/home/hyprland/settings.nix+3-3| ... | @@ -1,6 +1,7 @@ | ... | @@ -1,6 +1,7 @@ |
| 1 | { ... }: | 1 | { ... }: |
| 2 | { | 2 | { |
| 3 | wayland.windowManager.hyprland.settings = { | 3 | wayland.windowManager.hyprland.settings = { |
| 4 | "$mainMod" = "SUPER"; | ||
| 4 | # see: https://wiki.hypr.land/Configuring/Variables/#input | 5 | # see: https://wiki.hypr.land/Configuring/Variables/#input |
| 5 | input = { | 6 | input = { |
| 6 | kb_layout = "us"; | 7 | kb_layout = "us"; |
| ... | @@ -9,9 +10,8 @@ | ... | @@ -9,9 +10,8 @@ |
| 9 | }; | 10 | }; |
| 10 | # https://wiki.hypr.land/Configuring/Variables/#general | 11 | # https://wiki.hypr.land/Configuring/Variables/#general |
| 11 | general = { | 12 | general = { |
| 12 | "$mainMod" = "SUPER"; | ||
| 13 | layout = "dwindle"; | 13 | layout = "dwindle"; |
| 14 | no_border_on_floating = false; | 14 | #no_border_on_floating = false; |
| 15 | 15 | ||
| 16 | }; | 16 | }; |
| 17 | # https://wiki.hypr.land/Configuring/Variables/#misc | 17 | # https://wiki.hypr.land/Configuring/Variables/#misc |
| ... | @@ -23,7 +23,7 @@ | ... | @@ -23,7 +23,7 @@ |
| 23 | enable_swallow = true; | 23 | enable_swallow = true; |
| 24 | swallow_regex = "^(ghostty)$"; | 24 | swallow_regex = "^(ghostty)$"; |
| 25 | focus_on_activate = true; | 25 | focus_on_activate = true; |
| 26 | new_window_takes_over_fullscreen = 2; | 26 | on_focus_under_fullscreen = 2; |
| 27 | middle_click_paste = false; | 27 | middle_click_paste = false; |
| 28 | }; | 28 | }; |
| 29 | 29 |
users/natalie/home/hyprland/windowrules.nix+8-7| ... | @@ -3,10 +3,11 @@ | ... | @@ -3,10 +3,11 @@ |
| 3 | wayland.windowManager.hyprland.settings = { | 3 | wayland.windowManager.hyprland.settings = { |
| 4 | # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules | 4 | # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules |
| 5 | windowrule = [ | 5 | windowrule = [ |
| 6 | "float,class:^(mpv)$" | 6 | # "float,class:^(mpv)$" |
| 7 | "pin,class:^(rofi)$" | 7 | # "pin,class:^(rofi)$" |
| 8 | "pin,class:^(waypaper)$" | 8 | # "pin,class:^(waypaper)$" |
| 9 | "float,title:^(Volume Control)$" | 9 | "match:class ^(Volume Control)$, float on" |
| 10 | # "float,title:^(Volume Control)$" | ||
| 10 | 11 | ||
| 11 | #awakened-poe-trade | 12 | #awakened-poe-trade |
| 12 | # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-2992606569 | 13 | # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-2992606569 |
| ... | @@ -97,9 +98,9 @@ | ... | @@ -97,9 +98,9 @@ |
| 97 | 98 | ||
| 98 | # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules | 99 | # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules |
| 99 | layerrule = [ | 100 | layerrule = [ |
| 100 | "blur, vicinae" | 101 | "blur on, match:namespace vicinae" |
| 101 | "ignorealpha 0, vicinae" | 102 | "ignore_alpha 0, match:namespace vicinae" |
| 102 | "noanim, vicinae" | 103 | "no_anim on, match:namespace vicinae" |
| 103 | # "dimaround, rofi" | 104 | # "dimaround, rofi" |
| 104 | # "dimaround, swaync-control-center" | 105 | # "dimaround, swaync-control-center" |
| 105 | ]; | 106 | ]; |
users/natalie/packages.nix+1| ... | @@ -94,6 +94,7 @@ with pkgs; | ... | @@ -94,6 +94,7 @@ with pkgs; |
| 94 | # nodePackages.npm | 94 | # nodePackages.npm |
| 95 | go | 95 | go |
| 96 | elan | 96 | elan |
| 97 | zola | ||
| 97 | 98 | ||
| 98 | #expo deps | 99 | #expo deps |
| 99 | watchman | 100 | watchman |
users/natalie/vim/languages.nix-3| ... | @@ -69,9 +69,6 @@ | ... | @@ -69,9 +69,6 @@ |
| 69 | enable = true; | 69 | enable = true; |
| 70 | fold = true; | 70 | fold = true; |
| 71 | addDefaultGrammars = true; | 71 | addDefaultGrammars = true; |
| 72 | highlight = { | ||
| 73 | additionalVimRegexHighlighting = true; | ||
| 74 | }; | ||
| 75 | 72 | ||
| 76 | grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ | 73 | grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ |
| 77 | markdown_inline | 74 | markdown_inline |