diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | flake.nix | 10 | ||||
| m--------- | mut/dwmblocks | 0 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/init.fnl | 1 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/pkgs/lspconfig.fnl | 7 | ||||
| m--------- | mut/st | 0 | ||||
| -rw-r--r-- | overlays/suckless.nix | 3 |
7 files changed, 23 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index d58b6d9..71ca6ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "mut/dwm"] path = mut/dwm - url = https://github.com/mvinkio/dwm + url = git@github.com:ivi-vink/dwm.git [submodule "mut/st"] path = mut/st - url = https://github.com/mvinkio/st + url = git@github.com:ivi-vink/st.git [submodule "mut/dwmblocks"] path = mut/dwmblocks - url = https://github.com/mvinkio/dwmblocks + url = git@github.com:ivi-vink/dwmblocks.git @@ -42,6 +42,16 @@ ]))); }; + nixosConfigurations.core = inputs: extraModules: nixpkgs.lib.nixosSystem { + inherit lib system; + specialArgs = {inherit inputs;}; + modules = extraModules ++ [ + ] ++ (attrValues + (attrsets.mergeAttrsList (map modulesIn [ + ./profiles/core + ]))); + }; + nixosModules.core = { ... }: { imports = [ ({config, ... }: { diff --git a/mut/dwmblocks b/mut/dwmblocks deleted file mode 160000 -Subproject 50f519c335008abe52bab6a21db09df14076e36 diff --git a/mut/neovim/fnl/conf/init.fnl b/mut/neovim/fnl/conf/init.fnl index 80393c5..62c74a9 100644 --- a/mut/neovim/fnl/conf/init.fnl +++ b/mut/neovim/fnl/conf/init.fnl @@ -7,6 +7,7 @@ (require :conf.settings) (require :conf.pkgs) (require :conf.nix-develop) +(require :conf.diagnostic) (tset _G :P (lambda [...] (let [inspected (icollect [_ v (ipairs [...])] diff --git a/mut/neovim/fnl/conf/pkgs/lspconfig.fnl b/mut/neovim/fnl/conf/pkgs/lspconfig.fnl index 8a0bdce..f90339e 100644 --- a/mut/neovim/fnl/conf/pkgs/lspconfig.fnl +++ b/mut/neovim/fnl/conf/pkgs/lspconfig.fnl @@ -2,6 +2,13 @@ (local configs (require :lspconfig.configs)) (local {: attach} (require :conf.lsp)) +(lspconfig.rust_analyzer.setup + {:root_dir + (lspconfig.util.root_pattern + :.git + (vim.fn.getcwd)) + :on_attach attach}) + (lspconfig.pyright.setup {:root_dir (lspconfig.util.root_pattern :.git (vim.fn.getcwd)) :on_attach attach}) diff --git a/mut/st b/mut/st -Subproject e03a7d3f0b6bf4028389a82d372d0f89a922b9d +Subproject e0b285014d599ac4ee60f5d905884d8c6bb85ad diff --git a/overlays/suckless.nix b/overlays/suckless.nix index be12405..6f5b110 100644 --- a/overlays/suckless.nix +++ b/overlays/suckless.nix @@ -1,6 +1,7 @@ {pkgs, home, ...}: (final: prev: { st = (prev.st.overrideAttrs (oldAttrs: rec { src = /. + home + "/flake/mut/st"; + version = "0.1.0"; buildInputs = oldAttrs.buildInputs ++ [prev.harfbuzz]; })); dwm = (prev.dwm.overrideAttrs (oldAttrs: rec { @@ -8,7 +9,7 @@ })); dwmblocks =(prev.stdenv.mkDerivation rec { pname = "dwmblocks"; - version = "1.0"; + version = "1.1.2"; src = /. + home + "/flake/mut/dwmblocks"; buildInputs = [prev.xorg.libX11]; installPhase = '' |