working devShell!

This commit is contained in:
Charlie Root 2024-07-22 00:05:07 +02:00
commit 8e2371ddf6
11 changed files with 21 additions and 19 deletions

View file

@ -4,14 +4,16 @@
inputs.flake-parts.lib.mkFlake {inherit inputs;} ( inputs.flake-parts.lib.mkFlake {inherit inputs;} (
{withSystem, ...}: { {withSystem, ...}: {
systems = [ systems = [
"x86-64_linux" "x86_64-linux"
]; ];
imports = [ imports = [
inputs.treefmt-nix.flakeModule inputs.treefmt-nix.flakeModule
#./flake/pre-commit # inputs.flake-parts.flakeModules.easyOverlay
./flake/shell.nix # #./flake/pre-commit
./flake/fmt.nix ./parts/shell.nix
./parts/fmt.nix
]; ];
flake = { flake = {
nixosConfigurations = import ./hosts {inherit inputs withSystem;}; nixosConfigurations = import ./hosts {inherit inputs withSystem;};
}; };

View file

@ -13,7 +13,7 @@ in {
enable = true; enable = true;
clean.enable = true; clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3"; clean.extraArgs = "--keep-since 4d --keep 3";
flake = "/home/vali/repos/nichts"; flake = "/home/vali/projects/nichts";
}; };
}; };
} }

View file

@ -51,4 +51,3 @@ in {
# extraConfig = ./kakrc; # extraConfig = ./kakrc;
}; };
} }

View file

@ -1,4 +1,4 @@
_:{ _: {
programs.neovim-flake.settings.vim = { programs.neovim-flake.settings.vim = {
assistant.copilot = { assistant.copilot = {
enable = false; enable = false;

View file

@ -1,16 +1,15 @@
_:{ _: {
programs.neovim-flake.settings.vim = { programs.neovim-flake.settings.vim = {
autocomplete = { autocomplete = {
enable = true; enable = true;
type = "nvim-cmp"; type = "nvim-cmp";
mappings = { mappings = {
# close = "<C-e>"; # close = "<C-e>";
# confirm = "<tab>"; # confirm = "<tab>";
next = "<C-n>"; next = "<C-n>";
previous = "<C-p>"; previous = "<C-p>";
scrollDocsDown = "<C-j>"; scrollDocsDown = "<C-j>";
scrollDocsUp = "<C-k>"; scrollDocsUp = "<C-k>";
}; };
}; };
}; };

View file

@ -1,4 +1,4 @@
_:{ _: {
programs.neovim-flake.settings.vim = { programs.neovim-flake.settings.vim = {
binds = { binds = {
whichKey.enable = true; whichKey.enable = true;

View file

@ -3,7 +3,7 @@
in { in {
programs.neovim-flake.settings.vim = { programs.neovim-flake.settings.vim = {
notify = { notify = {
nvim-notify.enable = true; nvim-notify.enable = true;
}; };
}; };
} }

View file

@ -8,6 +8,7 @@
formatter = config.treefmt.build.wrapper; formatter = config.treefmt.build.wrapper;
treefmt = { treefmt = {
projectRootFile = "flake.nix"; projectRootFile = "flake.nix";
enableDefaultExcludes = true;
programs = { programs = {
alejandra.enable = true; alejandra.enable = true;

View file

@ -6,16 +6,17 @@
}: { }: {
devShells.default = pkgs.mkShellNoCC { devShells.default = pkgs.mkShellNoCC {
name = "nichts"; name = "nichts";
shellHook = ''
${config.pre-commit.installationScript}
'';
DIRENV_LOG_FORMAT = ""; DIRENV_LOG_FORMAT = "";
#inputsFrom = [config.treefmt.build.devShell]; inputsFrom = [config.treefmt.build.devShell];
packages = with pkgs; [ packages = [
config.treefmt.build.wrapper # treewide formatter config.treefmt.build.wrapper # treewide formatter
nil # nix language server pkgs.git # take a guess
alejandra
git # take a guess
statix # no idea
deadnix # clean up unused nix code
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "update"; name = "update";