From 97677f6181bb65508e848e994ff6af7fcfdeb6ca Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 21 Jan 2025 23:21:23 +0100 Subject: [PATCH] Change aliases, terminal and work stuff --- dotfiles/.bash_aliases | 8 +-- dotfiles/.bashrc | 5 ++ .../{ghostty.linux => .config/ghosty/config} | 0 dotfiles/.config/wezterm/wezterm.lua | 67 ------------------- dotfiles/.gitconfig | 6 -- dotfiles/symlink.sh | 2 +- nixos/modules/{utils.nix => compilation.nix} | 7 +- nixos/modules/work.nix | 2 - nixos/packages.nix | 4 -- nixos/users.nix | 6 +- 10 files changed, 14 insertions(+), 93 deletions(-) rename dotfiles/{ghostty.linux => .config/ghosty/config} (100%) delete mode 100644 dotfiles/.config/wezterm/wezterm.lua rename nixos/modules/{utils.nix => compilation.nix} (57%) diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index e0d9e40..5036b01 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -1,6 +1,6 @@ alias ll='ls -la' -alias lt='ls --human-readable --size -1 -S --classify' -alias nrebuild='sudo nixos-rebuild --use-remote-sudo switch' +alias nrs='sudo nixos-rebuild --use-remote-sudo switch' +alias nrb='sudo nixos-rebuild --use-remote-sudo boot' +alias ngc='sudo nix-collect-garbage --delete-older-than 14d' alias code='codium' -alias rgf='rg --files | rg' -alias rcd='ranger' \ No newline at end of file +alias rgf='rg --files | rg' \ No newline at end of file diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index d283691..7c39654 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -20,6 +20,11 @@ function ensure_ssh_key { fi } +function ngc { + local days=${1:-14} + sudo nix-collect-garbage --delete-older-than "${days}d" +} + # Map up/down arrow to search for history entries matching what is currently type in the command line. bind '"\e[A": history-search-backward' bind '"\e[B": history-search-forward' diff --git a/dotfiles/ghostty.linux b/dotfiles/.config/ghosty/config similarity index 100% rename from dotfiles/ghostty.linux rename to dotfiles/.config/ghosty/config diff --git a/dotfiles/.config/wezterm/wezterm.lua b/dotfiles/.config/wezterm/wezterm.lua deleted file mode 100644 index 8d8db9a..0000000 --- a/dotfiles/.config/wezterm/wezterm.lua +++ /dev/null @@ -1,67 +0,0 @@ -local wezterm = require 'wezterm'; - -return { - -- Set the default program - default_prog = { '/usr/bin/env', 'bash' }, - - -- Set the font and font size - font = wezterm.font("Jetbrains Mono"), - font_size = 13.0, - - -- Set color scheme - color_scheme = "OneHalfDark", - - -- Set window transparency - window_background_opacity = 0.95, - - -- Hide tab bar if there's only one tab - hide_tab_bar_if_only_one_tab = true, - - -- Window padding - window_padding = { - left = 5, - right = 5, - top = 5, - bottom = 25, - }, - - -- Use a steady block cursor - default_cursor_style = "BlinkingBlock", - cursor_blink_rate = 600, - animation_fps = 144, - - -- Set scrollback lines to a large number for history - scrollback_lines = 10000, - - -- Key bindings - keys = { - -- CTRL+T to open a new tab - {key="t", mods="CTRL", action=wezterm.action{SpawnTab="DefaultDomain"}}, - - -- CTRL+W to close the current tab - {key="w", mods="CTRL", action=wezterm.action{CloseCurrentTab={confirm=true}}}, - - -- CTRL+ALT+D to split pane horizontally - {key="d", mods="CTRL|ALT", action=wezterm.action{SplitHorizontal={domain="CurrentPaneDomain"}}}, - - -- CTRL+SHIFT+D to split pane vertically - {key="d", mods="CTRL|SHIFT", action=wezterm.action{SplitVertical={domain="CurrentPaneDomain"}}}, - - -- CTRL+Left/Right Arrow to move between tabs - {key="LeftArrow", mods="CTRL", action=wezterm.action{ActivateTabRelative=-1}}, - {key="RightArrow", mods="CTRL", action=wezterm.action{ActivateTabRelative=1}}, - - -- CTRL+Enter to toggle full screen - {key="Enter", mods="CTRL", action="ToggleFullScreen"}, - }, - - -- Enable native macOS-style key repeat - enable_csi_u_key_encoding = true, - - -- Set the default window size to something familiar - initial_cols = 120, - initial_rows = 30, - - -- Enable Scrollbar - enable_scroll_bar = true, -} \ No newline at end of file diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig index b795d8b..71123ff 100644 --- a/dotfiles/.gitconfig +++ b/dotfiles/.gitconfig @@ -36,11 +36,5 @@ process = git-lfs filter-process required = true -[includeIf "gitdir:~/Repos/github.com/blender/"] - path = ~/.config/git/blender.gitconfig - -[includeIf "gitdir:~/Repos/gitlab.com/blender/"] - path = ~/.config/git/blender.gitconfig - [includeIf "gitdir:~/Repos/projects.blender.org/"] path = ~/.config/git/blender.gitconfig \ No newline at end of file diff --git a/dotfiles/symlink.sh b/dotfiles/symlink.sh index 9066139..bf32ac6 100755 --- a/dotfiles/symlink.sh +++ b/dotfiles/symlink.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash dotfiles_home="${1:-$(dirname "$(realpath "$0")")}" -cp -rsf "$dotfiles_home"/. $HOME +cp -rsf "$dotfiles_home" $HOME echo "Dotfiles have been recursively copied and symlinked from $dotfiles_home to $HOME." diff --git a/nixos/modules/utils.nix b/nixos/modules/compilation.nix similarity index 57% rename from nixos/modules/utils.nix rename to nixos/modules/compilation.nix index e06f728..85307e9 100644 --- a/nixos/modules/utils.nix +++ b/nixos/modules/compilation.nix @@ -4,15 +4,10 @@ environment.systemPackages = with pkgs; [ mold gcc + ninja clang lld lldb musl - jdk11 - dioxus-cli - surrealdb - surrealdb-migrations - surrealist - trunk ]; } \ No newline at end of file diff --git a/nixos/modules/work.nix b/nixos/modules/work.nix index e5ef86d..a3bc54f 100644 --- a/nixos/modules/work.nix +++ b/nixos/modules/work.nix @@ -4,8 +4,6 @@ environment.systemPackages = with pkgs; [ thunderbird element-desktop - aws-sam-cli - awscli2 gnumake cmake ]; diff --git a/nixos/packages.nix b/nixos/packages.nix index 6c59c6d..ec2af1a 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -17,7 +17,6 @@ in fzf jq silver-searcher - ranger ripgrep networkmanager-openvpn (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' @@ -25,10 +24,7 @@ in background=${customWallpaper} '') dig - caligula zig - zls spotify - texlive.combined.scheme-full ]; } \ No newline at end of file diff --git a/nixos/users.nix b/nixos/users.nix index 347bcf4..8842c70 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -9,7 +9,7 @@ vscodium thunderbird fastfetch - wezterm + ghostty neovim logseq element-desktop @@ -18,8 +18,8 @@ python3 gnumake gccgo - # nodejs_22 - # corepack_22 + nodejs_22 + corepack_22 azure-cli sops blender