luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-11 21:53:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of github.com:JulienMalka/nix-config

Browse source
This commit is contained in:
Luj 2023-04-06 22:42:04 +02:00
commit d6d83122b2
Signed by: luj
GPG key ID: 6FC74C847011FD83
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -60,10 +60,8 @@
}; };
outputs = { self, home-manager, nixpkgs, unstable, deploy-rs, sops-nix, nixos-apple-silicon, ... }@inputs: outputs = { self, nixpkgs, deploy-rs, ... }@inputs:
let let
pkgs = import nixpkgs { system = "x86_64-linux"; };
pkgsrpi = import nixpkgs { system = "aarch64-linux"; };
lib = nixpkgs.lib.extend (import ./lib inputs); lib = nixpkgs.lib.extend (import ./lib inputs);
machines_plats = lib.mapAttrsToList (name: value: value.arch) lib.luj.machines; machines_plats = lib.mapAttrsToList (name: value: value.arch) lib.luj.machines;
@ -74,7 +72,6 @@
}) })
machines_plats); machines_plats);
in in
with lib;
rec { rec {
nixosModules = builtins.listToAttrs (map nixosModules = builtins.listToAttrs (map
(x: { (x: {

17
home-manager-modules/neovim/default.nix
View file

@ -40,10 +40,14 @@ with lib;
}; };
nix = { nix = {
command = "rnix-lsp"; command = "nil";
filetypes = [ filetypes = [ "nix" ];
"nix" rootPatterns = [ "flake.nix" ];
]; settings = {
nil = {
formatting = { command = [ "nixpkgs-fmt" ]; };
};
};
}; };
}; };
}; };
@ -51,9 +55,6 @@ with lib;
withPython3 = true; withPython3 = true;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
# LSP
nvim-lspconfig
plenary-nvim plenary-nvim
#Telescope #Telescope
@ -90,7 +91,7 @@ with lib;
rust-vim rust-vim
]; ];
extraPackages = with pkgs; [ rust-analyzer rnix-lsp pyright haskell-language-server ]; extraPackages = with pkgs; [ rust-analyzer pkgs.unstable.nil pyright haskell-language-server nixpkgs-fmt ];
extraConfig = '' extraConfig = ''
luafile ${./settings.lua} luafile ${./settings.lua}