diff --git a/flake.lock b/flake.lock index 9f7e646..2d30541 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1752113600, - "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", + "lastModified": 1752718651, + "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=", "owner": "nix-community", "repo": "disko", - "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", + "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1752208517, - "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", + "lastModified": 1752780124, + "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6a01e54af81b381695db796a43360bf6db5702f", + "rev": "c718918222bdb104397762dea67e6b397a7927fe", "type": "github" }, "original": { @@ -310,11 +310,11 @@ ] }, "locked": { - "lastModified": 1752246954, - "narHash": "sha256-c1Rq5Hc4WZLKj1RkmjLFCcX4QHBwrL+DIZNMEHno7DU=", + "lastModified": 1752814804, + "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e90b28967cacc64de7fb8742314ed0d7d12f47c6", + "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "type": "github" }, "original": { @@ -354,11 +354,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751943650, - "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", + "lastModified": 1752866191, + "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88983d4b665fb491861005137ce2b11a9f89f203", + "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", "type": "github" }, "original": { @@ -386,11 +386,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -400,6 +400,22 @@ "type": "github" } }, + "nixpkgs-working-jetbrains": { + "locked": { + "lastModified": 1752667200, + "narHash": "sha256-V6Ov5wYjjjlbXvZ0D9ojv9KsDhOX1sJFO55wfQjk5vM=", + "owner": "symphorien", + "repo": "nixpkgs", + "rev": "0bfaccdde33f5d7783372fc97d84de915d1d2e75", + "type": "github" + }, + "original": { + "owner": "symphorien", + "ref": "jdk_structured_attrs", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-working-xrdp": { "locked": { "lastModified": 1750030408, @@ -426,11 +442,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1752158208, - "narHash": "sha256-XbXYLUtaB/wHvZYefvaDPbo4eYj27kbtowHfww9bqLw=", + "lastModified": 1752976861, + "narHash": "sha256-59HcrqHfbSJUdmpzrAa9x8fW1PoS+ZGhCjL5k5HbyV8=", "owner": "nix-community", "repo": "nixvim", - "rev": "b728cf43d97814df43f5d9bd9dafac9072ccd9e8", + "rev": "0c50ed9349199219583cb1ed1a972d71e06039ec", "type": "github" }, "original": { @@ -447,11 +463,11 @@ ] }, "locked": { - "lastModified": 1752248434, - "narHash": "sha256-ud6xU5FlZSdi9RSPNIt+NWdZ3MmFGfQj4VoC7AQF+I0=", + "lastModified": 1753039389, + "narHash": "sha256-2DvnF9gHrOq3iXhXytE5nlZvhhJU2RrsB/jUVoTf99g=", "owner": "nix-community", "repo": "NUR", - "rev": "db699ccf4981f144e5200406f717a72e6751a0e2", + "rev": "cd4704bef83d332226b8a030296f5f4de3552958", "type": "github" }, "original": { @@ -518,6 +534,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-working-jetbrains": "nixpkgs-working-jetbrains", "nixpkgs-working-xrdp": "nixpkgs-working-xrdp", "nixvim": "nixvim", "nur": "nur", @@ -545,11 +562,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752231632, - "narHash": "sha256-ZuFQ62qagCV5GHSbwnpLk92HxKlNjG7w4wbkT1OrhUA=", + "lastModified": 1753009241, + "narHash": "sha256-puhWbjjrOtOlYYV0R2J99V905vUjF+NqyK5N+kiVZXg=", "owner": "danth", "repo": "stylix", - "rev": "0150050d6eed373b04fd85e08bd2ae7b5cc8d3b2", + "rev": "9242b3ec8e0d253f32614778ed4996af7aaf9438", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f0ab14f..6c80127 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,7 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; nixpkgs-working-xrdp.url = "github:NixOS/nixpkgs/b26c89e6aa1d7731d5e267656207f2e1c2f37f1d"; + nixpkgs-working-jetbrains.url = "github:symphorien/nixpkgs/jdk_structured_attrs"; # cosmic testing #nixos-cosmic = { # url = "github:lilyinstarlight/nixos-cosmic"; diff --git a/overlays.nix b/overlays.nix index f3debc4..a80e8d5 100644 --- a/overlays.nix +++ b/overlays.nix @@ -16,20 +16,26 @@ in discord-canary = prev.discord-canary.override { withVencord = true; }; discord = prev.discord.override { withVencord = true; }; tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; - vencord = prev.vencord.overrideAttrs { - version = "1.12.2"; - src = prev.fetchFromGitHub { - owner = "Vendicated"; - repo = "Vencord"; - rev = "v1.12.2"; - hash = "sha256-a4lbeuXEHDMDko8wte7jUdJ0yUcjfq3UPQAuSiz1UQU="; - }; - }; xrdp = (import inputs.nixpkgs-working-xrdp { system = "x86_64-linux"; config.allowUnfree = true; }).xrdp; + jetbrains = prev.jetbrains // { + jdk = (import inputs.nixpkgs-working-jetbrains { + system = prev.stdenv.hostPlatform.system; + config.allowUnfree = true; + }).jetbrains.jdk; + jdk-no-jcef = (import inputs.nixpkgs-working-jetbrains { + system = prev.stdenv.hostPlatform.system; + config.allowUnfree = true; + }).jetbrains.jdk-no-jcef; + jdk-no-jcef-17 = (import inputs.nixpkgs-working-jetbrains { + system = prev.stdenv.hostPlatform.system; + config.allowUnfree = true; + }).jetbrains.jdk-no-jcef-17; + }; + #hyprland = # inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; #xdg-desktop-portal-hyprland =