summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock70
-rw-r--r--flake.nix6
-rw-r--r--hosts/gheshki/home.nix5
-rw-r--r--hosts/mentat/home.nix2
-rw-r--r--modules/dev-tools.nix2
5 files changed, 81 insertions, 4 deletions
diff --git a/flake.lock b/flake.lock
index b5f994c..78cc1ef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,6 +18,24 @@
"type": "github"
}
},
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_2"
+ },
+ "locked": {
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs"
@@ -37,6 +55,25 @@
"type": "github"
}
},
+ "nixgl": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "nixpkgs_2"
+ },
+ "locked": {
+ "lastModified": 1762090880,
+ "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
+ "owner": "nix-community",
+ "repo": "nixGL",
+ "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nixGL",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1772465433,
@@ -55,6 +92,21 @@
},
"nixpkgs_2": {
"locked": {
+ "lastModified": 1746378225,
+ "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "93e8cdce7afc64297cfec447c311470788131cd9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1772822230,
"narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
"owner": "NixOS",
@@ -73,7 +125,8 @@
"inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs_2",
+ "nixgl": "nixgl",
+ "nixpkgs": "nixpkgs_3",
"unstable": "unstable"
}
},
@@ -92,6 +145,21 @@
"type": "github"
}
},
+ "systems_2": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"unstable": {
"locked": {
"lastModified": 1772773019,
diff --git a/flake.nix b/flake.nix
index 07234b8..68ba540 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,9 +12,12 @@
flake-utils = {
url = "github:numtide/flake-utils";
};
+ nixgl = {
+ url = "github:nix-community/nixGL";
+ };
};
- outputs = { self, nixpkgs, home-manager, unstable, flake-utils, ... }:
+ outputs = { self, nixpkgs, home-manager, unstable, flake-utils, nixgl, ... }:
let
mkExtraArgs = system: {
unstablePkgs = import unstable {
@@ -34,6 +37,7 @@
mkHostConfig = { hostname, system ? "aarch64-darwin" }: {
pkgs = import nixpkgs {
inherit system;
+ overlays = [ nixgl.overlay ];
config = {
allowUnfree = false;
};
diff --git a/hosts/gheshki/home.nix b/hosts/gheshki/home.nix
index 0483e4f..89dddfb 100644
--- a/hosts/gheshki/home.nix
+++ b/hosts/gheshki/home.nix
@@ -5,6 +5,7 @@
, unstableUnfreePkgs
, userOptions
, lib
+, nixgl
, ...
}:
{
@@ -16,5 +17,9 @@
"${userOptions.userHome}/.local/share/coursier/bin"
];
+ home.packages = [
+ pkgs.nixgl.nixGLIntel
+ ];
+
programs.alacritty.settings.font.size = lib.mkForce 8;
}
diff --git a/hosts/mentat/home.nix b/hosts/mentat/home.nix
index 9b17042..3351cbe 100644
--- a/hosts/mentat/home.nix
+++ b/hosts/mentat/home.nix
@@ -16,8 +16,6 @@
];
home.packages = [
- pkgs.alacritty
pkgs.stats
- pkgs.zed-editor
];
}
diff --git a/modules/dev-tools.nix b/modules/dev-tools.nix
index ea1056c..38db196 100644
--- a/modules/dev-tools.nix
+++ b/modules/dev-tools.nix
@@ -7,6 +7,7 @@
}:
{
home.packages = with pkgs; [
+ alacritty
coursier
curl
cvc4
@@ -30,6 +31,7 @@
wget
z3
zsh
+ zed-editor
unfreePkgs.claude-code
];