Compare commits

...

4 Commits

Author SHA1 Message Date
76061f4919 gemini-cli -> antigravity-cli 2026-05-25 08:20:48 +00:00
159daf0630 Move from legacyPackages to proper import 2026-05-25 08:17:19 +00:00
82419c57ad Move allowUnfree to all of homes
Eventually for antigravity-cli
2026-05-25 08:10:12 +00:00
6df89b4b06 Allow access to KVM 2026-05-25 07:52:24 +00:00
6 changed files with 60 additions and 12 deletions

3
.gitignore vendored
View File

@@ -6,3 +6,6 @@ result
# nix pre-commit autogenerated by devShell # nix pre-commit autogenerated by devShell
/.pre-commit-config.yaml /.pre-commit-config.yaml
# agy sessions
.antigravitycli

29
flake.lock generated
View File

@@ -204,11 +204,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779507042, "lastModified": 1779678629,
"narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=", "narHash": "sha256-gHcIFg0mm+KFsg7iZQt67kni3+qR5U3PhEC9P7vKlZ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34", "rev": "612bbe3b405ad5f71d7bf9edecc04b678a061652",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -252,11 +252,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1779357205, "lastModified": 1779508470,
"narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", "narHash": "sha256-Ap9KJX+5xHIn3bPIpfNgT6MEXdAECECwo4/rmlQD74M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", "rev": "29916453413845e54a65b8a1cf996842300cd299",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -266,6 +266,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1779694939,
"narHash": "sha256-Ly4j75O8ICaSQx3uxPnwk2x7PMF0XQvn5r0c3yBA7FI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f9d8b65950353691ab56561e7c73d2e1063d810b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
@@ -275,6 +291,7 @@
"jail-nix": "jail-nix", "jail-nix": "jail-nix",
"nix-homebrew": "nix-homebrew", "nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"systems": "systems_2", "systems": "systems_2",
"vscode-server": "vscode-server" "vscode-server": "vscode-server"
} }

View File

@@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@@ -32,6 +33,7 @@
{ {
self, self,
nixpkgs, nixpkgs,
nixpkgs-master,
systems, systems,
home-manager, home-manager,
vscode-server, vscode-server,
@@ -40,6 +42,17 @@
}@inputs: }@inputs:
let let
eachSystem = nixpkgs.lib.genAttrs (import systems); eachSystem = nixpkgs.lib.genAttrs (import systems);
overlay-master = _: prev: {
inherit
(import nixpkgs-master {
system = prev.stdenv.hostPlatform.system;
config = {
allowUnfree = true;
};
})
antigravity-cli
;
};
in in
{ {
checks = eachSystem (system: { checks = eachSystem (system: {
@@ -64,7 +77,10 @@
}; };
homeConfigurations."artem@deimos" = home-manager.lib.homeManagerConfiguration { homeConfigurations."artem@deimos" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = import nixpkgs {
system = "x86_64-linux";
overlays = [ overlay-master ];
};
extraSpecialArgs.primaryUser = "artem"; extraSpecialArgs.primaryUser = "artem";
modules = [ modules = [
inputs.fw_nix.nixosModules.identities inputs.fw_nix.nixosModules.identities
@@ -75,7 +91,10 @@
}; };
homeConfigurations."artem@mars" = home-manager.lib.homeManagerConfiguration { homeConfigurations."artem@mars" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-darwin; pkgs = import nixpkgs {
system = "x86_64-darwin";
overlays = [ overlay-master ];
};
extraSpecialArgs = { extraSpecialArgs = {
primaryUser = "artem"; primaryUser = "artem";
}; };
@@ -98,6 +117,9 @@
inputs.fw_nix.nixosModules.futureware inputs.fw_nix.nixosModules.futureware
inputs.nix-homebrew.darwinModules.nix-homebrew inputs.nix-homebrew.darwinModules.nix-homebrew
./hosts/mars/darwin.nix ./hosts/mars/darwin.nix
(_: {
nixpkgs.overlays = [ overlay-master ];
})
]; ];
}; };
@@ -117,6 +139,9 @@
inputs.fw_nix.nixosModules.sshd inputs.fw_nix.nixosModules.sshd
inputs.fw_nix.nixosModules.futureware inputs.fw_nix.nixosModules.futureware
./hosts/deimos/nixos.nix ./hosts/deimos/nixos.nix
(_: {
nixpkgs.overlays = [ overlay-master ];
})
]; ];
}; };

View File

@@ -15,6 +15,7 @@ in
extraGroups = [ extraGroups = [
"wheel" "wheel"
"docker" "docker"
"kvm"
]; ];
openssh.authorizedKeys.keys = identities.getAccessKeys { user = primaryUser; }; openssh.authorizedKeys.keys = identities.getAccessKeys { user = primaryUser; };
shell = pkgs.zsh; shell = pkgs.zsh;
@@ -30,8 +31,8 @@ in
home-assistant-cli home-assistant-cli
yt-dlp yt-dlp
# jailed-gemini --yolo # jailed-agy --yolo
(jail "jailed-gemini" pkgs.gemini-cli ( (jail "jailed-agy" pkgs.antigravity-cli (
with jail.combinators; with jail.combinators;
[ [
network network

View File

@@ -7,13 +7,16 @@
}: }:
{ {
home.username = primaryUser; home.username = primaryUser;
nixpkgs.config.allowUnfree = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
stow stow
wget wget
gemini-cli antigravity-cli
silver-searcher silver-searcher
yubikey-manager yubikey-manager
]; ];
home.activation.stowLegacy = lib.hm.dag.entryAfter [ "writeBoundary" ] '' home.activation.stowLegacy = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
if [ -d "$HOME/dotfiles/legacy" ]; then if [ -d "$HOME/dotfiles/legacy" ]; then
run ${pkgs.stow}/bin/stow -d $HOME/dotfiles -t $HOME legacy run ${pkgs.stow}/bin/stow -d $HOME/dotfiles -t $HOME legacy

View File

@@ -79,6 +79,5 @@
# -> set system.defaults.NSGlobalDomain # -> set system.defaults.NSGlobalDomain
# or system.defaults.CustomSystemPreferences # or system.defaults.CustomSystemPreferences
nixpkgs.config.allowUnfree = true;
programs.vscode.enable = true; programs.vscode.enable = true;
} }