mirror of
https://github.com/willemml/dotfiles.nix.git
synced 2025-04-12 11:17:17 +00:00
Enables cachix, fixes comma with sudo
This commit is contained in:
parent
821e873d1f
commit
ef0d9f0bf7
8 changed files with 35 additions and 10 deletions
10
flake.lock
generated
10
flake.lock
generated
|
@ -223,15 +223,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699156599,
|
||||
"narHash": "sha256-Qk9ZE/pG9lNIGUVNArJxL0Hc0Soa92eQPPIhcDwWinU=",
|
||||
"owner": "Mic92",
|
||||
"lastModified": 1699760693,
|
||||
"narHash": "sha256-u/gkNUHQR/q23voqE5J4xmEWQIAqR+g3lUnCtzn0k7Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "5388a4002179d6778d212dc2fdcc7ac3fdbd5b65",
|
||||
"rev": "8aff4ca3dee60d1422489fe8d52c2f837b3ad113",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Mic92",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
nix-github-actions.url = "github:nix-community/nix-github-actions";
|
||||
|
|
|
@ -34,7 +34,6 @@ in {
|
|||
cachix
|
||||
clang-tools
|
||||
cmake
|
||||
comma
|
||||
coreutils
|
||||
curl
|
||||
docker
|
||||
|
|
|
@ -12,6 +12,8 @@
|
|||
];
|
||||
|
||||
programs = {
|
||||
nix-index-database.comma.enable = true;
|
||||
|
||||
bash.enableCompletion = true;
|
||||
|
||||
direnv = {
|
||||
|
|
|
@ -1,8 +1,15 @@
|
|||
{pkgs, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../common/system.nix
|
||||
../modules/nix/link-inputs.nix
|
||||
../modules/nix/optimise.nix
|
||||
../modules/nix/use-flake-pkgs.nix
|
||||
../modules/nix/cachix.nix
|
||||
../modules/comma.nix
|
||||
../users/willem/home/darwin.nix
|
||||
../modules/yabai/default.nix
|
||||
../modules/yabai/scripting-additions.nix
|
||||
|
|
5
nixos/modules/comma.nix
Normal file
5
nixos/modules/comma.nix
Normal file
|
@ -0,0 +1,5 @@
|
|||
{inputs, ...}: {
|
||||
imports = [inputs.nix-index-database.nixosModules.nix-index];
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
programs.command-not-found.enable = false;
|
||||
}
|
12
nixos/modules/nix/cachix.nix
Normal file
12
nixos/modules/nix/cachix.nix
Normal file
|
@ -0,0 +1,12 @@
|
|||
{...}: {
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://willemml.cachix.org"
|
||||
"https://nix-community.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"willemml.cachix.org-1:A8M1pBOuBmA6f4Pq4+VNO0r4Joi2I3DZI72V3U+YnKg="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
};
|
||||
}
|
|
@ -8,6 +8,8 @@
|
|||
../../common/system.nix
|
||||
../modules/nix/use-flake-pkgs.nix
|
||||
../modules/nix/optimise.nix
|
||||
../modules/nix/cachix.nix
|
||||
../modules/comma.nix
|
||||
../users/willem/linux.nix
|
||||
];
|
||||
|
||||
|
@ -26,8 +28,6 @@
|
|||
}
|
||||
'';
|
||||
|
||||
programs.command-not-found.enable = false;
|
||||
|
||||
services.udev.enable = true;
|
||||
|
||||
services.openssh.enable = true;
|
||||
|
|
Loading…
Add table
Reference in a new issue