From f936753dae07db400459588513257602fd801f28 Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 15 Dec 2023 19:57:18 +0100 Subject: [PATCH] alt getting there --- alt/alias.nix | 15 ++++++++++++++ alt/default.nix | 16 +++++++++++++++ alt/fish.nix | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 alt/alias.nix create mode 100644 alt/fish.nix diff --git a/alt/alias.nix b/alt/alias.nix new file mode 100644 index 0000000..daee6ed --- /dev/null +++ b/alt/alias.nix @@ -0,0 +1,15 @@ +{ config, pkgs, ... }: + +{ + home.shellAliases = { + htop = "btm -b"; + ymd = "date +'%Y-%m-%d'"; + cb = "cd $(sed 's|^file://||' /home/till/.config/gtk-3.0/bookmarks | fzf --height 10% --reverse)"; + v = "nvim"; + r = "R --no-save --no-restore"; + R = "R --no-save --no-restore"; + cdg = "cd \$(git rev-parse --show-toplevel)"; + map = "telnet mapscii.me"; + weather = "curl wttr.in/frankfurt"; + }; +} diff --git a/alt/default.nix b/alt/default.nix index 88c57dc..8c31698 100644 --- a/alt/default.nix +++ b/alt/default.nix @@ -43,11 +43,13 @@ firefox qbittorrent vlc + mullvad-vpn ]; imports = [ ./desktop + ./alias.nix ]; programs.nix-index = { @@ -55,4 +57,18 @@ enableFishIntegration = true; }; + programs.git = { + enable = true; + userName = "Till"; + userEmail = "till@ktiu.net"; + lfs = { + enable = true; + }; + extraConfig = { + init = { + defaultBranch = "main"; + }; + }; + }; + } diff --git a/alt/fish.nix b/alt/fish.nix new file mode 100644 index 0000000..a60823f --- /dev/null +++ b/alt/fish.nix @@ -0,0 +1,54 @@ +{ config, pkgs, ... }: +{ + programs.fish = { + enable = true; + interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin"; + shellInit = '' + set -gx EDITOR "nvim" + set -gx VISUAL "nvim" + + function fish_greeting; end + + function startrloft --description 'Starts R with custom environment' + set -lx R_ENVIRON_USER "~/.config/rloft/RLoft_environ" + R -q + end + + function vd --wraps vim --description 'vim with date in filename' + nvim (ymd)_$argv.md + end + + function lipsum --description 'Create placeholder text' + nix-shell -p perl536Packages.TextLorem --run 'lorem '(echo $argv) + end + + set -U fish_prompt_pwd_dir_length 0 + + function fish_prompt --description "Write out the prompt" + echo -s (set_color brblack) (basename $PWD) (set_color normal) (set_color magenta) ' $ ' (set_color normal) + end + + function fish_right_prompt --description "Display info to the right of the prompt" + echo -s (__fish_git_prompt) + end + + function fish_mode_prompt; end + + set fish_cursor_default line blink + + set __fish_git_prompt_showdirtystate 'yes' + set __fish_git_prompt_showstashstate 'yes' + set __fish_git_prompt_showuntrackedfiles 'yes' + set __fish_git_prompt_showupstream 'yes' + set __fish_git_prompt_color_upstream_ahead green + set __fish_git_prompt_color_upstream_behind red + set __fish_git_prompt_char_dirtystate '*' + set __fish_git_prompt_char_stagedstate '→' + set __fish_git_prompt_char_untrackedfiles '☡' + set __fish_git_prompt_char_stashstate '↩' + set __fish_git_prompt_char_upstream_ahead '+' + set __fish_git_prompt_char_upstream_behind '-' + + ''; + }; +}