diff --git a/flake.lock b/flake.lock index eefca67..1b63c93 100644 --- a/flake.lock +++ b/flake.lock @@ -95,11 +95,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -209,11 +209,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1770260404, - "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", + "lastModified": 1767280655, + "narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", + "rev": "d49d2543f02dbd789ed032188c84570d929223cb", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767232402, - "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=", + "lastModified": 1764554060, + "narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=", "owner": "musnix", "repo": "musnix", - "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e", + "rev": "599562080b2901046829ca69e0d1461041d27b32", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770493836, - "narHash": "sha256-UPG9xFnVkqHF5e2GOucQO8BXXzwp8BwwON2g+WBXLMA=", + "lastModified": 1767257541, + "narHash": "sha256-eAZD0o5eC85jES3k8S0e1NlJJv+rTgofhl0QajhFjyM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a17befde0c0ca25617fb3da505294deb45cef170", + "rev": "0eb70f38f02923ff59743a0978fed88f04c98c7d", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770394936, - "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=", + "lastModified": 1767160009, + "narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=", "owner": "YaLTeR", "repo": "niri", - "rev": "549148d27779d024255a84535b42b947f1c2a113", + "rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1770464364, - "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "lastModified": 1767047869, + "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770464364, - "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "lastModified": 1767047869, + "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -422,11 +422,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1769049374, - "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", + "lastModified": 1766849711, + "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", + "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1768249818, - "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", + "lastModified": 1761730856, + "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "owner": "NuschtOS", "repo": "search", - "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", + "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1770526836, - "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", + "lastModified": 1766894905, + "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", + "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1770308890, - "narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=", + "lastModified": 1766603740, + "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", "owner": "danth", "repo": "stylix", - "rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6", + "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", "type": "github" }, "original": { @@ -633,11 +633,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -649,11 +649,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -665,11 +665,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1770167989, - "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=", + "lastModified": 1766429945, + "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4", + "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1770438797, - "narHash": "sha256-pwnQTmZswF6bu2/Ie7ajOo8w6rXQwVI954S9WX1UG3w=", + "lastModified": 1767307876, + "narHash": "sha256-d5EKvUnfr6tdhymIThz0WGG0JHT2cCZzbZK4t2CwYuc=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "d396599774bdbafeb86c122dc2c422c7084ea390", + "rev": "c5bffaf433e6137fe80cd1930584836f11119b26", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1857f36..f0cb5b8 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ ./hardware/framework-13.nix ./nixos/workstation.nix ./nixos/modules/work.nix - ./nixos/programs/hyprland.nix + ./nixos/programs/niri.nix ]; home-modules = [ ./home/programs/work.nix diff --git a/hardware/framework-13.nix b/hardware/framework-13.nix index 50f4e12..dd70137 100644 --- a/hardware/framework-13.nix +++ b/hardware/framework-13.nix @@ -80,40 +80,40 @@ ''; }; - # programs.niri.settings.outputs = { - # # Laptop display - # "eDP-1" = { - # mode = { - # width = 2256; - # height = 1504; - # refresh = 59.999; - # }; - # }; - # "HP Inc. HP 24x 1CR9500W9Q" = { - # mode = { - # width = 1920; - # height = 1080; - # refresh = 144.001; - # }; - # scale = 1.0; - # position = { - # x = 2256; - # y = 0; - # }; - # }; - # "Ancor Communications Inc ASUS VS228 F3LMTF154813" = { - # mode = { - # width = 1920; - # height = 1080; - # refresh = 60.0; - # }; - # scale = 1.0; - # position = { - # x = 2256 + 1920; - # y = 0; - # }; - # }; - # }; + programs.niri.settings.outputs = { + # Laptop display + "eDP-1" = { + mode = { + width = 2256; + height = 1504; + refresh = 59.999; + }; + }; + "HP Inc. HP 24x 1CR9500W9Q" = { + mode = { + width = 1920; + height = 1080; + refresh = 144.001; + }; + scale = 1.0; + position = { + x = 2256; + y = 0; + }; + }; + "Ancor Communications Inc ASUS VS228 F3LMTF154813" = { + mode = { + width = 1920; + height = 1080; + refresh = 60.0; + }; + scale = 1.0; + position = { + x = 2256 + 1920; + y = 0; + }; + }; + }; } ]; diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 53ec0b2..12603c1 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -38,9 +38,6 @@ in { numlock_by_default = true; accel_profile = "flat"; }; - gesture = [ - "3, horizontal, workspace" - ]; decoration = { rounding = 0; }; @@ -66,9 +63,9 @@ in { "${modifier}_SHIFT, space, cyclenext, floating" # window management - "${modifier}, M, fullscreen," - "${modifier}, G, togglefloating," - "${modifier}, Q, killactive" + "${modifier}, F, fullscreen," + "${modifier}, V, togglefloating," + "${modifier}_SHIFT, X, killactive" # master layout "${modifier}, j, layoutmsg, rollnext" @@ -85,7 +82,7 @@ in { "${modifier}_SHIFT, l, moveintogroup, r" # scratch buffer - "${modifier}, Y, togglespecialworkspace" + "${modifier}, Y, togglespecialworkspace" "${modifier}_SHIFT, Y, movetoworkspace, special" # applications diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 3315c75..78b8460 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -31,7 +31,6 @@ bitwarden-desktop inputs.zen-browser.packages.x86_64-linux.default - brave ]; programs.obs-studio = { diff --git a/home/programs/scripts.nix b/home/programs/scripts.nix index 12b9c12..feff58e 100644 --- a/home/programs/scripts.nix +++ b/home/programs/scripts.nix @@ -102,10 +102,6 @@ in { modifier = "${modifier}_SHIFT"; key = "S"; } - { - modifier = ""; - key = "Print"; - } ]; } {