From 4459f75c75821d88d565d488ac4b6b9cb0f23473 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Sat, 27 Dec 2025 20:30:25 -0700 Subject: [PATCH] update --- flake.lock | 203 +++++++++++++++++++++++++++++--------- flake.nix | 12 +++ hosts/modules/aagl.nix | 10 ++ hosts/modules/core.nix | 1 + hosts/modules/nixos.nix | 2 + hosts/modules/steam.nix | 1 + hosts/system-packages.nix | 1 + 7 files changed, 183 insertions(+), 47 deletions(-) create mode 100644 hosts/modules/aagl.nix diff --git a/flake.lock b/flake.lock index 90c018d..b188e9f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "aagl": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1766793997, + "narHash": "sha256-cQ9XvbEMxKr6bTIGtplFXGKeV3dvbd1xJudITECr81c=", + "owner": "alsaiduq-lab", + "repo": "aagl-gtk-on-nix", + "rev": "45d0f972f035a0b541d506ea31e1a100ed7cb5f7", + "type": "github" + }, + "original": { + "owner": "alsaiduq-lab", + "ref": "release-25.11", + "repo": "aagl-gtk-on-nix", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -44,11 +67,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1766517055, - "narHash": "sha256-r/+oO2811yJWm52ysdt/gNG2efXKrWH5+jEBttt/m1s=", + "lastModified": 1766877811, + "narHash": "sha256-sfHrgmzYTxaXGrtigHLcKC+QZBNSjlMaeQ719qLX5qY=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "1d4d145187fa6857cd7a846e09ea032819a98993", + "rev": "b1632a0a0355b752e7bdbc589ec4c91305e5ed31", "type": "github" }, "original": { @@ -129,6 +152,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -167,19 +206,19 @@ }, "ghostty": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1766518023, - "narHash": "sha256-DB90UOiBqPl+MkRGIeWbPkOCo/8lRxQ6oTPbLB+OdvI=", + "lastModified": 1766784567, + "narHash": "sha256-fpRgcNFEGRidNTDk3CVsvKxWIgB9Ph5EM+q5DGe6CI8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "634c3353fe5bc7a5ecdb89305d87c9ae8d91b185", + "rev": "c00d7fc5c4dc28bfa14935a84c70591d7103c284", "type": "github" }, "original": { @@ -212,7 +251,7 @@ }, "grim-hyprland": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_2" }, "locked": { @@ -258,11 +297,11 @@ ] }, "locked": { - "lastModified": 1766519125, - "narHash": "sha256-sSMkdlSo56WrEzciLZTm8qpYxBYxeByGryAIAmIt+/g=", + "lastModified": 1766879926, + "narHash": "sha256-gNcyF6VUcZ7xkW2pcZRejuFM7RDPSLz3HyjAG29Y6OQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9c790e687e2e7645899cb21dec2a416710aa1064", + "rev": "b3ae8229591a1dd3f460deb75a541d6514ec1509", "type": "github" }, "original": { @@ -273,7 +312,7 @@ }, "hu-tao-cursor": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1758768962, @@ -366,11 +405,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1766498696, - "narHash": "sha256-y0bopy/Hob48/q71u4yJo2S0g90JFUJqq3rfh2DgKkk=", + "lastModified": 1766870612, + "narHash": "sha256-k0JGpkHZb5s/msskYKcYLwGuPklJW8qWN1vIhBZARyI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f7f357f15f83612078eb0919ca08b71cac01c25e", + "rev": "a8452705d6512da36f66e4a7d6e7799afbc7ffdd", "type": "github" }, "original": { @@ -629,14 +668,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1766455463, - "narHash": "sha256-VEyrofUKseSH18CHlC3J8RiS48YgHwmYyJ9F6Ja1mUA=", + "lastModified": 1766800877, + "narHash": "sha256-uttWzlZdQxd7surfe4zeMjTnwIgWUjBygVDdrA1Ssag=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9271d3b26d6e3d57a101bf3da4ce0496dc515018", + "rev": "4108f21b00b10e185ab3d28f9e89e6359c159793", "type": "github" }, "original": { @@ -647,15 +686,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763191728, - "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz" + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -674,6 +716,19 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1763191728, + "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1727802920, "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", @@ -689,7 +744,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1758346548, "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", @@ -705,7 +760,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1766125104, "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", @@ -721,13 +776,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1766473571, - "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=", + "lastModified": 1766736597, + "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76701a179d3a98b07653e2b0409847499b2a07d3", + "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852", "type": "github" }, "original": { @@ -737,6 +792,22 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1766747458, + "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvim-dots": { "flake": false, "locked": { @@ -775,7 +846,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -796,6 +867,24 @@ "type": "github" } }, + "proton-cachyos": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1766810311, + "narHash": "sha256-Tu5UopFfDdcJT5asaiZQojCblfPizqzqAc9H1Ouo2g8=", + "owner": "Arsalan2356", + "repo": "proton-cachyos-flake", + "rev": "140811be3a75e9c14e49683c323e02d138f41adb", + "type": "github" + }, + "original": { + "owner": "Arsalan2356", + "repo": "proton-cachyos-flake", + "type": "github" + } + }, "quickshell": { "inputs": { "nixpkgs": [ @@ -804,16 +893,16 @@ ] }, "locked": { - "lastModified": 1764663772, - "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", + "lastModified": 1766386896, + "narHash": "sha256-1uql4y229Rh+/2da99OVNe6DfsjObukXkf60TYRCvhI=", "ref": "refs/heads/master", - "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", - "revCount": 713, + "rev": "3918290c1bcd93ed81291844d9f1ed146672dbfc", + "revCount": 714, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, "original": { - "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "rev": "3918290c1bcd93ed81291844d9f1ed146672dbfc", "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" } @@ -825,11 +914,11 @@ ] }, "locked": { - "lastModified": 1766386896, - "narHash": "sha256-1uql4y229Rh+/2da99OVNe6DfsjObukXkf60TYRCvhI=", + "lastModified": 1766725085, + "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", "ref": "refs/heads/master", - "rev": "3918290c1bcd93ed81291844d9f1ed146672dbfc", - "revCount": 714, + "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "revCount": 715, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -840,6 +929,7 @@ }, "root": { "inputs": { + "aagl": "aagl", "dankMaterialShell": "dankMaterialShell", "dgop": "dgop", "disko": "disko", @@ -850,13 +940,32 @@ "hyprland": "hyprland", "hyprland-dots": "hyprland-dots", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nvim-dots": "nvim-dots", "pinix": "pinix", + "proton-cachyos": "proton-cachyos", "quickshell": "quickshell_2", "unstable": "unstable" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1764124769, + "narHash": "sha256-vcoOEy3i8AGJi3Y2C48hrf6CuL2h8W1gLe1gNt72Kxg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "5da8c00313b4434f00aed6b4c94cd3b207bafdc5", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -904,11 +1013,11 @@ }, "unstable": { "locked": { - "lastModified": 1766410818, - "narHash": "sha256-ruVneSx6wFy5PMw1ow3BE+znl653TJ6+eeNUj4B/9y8=", + "lastModified": 1766840161, + "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a7affa77a5a539afa1c7859e2c31abdb1aeadf3", + "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e3988b4..78a7894 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,15 @@ url = "github:fufexan/nix-gaming"; }; + proton-cachyos = { + url = "github:Arsalan2356/proton-cachyos-flake"; + }; + + aagl = { + url = "github:alsaiduq-lab/aagl-gtk-on-nix/release-25.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; @@ -87,6 +96,7 @@ dankMaterialShell, pinix, disko, + aagl, #sops-nix, ... } @ inputs: let @@ -125,6 +135,7 @@ }; modules = [ + aagl.nixosModules.default { nixpkgs = { config = { @@ -143,6 +154,7 @@ dankMaterialShell = inputs.dankMaterialShell.packages.${system}.dankMaterialShell; pinix = inputs.pinix.packages.${system}.default; wine-cachyos = inputs.nix-gaming.packages.${system}.wine-cachyos; + proton-cachyos = inputs.proton-cachyos.packages.${system}.proton-cachyos; }) (final: prev: { inherit diff --git a/hosts/modules/aagl.nix b/hosts/modules/aagl.nix new file mode 100644 index 0000000..7d0abb1 --- /dev/null +++ b/hosts/modules/aagl.nix @@ -0,0 +1,10 @@ +{ + programs = { + anime-game-launcher.enable = true; + anime-games-launcher.enable = true; + honkers-railway-launcher.enable = true; + honkers-launcher.enable = true; + wavey-launcher.enable = true; + sleepy-launcher.enable = true; + }; +} diff --git a/hosts/modules/core.nix b/hosts/modules/core.nix index 421f5b6..ddac167 100644 --- a/hosts/modules/core.nix +++ b/hosts/modules/core.nix @@ -24,5 +24,6 @@ pinix cairo cabextract + xdg-utils ]; } diff --git a/hosts/modules/nixos.nix b/hosts/modules/nixos.nix index e5c21fb..a4149b8 100644 --- a/hosts/modules/nixos.nix +++ b/hosts/modules/nixos.nix @@ -15,6 +15,7 @@ "https://hyprland.cachix.org" "https://nix-community.cachix.org" "https://cache.nixos-cuda.org" + "https://ezkea.cachix.org" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" @@ -23,6 +24,7 @@ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" + "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; }; } diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix index 867197f..91b0c1d 100644 --- a/hosts/modules/steam.nix +++ b/hosts/modules/steam.nix @@ -5,6 +5,7 @@ # gamescopeSession.enable = true; extraCompatPackages = [ pkgs.proton-ge-bin + pkgs.proton-cachyos ]; }; programs.gamemode = { diff --git a/hosts/system-packages.nix b/hosts/system-packages.nix index 753d7a2..7582e67 100644 --- a/hosts/system-packages.nix +++ b/hosts/system-packages.nix @@ -34,6 +34,7 @@ ./modules/greeter.nix ./modules/go.nix ./modules/flatpak.nix + ./modules/aagl.nix ]; npm.enable = true; services.udisks2.enable = true;