tidied home/common/

This commit is contained in:
serenity-F 2024-09-26 22:53:17 +10:00
parent 0e5ea93599
commit 00139a0426
No known key found for this signature in database
9 changed files with 23 additions and 5 deletions

View file

@ -0,0 +1,22 @@
{
self,
inputs,
outputs,
lib,
config,
pkgs,
...
}:
{
imports = [
./git.nix
./yazi.nix
./kitty.nix
./neofetch.nix
];
}

View file

@ -0,0 +1,382 @@
pkgs: {
enable = true;
loginShellInit = ''
set -x EDITOR lvim
set -x LIBVIRT_DEFAULT_URI "qemu:///system"
fish_add_path "~/.local/bin"
fish_add_path ~/.local/bin/scripts
fish_add_path /var/lib/flatpak/exports/bin
fish_add_path ~/.cargo/bin
fish_add_path ~/.local/share/npm-global/bin
'';
shellAbbrs = {
b = "bat";
"1" = "prevd";
"2" = "prevd 2";
"3" = "prevd 3";
"4" = "prevd 4";
c = "cd";
cg = "cargo";
reload = "exec fish";
nv = "lvim";
sshfix = "kitty +kitten ssh";
tree = "eza -TR --git-ignore";
up = "topgrade";
gay = "curl fetch.sashanoraa.gay";
sc = "sudo systemctl";
scs = "systemctl status";
scst = "sudo systemctl start";
scsp = "sudo systemctl stop";
scr = "sudo systemctl restart";
jr = "journalctl";
jre = "journalctl -e -u";
jrf = "journalctl -f -u";
nxp = "nix-shell --command fish -p";
nxs = "nix search nixpkgs";
# nxr = {
# expansion = "nix run nixpkgs#%";
# setCursor = true;
# };
# nxsh = {
# expansion = "nix shell nixpkgs#%";
# setCursor = true;
# };
g = "git";
ga = "git add";
gaa = "git add --all";
gau = "git add -u";
gb = "git branch";
gco = "git checkout";
gc = "git commit";
gca = "git commit --amend";
gcl = "git clone";
gd = "git diff";
gf = "git fetch";
gl = "git log";
gm = "git merge";
gp = "git push";
gpl = "git pull";
gpn = "git push -u origin (current_branch)";
gr = "git remote";
gra = "git remote add";
grao = "git remote add origin";
grb = "git rebase";
grbi = "git rebase -i";
gs = "git status -sb";
gsu = "git submodule";
gro = "git restore";
gsw = "git switch";
};
shellAliases = {
cl = "printf '\\033[2J\\033[3J\\033[1;1H'";
git-master-to-main = "git branch -m master main && git push origin :master main:main";
l = "eza";
la = "eza -a";
ll = "eza -l";
lla = "eza -al";
shn = "git remote add origin git@git.sr.ht:~zethra/$(basename $(pwd))";
scratch = "lvim /tmp/scratch";
tmp = "lvim /dev/null";
ssh = "kitty +kitten ssh";
};
interactiveShellInit = ''
fish_vi_key_bindings
set fish_cursor_default block
set fish_cursor_insert line
set fish_cursor_replace_one underscore
set fish_cursor_replace underscore
set fish_cursor_external line
set fish_cursor_visual block
set -x EXA_COLORS 'di=35;01:da=35'
# Syntax Highlighting Colors
set -Ux fish_color_normal c0caf5
set -Ux fish_color_command 7dcfff
set -Ux fish_color_keyword bb9af7
set -Ux fish_color_quote e0af68
set -Ux fish_color_redirection c0caf5
set -Ux fish_color_end ff9e64
set -Ux fish_color_error f7768e
set -Ux fish_color_param 9d7cd8
set -Ux fish_color_comment 565f89
set -Ux fish_color_selection --background=33467c
set -Ux fish_color_search_match --background=33467c
set -Ux fish_color_operator 9ece6a
set -Ux fish_color_escape bb9af7
set -Ux fish_color_autosuggestion 565f89
# Completion Pager Colors
set -Ux fish_pager_color_progress 565f89
set -Ux fish_pager_color_prefix 7dcfff
set -Ux fish_pager_color_completion c0caf5
set -Ux fish_pager_color_description 565f89
set -Ux fish_pager_color_selected_background --background=33467c
source ~/.config/fish/functions/__fre_cd.fish
abbr -a nxr --set-cursor "nix run nixpkgs#%"
abbr -a nxsh --set-cursor "nix shell nixpkgs#%"
complete -x -c mkproj -d "Template name" -a "(ls ~/Projects/nixcfg/programs/cookiecutter)"
'';
functions = {
fre-clean = ''
for p in (fre --sorted)
if ! [ -d $p ]
echo $p
fre -D $p
end
end
'';
fish_greeting = ''
if type -q kitty-img
printf '💖 hiya sashanoraa '
kitty-img ~/.config/fish/pfp.png 2>/dev/null
echo ' 'welcome to (gethost) "~" 🏳️‍⚧️
else
echo 💖 hiya sashanoraa welcome to (gethost) "~" 🏳️‍⚧️
end
'';
gbd = {
wraps = "git branch -d";
body = "git branch -d $argv[1] && git push --delete origin $argv[1]";
};
gbD = {
wraps = "git branch -D";
body = "git branch -D $argv[1] && git push --delete origin $argv[1]";
};
mkproj = {
body = ''
cookiecutter "$HOME/Projects/nixcfg/programs/cookiecutter/$argv[1]"
'';
};
gethost = ''
if test -f /run/.containerenv
function gethost
grep -F name= /run/.containerenv | cut -d '"' -f2;
end
else if command -v hostnamectl &> /dev/null
function gethost --wraps=hostnamectl --description 'alias gethost hostnamectl'
hostnamectl --pretty;
end
else if command -v hostname &> /dev/null
function gethost --wraps=hostname --description 'alias gethost hostname -s'
hostname -s;
end
else
function gethost --wraps=hostname --description 'alias gethost hostname'
echo host_error;
end
end
'';
mkshell = ''
echo "{ pkgs ? import <nixpkgs> {} }:
pkgs.mkShell {
packages = with pkgs; [ $argv ];
}" > shell.nix
echo "use nix" > .envrc && direnv allow .
printf ".envrc\n.direnv" >> .gitignore
'';
copy = ''
if command -v wl-copy &> /dev/null
if test -f "$argv[1]"
wl-copy < "$argv[1]"
else
wl-copy $argv
end
else
xclip -sel clip "$argv"
end
'';
paste = ''
if command -v wl-paste &> /dev/null
wl-paste
else
xclip -sel clip -o "$argv"
end
'';
current_branch = ''
set ref (git symbolic-ref HEAD 2> /dev/null); or \
set ref (git rev-parse --short HEAD 2> /dev/null); or return
echo $ref | sed s-refs/heads/--
'';
__fre_cd = {
onVariable = "PWD";
body = ''
status --is-command-substitution; and return
fre --add (pwd)
'';
};
mommy = ''
set -g prev_status $status
# SHELL_MOMMYS_LITTLE - what to call you~ (default: "girl")
# SHELL_MOMMYS_PRONOUNS - what pronouns mommy will use for themself~ (default: "her")
# SHELL_MOMMYS_ROLES - what role mommy will have~ (default "mommy")
set -g COLORS_LIGHT_PINK '\e[38;5;217m'
set -g COLORS_LIGHT_BLUE '\e[38;5;117m'
set -g COLORS_FAINT '\e[2m'
set -g COLORS_RESET '\e[0m'
set -g DEF_WORDS_LITTLE "girl"
set -g DEF_WORDS_PRONOUNS "her"
set -g DEF_WORDS_ROLES "mommy"
set -g DEF_MOMMY_COLOR "$COLORS_LIGHT_PINK"
set -g DEF_ONLY_NEGATIVE "false"
set -g NEGATIVE_RESPONSES \
"do you need MOMMYS_ROLE's help~? ❤️" \
"Don't give up, my love~ ❤️" \
"Don't worry, MOMMYS_ROLE is here to help you~ ❤️" \
"I believe in you, my sweet AFFECTIONATE_TERM~ ❤️" \
"It's okay to make mistakes, my dear~ ❤️" \
"just a little further, sweetie~ ❤️" \
"Let's try again together, okay~? ❤️" \
"MOMMYS_ROLE believes in you, and knows you can overcome this~ ❤️" \
"MOMMYS_ROLE believes in you~ ❤️" \
"MOMMYS_ROLE is always here for you, no matter what~ ❤️" \
"MOMMYS_ROLE is here to help you through it~ ❤️" \
"MOMMYS_ROLE is proud of you for trying, no matter what the outcome~ ❤️" \
"MOMMYS_ROLE knows it's tough, but you can do it~ ❤️" \
"MOMMYS_ROLE knows MOMMYS_PRONOUN little AFFECTIONATE_TERM can do better~ ❤️" \
"MOMMYS_ROLE knows you can do it, even if it's tough~ ❤️" \
"MOMMYS_ROLE knows you're feeling down, but you'll get through it~ ❤️" \
"MOMMYS_ROLE knows you're trying your best~ ❤️" \
"MOMMYS_ROLE loves you, and is here to support you~ ❤️" \
"MOMMYS_ROLE still loves you no matter what~ ❤️" \
"You're doing your best, and that's all that matters to MOMMYS_ROLE~ ❤️" \
"MOMMYS_ROLE is always here to encourage you~ ❤️"
set -g POSITIVE_RESPONSES \
"*pets your head*" \
"awe, what a good AFFECTIONATE_TERM~\nMOMMYS_ROLE knew you could do it~ ❤️" \
"good AFFECTIONATE_TERM~\nMOMMYS_ROLE's so proud of you~ ❤️" \
"Keep up the good work, my love~ ❤️" \
"MOMMYS_ROLE is proud of the progress you've made~ ❤️" \
"MOMMYS_ROLE is so grateful to have you as MOMMYS_PRONOUN little AFFECTIONATE_TERM~ ❤️" \
"I'm so proud of you, my love~ ❤️" \
"MOMMYS_ROLE is so proud of you~ ❤️" \
"MOMMYS_ROLE loves seeing MOMMYS_PRONOUN little AFFECTIONATE_TERM succeed~ ❤️" \
"MOMMYS_ROLE thinks MOMMYS_PRONOUN little AFFECTIONATE_TERM earned a big hug~ ❤️" \
"that's a good AFFECTIONATE_TERM~ ❤️" \
"you did an amazing job, my dear~ ❤️" \
"you're such a smart cookie~ ❤️"
# allow for overriding of default words (IF ANY SET)
if test -n "$SHELL_MOMMYS_LITTLE"
set DEF_WORDS_LITTLE "$SHELL_MOMMYS_LITTLE"
end
if test -n "$SHELL_MOMMYS_PRONOUNS"
set DEF_WORDS_PRONOUNS "$SHELL_MOMMYS_PRONOUNS"
end
if test -n "$SHELL_MOMMYS_ROLES"
set DEF_WORDS_ROLES "$SHELL_MOMMYS_ROLES"
end
if test -n "$SHELL_MOMMYS_COLOR"
set DEF_MOMMY_COLOR "$SHELL_MOMMYS_COLOR"
end
# allow overriding to true
if test "$SHELL_MOMMYS_ONLY_NEGATIVE" = "true"
set DEF_ONLY_NEGATIVE "true"
end
# if the array is set for positive/negative responses, overwrite it
if test -n "$SHELL_MOMMYS_POSITIVE_RESPONSES"
set POSITIVE_RESPONSES "$SHELL_MOMMYS_POSITIVE_RESPONSES"
end
if test -n "$SHELL_MOMMYS_NEGATIVE_RESPONSES"
set NEGATIVE_RESPONSES "$SHELL_MOMMYS_NEGATIVE_RESPONSES"
end
# split a string on forward slashes and return a random element
function pick_word
random choice (string split -n / $argv)
end
function pick_response # given a response type, pick an entry from the array
if test $argv[1] = "positive"
set element (random choice $POSITIVE_RESPONSES)
else if test $argv[1] = "negative"
set element (random choice $NEGATIVE_RESPONSES)
else
echo "Invalid response type: $argv[1]"
exit 1
end
# Return the selected response
echo "$element"
end
function sub_terms # given a response, sub in the appropriate terms
set -l response $argv
# pick_word for each term
set -l affectionate_term (pick_word $DEF_WORDS_LITTLE)
set -l pronoun (pick_word $DEF_WORDS_PRONOUNS)
set -l role (pick_word $DEF_WORDS_ROLES)
# sub in the terms, store in variable
set -l response (echo "$response" | string replace "AFFECTIONATE_TERM" "$affectionate_term")
set -l response (echo "$response" | string replace "MOMMYS_PRONOUN" "$pronoun")
set -l response (echo "$response" | string replace "MOMMYS_ROLE" "$role")
# we have string literal newlines in the response, so we need to printf it out
# print faint and colorcode
echo -e "$DEF_MOMMY_COLOR$response$COLORS_RESET"
end
function success
if test "$DEF_ONLY_NEGATIVE" = "true"
return 0
end
# pick_response for the response type
set -l response (pick_response "positive")
sub_terms "$response" >&2
return 0
end
function failure
set -l response (pick_response "negative")
sub_terms "$response" >&2
return $prev_status
end
if test $prev_status -eq 0
success
else
failure
end
'';
};
plugins = [
# {
# name = "done";
# src = pkgs.fishPlugins.done.src;
# }
# {
# name = "puffer";
# src = pkgs.fishPlugins.puffer.src;
# }
# {
# name = "autopair";
# src = pkgs.fishPlugins.autopair.src;
# }
];
}

