From e0a0721dea2f2f01e51aeadc880e6269643cae80 Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Tue, 17 Dec 2024 19:25:58 +0300 Subject: [PATCH] pkgs: Flakify AAGL --- flake.lock | 158 ++++++++++++++-------- flake.nix | 4 +- home-manager/users/chest/home.nix | 1 - home-manager/users/chest/modules/aagl.nix | 11 -- nixos/hosts/Eclipse/configuration.nix | 1 + nixos/hosts/Eclipse/modules/aagl.nix | 5 + 6 files changed, 114 insertions(+), 66 deletions(-) delete mode 100644 home-manager/users/chest/modules/aagl.nix create mode 100644 nixos/hosts/Eclipse/modules/aagl.nix diff --git a/flake.lock b/flake.lock index b02441c..dc2d9d1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,28 @@ { "nodes": { + "aagl": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1733424266, + "narHash": "sha256-cBxteBDr4K4GdUr6ugitxkhcnNDxqoExyK9TVz1RhRQ=", + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "rev": "24e2f7bf68d27e25dd5997185a91d576cc1f409a", + "type": "github" + }, + "original": { + "owner": "ezKEa", + "repo": "aagl-gtk-on-nix", + "type": "github" + } + }, "ags": { "inputs": { "astal": "astal", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1731966249, @@ -21,7 +40,7 @@ }, "ags_2": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "systems": "systems_2" }, "locked": { @@ -94,7 +113,7 @@ }, "ayugram-desktop": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1731434367, @@ -194,6 +213,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -381,7 +416,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -487,7 +522,7 @@ "hyprpanel": { "inputs": { "ags": "ags_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1732080094, @@ -555,11 +590,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -613,7 +648,39 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1729880355, "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", @@ -629,7 +696,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1731676054, "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", @@ -645,33 +712,17 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_5": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "nixos", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -694,6 +745,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -709,7 +776,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1731531548, "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", @@ -725,25 +792,9 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -767,13 +818,14 @@ }, "root": { "inputs": { + "aagl": "aagl", "ags": "ags", "ayugram-desktop": "ayugram-desktop", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "hyprpanel": "hyprpanel", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable_2", "sops-nix": "sops-nix", "stylix": "stylix", @@ -782,7 +834,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1731954233, @@ -804,11 +856,11 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -926,7 +978,7 @@ "tlock": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1716429453, diff --git a/flake.nix b/flake.nix index 25bd15f..7147c5e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,15 +5,17 @@ extra-substituters = [ "https://cache.garnix.io" "https://hyprland.cachix.org" + "https://ezkea.cachix.org" ]; extra-trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; }; inputs = { - + aagl.url = "github:ezKEa/aagl-gtk-on-nix"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; sops-nix.url = "github:Mic92/sops-nix"; diff --git a/home-manager/users/chest/home.nix b/home-manager/users/chest/home.nix index 039dad3..aff61cf 100644 --- a/home-manager/users/chest/home.nix +++ b/home-manager/users/chest/home.nix @@ -5,7 +5,6 @@ ../../packages/desktop.nix ../../packages/art.nix - ./modules/aagl.nix ./modules/git.nix ./modules/hyprland.nix ./modules/style.nix diff --git a/home-manager/users/chest/modules/aagl.nix b/home-manager/users/chest/modules/aagl.nix deleted file mode 100644 index bf8c669..0000000 --- a/home-manager/users/chest/modules/aagl.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - aagl-gtk-on-nix = import ( - builtins.fetchTarball { - url = "https://github.com/ezKEa/aagl-gtk-on-nix/archive/main.tar.gz"; - sha256 = "14fnbcvmr1b8jkkjfbyarljwawgh3as9skdyvyc10b1nqh0641h0"; - } - ); -in -{ - home.packages = [ aagl-gtk-on-nix.the-honkers-railway-launcher ]; -} diff --git a/nixos/hosts/Eclipse/configuration.nix b/nixos/hosts/Eclipse/configuration.nix index 19fe6ce..99c381b 100644 --- a/nixos/hosts/Eclipse/configuration.nix +++ b/nixos/hosts/Eclipse/configuration.nix @@ -3,6 +3,7 @@ ./hardware-configuration.nix ./secrets/secrets.nix ./modules/grub.nix + ./modules/aagl.nix ../../packages.nix ../../modules/bundle.nix ../../modules/gamemode.nix diff --git a/nixos/hosts/Eclipse/modules/aagl.nix b/nixos/hosts/Eclipse/modules/aagl.nix new file mode 100644 index 0000000..1b6ede2 --- /dev/null +++ b/nixos/hosts/Eclipse/modules/aagl.nix @@ -0,0 +1,5 @@ +{ inputs, ... }: { + imports = [ inputs.aagl.nixosModules.default ]; + nix.settings = inputs.aagl.nixConfig; # Set up Cachix + programs.honkers-railway-launcher.enable = true; +}