From 8044702f069cc32fd4fe8d60a24d3d678128384b Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 19 Sep 2024 14:45:43 -0500 Subject: [PATCH] Cleanup some default values Set IVR tmux setting to Xonsh, since I cannot control my user's login shell Set some default editor and terminal settings in VSCodium so it automatically launches tmux (thus, on my IVR machine, it will also pick up Xonsh for my user's environment setting) --- darwin/ivr/default.nix | 41 -------------------------------------- home/hosts/ivr/default.nix | 1 + home/modules/vscodium.nix | 18 +++++++++++++++++ 3 files changed, 19 insertions(+), 41 deletions(-) delete mode 100644 darwin/ivr/default.nix diff --git a/darwin/ivr/default.nix b/darwin/ivr/default.nix deleted file mode 100644 index 60b43be..0000000 --- a/darwin/ivr/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs, ... }: -let - qemu_conf = pkgs.stdenv.mkDerivation { - name = "qemu_conf"; - phases = [ "installPhase" ]; - - cfg = pkgs.writeText "qemu.conf" - '' - security_driver = "none" - dynamic_ownership = 0 - remember_owner = 0 - ''; - installPhase = '' - mkdir -p $out/opt/homebrew/etc/libvirt/ - cp $cfg $out/opt/homebrew/etc/libvirt/qemu.conf - ''; - }; -in { - environment.systemPackages = with pkgs; [ - qemu_conf - unixtools.watch - ]; - - homebrew = { - enable = true; - brews = [ - "qemu" - "gcc" - "libaacs" - { - name = "libvirt"; - restart_service = true; - } - "virt-manager" - ]; - casks = [ - "synology-drive" - "handbrake" - ]; - }; -} diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix index fd5cf8d..352c975 100644 --- a/home/hosts/ivr/default.nix +++ b/home/hosts/ivr/default.nix @@ -61,4 +61,5 @@ in { username = "gregory.hellings"; homeDirectory = lib.mkForce "/home/gregory.hellings"; }; + programs.tmux.shell = (lib.getExe x); } diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 0309533..c0c6c1b 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -28,6 +28,24 @@ in { vscjava.vscode-java-dependency vscjava.vscode-java-debug ]; + userSettings = { + "direnv.restart.automatic" = true; + "direnv.path.executable" = "/home/gregory.hellings/.nix-profile/bin/direnv"; + "extensions.autoUpdate" = false; + "extensions.experimental.affinity" = { + "asvetliakov.vscode-neovim" = 1; + }; + "git.openRepositoryInParentFolders" = "always"; + "search.exclude" = { + "**/.tox" = true; + }; + "terminal.integrated.defaultProfile.linux" = "tmux"; + "vscode-neovim.neovimInitVimPaths.darwin" = "~/.config/nvim/init.lua"; + "vscode-neovim.neovimInitVimPaths.linux" = "~/.config/nvim/init.lua"; + "workbench.settings.applyToAllProfiles" = [ + "direnv.path.executable" + ]; + }; }; }; }