changes 08-09-25

This commit is contained in:
2025-08-09 23:20:12 -04:00
parent 4e44a1618b
commit 09302c1562
22 changed files with 145 additions and 79 deletions

View File

@@ -10,6 +10,7 @@ let
myScripts.viconf
myScripts.vipkg
myScripts.fetchfromgh
myScripts.mkshell
myScripts.garbage-collect
myScripts.rebuild
myScripts.chpaper
@@ -59,6 +60,7 @@ in {
rustup
w3m
neovide
claude-code
python3
ghostty
firefox
@@ -70,6 +72,7 @@ in {
discord
cloc
wine
nerd-fonts.fira-code
nodejs_latest
] ++ scripts;
};

View File

@@ -21,13 +21,6 @@ in
export RESULT
echo "\$RESULT = $RESULT"
}
precmd() { # Reset kitty color scheme
if [ "$NIX_SHELL" = "false" ]; then # don't run this in a nix-shell
trap 'NIX_SHELL=false kitty_theme' EXIT SIGINT SIGTERM SIGHUP
else # but still apply ssh theme logic in nix-shell
trap 'kitty_theme' EXIT SIGINT SIGTERM SIGHUP
fi
}
nix-shell() {
NIX_SHELL=true command nix-shell "$@" --run zsh
}
@@ -55,17 +48,6 @@ in
command neovide "$@"
}
alias vi="nvim"
kitty_theme() {
if [ $TERM = "xterm-kitty" ]; then
if [ -n "$SSH_CONNECTION" ]; then
kitty @ set-colors -a ~/.config/kitty/ssh-theme.conf
elif [ "$name" = "nix-shell-env" ] || [ "$NIX_SHELL" = "true" ]; then
kitty @ set-colors -a ~/.config/kitty/nix-shell-theme.conf
else
kitty @ set-colors -a ~/.config/kitty/default-theme.conf
fi
fi
}
grimblast() {
if command grimblast "$@"; then
${shellsound} ${sndpath}/screenshot.wav
@@ -145,9 +127,10 @@ in
eza -1 --group-directories-first --icons "$@"
SOUNDS_ENABLED=$prev_sounds_enabled
builtin cd "$@"
${shellsound} /nix/store/7a9w7np3qrvmzxjbs7xj05qq2yccgfsj-source/assets/sound/cd.wav
${shellsound} ${sndpath}/cd.wav
return 0
}
if [ ! -e $HOME/.zsh_history ]; then
touch $HOME/.zsh_history
chmod 600 $HOME/.zsh_history
@@ -191,7 +174,6 @@ in
source ${fzf-tab}/fzf-tab.plugin.zsh
bindkey -v
kitty_theme
type starship_zle-keymap-select >/dev/null || \
{
eval "$(starship init zsh)"

View File

@@ -1,9 +1,14 @@
{ env, config, pkgs, host, self, ... }: {
programs.nixvim.extraPackages = [
pkgs.cargo
pkgs.rustc
pkgs.rustup
pkgs.rust-analyzer
];
programs.nixvim = {
nixpkgs.useGlobalPackages = true;
extraPackages = [
pkgs.cargo
pkgs.rustc
pkgs.clippy
pkgs.rustup
pkgs.rust-analyzer
pkgs.nerd-fonts.envy-code-r
];
};
imports = [ ./plugins ./options.nix ./keymaps.nix ./autocmd.nix ];
}

View File

@@ -56,7 +56,7 @@ in {
vim.opt.linebreak = true
vim.opt.textwidth = 0
vim.opt.breakat = " \t!@*-+;:,./?"
vim.opt.guifont = "Fira Code:h18"
vim.opt.guifont = "EnvyCodeR Nerd Font Mono:h18"
vim.g.mapleader = "!"
vim.g.rust_recommended_style = 0

View File

@@ -0,0 +1,8 @@
{
programs.nixvim.plugins = {
claude-code = {
enable = true;
autoLoad = true;
};
};
}

View File

@@ -17,6 +17,7 @@
./nvim-lightbulb.nix
./neocord.nix
./copilot.nix
./claudecode.nix
./plugins.nix
./nvim-tree.nix
./telescope.nix

View File

@@ -82,7 +82,10 @@
installCargo = false;
installRustc = false;
settings = {
check.allTargets = false;
check = {
allTargets = false;
command = "clippy";
};
};
};
nixd = {

View File

@@ -4,7 +4,12 @@
programs.nixvim.plugins.rustaceanvim = {
enable = false;
settings = {
server.auto_attach = true;
server = {
auto_attach = true;
default_settings = {
checkOnSave.command = "clippy";
};
};
dap.adapter = false;
};
};

View File

@@ -16,6 +16,7 @@
firewall = {
enable = true;
allowedTCPPorts = [ 443 8080 ];
trustedInterfaces = [ "vnet9" "virbr0" "enp0s2" ];
};
};
};

View File

@@ -22,6 +22,7 @@ in {
#snes9x-gtk
#cust-openrct2
mgba
shadps4
cust-prismlauncher
];
};

View File

@@ -1,4 +1,4 @@
{ lib, config, username, ... }: {
{ lib, config, username, pkgs, ... }: {
options = {
movOpts.softwareCfg.virtConfig.enable =
lib.mkEnableOption "enables virtualization";
@@ -6,5 +6,9 @@
config = lib.mkIf config.movOpts.softwareCfg.virtConfig.enable {
virtualisation.libvirtd.enable = true;
programs.virt-manager.enable = true;
environment.systemPackages = with pkgs; [
spice-gtk
usbredir
];
};
}