From 23d71b3a095a544f28399da07201b3fcb5c5ea39 Mon Sep 17 00:00:00 2001 From: Drew Haven Date: Sun, 11 May 2025 11:21:36 -0700 Subject: [PATCH] [nix] Allow unfree for shells. [docker] Correctly export DOCKER_HOST. [nvim] Disable augment and turn on vtsls --- home-manager/features/development/docker.nix | 4 +--- .../neovim/config/lua/plugins/augment.lua | 1 + .../features/neovim/config/lua/plugins/lsp.lua | 4 ++++ system/features/container-dev.nix | 15 ++++++++------- system/hosts/altair/drew.nix | 7 +++++++ 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/home-manager/features/development/docker.nix b/home-manager/features/development/docker.nix index 226b062..52e5220 100644 --- a/home-manager/features/development/docker.nix +++ b/home-manager/features/development/docker.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - # Podman is enabled at the system level. - home.packages = with pkgs; [ - podman-compose + docker-compose ]; } diff --git a/home-manager/features/neovim/config/lua/plugins/augment.lua b/home-manager/features/neovim/config/lua/plugins/augment.lua index 4bbe371..3f8bfe5 100644 --- a/home-manager/features/neovim/config/lua/plugins/augment.lua +++ b/home-manager/features/neovim/config/lua/plugins/augment.lua @@ -1,3 +1,4 @@ return { "augmentcode/augment.vim", + enable = false, } diff --git a/home-manager/features/neovim/config/lua/plugins/lsp.lua b/home-manager/features/neovim/config/lua/plugins/lsp.lua index d80e61e..ff2425f 100644 --- a/home-manager/features/neovim/config/lua/plugins/lsp.lua +++ b/home-manager/features/neovim/config/lua/plugins/lsp.lua @@ -5,6 +5,10 @@ return { servers = { lua_ls = {}, nil_ls = {}, + vtsls = {}, + }, + codelens = { + enable = true, }, }, }, diff --git a/system/features/container-dev.nix b/system/features/container-dev.nix index 448e19a..7e638ca 100644 --- a/system/features/container-dev.nix +++ b/system/features/container-dev.nix @@ -7,11 +7,12 @@ }; }; - home-manager.users.drew = { ... }: - { - # Add the path to the docker socket to the environment. - programs.zsh.profileExtra = '' - export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock - ''; - }; + home-manager.users.drew = + { ... }: + { + # Add the path to the docker socket to the environment. + programs.zsh.envExtra = '' + export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock + ''; + }; } diff --git a/system/hosts/altair/drew.nix b/system/hosts/altair/drew.nix index 4e1e9d3..a020089 100644 --- a/system/hosts/altair/drew.nix +++ b/system/hosts/altair/drew.nix @@ -11,6 +11,7 @@ in "/features/development/development.nix" "/features/development/docker.nix" "/features/development/haskell.nix" + "/features/development/typescript.nix" "/features/eww" "/features/gaming.nix" "/features/linux-desktop.nix" @@ -20,6 +21,12 @@ in (import ../../../home-manager/features/wallpaper.nix monitors) ]; + # This config file is needed for nix shell to allow unfree programs. I'm not + # sure why this isn't a home-manager option. + home.file.".config/nixpkgs/config.nix".text = '' + { allowUnfree = true; } + ''; + home.stateVersion = "24.11"; home.username = "drew";