diff --git a/flake.lock b/flake.lock index 7110f93..fc44051 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1718141734, + "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", "type": "github" }, "original": { @@ -69,17 +69,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1718025901, - "narHash": "sha256-RpNsQZ3jCNEkYKy9crhIV5LFjTNRJHvdHHr+DFATDqs=", + "lastModified": 1718139749, + "narHash": "sha256-VcWBqYRI82PuyqD5jZrmSkvVKGq4Ax0iNO5HI0aFRV0=", "ref": "refs/heads/main", - "rev": "7ba2c31822b3df9b40b4184550423f23023b55bb", - "revCount": 4793, + "rev": "8412ffcc42012888757cd00a004871e8bc353cf2", + "revCount": 4805, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -119,6 +120,10 @@ }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -129,11 +134,11 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -142,6 +147,31 @@ "type": "github" } }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881334, + "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -184,11 +214,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -200,11 +230,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -216,11 +246,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -232,11 +262,11 @@ }, "nur": { "locked": { - "lastModified": 1718026702, - "narHash": "sha256-B62vRJYFK7x5pJKDvXCIRgKcAS9K/KwoTBYAECfb81A=", + "lastModified": 1718189173, + "narHash": "sha256-PVau5Ijdz6DNjUUBpZ5QwygfyqiK+imr62q4+kxJkzo=", "owner": "nix-community", "repo": "NUR", - "rev": "f7e5fe023ea5742a1db039b6ba17f717ef24cc0f", + "rev": "a881f3b94209d231585fba2c435ebe0437a6b217", "type": "github" }, "original": { @@ -263,11 +293,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1717967427, - "narHash": "sha256-ltR6Svr220r008dqQw4IJNmr4Pas///qLPVQ4NNto4A=", + "lastModified": 1718131642, + "narHash": "sha256-kSxes9PQWJjUSSWq2VAEFvUQtmxJ4bvmx8jEpeupGbk=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "2b57b5706cde7577c9cbb4de9e1f9a14777d09af", + "rev": "342de8a2cddf8143d7ce9c13c10613af8aa78c6e", "type": "github" }, "original": { @@ -297,11 +327,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1714646798, - "narHash": "sha256-f4S92muHiNmLAxzFjQorB3HYO7P98m58IwbhD3NTxf4=", + "lastModified": 1718053731, + "narHash": "sha256-31k31t4bQYTe5tr1YAsaJ50vYmtTIo6XxVZZjAXagMA=", "ref": "refs/heads/master", - "rev": "b41f57e578e5f7c8c56e178aa6d860196291ade9", - "revCount": 3435, + "rev": "558b11cd8b7b282689607a57c4175abd13f14c43", + "revCount": 3502, "submodules": true, "type": "git", "url": "https://github.com/thomasave/Waybar" @@ -329,11 +359,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1717918856, + "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "72907822c19afc0983c69d59d299204381623725", "type": "github" }, "original": { diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index b74d738..4d1599b 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -19,6 +19,13 @@ let echo -n "''${code[-1]}" | ${pkgs.wl-clipboard}/bin/wl-copy; ''; + # Enable split-monitor-workspaces + # workspace_command_prefix = "split-"; + # hyprland_plugins = [inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces]; + + workspace_command_prefix = ""; + hyprland_plugins = []; + launch_alacritty = pkgs.writeShellScriptBin "launch_alacritty" '' RUNNING_WAYPIPE=false SSH_CLIENT="" @@ -125,9 +132,7 @@ in { systemd.enableXdgAutostart = true; xwayland.enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; - plugins = [ - # inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces - ]; + plugins = [] ++ hyprland_plugins; settings = { "$mainMod" = "SUPER"; exec-once = [ @@ -254,10 +259,10 @@ in { "$mainMod ALT, H, resizeactive, -20 0" "$mainMod ALT, K, resizeactive, 0 -20" "$mainMod ALT, J, resizeactive, 0 20" - "$mainMod SHIFT, T, split-movetoworkspace, empty" - "$mainMod, T, split-workspace, empty" - "$mainMod, TAB, split-workspace, m+1" - "$mainMod SHIFT, TAB, split-workspace, m-1" + "$mainMod SHIFT, T, ${workspace_command_prefix}movetoworkspace, empty" + "$mainMod, T, ${workspace_command_prefix}workspace, empty" + "$mainMod, TAB, ${workspace_command_prefix}workspace, m+1" + "$mainMod SHIFT, TAB, ${workspace_command_prefix}workspace, m-1" ] ++ ( # workspaces # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} @@ -265,8 +270,8 @@ in { let ws = let c = (x + 1) / 10; in builtins.toString (x + 1 - (c * 10)); in [ - "$mainMod, ${ws}, split-workspace, ${toString (x + 1)}" - "$mainMod SHIFT, ${ws}, split-movetoworkspace, ${toString (x + 1)}" + "$mainMod, ${ws}, ${workspace_command_prefix}workspace, ${toString (x + 1)}" + "$mainMod SHIFT, ${ws}, ${workspace_command_prefix}movetoworkspace, ${toString (x + 1)}" ]) 10)); }; }; diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix index 5dcd591..b7b8b24 100644 --- a/hosts/Aloria/default.nix +++ b/hosts/Aloria/default.nix @@ -9,10 +9,10 @@ pkgs.intel-media-driver ]; - services.ollama = { - enable = true; - acceleration = "cuda"; - }; + # services.ollama = { + # enable = true; + # acceleration = "cuda"; + # }; services.logind.extraConfig = ''HandlePowerKey=ignore''; networking.wg-quick.interfaces = {