diff --git a/nix-config/home/materus/default.nix b/nix-config/home/materus/default.nix index f7a101f..79fe4bf 100644 --- a/nix-config/home/materus/default.nix +++ b/nix-config/home/materus/default.nix @@ -35,6 +35,13 @@ source ${pkgs.vte}/etc/profile.d/vte.sh ''; + xdg.configFile."zsh/data/nix_profile.sh".text = '' + [[ -e ~/.nix-profile/etc/profile.d/hm-session-vars.sh ]] && emulate sh -c "source ~/.nix-profile/etc/profile.d/hm-session-vars.sh" + [[ -e ~/.nix-profile/etc/profile.d/command-not-found.sh ]] && emulate sh -c "source ~/.nix-profile/etc/profile.d/command-not-found.sh" + [[ -e ~/.nix-profile/etc/profile.d/wezterm.sh ]] && emulate sh -c "source ~/.nix-profile/etc/profile.d/wezterm.sh" + __HOME_ZPROFILE_NIX_SOURCED=1 + ''; + xdg.userDirs.enable = lib.mkDefault true; xdg.userDirs.createDirectories = lib.mkDefault config.xdg.userDirs.enable; diff --git a/nix-config/host/materusPC/home-manager/materus.nix b/nix-config/host/materusPC/home-manager/materus.nix index 38a252d..2cf2e0c 100644 --- a/nix-config/host/materusPC/home-manager/materus.nix +++ b/nix-config/host/materusPC/home-manager/materus.nix @@ -2,6 +2,7 @@ pkgs, config, lib, + mkk, ... }: let @@ -11,6 +12,8 @@ in home.stateVersion = "25.11"; mkk.neovim.enable = true; + programs.nix-index.enable = true; + mkk.dir = config.lib.file.mkOutOfStoreSymlink "/mkk/config"; programs.git = { enable = true; @@ -178,10 +181,11 @@ in }; target = config.xdg.configFile."VSCodium/User/settings.nix.jsonnet".target; command = '' + echo "Kill codium" + run ${pkgs.procps}/bin/pkill -9 codium || true echo "Copying mutable VSCodium files" verboseEcho "${source} -> ${target}" run cp --remove-destination --no-preserve=mode ${source} ${target} - echo "Remove old settings_generated.json" if [ -f '${config.xdg.configFile."VSCodium/User/settings_generated.json".target}' ]; then run rm -f ${config.xdg.configFile."VSCodium/User/settings_generated.json".target} diff --git a/nix-config/host/materusPC/services.nix b/nix-config/host/materusPC/services.nix index 5d63614..876665c 100644 --- a/nix-config/host/materusPC/services.nix +++ b/nix-config/host/materusPC/services.nix @@ -108,6 +108,7 @@ services.davfs2.enable = true; programs.ssh.startAgent = true; + programs.ssh.forwardX11 = true; services.openssh.enable = true; services.openssh.openFirewall = true; #region Sunshine