diff --git a/configuration.nix b/configuration.nix index 1a6cdfd..ee233ee 100644 --- a/configuration.nix +++ b/configuration.nix @@ -243,7 +243,10 @@ in "allen" ]; - programs.hyprland.enable = true; + programs.hyprland = { + enable = true; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + }; environment.variables = { LD_LIBRARY_PATH = lib.makeLibraryPath ( diff --git a/flake.lock b/flake.lock index cd0bed2..3ae55f6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1762356719, - "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", + "lastModified": 1777499565, + "narHash": "sha256-nU55VWk99Pn1QzQDDjFISocC4SgDZ3Xp+zb6ji3JclM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", + "rev": "813c1e8981893c11e118b19c125d6bc282f51765", "type": "github" }, "original": { @@ -36,15 +36,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "lastModified": 1776511930, + "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "rev": "39435900785d0c560c6ae8777d29f28617d031ef", "type": "github" }, "original": { @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1762462052, - "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", + "lastModified": 1776426399, + "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", + "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84", "type": "github" }, "original": { @@ -179,18 +179,19 @@ "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1762542520, - "narHash": "sha256-hMWWVGEoJRNDaAJxHoL1YL+IXGxdQooEw8lABELVopg=", + "lastModified": 1778151950, + "narHash": "sha256-iPVgukP0AgXJBD9d8M0yX35oTE//kaAos6Ux+zPC/tw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "522edc87126a48f3ce4891747b6a92a22385b1e7", + "rev": "6b8b20100253c083227e611be20360f4d8e7794e", "type": "github" }, "original": { @@ -218,6 +219,10 @@ "hyprland", "hyprutils" ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -228,11 +233,11 @@ ] }, "locked": { - "lastModified": 1762465111, - "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=", + "lastModified": 1776426575, + "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "a415eba866a953f3096d661318f771aa0082eb98", + "rev": "a968d211048e3ed538e47b84cb3649299578f19d", "type": "github" }, "original": { @@ -253,11 +258,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", "type": "github" }, "original": { @@ -282,11 +287,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1777320127, + "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", "type": "github" }, "original": { @@ -317,7 +322,11 @@ "hyprland-guiutils", "hyprutils" ], - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], "nixpkgs": [ "hyprland", "hyprland-guiutils", @@ -330,11 +339,11 @@ ] }, "locked": { - "lastModified": 1762463729, - "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "lastModified": 1772462885, + "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998", "type": "github" }, "original": { @@ -355,11 +364,11 @@ ] }, "locked": { - "lastModified": 1762387740, - "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", + "lastModified": 1777492286, + "narHash": "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", + "rev": "ec5c0c709706bad5b82f667fd8758eae442577ce", "type": "github" }, "original": { @@ -372,23 +381,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprland-guiutils", - "hyprtoolkit", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-guiutils", - "hyprtoolkit", "systems" ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1777159683, + "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", "type": "github" }, "original": { @@ -397,8 +402,12 @@ "type": "github" } }, - "hyprwayland-scanner_2": { + "hyprwire": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -409,16 +418,16 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1777388329, + "narHash": "sha256-40YxVGF2rA9iH3D7am5fy4EOSBbMgpJtJ9yhl0Cx+qI=", "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "repo": "hyprwire", + "rev": "04be2897e05f9b271d532b5ae56ca088d2eeac02", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprwayland-scanner", + "repo": "hyprwire", "type": "github" } }, @@ -455,11 +464,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -495,11 +504,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", "type": "github" }, "original": { @@ -546,15 +555,16 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1759855608, - "narHash": "sha256-DO6OaOY8G4HFP7Rz6gRCG6K2PZ8NrXkDIF6NJGRVcbs=", - "owner": "Duckonaut", + "lastModified": 1778019879, + "narHash": "sha256-E4P1ieHBhshPBWn5/OZvsPLsTbXfjUOQ/9/M1IbYYwk=", + "owner": "zjeffer", "repo": "split-monitor-workspaces", - "rev": "10719e725ade06da410db52268f4b9cf8ea5f63c", + "rev": "d55750b18d9cc9b8b8a10e650d29950578471398", "type": "github" }, "original": { - "owner": "Duckonaut", + "owner": "zjeffer", + "ref": "feat/zjeffer/lua", "repo": "split-monitor-workspaces", "type": "github" } @@ -602,11 +612,11 @@ ] }, "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", + "lastModified": 1777585783, + "narHash": "sha256-JTeWRy42VElroJ0rVdZuVXSoTLsx+NzQfGPKMbtn3SU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", + "rev": "fa50d6fbaff8f42c61071b87b034a90d82a33558", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 855a266..438ec5c 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,10 @@ hyprland.url = "github:hyprwm/Hyprland"; split-monitor-workspaces = { - url = "github:Duckonaut/split-monitor-workspaces"; + type = "github"; + owner = "zjeffer"; + repo = "split-monitor-workspaces"; + ref = "feat/zjeffer/lua"; inputs.hyprland.follows = "hyprland"; }; }; diff --git a/home.nix b/home.nix index 9e8a7e5..848d69d 100644 --- a/home.nix +++ b/home.nix @@ -50,16 +50,21 @@ programs.direnv.enable = true; programs.direnv.nix-direnv.enable = true; + xdg.configFile."hypr/plugins.lua".text = + let + smw = + inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces; + in + '' + --hl.on("hyprland.start", function() + hl.plugin.load("${smw}/lib/libsplit-monitor-workspaces.so") + --end) + ''; + wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - plugins = [ - split-monitor-workspaces.packages.x86_64-linux.split-monitor-workspaces - ]; - extraConfig = '' - source = ~/.config/hypr/hyprland-custom.conf - ''; }; home.stateVersion = "25.05"; diff --git a/modules/home/fish/functions.nix b/modules/home/fish/functions.nix index 957b148..8023c1f 100644 --- a/modules/home/fish/functions.nix +++ b/modules/home/fish/functions.nix @@ -11,10 +11,14 @@ and cd $argv[1] ''; }; + fish_greeting = { + body = ""; + }; }; programs.fish.interactiveShellInit = '' if test -f $HOME/.config/fish/kube.fish source $HOME/.config/fish/kube.fish end ''; -} \ No newline at end of file +} + diff --git a/modules/home/starship.nix b/modules/home/starship.nix index cd96b9c..51fead1 100644 --- a/modules/home/starship.nix +++ b/modules/home/starship.nix @@ -96,7 +96,6 @@ kotlin.symbol = "kt "; kubernetes.symbol = "kubernetes "; lua.symbol = "lua "; - maven.symbol = "maven "; nodejs.symbol = "nodejs "; memory_usage.symbol = "memory "; meson = { diff --git a/pkgs/util.nix b/pkgs/util.nix index 26eea2d..b807589 100644 --- a/pkgs/util.nix +++ b/pkgs/util.nix @@ -112,4 +112,5 @@ with pkgs; cachix browsh kdePackages.qt6ct + kitty ] diff --git a/services/x.nix b/services/x.nix index 8e5dbcc..2564623 100644 --- a/services/x.nix +++ b/services/x.nix @@ -16,7 +16,6 @@ xdg.portal = { enable = true; extraPortals = with pkgs; [ - xdg-desktop-portal-hyprland xdg-desktop-portal-gtk xdg-desktop-portal-gnome ];