diff --git a/flake.nix b/flake.nix index 7d6959d..0b4460f 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,7 @@ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; experimental-features = [ "nix-command" "flakes" ]; + trusted-users = ["root" "user"]; auto-optimise-store = true; }; diff --git a/home/Kell.nix b/home/Kell.nix index dc8c1e5..1d614f6 100644 --- a/home/Kell.nix +++ b/home/Kell.nix @@ -15,6 +15,7 @@ home.packages = with pkgs; [ telegram-desktop webcord + devenv ]; services.hyprpaper = { diff --git a/home/common.nix b/home/common.nix index c956995..c08b0b4 100644 --- a/home/common.nix +++ b/home/common.nix @@ -26,4 +26,5 @@ OPENCV_LOG_LEVEL = "ERROR"; COLORTERM = "truecolor"; }; + } diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 0fca8cc..cfe11a0 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -2,6 +2,7 @@ { home.packages = with pkgs; [ + nixd clang go nodejs diff --git a/home/nvim/files/lua/plugins/nvim-cmp.lua b/home/nvim/files/lua/plugins/nvim-cmp.lua index 82479b4..c82b021 100644 --- a/home/nvim/files/lua/plugins/nvim-cmp.lua +++ b/home/nvim/files/lua/plugins/nvim-cmp.lua @@ -122,6 +122,10 @@ return { capabilities = capabilities } + require('lspconfig').nixd.setup { + capabilities = capabilities + } + require('lspconfig').clangd.setup { capabilities = capabilities, -- root_dir = function() diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 3c8c6ba..a63ea8f 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -23,6 +23,17 @@ TERM = "screen-256color"; PYTHONDONTWRITEBYTECODE = "1"; GOPATH = "${config.xdg.dataHome}/go"; + DIRENV_LOG_FORMAT=""; + }; + programs.direnv = { + enable = true; + enableZshIntegration = true; # see note on other shells below + nix-direnv.enable = true; + config = { + global = { + hiden_env_diff = true; + }; + }; }; programs.command-not-found.enable = true; programs.zoxide = { diff --git a/home/zsh/files/p10k.zsh b/home/zsh/files/p10k.zsh index 85cce22..947bda8 100644 --- a/home/zsh/files/p10k.zsh +++ b/home/zsh/files/p10k.zsh @@ -89,7 +89,7 @@ # xplr # xplr shell (https://github.com/sayanarijit/xplr) # vim_shell # vim shell indicator (:sh) # midnight_commander # midnight commander shell (https://midnight-commander.org/) - # nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) + nix_shell # nix shell (https://nixos.org/nixos/nix-pills/developing-with-nix-shell.html) # vi_mode # vi mode (you don't need this if you've enabled prompt_char) # vpn_ip # virtual private network indicator # load # CPU load @@ -771,7 +771,7 @@ typeset -g POWERLEVEL9K_NIX_SHELL_BACKGROUND=4 # Tip: If you want to see just the icon without "pure" and "impure", uncomment the next line. - # typeset -g POWERLEVEL9K_NIX_SHELL_CONTENT_EXPANSION= + typeset -g POWERLEVEL9K_NIX_SHELL_CONTENT_EXPANSION= # Custom icon. # typeset -g POWERLEVEL9K_NIX_SHELL_VISUAL_IDENTIFIER_EXPANSION='⭐'