View file

@ -0,0 +1,14 @@
{ pkgs, config, ... }:
{
programs.git = {
enable = true;
userName = "serenity-F";
userEmail = "serenity-F@noreply.codeberg.org";
extraConfig = {
init.defaultBranch = "main";
# Automatically track remote branch
push.autoSetupRemote = true;
};
};
}

View file

@ -0,0 +1,24 @@
{ ... }:
{
#systemd.tmpfiles.rules = [
#" d ~/sync/organisation 0755 serenity users"
#];
services.git-sync = {
enable = true;
#package = [ ];
repositories = {
organisation-sync = {
interval = 75000;
url = "https://codeberg.org/serenity-F/organisation-sync.git";
path = "~/sync/organisation";
#extraPackages = pkgs.blank;
};
};
};
}

View file

@ -0,0 +1,58 @@
{ config, pkgs, ... }: {
programs.kitty = {
enable = true;
font = {
name = "spleen 32x64";
size = 11;
};
settings = {
scrollback_lines = 10000;
enable_audio_bell = false;
update_check_interval = 0;
# font_family = "spleen";
# font_size = 12;
cursor_shape = "Underline";
cursor_underline_thickness = 1;
window_padding_width = 5;
url_style = "curly";
confirm_os_window_close = "0";
remember_window_size = "no";
disable_ligatures = "never";
shell = "${pkgs.fish}/bin/fish";
initial_window_width = 1200;
initial_window_height = 600;
background = "#" + config.theme.colors.bg;
background_opacity = "0.60";
background_blur = 0;
url_color = "#" + config.theme.colors.primary-fg;
color0 = "#" + config.theme.colors.color0;
color8 = "#" + config.theme.colors.color8;
color1 = "#" + config.theme.colors.color1;
color9 = "#" + config.theme.colors.color9;
color2 = "#" + config.theme.colors.color2;
color10 = "#" + config.theme.colors.color10;
color3 = "#" + config.theme.colors.color3;
color11 = "#" + config.theme.colors.color11;
color4 = "#" + config.theme.colors.color4;
color12 = "#" + config.theme.colors.color12;
color5 = "#" + config.theme.colors.color5;
color13 = "#" + config.theme.colors.color13;
color6 = "#" + config.theme.colors.color6;
color14 = "#" + config.theme.colors.color14;
color7 = "#" + config.theme.colors.color7;
color15 = "#" + config.theme.colors.color15;
cursor = "#" + config.theme.colors.fg;
cursor_text_color = "#" + config.theme.colors.bg;
selection_foreground = "#" + config.theme.colors.primary-fg;
selection_background = "#" + config.theme.colors.primary-bg;
};
};
}

