Compare commits
8 Commits
84bdaa7bd0
...
master
Author | SHA1 | Date | |
---|---|---|---|
39745885c2 | |||
af79a7c09c | |||
ade6aba195 | |||
b3777d53a9 | |||
3782f0b76c | |||
4f67e2b9f7 | |||
e48092d2ae | |||
ee6cf018b7 |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -43,3 +43,6 @@
|
||||
[submodule "base/.vim/bundle/vim-groovy"]
|
||||
path = base/.vim/bundle/vim-groovy
|
||||
url = https://github.com/thecodesmith/vim-groovy
|
||||
[submodule "base/.vim/bundle/FastFold"]
|
||||
path = base/.vim/bundle/FastFold
|
||||
url = https://github.com/Konfekt/FastFold
|
||||
|
@@ -8,6 +8,8 @@ Environment="LD_LIBRARY_PATH=/var/home/salt/Projects/ollama/rocm/lib/ollama/"
|
||||
ExecStart=/home/salt/Projects/ollama/ollama serve
|
||||
Restart=always
|
||||
RestartSec=3
|
||||
MemoryHigh=3G
|
||||
MemoryMax=4G
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
|
@@ -21,7 +21,7 @@ proj() {
|
||||
cd "$projdir" || return 50
|
||||
# Run code if we have it
|
||||
# The fun part is this environment file can access some vars about the proj
|
||||
local envfile="$projdir/.env"
|
||||
local envfile="$projdir/.project-env"
|
||||
if [ -r "$envfile" ]; then
|
||||
. "$envfile"
|
||||
echo "Sourced environment file for project"
|
||||
|
1
base/.vim/bundle/FastFold
Submodule
1
base/.vim/bundle/FastFold
Submodule
Submodule base/.vim/bundle/FastFold added at c1ddfa1a0e
Submodule base/.vim/bundle/SimpylFold deleted from ff4c85197c
Submodule base/.vim/bundle/vim-template deleted from df6d29a854
@@ -1,124 +0,0 @@
|
||||
#! /bin/bash
|
||||
#
|
||||
# %FILE%
|
||||
# Copyright (C) %YEAR% %USER% <%MAIL%>
|
||||
#
|
||||
# Distributed under terms of the %LICENSE% license.
|
||||
#
|
||||
set -e
|
||||
|
||||
# Read-only set-once variables
|
||||
declare -r _name="$(basename -- "$0")"
|
||||
# Options
|
||||
declare -i _opthelp
|
||||
declare -i _optverbose
|
||||
# Working variables
|
||||
declare -a _args
|
||||
declare _return
|
||||
|
||||
# Helper functions
|
||||
log() {
|
||||
# Print a line to the terminal if _optverbose is greater than $2
|
||||
# $2 defaults to 0
|
||||
# loglevel 0: Daily-use messages
|
||||
# loglevel 1: Detailed but not quite debugging
|
||||
# loglevel 2: Definitely debugging
|
||||
[ -z "$1" ] && return 1
|
||||
if (( _optverbose >= ${2:-0} )); then
|
||||
printf "%s\\n" "$1"
|
||||
fi
|
||||
}
|
||||
warn() {
|
||||
# Print a yellow line to the terminal, respecting _optverbose
|
||||
[ -z "$1" ] && return 1
|
||||
if (( _optverbose >= ${2:-0} )); then
|
||||
if [ -t 1 ]; then
|
||||
printf "\\e[33m%s\\e[0m\\n" "$1"
|
||||
else
|
||||
printf "WARN: %s\\n" "$1"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
error() {
|
||||
# Print a red line to the terminal, exit if $2 is specified
|
||||
[ -z "$1" ] && return 1
|
||||
if [ -t 2 ]; then
|
||||
printf "\\e[31m%s\\e[0m\\n" "$1" 1>&2
|
||||
else
|
||||
printf "ERROR: %s\\n" "$1" 1>&2
|
||||
fi
|
||||
[ -z "$2" ] && return
|
||||
exit "${2:-1}"
|
||||
}
|
||||
has() {
|
||||
# Parse out all arguments and try to find them in path
|
||||
# If an argument cannot be found, set _return and fail
|
||||
for prog in "$@"; do
|
||||
if ! command -v "$prog" > /dev/null 2>&1; then
|
||||
_return="$prog"
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
# Core program functions
|
||||
printhelp() {
|
||||
cat << EOF
|
||||
Usage: $_name [OPTION]...
|
||||
|
||||
-h Print this help text
|
||||
-v Print more status messages. Stacks
|
||||
|
||||
Copyright (c) %YEAR% %MAIL%
|
||||
Licensed under the %LICENSE% license
|
||||
EOF
|
||||
}
|
||||
|
||||
# Main
|
||||
main() {
|
||||
# Parse out arguments
|
||||
while [ -n "$1" ]; do
|
||||
# Parse out flags
|
||||
while getopts ":hv" opt; do
|
||||
case $opt in
|
||||
h)
|
||||
_opthelp=1
|
||||
;;
|
||||
v)
|
||||
_optverbose+=1
|
||||
;;
|
||||
:)
|
||||
error "Option requires argument: -$OPTARG" 2
|
||||
;;
|
||||
*)
|
||||
error "Invalid option: -$OPTARG" 2
|
||||
;;
|
||||
esac
|
||||
done
|
||||
# Store arguments
|
||||
shift $((OPTIND - 1))
|
||||
if [ -n "$1" ]; then
|
||||
_args+=("$1")
|
||||
shift
|
||||
fi
|
||||
unset OPTIND
|
||||
done
|
||||
# Early hook for help
|
||||
[ -n "$_opthelp" ] && printhelp && exit 0
|
||||
# Validate critical options
|
||||
# TODO: That
|
||||
# Validate core program dependencies
|
||||
log "Validating dependencies" 2
|
||||
if ! has basename; then
|
||||
error "Failed to find program: $_return" 1
|
||||
fi
|
||||
|
||||
# Do the do
|
||||
# TODO: The do%HERE%
|
||||
warn "Nothing to do"
|
||||
exit 0
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
@@ -1,9 +0,0 @@
|
||||
#! /usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim:fenc=utf-8
|
||||
#
|
||||
# Copyright © %YEAR% %USER% <%MAIL%>
|
||||
#
|
||||
# Distributed under terms of the %LICENSE% license.
|
||||
|
||||
%HERE%
|
13
base/.vimrc
13
base/.vimrc
@@ -13,7 +13,6 @@ endif
|
||||
set autoread " Automatically read when a file is changed outside of Vim
|
||||
set clipboard=unnamedplus " Use XA_PRIMARY clipboard by default
|
||||
set encoding=utf-8
|
||||
set foldmethod=syntax
|
||||
set hidden " Allow buffer switching without saving
|
||||
set incsearch " Search while you type
|
||||
set laststatus=2 " Always show statusbar
|
||||
@@ -21,16 +20,14 @@ set list
|
||||
set listchars=tab:>·,trail:·
|
||||
set modeline
|
||||
set modelines=5
|
||||
set nofoldenable " Fuck autofolding
|
||||
set number relativenumber " Relative line numbering
|
||||
set number
|
||||
set t_Co=256
|
||||
set viminfo='20,<1000,s1000 " Increase buffer size
|
||||
" Folding
|
||||
set foldmethod=syntax
|
||||
"nnoremap <space> za
|
||||
set nofoldenable " Fuck autofolding
|
||||
|
||||
" Templates
|
||||
let g:email = 'jacob@babor.tech'
|
||||
let g:user = 'Jacob Babor'
|
||||
let g:license = 'MIT'
|
||||
let g:templates_directory = [ '~/.vim/templates' ]
|
||||
" Lightline
|
||||
set noshowmode
|
||||
let g:lightline = {
|
||||
|
@@ -34,15 +34,16 @@ decoration {
|
||||
animations {
|
||||
# https://wiki.hyprland.org/Configuring/Animations/
|
||||
enabled = yes
|
||||
bezier = snappy, 0.05, 0.9, 0.1, 1.05
|
||||
animation = windows, 1, 2, snappy
|
||||
bezier = snappy, 0.05, 0.9, 0.1, 1.05 # This is apparently kinda an ease-out-back sorta deal
|
||||
bezier = ease-out-expo, 0.16, 1, 0.30, 1
|
||||
animation = windows, 1, 2, ease-out-expo
|
||||
animation = windowsIn, 1, 1, default
|
||||
animation = windowsOut, 1, 2, default, popin 80%
|
||||
animation = layers, 1, 1, default
|
||||
animation = border, 1, 3, default
|
||||
animation = borderangle, 1, 8, default
|
||||
animation = fade, 1, 3, default
|
||||
animation = workspaces, 1, 1.5, snappy
|
||||
animation = workspaces, 1, 1.5, ease-out-expo
|
||||
}
|
||||
|
||||
dwindle {
|
||||
@@ -50,6 +51,7 @@ dwindle {
|
||||
pseudotile = yes # Enables pseudotile functionality
|
||||
preserve_split = yes # Remember splits
|
||||
force_split = 2 # Force splits to put the child on the right/down
|
||||
default_split_ratio = 1.1
|
||||
}
|
||||
|
||||
master {
|
||||
@@ -72,6 +74,7 @@ misc {
|
||||
# fullscreen/maximized state.
|
||||
# 0 - behind, 1 - takes over, 2 - unfullscreen/unmaxize [0/1/2]
|
||||
new_window_takes_over_fullscreen = 2
|
||||
vfr = 1
|
||||
}
|
||||
|
||||
xwayland {
|
||||
|
@@ -1,2 +1,2 @@
|
||||
# vim: set ft=hyprlang:
|
||||
exec-once = pgrep -U $USER swww-daemon || { rm /run/user/$UID/swww.socket; swww-daemon --format xrgb; }
|
||||
exec-once = pgrep -U $USER swww-daemon || { rm /run/user/$UID/swww-wayland-1.sock; swww-daemon --format xrgb; }
|
||||
|
Reference in New Issue
Block a user