rebase laptop

This commit is contained in:
Freya Murphy 2024-01-22 18:34:10 -05:00
parent 0a046f66db
commit 5009e5e06d
No known key found for this signature in database
GPG key ID: 988032A5638EE799
19 changed files with 225 additions and 245 deletions

View file

@ -0,0 +1,28 @@
import = ["/home/freya/.config/alacritty/catppuccin-mocha.toml"]
[font]
size = 11
[font.bold]
style = "Bold"
[font.bold_italic]
style = "Bold Italic"
[font.italic]
style = "Italic"
[font.normal]
family = "monospace"
style = "Regular"
[font.offset]
x = 0
y = 0
[window]
opacity = 0.85
[window.padding]
x = 10
y = 10

View file

@ -0,0 +1,76 @@
[colors.primary]
background = "#1E1E2E"
foreground = "#CDD6F4"
dim_foreground = "#CDD6F4"
bright_foreground = "#CDD6F4"
[colors.cursor]
text = "#1E1E2E"
cursor = "#F5E0DC"
[colors.vi_mode_cursor]
text = "#1E1E2E"
cursor = "#B4BEFE"
[colors.search.matches]
foreground = "#1E1E2E"
background = "#A6ADC8"
[colors.search.focused_match]
foreground = "#1E1E2E"
background = "#A6E3A1"
[colors.footer_bar]
foreground = "#1E1E2E"
background = "#A6ADC8"
[colors.hints.start]
foreground = "#1E1E2E"
background = "#F9E2AF"
[colors.hints.end]
foreground = "#1E1E2E"
background = "#A6ADC8"
[colors.selection]
text = "#1E1E2E"
background = "#F5E0DC"
[colors.normal]
black = "#45475A"
red = "#F38BA8"
green = "#A6E3A1"
yellow = "#F9E2AF"
blue = "#89B4FA"
magenta = "#F5C2E7"
cyan = "#94E2D5"
white = "#BAC2DE"
[colors.bright]
black = "#585B70"
red = "#F38BA8"
green = "#A6E3A1"
yellow = "#F9E2AF"
blue = "#89B4FA"
magenta = "#F5C2E7"
cyan = "#94E2D5"
white = "#A6ADC8"
[colors.dim]
black = "#45475A"
red = "#F38BA8"
green = "#A6E3A1"
yellow = "#F9E2AF"
blue = "#89B4FA"
magenta = "#F5C2E7"
cyan = "#94E2D5"
white = "#BAC2DE"
[[colors.indexed_colors]]
index = 16
color = "#FAB387"
[[colors.indexed_colors]]
index = 17
color = "#F5E0DC"

View file

@ -25,8 +25,8 @@
<alias>
<family>monospace</family>
<prefer>
<family>Fira Mono</family>
<family>Fira Mono Nerd Font</family>
<family>Fira Code</family>
<family>FiraCode Nerd Font Mono</family>
<family>Font Awesome 6 Pro Regular</family>
<family>Twemoji</family>
<family>DejaVu Sans Mono</family>

View file

@ -1,18 +1,19 @@
exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=Hyprland
exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME
exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_CURRENT_DESKTOP=Hyprland
$mod = SUPER
$term = alacritty
$term = kitty
$menu = wofi --allow-images --show drun --prompt "Search Program"
$scale = 1.5
$scale = 1.25
$radius = 5
$gaps = 10
$border = 3
$browser = firefox
$browser = librewolf
source = ~/.config/hypr/config.d/theme.conf
source = ~/.config/hypr/config.d/keybinds.conf

View file

@ -1,2 +1,2 @@
preload = ~/sync/wallpapers/nya0.png
wallpaper = ,~/sync/wallpapers/nya0.png
preload = ~/.config/desktop-common/wallpapers/blue.jpg
wallpaper = ,~/.config/desktop-common/wallpapers/blue.jpg

View file

