diff --git a/flake.lock b/flake.lock
index 092cb02..ceebed3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
{
"nodes": {
+ "aagl": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1726324232,
+ "narHash": "sha256-bBqhp8YBkdKRiJQ8+uV6+u+IzlsVpZXEN5h0VQUq4xo=",
+ "owner": "ezKEa",
+ "repo": "aagl-gtk-on-nix",
+ "rev": "a66a0ed113e3dccd9f3f1f9a18ca6b369629cb59",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ezKEa",
+ "repo": "aagl-gtk-on-nix",
+ "type": "github"
+ }
+ },
"anyrun": {
"inputs": {
"flake-parts": "flake-parts",
@@ -22,6 +43,27 @@
"type": "github"
}
},
+ "crane": {
+ "inputs": {
+ "nixpkgs": [
+ "lanzaboote",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1721842668,
+ "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
+ "owner": "ipetkov",
+ "repo": "crane",
+ "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
+ "type": "github"
+ },
+ "original": {
+ "owner": "ipetkov",
+ "repo": "crane",
+ "type": "github"
+ }
+ },
"devshell": {
"inputs": {
"nixpkgs": [
@@ -64,6 +106,38 @@
}
},
"flake-compat": {
+ "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_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": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -99,6 +173,27 @@
}
},
"flake-parts_2": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "lanzaboote",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1719994518,
+ "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
@@ -163,7 +258,7 @@
"nixvim",
"flake-compat"
],
- "gitignore": "gitignore",
+ "gitignore": "gitignore_2",
"nixpkgs": [
"nixvim",
"nixpkgs"
@@ -188,6 +283,28 @@
}
},
"gitignore": {
+ "inputs": {
+ "nixpkgs": [
+ "lanzaboote",
+ "pre-commit-hooks-nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "gitignore_2": {
"inputs": {
"nixpkgs": [
"nixvim",
@@ -250,6 +367,31 @@
"type": "github"
}
},
+ "lanzaboote": {
+ "inputs": {
+ "crane": "crane",
+ "flake-compat": "flake-compat_2",
+ "flake-parts": "flake-parts_2",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "pre-commit-hooks-nix": "pre-commit-hooks-nix",
+ "rust-overlay": "rust-overlay"
+ },
+ "locked": {
+ "lastModified": 1725379389,
+ "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=",
+ "owner": "nix-community",
+ "repo": "lanzaboote",
+ "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "lanzaboote",
+ "type": "github"
+ }
+ },
"nix-darwin": {
"inputs": {
"nixpkgs": [
@@ -287,6 +429,22 @@
"type": "github"
}
},
+ "nixpkgs-stable": {
+ "locked": {
+ "lastModified": 1720386169,
+ "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-24.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs_2": {
"locked": {
"lastModified": 1724819573,
@@ -306,8 +464,8 @@
"nixvim": {
"inputs": {
"devshell": "devshell",
- "flake-compat": "flake-compat",
- "flake-parts": "flake-parts_2",
+ "flake-compat": "flake-compat_3",
+ "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
@@ -353,18 +511,68 @@
"type": "github"
}
},
+ "pre-commit-hooks-nix": {
+ "inputs": {
+ "flake-compat": [
+ "lanzaboote",
+ "flake-compat"
+ ],
+ "gitignore": "gitignore",
+ "nixpkgs": [
+ "lanzaboote",
+ "nixpkgs"
+ ],
+ "nixpkgs-stable": "nixpkgs-stable"
+ },
+ "locked": {
+ "lastModified": 1721042469,
+ "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
+ "aagl": "aagl",
"anyrun": "anyrun",
"disko": "disko",
"flatpaks": "flatpaks",
"home-manager": "home-manager",
+ "lanzaboote": "lanzaboote",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
"satisfactory-server": "satisfactory-server",
"stablepkgs": "stablepkgs"
}
},
+ "rust-overlay": {
+ "inputs": {
+ "nixpkgs": [
+ "lanzaboote",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1722219664,
+ "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
"satisfactory-server": {
"inputs": {
"nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 8ae2ca7..bf303f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
aagl = {
- url = "github.ezKEa/aagl-gtk-on-nix";
+ url = "github:ezKEa/aagl-gtk-on-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -63,12 +63,13 @@
./modules/nh.nix
./modules/waydroid.nix
./modules/packages.nix
-# ./modules/aagl.nix
-# inputs.aagl.nixosModules.default
+ ./modules/aagl.nix
+ inputs.aagl.nixosModules.default
inputs.lanzaboote.nixosModules.lanzaboote
-# { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
+ { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects
+
# Imports home-manager module for use within nixos, not reccomended for use WITH standalone version
-# inputs.home-manager.nixosModules.default
+# inputs.home-manager.nixosModules.default
];
};
nixosConfigurations.biggerpi = nixpkgs.lib.nixosSystem {
diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix
index 4559c07..20bf98b 100644
--- a/hosts/gabbielaptop/configuration.nix
+++ b/hosts/gabbielaptop/configuration.nix
@@ -12,7 +12,7 @@
];
# Bootloader.
- boot.loader.efi.canTouchEfiVariables = true;
+# boot.loader.efi.canTouchEfiVariables = true;
boot = {
initrd.systemd.enable = true;
@@ -39,8 +39,6 @@
boot.initrd.kernelModules = [ "amdgpu" ];
- boot.bootspec.enabled = true;
-
networking.hostName = "gabbielaptop"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.