cleanup and switched a few utilities

This commit is contained in:
nicco
2026-10-15 11:18:48 +02:00
parent fb87d4bc23
commit 286f10a303
6 changed files with 45 additions and 14 deletions
+2 -2
View File
@@ -6,13 +6,13 @@
# Utility # Utility
"alt-tab" "alt-tab"
"keka" "macpacker"
"keycastr" "keycastr"
"raycast"
"abue-ammar/tinycast/tinycast" "abue-ammar/tinycast/tinycast"
"ghostty" "ghostty"
"iina" "iina"
"cap" "cap"
"macusb"
# Dev # Dev
"sloth" "sloth"
-6
View File
@@ -7,12 +7,6 @@
}: }:
{ {
nix.enable = false; nix.enable = false;
nix.settings = {
experimental-features = "nix-command flakes";
substituters = [ "https://devenv.cachix.org" ];
trusted-public-keys = [ "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" ];
};
# Set Git commit hash for darwin-version. # Set Git commit hash for darwin-version.
system.configurationRevision = flake.rev or flake.dirtyRev or null; system.configurationRevision = flake.rev or flake.dirtyRev or null;
Generated
+37 -1
View File
@@ -20,6 +20,25 @@
"type": "github" "type": "github"
} }
}, },
"mole": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1792049451,
"narHash": "sha256-600ceEZVAFrwwbek3B+KdPlu+Q+/CM7Xn6XnadnXF6g=",
"owner": "tw93",
"repo": "mole",
"rev": "c5ca9f6900151fb402f9ec3eab4550f82a0e9ea6",
"type": "github"
},
"original": {
"owner": "tw93",
"ref": "main",
"repo": "mole",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -41,6 +60,22 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1791244311,
"narHash": "sha256-cy5PsNucfXU5+KtLR+S9/zdkWOUplhL5Xr0LQWhSYbs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2bd3427b41d10b8318383195efe502ed1baca6cd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-26.05-darwin",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1790390834, "lastModified": 1790390834,
"narHash": "sha256-StRyS/lFHtIw/UgJk+xo+HA66mtoWeDUbkJdvf2Byn4=", "narHash": "sha256-StRyS/lFHtIw/UgJk+xo+HA66mtoWeDUbkJdvf2Byn4=",
@@ -59,8 +94,9 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"mole": "mole",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
} }
} }
}, },
+4 -1
View File
@@ -9,6 +9,8 @@
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
mole.url = "github:tw93/mole/main";
}; };
outputs = outputs =
@@ -17,6 +19,7 @@
nix-darwin, nix-darwin,
nixpkgs, nixpkgs,
home-manager, home-manager,
mole,
}: }:
let let
hosts = import ./hosts; hosts = import ./hosts;
@@ -38,7 +41,7 @@
home-manager.backupFileExtension = "backup"; home-manager.backupFileExtension = "backup";
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${host.username} = import ./home/home.nix { inherit host; }; home-manager.users.${host.username} = import ./home/home.nix { inherit host mole; };
} }
]; ];
}; };
+2 -1
View File
@@ -1,4 +1,4 @@
{ host }: { host, mole }:
{ {
pkgs, pkgs,
lib, lib,
@@ -14,6 +14,7 @@ let
home.packages = home.packages =
common.home.packages common.home.packages
++ (import ./pkgs.nix { inherit pkgs; }) ++ (import ./pkgs.nix { inherit pkgs; })
++ [ mole.packages.${host.platform}.mole ]
++ ((lib.attrByPath [ "extras" "pkgs" ] (pkgs: [ ]) host) pkgs); ++ ((lib.attrByPath [ "extras" "pkgs" ] (pkgs: [ ]) host) pkgs);
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
-3
View File
@@ -7,7 +7,6 @@ with pkgs;
woff2 woff2
# Dev # Dev
devenv
nixpacks nixpacks
posting posting
opencode opencode
@@ -26,8 +25,6 @@ with pkgs;
nixd # Nix nixd # Nix
# Language specific # Language specific
nil
nixd
bun bun
zig zig
uv uv