@ -1,9 +1,9 @@
[Default Applications]
text/html=firefox.desktop
x-scheme-handler/http=firefox.desktop
x-scheme-handler/https=firefox.desktop
x-scheme-handler/about=firefox.desktop
x-scheme-handler/unknown=firefox.desktop
text/html=librewolf.desktop
x-scheme-handler/http=librewolf.desktop
x-scheme-handler/https=librewolf.desktop
x-scheme-handler/about=librewolf.desktop
x-scheme-handler/unknown=librewolf.desktop
image/png=imv.desktop
image/jpeg=imv.desktop
image/webp=imv.desktop
@ -29,26 +29,11 @@ text/x-moc=nvim.desktop
text/x-pascal=nvim.desktop
text/x-tcl=nvim.desktop
text/x-tex=nvim.desktop
application/x-shellscript=nvim.desktop
text/x-c=nvim.desktop
text/x-c++=nvim.desktop
application/gzip=org.gnome.Nautilus.desktop
application/zip=org.gnome.Nautilus.desktop
application/x-bzip2=org.gnome.Nautilus.desktop
application/vnd.ms-opentype=org.gnome.Nautilus.desktop
font/sfnt=org.gnome.Nautilus.desktop
application/java-archive=org.gnome.Nautilus.desktop
application/x-iso9660-image=org.gnome.Nautilus.desktop
application/x-xz=org.gnome.Nautilus.desktop
application/x-zerosize=nvim.desktop
x-scheme-handler/mailto=userapp-Thunderbird-Y667E2.desktop
message/rfc822=userapp-Thunderbird-Y667E2.desktop
x-scheme-handler/mid=userapp-Thunderbird-Y667E2.desktop
x-scheme-handler/webcal=userapp-Thunderbird-9WQSA2.desktop
text/calendar=userapp-Thunderbird-9WQSA2.desktop
application/x-extension-ics=userapp-Thunderbird-9WQSA2.desktop
x-scheme-handler/webcals=userapp-Thunderbird-9WQSA2.desktop
x-scheme-handler/mspa=unofficial-homestuck-collection.desktop
application/x-shellscript=nvim.desktop
x-scheme-handler/msteams=teams.desktop
[Added Associations]
application/x-zerosize=nvim.desktop;
@ -56,8 +41,8 @@ x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-4
x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-4IZTA2.desktop;
x-scheme-handler/webcal=userapp-Thunderbird-9WQSA2.desktop;
x-scheme-handler/webcals=userapp-Thunderbird-9WQSA2.desktop;
x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;
x-scheme-handler/mailto=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;userapp-Thunderbird-2QYKF2.desktop;
message/rfc822=userapp-Thunderbird-E9G491.desktop;
x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;
x-scheme-handler/mid=userapp-Thunderbird-E9G491.desktop;userapp-Thunderbird-Y667E2.desktop;userapp-Thunderbird-2QYKF2.desktop;
x-scheme-handler/discord=discord.desktop;
x-scheme-handler/slack=slack.desktop;

View file

@ -69,11 +69,18 @@ require('lspconfig/prolog_lsp')
lsp.configure('prolog_lsp', {force_setup = true})
lsp.setup()
require'lspconfig'.phpactor.setup{
on_attach = on_attach,
init_options = {
["language_server_phpstan.enabled"] = false,
["language_server_psalm.enabled"] = false,
}
}
vim.diagnostic.config({
virtual_text = true
})
require("neodev").setup()
require("nvim-surround").setup()
require("toggleterm").setup()

View file

