diff --git a/flake.lock b/flake.lock index 468ce7b..0559144 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1755946532, - "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", + "lastModified": 1759499898, + "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", + "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758932548, - "narHash": "sha256-pkQQelNKugdavUKiT22N+CoeVL7knzwWQdWvKFa1caE=", + "lastModified": 1759705705, + "narHash": "sha256-ckBnfbxbT7VU7ay0c5jkstAZHrC4xDpEHgnQo99OdEw=", "owner": "9001", "repo": "copyparty", - "rev": "6f6b70ad04960bf99b4e1ad12aab27f876b55dc4", + "rev": "20ac117c3272da50ce125795d831ac55f29e766d", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1758964003, - "narHash": "sha256-snZ/nOHvA1BdGcO+jzaYTAh4vhzHOQ9hivsFdrnlUjc=", + "lastModified": 1759739185, + "narHash": "sha256-mO3kaYc+xdbwf8roqexsKq1ocQCQsZzFha0fIJMbRRw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fc94b22fd2b6110333e03180c0e36ffd10ae2029", + "rev": "722d8e6f96a0fd1dcf3d49a1f2dc38aec8c4039d", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1758192433, - "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", + "lastModified": 1759490292, + "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", + "rev": "9431db625cd9bb66ac55525479dce694101d6d7a", "type": "github" }, "original": { @@ -418,11 +418,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1758927862, - "narHash": "sha256-I724P6Mud+VSPiyvwu2If10AaKER1RKiKI633C9FnyQ=", + "lastModified": 1759749604, + "narHash": "sha256-IF5RWz8v+L+YD0oaX3SHWeSOQ5rzC5wBQUtp9cw0wEE=", "ref": "refs/heads/main", - "rev": "6f1d2e771dca1b5eea5ec344ca1b6a80d4fd4ee5", - "revCount": 6457, + "rev": "17e77e0407bebd5d24521012ee1d04b156d6b9f4", + "revCount": 6478, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1758895089, - "narHash": "sha256-HOIITlSwB5iuVEVLmWNGu8bvI83Y2IbN8SzJQmBDwvg=", + "lastModified": 1759748449, + "narHash": "sha256-9I7KVSR7PsSaahM6CbxUyjXSRAY/4+29rFblZDqHPFE=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4d940a10aff16b240533c9b6527a14ff91e5e5ae", + "rev": "7be897d6ae765fab756c0b7e6b91e8c5b39a419e", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1757694755, - "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", + "lastModified": 1759080228, + "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", + "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", "type": "github" }, "original": { @@ -570,11 +570,11 @@ ] }, "locked": { - "lastModified": 1756810301, - "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1756117388, - "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", + "lastModified": 1759490926, + "narHash": "sha256-7IbZGJ5qAAfZsGhBHIsP8MBsfuFYS0hsxYHVkkeDG5Q=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", + "rev": "94cce794344538c4d865e38682684ec2bbdb2ef3", "type": "github" }, "original": { @@ -673,11 +673,11 @@ ] }, "locked": { - "lastModified": 1758530032, - "narHash": "sha256-WbfonO3flDebFitpthl/QjwHFUitGgFXBkA1cKzpIoQ=", + "lastModified": 1759739024, + "narHash": "sha256-cJmHXccjpUH0AQsFcts+OZ/lUzdeaxF7oMft0VQOnoA=", "owner": "Mic92", "repo": "nix-ld", - "rev": "a2bcfb11963dc4597b2c137fda7466df15a41565", + "rev": "d4c51086457b3f4b631dfa26f2c982d1acd98374", "type": "github" }, "original": { @@ -724,11 +724,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -755,11 +755,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -771,11 +771,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -803,11 +803,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -859,11 +859,11 @@ ] }, "locked": { - "lastModified": 1756961635, - "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -924,11 +924,11 @@ ] }, "locked": { - "lastModified": 1758425756, - "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", + "lastModified": 1759635238, + "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", + "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", "type": "github" }, "original": { @@ -979,11 +979,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1758905463, - "narHash": "sha256-8ANQ3MxULwolfkJEdUYlL5usISAxtysWctqqeSiJ/OE=", + "lastModified": 1759690047, + "narHash": "sha256-Vlpa0d1xOgPO9waHwxJNi6LcD2PYqB3EjwLRtSxXlHc=", "owner": "nix-community", "repo": "stylix", - "rev": "4aae0ebc2b0d37d4f90ace2c8bbadffadb2e2a97", + "rev": "09022804b2bcd217f3a41a644d26b23d30375d12", "type": "github" }, "original": { @@ -1073,11 +1073,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -1089,11 +1089,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -1105,11 +1105,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -1120,11 +1120,11 @@ }, "unstable": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -1141,11 +1141,11 @@ ] }, "locked": { - "lastModified": 1758985165, - "narHash": "sha256-bzthrGCHUDzUHH9F3eNl5LG5rfg4ig9x3TGjjUE23qA=", + "lastModified": 1759711004, + "narHash": "sha256-B39NxeKCnK3DJlmJKIts6njcXcVVASLUChDNmRl4dxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "11cc3d55ded3346a8195000ddeadde782a611e56", + "rev": "6f4021da5d2bb5ea7cb782ff413ecb7062066820", "type": "github" }, "original": { @@ -1221,11 +1221,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1758946930, - "narHash": "sha256-dC+03a5Lfi2KYCgb4mFvewHfa3N8LOMhkfZ1dzEPGfY=", + "lastModified": 1759724568, + "narHash": "sha256-i/+YcMMMFXeUKWbR683eoxyz+4Jcb01MHVCjj6OHl0Y=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "75f421d180518e3a1b2daf9c39efaf3d13cd1dd3", + "rev": "b63e1644c96baaaccb78f8d3101f39fbfee733cb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f65856b..6aa4cd3 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ # Nixpkgs nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-generators = { url = "github:nix-community/nixos-generators"; diff --git a/hm-modules/development/default.nix b/hm-modules/development/default.nix index 7f082e7..932c973 100644 --- a/hm-modules/development/default.nix +++ b/hm-modules/development/default.nix @@ -26,6 +26,7 @@ in { home.file."jdk/openjdk23".source = pkgs.jdk23; home.file."nodejs/nodejs_22".source = pkgs.nodejs_22; home.file."python/python3".source = pkgs.python3; + home.file."jdk/zulujdk22".source = pkgs.zulu22; dov.shell = { zsh = { diff --git a/hm-modules/random/kanshi/config b/hm-modules/random/kanshi/config index a966eda..3e34e1e 100644 --- a/hm-modules/random/kanshi/config +++ b/hm-modules/random/kanshi/config @@ -3,6 +3,6 @@ profile LAPTOP_ONLY { } profile HOME { - output eDP-1 mode 2560x1440 position 480,1440 - output DP-3 mode 3440x1440 position 0,0 + output eDP-1 mode 2560x1440@165 position 480,1440 + output DP-3 mode 3440x1440@165 position 0,0 } diff --git a/machines/fujin/main/default.nix b/machines/fujin/main/default.nix index bdeec8c..d6bf87b 100644 --- a/machines/fujin/main/default.nix +++ b/machines/fujin/main/default.nix @@ -9,6 +9,10 @@ #./sops.nix ]; + nixpkgs.overlays = [ + (import ./overlays/zulu22.nix) + ]; + users.users.${username} = { description = "NixOS Omen Laptop"; hashedPassword = diff --git a/machines/fujin/main/overlays/zulu22.nix b/machines/fujin/main/overlays/zulu22.nix new file mode 100644 index 0000000..eaa8dc4 --- /dev/null +++ b/machines/fujin/main/overlays/zulu22.nix @@ -0,0 +1,43 @@ +final: prev: { + zulu22 = prev.callPackage ({ lib, stdenv, fetchurl, makeWrapper, setJavaClassPath }: + let + platform = if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macos" + else throw "Unsupported platform"; + + arch = if stdenv.isx86_64 then "x64" + else if stdenv.isAarch64 then "aarch64" + else throw "Unsupported architecture"; + + version = "22.32.21"; + + hashes = { + "linux-x64" = "sha256-8fvtwOc/aXHnufwjNTvv9iB9ZIFRWhFmdLix9NtthEE="; + "linux-aarch64" = "sha256-3RLNNEbMk5wAZsQmbQj/jpx9iTL/yr9N3wL4t7m6c+s="; + "macos-x64" = "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw="; + "macos-aarch64" = "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0="; + }; + + in stdenv.mkDerivation { + pname = "zulu"; + inherit version; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu22.32.21-ca-crac-jdk22.0.2-linux_x64.tar.gz"; + hash = hashes."${platform}-${arch}"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out + cp -r ./* $out/ + ''; + + meta = with lib; { + description = "Certified builds of OpenJDK"; + platforms = platforms.linux ++ platforms.darwin; + }; + } + ) {}; +}