add homebrew and fix jj
This commit is contained in:
42
flake.lock
generated
42
flake.lock
generated
@@ -1,5 +1,22 @@
|
||||
{
|
||||
"nodes": {
|
||||
"brew-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1761551821,
|
||||
"narHash": "sha256-N3Zj73TAxclhLGgADbPVwcVrhYIBKUgAxjfQuOXre6s=",
|
||||
"owner": "Homebrew",
|
||||
"repo": "brew",
|
||||
"rev": "8f6719274133c5bcc24c058c5a6bcbb3b0cd48b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Homebrew",
|
||||
"ref": "4.6.19",
|
||||
"repo": "brew",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"clan-core": {
|
||||
"inputs": {
|
||||
"data-mesher": "data-mesher",
|
||||
@@ -141,11 +158,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762183399,
|
||||
"narHash": "sha256-vr2aL1QLfERYTfYBgK8cW3T9eSdSEThH462wKaGlmEU=",
|
||||
"lastModified": 1762228452,
|
||||
"narHash": "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a5fee077929ae2f2800c3087dce5e1abb4edfbc6",
|
||||
"rev": "aa6936bb637e46a49cf1292486200ba41dd4bcf7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -203,6 +220,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-homebrew": {
|
||||
"inputs": {
|
||||
"brew-src": "brew-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761927470,
|
||||
"narHash": "sha256-KsFDGRGD8j1R6TvJ4HkebKsh3HXLY0XazanLrhO3wqE=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "nix-homebrew",
|
||||
"rev": "3cae36b3a17b09a66435291619dce8cf2c4728ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "zhaofengli",
|
||||
"repo": "nix-homebrew",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-select": {
|
||||
"locked": {
|
||||
"lastModified": 1755887746,
|
||||
@@ -295,6 +330,7 @@
|
||||
"inputs": {
|
||||
"clan-core": "clan-core",
|
||||
"home-manager": "home-manager",
|
||||
"nix-homebrew": "nix-homebrew",
|
||||
"nixpkgs": [
|
||||
"clan-core",
|
||||
"nixpkgs"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
inputs.clan-core.url = "https://git.yadunut.dev/yadunut/clan-core/archive/main.tar.gz";
|
||||
inputs.nixpkgs.follows = "clan-core/nixpkgs";
|
||||
inputs.nix-homebrew.url = "github:zhaofengli/nix-homebrew";
|
||||
inputs.home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "clan-core/nixpkgs";
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
inputs.home-manager.darwinModules.home-manager
|
||||
inputs.nix-homebrew.darwinModules.nix-homebrew
|
||||
../../modules/common/sane-defaults
|
||||
../../modules/common/users
|
||||
];
|
||||
@@ -17,6 +17,12 @@
|
||||
sane-defaults.enable = true;
|
||||
};
|
||||
|
||||
nix-homebrew = {
|
||||
enable = true;
|
||||
user = "yadunut";
|
||||
autoMigrate = true;
|
||||
};
|
||||
|
||||
# # Home Manager configuration
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.yadunut = {
|
||||
@@ -36,7 +42,6 @@
|
||||
"1password"
|
||||
"1password-cli"
|
||||
"calibre"
|
||||
"cardhop"
|
||||
"coconutbattery"
|
||||
"daisydisk"
|
||||
"darktable"
|
||||
@@ -83,10 +88,8 @@
|
||||
|
||||
fonts.packages = [ pkgs.jetbrains-mono ];
|
||||
|
||||
security.pam.services.sudo_local.touchIdAuth = true;
|
||||
|
||||
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||
clan.core.networking.targetHost = "root@localhost";
|
||||
nix.enable = false; # since we're using nix darwin
|
||||
nix.enable = false; # since we're using nix darwin and determinate nix
|
||||
system.stateVersion = 6;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ let
|
||||
dock.autohide = true;
|
||||
dock.autohide-delay = 0.0;
|
||||
};
|
||||
security.pam.services.sudo_local.touchIdAuth = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -27,9 +27,7 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
home.packages = with pkgs; [
|
||||
git
|
||||
lazygit
|
||||
jujutsu
|
||||
delta
|
||||
];
|
||||
|
||||
@@ -133,7 +131,7 @@ in
|
||||
"@-"
|
||||
];
|
||||
};
|
||||
ui.default-command = "log";
|
||||
ui.default-command = ["log" "--no-pager"];
|
||||
};
|
||||
};
|
||||
programs.gh.enable = true;
|
||||
|
||||
Reference in New Issue
Block a user