@ -150,34 +150,6 @@ local cats = {
[[[bug] .*' / .*' ; .*`- +' `*' ]],
[[ `*-* `*-* `*-*']],
},
{
[[ .-o=o-.]],
[[ , /=o=o=o=\ .--.]],
[[ _|\|=o=O=o=O=| \]],
[[ __.' a`\=o=o=o=(`\ /]],
[[ '. a 4/`|.-""'`\ \ ;'`) .---.]],
[[ \ .' / .--' |_.' / .-._)]],
[[ `) _.' / /`-.__.' /]],
[[ jgs `'-.____; /'-.___.-']],
[[ `"""`]],
},
{
[[ (`.]],
[[ ) )]],
[[ ( (]],
[[ \ \]],
[[ \ \]],
[[ .-' `-.]],
[[ / `.]],
[[ ( ) `-._ , _]],
[[ ) ,' (.\--'(]],
[[ \ ( ) / \]],
[[ \ \_( / ( <0 (0]],
[[ \_)))\ ( `._ ::Y)__]],
[[ ''' \ `-._.'`---^_)))]],
[[ `-._ ))) ```]],
[[ ``` hjw]],
}
}
math.randomseed(os.time())

View file

@ -17,5 +17,6 @@ vim.filetype.add({
pattern = {
['.*%.pl'] = 'prolog',
['.*%.prolog'] = 'prolog',
['.*%.php.m4'] = 'php',
}
})

View file

@ -6,7 +6,7 @@ exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_
set $mod Mod4
# Set terminal
set $term alacritty
set $term kitty
# Set app launcher
set $menu wofi --allow-images --show=drun --prompt "Search Program"
@ -27,10 +27,10 @@ set $blur_radius 10
set $blur_passes 3
# Set browser
set $browser firefox
set $browser librewolf
# Autostart apps
exec $HOME/.config/sway/scripts.d/auto.sh
exec $HOME/.config/desktop-common/scripts.d/auto.sh
# Local configs
include $HOME/.config/sway/config.d/*

View file

@ -19,7 +19,7 @@ bindsym $mod+Shift+l exec $lock
bindsym Ctrl+Alt+Delete exec killall sway
# Power menu
bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/sway/logout.d/power/style.css -l ~/.config/sway/logout.d/power/layout
bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/desktop-common/logout.d/power/style.css -l ~/.config/desktop-common/logout.d/power/layout
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
@ -54,5 +54,7 @@ bindsym Print exec grim - | wl-copy -t iamge/png && notify-send -t 3000 "Sway" "
bindsym Shift+Print exec slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
# Michelsoft Binbows
bindsym Ctrl+$mod+Shift+L exec firefox "https://linkedin.com"
bindsym Ctrl+$mod+Shift+S exec alacritty -e sl
bindsym Ctrl+$mod+Shift+L exec $browser "https://linkedin.com"
bindsym Ctrl+$mod+Shift+S exec $term -e sl
bindsym Ctrl+$mod+Shift+T exec electron25 "https://twitter.com"
bindsym Ctrl+$mod+Shift+M exec electron25 "https://www.tumblr.com"

View file

@ -1,8 +1,14 @@
### Set borders
gaps inner $gaps
<<<<<<< HEAD
for_window [class="^.*"] border pixel 2
default_border pixel 2
default_floating_border pixel 2
=======
for_window [class="^.*"] border pixel 0
default_border pixel 0
default_floating_border pixel 0
>>>>>>> b688e13 (shinji)
### Colors

View file

@ -14,7 +14,7 @@
*/
window#waybar {
background-color: rgba(20, 23, 29, 0.85);
background-color: rgba(30, 30, 46, 0.85);
color: #c7c6c3;
}

View file

@ -6,3 +6,5 @@
gpgsign = true
[init]
defaultBranch = main
[http]
postBuffer = 157286400

View file

@ -10,26 +10,46 @@ host jolteon
Host yveltal
HostName yveltal.freya.cat
User freya
User root
Port 1111
Host yveltal.local
HostName 192.168.0.126
User root
Port 1111
Host yveltal.ospf
Hostname 10.1.1.1
User root
Port 22
Host yveltal.router
Hostname 10.1.3.1
User root
Port 22
Host yveltal.services
Hostname 10.1.3.129
User root
Port 22
Host yveltal.plex
Hostname 10.1.3.73
User root
Port 22
Host yveltal.minecraft
Hostname 10.1.3.13
User root
Port 22
Host stationery
HostName stationery.faith
User freya
Host queeg
Hostname queeg.cs.rit.edu
User tam2214
Host nitron
Hostname nitron.cs.rit.edu
User tam2214
Host github.com
Hostname github.com
User tam2214
IdentityFile /home/freya/.ssh/id_rit
Host redcom
Hostname fmurphy-dev.redcom.com
User fmurphy
Host *
KexAlgorithms -sntrup761x25519-sha512@openssh.com

View file

@ -20,9 +20,29 @@ export GTK_THEME=Lavanda-Sea-Dark
# Set terminal
export TERMINAL=alacritty
# start sway only once and on the primary tty
if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
exec sway &> .log/sway
fi
clear
echo
echo
echo "Please select an environment..."
echo "Or press any key to enter terminal"
echo "[S]way [H]yprland"
echo
echo
exec fbterm
stty raw -echo
choice=$(dd bs=1 count=1 2> /dev/null)
stty -raw echo
case "$choice" in
"s")
echo "Launching sway..."
exec sway &> $HOME/.log/sway
;;
"h")
echo "Launching Hyprland..."
exec Hyprland &> $HOME/.log/Hyprland
;;
esac
exec fbterm &> $HOME/.log/fbterm

22
.zshrc
View file

@ -34,9 +34,8 @@ alias ip="ip --color=auto"
alias grep="grep --color=auto"
alias diff="diff --color=auto"
alias ccat="highlight --out-format=ansi"
alias config="/usr/bin/git --git-dir=$HOME/.cfg --work-tree=$HOME"
alias vim="nvim"
alias show="kitten icat --align=left"
# Have manpages use colors
export LESS_TERMCAP_md=$'\e[1;36m'
@ -56,7 +55,13 @@ export GROFF_NO_SGR=1
ZSH_AUTOSUGGEST_STRATEGY=(completion history)
}
.reload
ssh() {
if [ "$1" = "redcom" ]; then
/usr/bin/ssh $1
else
TERM=alacritty /usr/bin/ssh $1
fi
}
# Enable zsh keybinds for home, end, and other movement keybinds
bindkey "\e[1;5D" backward-word
@ -68,8 +73,17 @@ bindkey "\e[H" beginning-of-line
bindkey "\e[F" end-of-line
bindkey "\e\d" undo
.ranger() {
ranger --choosedir=$HOME/.rangerdir < $TTY
LASTDIR=$(cat $HOME/.rangerdir)
cd "$LASTDIR"
zle reset-prompt
}
zle -N reload .reload
bindkey "^R" reload
zle -N ranger .ranger
bindkey "^F" ranger
# GPG SETUP FOR SSH
export GPG_TTY=$(tty)

11
aur
View file

@ -1,11 +0,0 @@
autotiling
cider
fbterm
mkinitcpio-firmware
paru
pesterchum-git
pfetch-rs
swayfx
ttf-twemoji-color
units
wlogout

143
packages
View file

@ -1,143 +0,0 @@
acpi
alacritty
alsa-tools
alsa-utils
amd-ucode
base
base-devel
bind
blueberry
bluez-utils
brightnessctl
btrfs-progs
chromium
clang
cmake
cups
cups-pdf
discord
docker
docker-compose
doxygen
easyeffects
efibootmgr
element-desktop
evtest
firefox
fontforge
fuse2
gimp
git
gnome-keyring
gnome-themes-extra
grim
grub
highlight
htop
imv
iwd
jq
krita
less
lib32-libva-mesa-driver
lib32-mesa-vdpau
libreoffice-fresh
libva-mesa-driver
libvirt
linux
linux-firmware
linux-headers
lutris
mako
man-db
man-pages
maven
mesa-vdpau
meson
mpv
neofetch
neovim
network-manager-applet
networkmanager
nodejs
noto-fonts-cjk
npm
obs-studio
octave
opendoas
p7zip
pacman-contrib
pandoc-cli
pavucontrol
perl-image-exiftool
pipewire-alsa
pipewire-pulse
python-pynvim
qbittorrent
qemu-full
qt5-wayland
ripgrep
ruby
rustup
sassc
sbctl
sl
slurp
sof-firmware
starship
steam
swaybg
swayidle
swaylock
swi-prolog
tcpdump
texlive-basic
texlive-bibtexextra
texlive-binextra
texlive-context
texlive-fontsextra
texlive-fontsrecommended
texlive-fontutils
texlive-formatsextra
texlive-games
texlive-humanities
texlive-latex
texlive-latexextra
texlive-latexrecommended
texlive-luatex
texlive-mathscience
texlive-metapost
texlive-music
texlive-pictures
texlive-plaingeneric
texlive-pstricks
texlive-publishers
texlive-xetex
thunar
thunderbird
tlp
tmux
tree
ttf-dejavu
unzip
vim
virt-manager
vulkan-tools
waybar
waylock
wget
wine-staging
winetricks
wireguard-tools
wl-clipboard
wl-mirror
wofi
xdg-desktop-portal
xdg-desktop-portal-wlr
xf86-video-amdgpu
xorg-xwayland
yt-dlp
zathura
zathura-pdf-mupdf
zsh
zsh-syntax-highlighting