View file

@ -0,0 +1,17 @@
{ lib, config, pkgs, ... }:
{
programs.lazygit = {
enable = true;
settings = {
gui.theme = {
lightTheme = false;
activeBorderColor = [ "blue" "bold" ];
inactiveBorderColor = [ "black" ];
selectedLineBgColor = [ "default" ];
};
};
};
}

View file

@ -0,0 +1,147 @@
{ pkgs, config, ... }: {
home.packages = with pkgs; [
neofetch
];
xdg.configFile."neofetch/ascii.txt".text = ''
''${c6}
@@
@@@
@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@@
@@@
@@
'';
xdg.configFile."neofetch/config.conf".text = ''
# From: https://github.com/Chick2D/neofetch-themes/
# Made by https://github.com/Dan1jel
print_info() {
prin "\n"
prin "\n \n Host" "Hades"
# info "\n \n OS" distro
prin "\n \n OS" "SerenityOS (NixOS)"
info "\n \n Kernel" kernel
info "\n \n Packages" packages
# info "\n \n Desktop" de
prin "\n \n Desktop" "Hyprland (wayland)"
# info "\n \n Shell" shell
prin "\n \n Shell" "Fish"
# info "\n \n Editor" editor
prin "\n \n Editor" "neovim"
# info "\n \n Terminal" term
prin "\n \n Terminal" "Kitty"
# info "\n \n Terminal Font" term_font
# prin "\n \n Terminal Font" "Spleen"
# info "\n \n Model" model
prin "\n \n Motherboard" "MSI Z97 G3"
# prin "\n \n Device" "Thinkpad T470s"
info "\n \n Processor" cpu
info "\n \n Memory" memory
info "\n \n GPU" gpu
# prin "\n \n Graphics" "Radeon RX Vega 64"
# info "\n \n Resolution" resolution
# info "\n \n Uptime" uptime
prin "\n"
prin "\n \n Hotel?" "trivago"
prin "\n \n Trans rights !"
}
reset="\033[0m"
gray="\033[1;90m"
red="\033[1;31m"
green="\033[1;32m"
yellow="\033[1;33m"
blue="\033[1;34m"
magenta="\033[1;35m"
cyan="\033[1;36m"
white="\033[1;37m"
cl0="''${gray}"
cl1="''${red}"
cl2="''${green}"
cl3="''${yellow}"
cl4="''${blue}"
cl5="''${magenta}"
cl6="''${cyan}"
cl7="''${white}"
title_fqdn="off"
kernel_shorthand="on"
distro_shorthand="on"
os_arch="off"
uptime_shorthand="on"
memory_percent="off"
memory_unit="mib"
mem_precision=0
package_managers="on"
shell_path="off"
shell_version="on"
speed_type="bios_limit"
speed_shorthand="on"
cpu_brand="off"
cpu_speed="on"
cpu_cores="off"
cpu_temp="off"
gpu_brand="off"
gpu_type="dedicated"
refresh_rate="off"
gtk_shorthand="on"
gtk2="on"
gtk3="on"
de_version="on"
disk_show=('/storage/emulated' '/' '/server')
disk_subtitle="none"
disk_percent="on"
music_player="auto"
song_format="%artist% - %album% - %title%"
song_shorthand="off"
mpc_args=()
colors=(${toString config.theme.colors.primary-ansi-16-number} 1 ${
toString config.theme.colors.primary-ansi-16-number
} ${toString config.theme.colors.primary-ansi-16-number} 7)
bold="on"
underline_enabled="on"
underline_char="-"
separator=":"
block_range=(0 15)
color_blocks="on"
block_width=3
block_height=1
col_offset="auto"
bar_char_elapsed="-"
bar_char_total="="
bar_border="on"
bar_length=15
bar_color_elapsed="distro"
bar_color_total="distro"
cpu_display="off"
memory_display="on"
battery_display="off"
disk_display="off"
image_backend="ascii"
image_source="$HOME/.config/neofetch/ascii.txt"
ascii_distro="auto"
ascii_colors=(distro)
ascii_bold="on"
image_loop="off"
thumbnail_dir="''${XDG_CACHE_HOME:-''${HOME}/.cache}/thumbnails/neofetch"
crop_mode="normal"
crop_offset="center"
image_size="auto"
gap=2
yoffset=0
xoffset=0
background_color=
stdout="off"
'';
}

View file

@ -0,0 +1,11 @@
{ pkgs, config, ... }:
{
programs.yazi = {
enable = true;
enableFishIntegration = true;
};
}