From 15436567c666403e8d36f985b171b875cee8a8ed Mon Sep 17 00:00:00 2001 From: Nikos Papadakis Date: Fri, 3 Jan 2025 22:28:41 +0200 Subject: [PATCH] stuff --- flake.nix | 19 ++++++++++++---- home.nix | 25 ++++++++++++--------- nvim/lazy-lock.json | 40 +++++++++++++++++----------------- nvim/lua/plugins/lspconfig.lua | 8 +++---- 4 files changed, 53 insertions(+), 39 deletions(-) diff --git a/flake.nix b/flake.nix index d4011df..eaed5f5 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,15 @@ }; }; - outputs = { nixpkgs, home-manager, flake-utils, ... }@inputs: - flake-utils.lib.eachDefaultSystem (system: + outputs = + { + nixpkgs, + home-manager, + flake-utils, + ... + }@inputs: + flake-utils.lib.eachDefaultSystem ( + system: let user = "nikos"; # change your user here dotfilesHome = "/home/${user}/.dotfiles"; # specify your dotfiles path @@ -24,6 +31,7 @@ ]; in { + formatter = pkgs.nixfmt-rfc-style; packages.homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { inherit pkgs; @@ -34,7 +42,10 @@ ./home.nix ]; - extraSpecialArgs = { extra = { inherit user dotfilesHome; }; }; + extraSpecialArgs = { + extra = { inherit user dotfilesHome; }; + }; }; - }); + } + ); } diff --git a/home.nix b/home.nix index 3a77b21..b789837 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, extra, ... }: +{ + config, + pkgs, + lib, + extra, + ... +}: let symlink = path: config.lib.file.mkOutOfStoreSymlink "/home/${extra.user}/.dotfiles/${path}"; in @@ -33,7 +39,6 @@ in fd # find alternative, used by nvim lsd # "ls" alternative zoxide # "z" command - nerd-fonts.jetbrains-mono devenv devbox ]; @@ -58,13 +63,13 @@ in programs.fish = { enable = true; - shellInit = lib.strings.concatStringsSep "\n" ([ - (builtins.readFile ./fish/config.fish) - ] ++ lib.attrsets.mapAttrsToList - ( - name: value: builtins.readFile (./fish/functions + ("/" + name)) + shellInit = lib.strings.concatStringsSep "\n" ( + [ + (builtins.readFile ./fish/config.fish) + ] + ++ lib.attrsets.mapAttrsToList (name: value: builtins.readFile (./fish/functions + ("/" + name))) ( + builtins.readDir ./fish/functions ) - (builtins.readDir ./fish/functions) ); }; @@ -73,8 +78,8 @@ in defaultEditor = true; package = pkgs.neovim; extraPackages = [ - pkgs.nil # Nix lsp - pkgs.nixpkgs-fmt # Nix formatter + pkgs.nixd + pkgs.nixfmt-rfc-style pkgs.efm-langserver # Generic language server pkgs.lua-language-server # Lua lsp pkgs.gopls # Go lsp diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 61effdd..779c69d 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,32 +1,32 @@ { "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, + "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "conform.nvim": { "branch": "master", "commit": "e76afe8f7976071fae308e31bf426f557a8ef339" }, + "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, + "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, "fidget.nvim": { "branch": "main", "commit": "4e854f3299e21d1c18279add340428a97520fc44" }, - "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, - "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, - "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, - "mini.nvim": { "branch": "main", "commit": "19e1584124cda35388d4fdb911eab7124014e541" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, + "mini.nvim": { "branch": "main", "commit": "64e95aa77587d04f97a5579b2106a82a08a7d968" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "38d4b239aab2dc3fdfe56b42e3f0f20c237ca695" }, - "nvim-treesitter": { "branch": "master", "commit": "4770d9a1a77b0cc2b723c646c3dbe43a9133e5db" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" }, - "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-lspconfig": { "branch": "master", "commit": "57154fd9a24e76907e3b0bdba4677ef42c88d91c" }, + "nvim-treesitter": { "branch": "master", "commit": "5d18ef22dc63624e90aa7b6dbc17f2c3856ae716" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, + "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, "oil.nvim": { "branch": "master", "commit": "fdb50dc5c57524c4b0b05b593abff4d4f7a099f6" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, - "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, - "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" }, - "vim-dadbod-ui": { "branch": "master", "commit": "aa003f514ba0b1250ba0f284f031d011bb9e83e8" } + "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" }, + "vim-dadbod-completion": { "branch": "master", "commit": "71eb73d1f7399be6a56cc43b928276cd5ca27ffd" }, + "vim-dadbod-ui": { "branch": "master", "commit": "0fec59e3e1e619e302198cd491b7d27f8d398b7c" } } diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua index 718a3c2..3206063 100644 --- a/nvim/lua/plugins/lspconfig.lua +++ b/nvim/lua/plugins/lspconfig.lua @@ -46,12 +46,10 @@ local function config() }, }, gopls = {}, - nil_ls = { + nixd = { settings = { - ['nil'] = { - formatting = { - command = { "nixpkgs-fmt" }, - }, + formatting = { + command = { "nixfmt" }, }, }, },