authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2026-02-06 22:45:57-08:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2026-02-06 22:45:57-08:00
log607eb868eec0b819acf61cf1e131e0d5bb05a12f
tree4d1797925cbb7aecca120c12f24bb7a617d81df5
parentc9045e8b43c787d7d9936b846d1a3483936580f6
signature Commit is signed but in an unrecognized format.

remove hyprland

14 files changed, 129 insertions(+), 94 deletions(-)

flake.lock+43-27
......@@ -367,11 +367,11 @@
367367 ]
368368 },
369369 "locked": {
370 "lastModified": 1767909183,
371 "narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=",
370 "lastModified": 1767930051,
371 "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=",
372372 "owner": "nix-community",
373373 "repo": "home-manager",
374 "rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509",
374 "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb",
375375 "type": "github"
376376 },
377377 "original": {
......@@ -456,11 +456,11 @@
456456 "xdph": "xdph"
457457 },
458458 "locked": {
459 "lastModified": 1767907620,
460 "narHash": "sha256-zpQr4jkAoARBI22dFDnRekUagdRt6Mfc+ThpSSHm90s=",
459 "lastModified": 1768074837,
460 "narHash": "sha256-40JgzyxRdB7Je46J3YpZel+eb6G9m7DmWuapf8WqrG0=",
461461 "owner": "hyprwm",
462462 "repo": "Hyprland",
463 "rev": "5b1b79c29c5e0ea974b2a9da5d122dd0f3bedca6",
463 "rev": "8f8b31e7a66acb4eb3836aa2fe6d751e5889bdaa",
464464 "type": "github"
465465 },
466466 "original": {
......@@ -569,26 +569,6 @@
569569 "type": "github"
570570 }
571571 },
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 },
592572 "hyprtoolkit": {
593573 "inputs": {
594574 "aquamarine": [
......@@ -788,6 +768,21 @@
788768 "type": "github"
789769 }
790770 },
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 },
791786 "nix-index-database": {
792787 "inputs": {
793788 "nixpkgs": [
......@@ -974,13 +969,13 @@
974969 "darwin": "darwin",
975970 "home-manager": "home-manager",
976971 "hyprland": "hyprland",
977 "hyprsplit": "hyprsplit",
978972 "moonlight": "moonlight",
979973 "nix-index-database": "nix-index-database",
980974 "nix-options-search": "nix-options-search",
981975 "nixpkgs": "nixpkgs_3",
982976 "nvf": "nvf",
983977 "rust-overlay": "rust-overlay",
978 "split-monitor-workspaces": "split-monitor-workspaces",
984979 "zen-browser": "zen-browser",
985980 "zig": "zig",
986981 "zls": "zls"
......@@ -1090,6 +1085,27 @@
10901085 "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
10911086 }
10921087 },
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 },
10931109 "systems": {
10941110 "locked": {
10951111 "lastModified": 1681028828,
flake.nix+24-3
......@@ -25,9 +25,9 @@
2525 moonlight.inputs.nixpkgs.follows = "nixpkgs";
2626
2727 hyprland.url = "github:hyprwm/Hyprland";
28 hyprsplit = {
29 url = "github:shezdy/hyprsplit";
30 inputs.hyprland.follows = "hyprland";
28 split-monitor-workspaces = {
29 url = "github:Duckonaut/split-monitor-workspaces";
30 inputs.hyprland.follows = "hyprland"; # <- make sure this line is present for the plugin to work as intended
3131 };
3232
3333 zen-browser = {
......@@ -72,6 +72,27 @@
7272 };
7373 });
7474 })
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 })
7596
7697 # custom packages
7798 (_: pkgs: {
modules/neovim/default.nix-8
......@@ -84,14 +84,6 @@
8484 treesitter = {
8585 enable = true;
8686 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 };
9587 };
9688 debugger.nvim-dap = {
9789 enable = true;
modules/shared/nix.nix+3
......@@ -28,11 +28,14 @@
2828 "https://nix-community.cachix.org"
2929 # For haskell
3030 "https://cache.iog.io"
31
32 "https://hyprland.cachix.org"
3133 ];
3234 trusted-public-keys = [
3335 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
3436 # For haskell
3537 "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
38 "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
3639 ];
3740 };
3841 gc = {
users/fish/vim/languages.nix-3
......@@ -69,9 +69,6 @@
6969 enable = true;
7070 fold = true;
7171 addDefaultGrammars = true;
72 highlight = {
73 additionalVimRegexHighlighting = true;
74 };
7572
7673 grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
7774 markdown_inline
users/natalie/desktop/configuration.nix+8-8
......@@ -19,10 +19,10 @@
1919 };
2020
2121 programs = {
22 hyprland = {
23 enable = true;
24 withUWSM = true;
25 };
22 # hyprland = {
23 # enable = true;
24 # withUWSM = true;
25 # };
2626 gamemode.enable = true;
2727
2828 _1password.enable = true;
......@@ -87,10 +87,10 @@
8787 xdgOpenUsePortal = true;
8888 config = {
8989 common.default = [ "gtk" ];
90 hyprland.default = [
91 "gtk"
92 "hyprland"
93 ];
90 # hyprland.default = [
91 # "gtk"
92 # "hyprland"
93 # ];
9494 };
9595
9696 extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
users/natalie/home/default.nix+3-3
......@@ -2,11 +2,11 @@
22{
33 imports = [
44 ./tmux.nix
5 ./hyprland
5 # ./hyprland
66 ./vicinae.nix
7 ./swaync.nix
7 # ./swaync.nix
88 ./gtk.nix
9 ./waybar
9 # ./waybar
1010 ./scripts
1111 ];
1212}
users/natalie/home/hyprland/binds.nix+23-23
......@@ -72,29 +72,29 @@
7272 "CTRL ALT, down, exec, hyprctl dispatch focuswindow tiled"
7373
7474 # switch workspace
75 "$mainMod, 1, workspace, 1"
76 "$mainMod, 2, workspace, 2"
77 "$mainMod, 3, workspace, 3"
78 "$mainMod, 4, workspace, 4"
79 "$mainMod, 5, workspace, 5"
80 "$mainMod, 6, workspace, 6"
81 "$mainMod, 7, workspace, 7"
82 "$mainMod, 8, workspace, 8"
83 "$mainMod, 9, workspace, 9"
84 "$mainMod, 0, workspace, 10"
75 "$mainMod, 1, split-workspace, 1"
76 "$mainMod, 2, split-workspace, 2"
77 "$mainMod, 3, split-workspace, 3"
78 "$mainMod, 4, split-workspace, 4"
79 "$mainMod, 5, split-workspace, 5"
80 "$mainMod, 6, split-workspace, 6"
81 "$mainMod, 7, split-workspace, 7"
82 "$mainMod, 8, split-workspace, 8"
83 "$mainMod, 9, split-workspace, 9"
84 "$mainMod, 0, split-workspace, 10"
8585
8686 # same as above, but switch to the workspace
87 "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent
88 "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
89 "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
90 "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
91 "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
92 "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
93 "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
94 "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
95 "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
96 "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
97 "$mainMod CTRL, c, movetoworkspace, empty"
87 "$mainMod SHIFT, 1, split-movetoworkspacesilent, 1" # movetoworkspacesilent
88 "$mainMod SHIFT, 2, split-movetoworkspacesilent, 2"
89 "$mainMod SHIFT, 3, split-movetoworkspacesilent, 3"
90 "$mainMod SHIFT, 4, split-movetoworkspacesilent, 4"
91 "$mainMod SHIFT, 5, split-movetoworkspacesilent, 5"
92 "$mainMod SHIFT, 6, split-movetoworkspacesilent, 6"
93 "$mainMod SHIFT, 7, split-movetoworkspacesilent, 7"
94 "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
95 "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
96 "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
97 "$mainMod CTRL, c, split-movetoworkspace, empty"
9898
9999 # window control
100100 "$mainMod SHIFT, left, movewindow, l"
......@@ -131,8 +131,8 @@
131131 ",XF86AudioPrev,exec, playerctl previous"
132132 ",XF86AudioStop,exec, playerctl stop"
133133
134 "$mainMod, mouse_down, workspace, e-1"
135 "$mainMod, mouse_up, workspace, e+1"
134 "$mainMod, mouse_down, split-workspace, e-1"
135 "$mainMod, mouse_up, split-workspace, e+1"
136136
137137 # clipboard manager
138138 "$mainMod, V, exec, vicinae vicinae://extensions/vicinae/clipboard/history"
users/natalie/home/hyprland/hyprland.nix+10-3
......@@ -1,4 +1,9 @@
1{ config, pkgs, ... }:
1{
2 inputs,
3 config,
4 pkgs,
5 ...
6}:
27{
38 home.packages = with pkgs; [
49 swww
......@@ -23,8 +28,10 @@
2328 # ];
2429 wayland.windowManager.hyprland = {
2530 enable = true;
26 package = null;
27 portalPackage = null;
31 package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
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;
2835
2936 xwayland = {
3037 enable = true;
users/natalie/home/hyprland/plugins.nix+3-3
......@@ -2,12 +2,12 @@
22{
33 wayland.windowManager.hyprland = {
44 plugins = [
5 inputs.hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.hyprsplit
5 inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces
66 ];
77 settings = {
88 plugin = {
9 hyprsplit = {
10 num_workspaces = 5;
9 split-monitor-workspaces = {
10 count = 5;
1111 };
1212 };
1313 };
users/natalie/home/hyprland/settings.nix+3-3
......@@ -1,6 +1,7 @@
11{ ... }:
22{
33 wayland.windowManager.hyprland.settings = {
4 "$mainMod" = "SUPER";
45 # see: https://wiki.hypr.land/Configuring/Variables/#input
56 input = {
67 kb_layout = "us";
......@@ -9,9 +10,8 @@
910 };
1011 # https://wiki.hypr.land/Configuring/Variables/#general
1112 general = {
12 "$mainMod" = "SUPER";
1313 layout = "dwindle";
14 no_border_on_floating = false;
14 #no_border_on_floating = false;
1515
1616 };
1717 # https://wiki.hypr.land/Configuring/Variables/#misc
......@@ -23,7 +23,7 @@
2323 enable_swallow = true;
2424 swallow_regex = "^(ghostty)$";
2525 focus_on_activate = true;
26 new_window_takes_over_fullscreen = 2;
26 on_focus_under_fullscreen = 2;
2727 middle_click_paste = false;
2828 };
2929
users/natalie/home/hyprland/windowrules.nix+8-7
......@@ -3,10 +3,11 @@
33 wayland.windowManager.hyprland.settings = {
44 # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules
55 windowrule = [
6 "float,class:^(mpv)$"
7 "pin,class:^(rofi)$"
8 "pin,class:^(waypaper)$"
9 "float,title:^(Volume Control)$"
6 # "float,class:^(mpv)$"
7 # "pin,class:^(rofi)$"
8 # "pin,class:^(waypaper)$"
9 "match:class ^(Volume Control)$, float on"
10 # "float,title:^(Volume Control)$"
1011
1112 #awakened-poe-trade
1213 # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-2992606569
......@@ -97,9 +98,9 @@
9798
9899 # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules
99100 layerrule = [
100 "blur, vicinae"
101 "ignorealpha 0, vicinae"
102 "noanim, vicinae"
101 "blur on, match:namespace vicinae"
102 "ignore_alpha 0, match:namespace vicinae"
103 "no_anim on, match:namespace vicinae"
103104 # "dimaround, rofi"
104105 # "dimaround, swaync-control-center"
105106 ];
users/natalie/packages.nix+1
......@@ -94,6 +94,7 @@ with pkgs;
9494 # nodePackages.npm
9595 go
9696 elan
97 zola
9798
9899 #expo deps
99100 watchman
users/natalie/vim/languages.nix-3
......@@ -69,9 +69,6 @@
6969 enable = true;
7070 fold = true;
7171 addDefaultGrammars = true;
72 highlight = {
73 additionalVimRegexHighlighting = true;
74 };
7572
7673 grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
7774 markdown_inline