Skip to content

Commit

Permalink
Update flake.lock (#131)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
simonrw and github-actions[bot] authored Jul 8, 2024
1 parent f6fc6c0 commit 6078a9b
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 69 deletions.
94 changes: 39 additions & 55 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
flake-utils,
home-manager,
jetbrains-updater,
nix-index-database,
vscode-server,
cert-info,
nur,
Expand All @@ -72,7 +71,6 @@
keymapp = final.callPackage ./derivations/keymapp {pkgs = final;};
listprojects = final.callPackage ./derivations/listprojects {};
notify-wrapper = final.callPackage ./derivations/notify-wrapper {};
database = nix-index-database.legacyPackages.${system}.database;
monaspace = final.callPackage ./derivations/monaspace {};
ansi = final.callPackage ./derivations/ansi {};
wally = final.callPackage ./derivations/wally {};
Expand Down Expand Up @@ -142,10 +140,10 @@
imports = [
./home/home.nix
nixvim.homeManagerModules.nixvim
inputs.nix-index-database.hmModules.nix-index
];
};
}
nix-index-database.nixosModules.nix-index
vscode-server.nixosModule
({
config,
Expand Down Expand Up @@ -197,10 +195,10 @@
imports = [
./home/home.nix
nixvim.homeManagerModules.nixvim
inputs.nix-index-database.hmModules.nix-index
];
};
}
nix-index-database.darwinModules.nix-index
];
};
};
Expand All @@ -220,6 +218,7 @@
modules = [
./home/home.nix
nixvim.homeManagerModules.nixvim
inputs.nix-index-database.hmModules.nix-index
];
# stop infinite recusion when trying to access
# pkgs.stdenv.is{Linux,Darwin} from within a module
Expand Down
11 changes: 4 additions & 7 deletions home/nix-index.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# add symlink to nix-index database
{
lib,
pkgs,
config,
...
}: {
home.file."${config.xdg.cacheHome}/nix-index/files".source = pkgs.database;
programs = {
nix-index-database.comma.enable = true;
nix-index.enable = true;
};
}
1 change: 0 additions & 1 deletion home/packages/simon.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ in {
bat
cachix
cert-info
comma
curlie
custom-curl
devenv
Expand Down
2 changes: 1 addition & 1 deletion minimal/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ in {
../home/fzf.nix
../home/jq.nix
../home/nixvim
../home/nix-index.nix
# ../home/nix-index.nix
../home/tmux.nix
../home/git/global.nix
];
Expand Down
1 change: 0 additions & 1 deletion system/darwin/mba/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

programs.fish.enable = true;
programs.zsh.enable = true;
programs.nix-index.enable = true;
programs.gnupg.agent.enable = true;

system.keyboard.enableKeyMapping = true;
Expand Down

0 comments on commit 6078a9b

Please sign in to comment.