Compare commits

...

15 Commits

Author SHA1 Message Date
clint d0cd3783cf clippy 2025-05-31 13:04:53 -05:00
clint 4ed2e0831b aliases 2025-05-31 11:30:04 -05:00
clint 4411c5f9a6 rofi temp 2025-05-31 09:01:19 -05:00
clint d76e8aebf7 Merge branch 'master' of https://git.terminallychill.xyz/clint/dotfiles 2025-05-07 15:00:20 -05:00
clint 2236d67d6e eza; exa gone 2025-05-07 14:58:04 -05:00
clint e5a13840a7 asdf 2025-05-07 14:55:47 -05:00
clint 021fcbff61 null-ls dead; using none-ls 2025-05-07 14:55:47 -05:00
clint 86ec8ee471 whichkey update 2025-05-07 14:55:47 -05:00
clint f4bcd89714 bash-completion added 2025-05-07 14:55:47 -05:00
clint aecbf02a04 friendship ended with firefox, floorp new best friend 2025-05-07 14:55:47 -05:00
clint beead9be21 space 2025-05-07 14:55:47 -05:00
clint 95263cc8d6 move to workspace SILENT 2025-05-07 14:55:47 -05:00
c 33f82903e4 zshrc fzf history and ps1 2025-03-13 23:38:17 -05:00
clint cc54ff0749 minutes, not month, you dumbass 2025-02-28 08:29:59 -06:00
clint bbd793cc82 Merge pull request 'hyprland' (#4) from hyprland into master
Reviewed-on: #4
2025-02-28 14:27:04 +00:00
8 changed files with 102 additions and 95 deletions

View File

@ -14,11 +14,15 @@ bind -m vi-insert 'Control-l: clear-screen'
PS1='\[\e[32m\]\u@\h\[\e[0m\]:\[\e[34m\]\w\[\e[0m\] \$ ' PS1='\[\e[32m\]\u@\h\[\e[0m\]:\[\e[34m\]\w\[\e[0m\] \$ '
# Source this file from git that expands PS1 stuff # Source this file from git that expands PS1 stuff
GIT_PS1_SHOWUPSTREAM=git GIT_PS1_SHOWUPSTREAM='verbose name'
GIT_PS1_SHOWDIRTYSTATE=true GIT_PS1_SHOWDIRTYSTATE=true
GIT_PS1_SHOWUNTRACKEDFILES=true GIT_PS1_SHOWUNTRACKEDFILES=true
#GIT_PS1_SHOWCOLORHINTS=true
GIT_PS1_DESCRIBE_STYLE=branch
source /etc/bash_completion.d/git-prompt.sh source /etc/bash_completion.d/git-prompt.sh
PS1='\[\e[01;32m\]\u@\h\[\e[0m\]:\[\e[01;34m\]\w\[\e[0m\]$(__git_ps1 " (%s)")\[\e[0m\]\$ ' PS1='\[\e[01;32m\]\u@\h\[\e[0m\]:\[\e[01;34m\]\w\[\e[0m\]$(__git_ps1 "(%s)")\[\e[0m\]\$ '
[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
. /usr/share/bash-completion/bash_completion
# History settings: no duplicates, decent size # History settings: no duplicates, decent size
HISTSIZE=10000 HISTSIZE=10000
@ -32,16 +36,20 @@ alias np='nano -w PKGBUILD'
alias more="less" alias more="less"
alias rofi='rofi -m 1' alias rofi='rofi -m 1'
alias weather="curl wttr.in" alias weather="curl wttr.in"
alias ls="exa -lhg --group-directories-first" alias ls="eza -lhg --group-directories-first"
alias ll="exa -lhga --group-directories-first" alias ll="eza -lhga --group-directories-first"
alias vim="nvim" alias vim="nvim"
alias docs="python ~/scripts/stock_price.py -s docs" alias docs="python ~/scripts/stock_price.py -s docs"
alias stock="python ~/scripts/stock_price.py -s " alias stock="python ~/scripts/stock_price.py -s "
alias r="ranger" alias r="ranger"
alias grep='grep --colour=auto' alias grep='grep --colour=auto'
alias cdd='. ~/scripts/project_picker.sh'
alias configedit='. ~/scripts/config_edit.sh'
alias clip='cliphist list | fzf --no-sort | cliphist decode | wl-copy'
# expand path # expand path
PATH=$PATH:/usr/local/bin PATH=/usr/local/bin:/usr/bin/:/usr/sbin
PATH=$PATH:~/.local/share
# exports # exports
export EDITOR=/usr/bin/nvim export EDITOR=/usr/bin/nvim
@ -60,3 +68,6 @@ bind '"\C-t": "fzf --preview \"cat {}\" < <(find . -type f) | xargs $EDITOR\n"'
# kinda annoying tbh # kinda annoying tbh
# pfetch || neofetch || fastfetch # pfetch || neofetch || fastfetch
# Created by `pipx` on 2025-05-04 00:05:20
export PATH="$PATH:/home/clint/.local/bin"

View File

@ -13,7 +13,8 @@ monitor = DP-2,1920x1080, 1920x0, 1
# See https://wiki.hyprland.org/Configuring/Keywords/ # See https://wiki.hyprland.org/Configuring/Keywords/
$terminal = alacritty $terminal = alacritty
$fileManager = dolphin $fileManager = dolphin
$menu = wofi --show drun # $menu = wofi --show drun
$menu = rofi -theme /home/clint/.config/wofi/test3.rasi -show drun
################# #################
### AUTOSTART ### ### AUTOSTART ###
@ -22,6 +23,7 @@ $menu = wofi --show drun
# Autostart necessary processes (like notifications daemons, status bars, etc.) # Autostart necessary processes (like notifications daemons, status bars, etc.)
# Or execute your favorite apps at launch like this: # Or execute your favorite apps at launch like this:
exec-once = waybar & hyprpaper exec-once = waybar & hyprpaper
exec-once = wl-paste --watch cliphist store
############################# #############################
### ENVIRONMENT VARIABLES ### ### ENVIRONMENT VARIABLES ###
@ -160,11 +162,12 @@ bind = $mainMod SHIFT, Space, togglefloating,
bind = $mainMod, D, exec, $menu bind = $mainMod, D, exec, $menu
bind = $mainMod SHIFT, P, pseudo, # dwindle bind = $mainMod SHIFT, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle bind = $mainMod, J, togglesplit, # dwindle
bind = $mainMod SHIFT, W, exec, firefox bind = $mainMod SHIFT, W, exec, flatpak run one.ablaze.floorp
bind = $mainMod, P, exec, ~/scripts/hypr_change_wallpaper.sh bind = $mainMod, P, exec, ~/scripts/hypr_change_wallpaper.sh
bind = $mainMod, L, exec, hyprlock bind = $mainMod, L, exec, hyprlock
bind = $mainMod, F, fullscreen bind = $mainMod, F, fullscreen
bind = $mainMod, X, exec, ~/scripts/hypr_shutdown.sh bind = $mainMod, X, exec, ~/scripts/hypr_shutdown.sh
bind = $mainMod, H, exec, cliphist list | rofi -theme /home/clint/.config/wofi/test3.rasi -dmenu | cliphist decode | wl-copy
# Move focus with mainMod + arrow keys # Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l bind = $mainMod, left, movefocus, l
@ -191,16 +194,16 @@ bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10 bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9] # Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1 bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2 bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3 bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4 bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5 bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6 bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7 bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10 bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10
# idk fixing workspace locations # idk fixing workspace locations
workspace = 1,monitor:HDMI-A-1 workspace = 1,monitor:HDMI-A-1
@ -215,7 +218,7 @@ workspace = 8,monitor:DP-2
# Example special workspace (scratchpad) # Example special workspace (scratchpad)
bind = $mainMod, S, togglespecialworkspace, magic bind = $mainMod, S, togglespecialworkspace, magic
bind = $mainMod SHIFT, S, movetoworkspace, special:magic bind = $mainMod SHIFT, S, movetoworkspacesilent, special:magic
# Scroll through existing workspaces with mainMod + scroll # Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1 bind = $mainMod, mouse_down, workspace, e+1

View File

@ -1,7 +1,7 @@
# BACKGROUND # BACKGROUND
background { background {
monitor = monitor =
path = /home/clint/Pictures/wallpapers/castle2.jpg path = /home/clint/Pictures/wallpapers/redtrees.jpg
} }

View File

@ -1,6 +1,6 @@
preload = /home/clint/Pictures/wallpapers/castle_view.jpg preload =
wallpaper = HDMI-A-1, /home/clint/Pictures/wallpapers/castle_view.jpg wallpaper = HDMI-A-1, /home/clint/Pictures/wallpapers/forest.jpg
wallpaper = DP-2, /home/clint/Pictures/wallpapers/castle_view.jpg wallpaper = DP-2, /home/clint/Pictures/wallpapers/forest.jpg
#enable splash text rendering over the wallpaper #enable splash text rendering over the wallpaper
splash = false splash = false

View File

@ -3,56 +3,40 @@
local wk = require("which-key") local wk = require("which-key")
wk.register({ wk.add({
["<leader>"] = { { "<leader><F1>", desc = "Open IPython" },
-- File related stuff { "<leader><F2>", desc = "Execute py file" },
f = { { "<leader><F5>", desc = "Debug: Continue" },
name = "+file", { "<leader>B", desc = "Set Breakpoint" },
f = "Find File", { "<leader>D", desc = "Debug UI" },
s = "Live Search", { "<leader>K", desc = "Hover" },
b = "File Browser (delete this?)", { "<leader>R", desc = "Rename Object" },
r = "Recent Files", { "<leader>Y", desc = "Yank to system clipboard" },
}, { "<leader>b", desc = "Buffers" },
-- Git related stuff { "<leader>c", desc = "Change Color Scheme" },
g = { { "<leader>d", desc = "Diagnostics" },
name = "+git", { "<leader>e", desc = "File Explorer" },
g = "LazyGit", { "<leader>f", group = "file" },
f = "Git Files", { "<leader>fb", desc = "File Browser (delete this?)" },
b = "Git Blame (show)", { "<leader>ff", desc = "Find File" },
n = "Next hunk", { "<leader>fo", desc = "Format Current File" },
N = "Prev hunk", { "<leader>fr", desc = "Recent Files" },
{ "<leader>fs", desc = "Live Search" },
}, { "<leader>g", group = "git" },
r = { { "<leader>gN", desc = "Prev hunk" },
name = "+repl", { "<leader>gb", desc = "Git Blame (show)" },
p = "Run Python" { "<leader>gd", desc = "Go to definition" },
}, { "<leader>gf", desc = "Git Files" },
t = { { "<leader>gg", desc = "LazyGit" },
name = "+timestamps", { "<leader>gn", desc = "Next hunk" },
t = "Print time", { "<leader>h", desc = "Registers" },
d = "Print date+time" { "<leader>o", desc = "Object Explorer" },
}, { "<leader>r", group = "repl" },
-- Misc { "<leader>rp", desc = "Run Python" },
c = "Change Color Scheme", { "<leader>s", desc = "Find and Replace" },
y = "Yank to system clipboard", { "<leader>t", group = "timestamps" },
Y = "Yank to system clipboard", { "<leader>td", desc = "Print date+time" },
d = "Diagnostics", { "<leader>tt", desc = "Print time" },
e = "File Explorer", { "<leader>x", desc = "Execute selected code" },
s = "Find and Replace", { "<leader>y", desc = "Yank to system clipboard" },
b = "Buffers",
h = "Registers",
o = "Object Explorer",
fo = "Format Current File",
-- LSP related stuff
R = "Rename Object",
K = "Hover",
gd = "Go to definition",
-- Debugging
D = "Debug UI",
B = "Set Breakpoint",
["<F1>"] = "Open IPython",
x = "Execute selected code",
["<F2>"] = "Execute py file",
["<F5>"] = "Debug: Continue",
},
}) })

View File

@ -1,8 +1,21 @@
return { return {
-- -- Linter
-- {
-- 'jose-elias-alvarez/null-ls.nvim',
-- config = function()
-- local nls = require("null-ls")
-- nls.setup({
-- sources = {
-- nls.builtins.formatting.black,
-- },
-- })
-- end,
-- },
-- Linter -- Linter
{ {
'jose-elias-alvarez/null-ls.nvim', 'nvimtools/none-ls.nvim',
config = function() config = function()
local nls = require("null-ls") local nls = require("null-ls")
nls.setup({ nls.setup({

View File

@ -8,7 +8,7 @@ set-window-option -g status-left-length 30
# right status # right status
set-window-option -g status-right-length 300 set-window-option -g status-right-length 300
set-window-option -g status-right "#[bg=white fg=black bold][`F]#[bg=black fg=white] Search #[bg=white fg=black bold][`C-r]#[bg=black fg=white] Restore #[bg=white fg=black bold][`C-s]#[bg=black fg=white] Save#[fg=brightred bg=black] #[fg=white bg=black] #{weather} #[fg=brightred bg=black] #[fg=colour179 bg=black]🖥 CPU:#{cpu_percentage} MEM:#{ram_percentage} #[fg=brightred bg=black] #[fg=white bg=black]📅%Y-%m-%d 🕗%I:%m%p" set-window-option -g status-right "#[bg=white fg=black bold][`F]#[bg=black fg=white] Search #[bg=white fg=black bold][`C-r]#[bg=black fg=white] Restore #[bg=white fg=black bold][`C-s]#[bg=black fg=white] Save#[fg=brightred bg=black] #[fg=white bg=black] #{weather} #[fg=brightred bg=black] #[fg=colour179 bg=black]🖥 CPU:#{cpu_percentage} MEM:#{ram_percentage} #[fg=brightred bg=black] #[fg=white bg=black]📅%Y-%m-%d 🕗%I:%M%p"
set-window-option -g status-right-style "fg=white bg=black" set-window-option -g status-right-style "fg=white bg=black"
# set-option -g status-right # set-option -g status-right

View File

@ -1,15 +1,5 @@
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. # prompt
# Initialization code that may require console input (password prompts, [y/n] export PS1="%{%F{226}%}%n%{%F{220}%}@%{%F{214}%}%m %{%F{33}%}%1~ %{%f%}$ "
# confirmations, etc.) must go above this block; everything else may go below.
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi
# import keys
if [ -f ~/.keys ]; then
. ~/.keys
echo "keys loaded"
fi
# aliases # aliases
# alias python="/Library/Frameworks/Python.framework/Versions/3.10/bin/python3" # alias python="/Library/Frameworks/Python.framework/Versions/3.10/bin/python3"
@ -52,12 +42,6 @@ compinit
_comp_options+=(globdots) _comp_options+=(globdots)
zstyle ':completion:*' menu select zstyle ':completion:*' menu select
# start power theme
source ~/powerlevel10k/powerlevel10k.zsh-theme
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
# auto cd # auto cd
setopt auto_cd setopt auto_cd
@ -71,4 +55,16 @@ eval "$(pyenv init --path)"
eval "$(pyenv init -)" eval "$(pyenv init -)"
# eval "$(pyenv virtualenv-init -)" # eval "$(pyenv virtualenv-init -)"
source ~/powerlevel10k/powerlevel10k.zsh-theme
# fzf
export FZF_DEFAULT_OPTS='--layout=reverse --height=50% --preview-window=right:50%:border-sharp --border-label=" command preview " --border=double'
# Set up fzf key bindings and fuzzy completion
# Ctrl+R override for bash history
# Alt-C overried to cd into selected directory
eval "$(fzf --zsh)"
# Quick file finder with preview and open with vim (Ctrl+T override)
# bind '"\C-t": "fzf --preview \"cat {}\" < <(find . -type f) | xargs $EDITOR\n"'