diff options
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/pkgs/lspconfig.fnl | 4 | ||||
| -rw-r--r-- | profiles/station/suckless.nix | 4 |
3 files changed, 7 insertions, 8 deletions
@@ -23,17 +23,14 @@ let system = "x86_64-linux"; pkgs = import nixpkgs {inherit system;}; - lib = (nixpkgs.lib.extend (_: _: home-manager.lib)).extend (import ./lib self); + lib = (nixpkgs.lib.extend (_: _: home-manager.lib)).extend (import ./ivi self); # Gets module from ./machines/ and uses the lib to define which other modules # the machine needs. - # let - # machine = ivi.machines.${name}; - # in mkSystem = machine: machineConfig: with lib; lib.nixosSystem { inherit lib system; - specialArgs = {inherit machine inputs;}; + specialArgs = {inherit self machine inputs;}; modules = with lib; machine.modules ++ machineConfig diff --git a/mut/neovim/fnl/conf/pkgs/lspconfig.fnl b/mut/neovim/fnl/conf/pkgs/lspconfig.fnl index 64220b9..82ca385 100644 --- a/mut/neovim/fnl/conf/pkgs/lspconfig.fnl +++ b/mut/neovim/fnl/conf/pkgs/lspconfig.fnl @@ -5,7 +5,9 @@ (lspconfig.rust_analyzer.setup {:settings {:rust-analyzer - {:cargo {:features [:ssr]}}} + {:cargo {:buildScripts {:enable true}} + :procMacro {:enable true :attributes {:enable true}} + :inlayHints {:enable true}}} :root_dir (lspconfig.util.root_pattern :.git diff --git a/profiles/station/suckless.nix b/profiles/station/suckless.nix index abdaf54..e991e9d 100644 --- a/profiles/station/suckless.nix +++ b/profiles/station/suckless.nix @@ -1,12 +1,12 @@ { - flake, + self, config, pkgs, suckless, lib, ... }: with lib; { - nixpkgs.overlays = [(import ./overlays/suckless.nix {inherit pkgs; home = config.ivi.home;})]; + nixpkgs.overlays = [(import (self + "/overlays/suckless.nix") {inherit pkgs; home = config.ivi.home;})]; hm = { xsession = { enable = true; |