Routine update. not sure if this config works or not

This commit is contained in:
Jellyfishsh 2025-02-23 21:33:57 -08:00
parent f16b8c3737
commit 837871a67e
17 changed files with 673 additions and 32 deletions

View File

View File

@ -1,9 +0,0 @@
(defwindow powermenu
:monitor 0
:stacking "fg"
:windowtype "normal"
:wm-ignore true
:geometry (geometry
:width "50%"
:height "50%")
(label :text "Hello, World!"))

View File

@ -19,6 +19,7 @@
"nvim-treesitter": { "branch": "master", "commit": "0c94de7e9792cf89c14a865ab819ad5c6e6a7f77" },
"nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
"plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
"rustaceanvim": { "branch": "master", "commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39" },
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" }
}

View File

@ -6,19 +6,26 @@ return {
{
"williamboman/mason-lspconfig.nvim",
opts = {
ensure_installed = {"lua_ls", "clangd", "ts_ls", "pyright", "zls", "hls", "bashls"}
ensure_installed = {"lua_ls", "clangd", "ts_ls", "pyright", "zls", "hls", "bashls", "docker_compose_language_service", "dockerls", }
}
},
{
'mrcjkb/rustaceanvim',
version = '^5',
lazy = false
},
{
"neovim/nvim-lspconfig",
config = function()
require("lspconfig").lua_ls.setup({})
require("lspconfig").clangd.setup({})
require("lspconfig").ts_ls.setup({})
require("lspconfig").eslint.setup({})
require("lspconfig").pyright.setup({})
require("lspconfig").zls.setup({})
require("lspconfig").hls.setup({})
require("lspconfig").bashls.setup({})
require("lspconfig").docker_compose_language_service.setup({})
require("lspconfig").dockerls.setup({})
end
},
{
@ -80,6 +87,12 @@ return {
require("lspconfig").bashls.setup({
capabilities = capabilities
})
require("lspconfig").docker_compose_language_service.setup({
capabilities = capabilities
})
require("lspconfig").dockerls.setup({
capabilities = capabilities
})
end
}

View File

@ -12,6 +12,17 @@ return {
visible = true,
hide_dotfiles = false,
hide_gitignored = false,
},
window = {
position = "current"
}
},
event_handlers = {
{
event = "file_open_requested",
handler = function ()
vim.cmd("Neotree close")
end
}
}
}

View File

@ -159,6 +159,12 @@ riverctl rule-add -app-id "bar" csd
# Set the default layout generator to be rivertile and start it.
# River will send the process group of the init executable SIGTERM on exit.
riverctl default-layout rivertile
rivertile -view-padding 6 -outer-padding 6 &
rivertile -view-padding 0 -outer-padding 0 &
riverctl map normal Super R spawn 'dmenu_run'
#Setup
pipewire&
exec dbus-update-activation-environment --all
riverctl map normal Super R spawn 'rofi -show run'

View File

@ -2,12 +2,16 @@ set-option -g default-shell $SHELL
set -as terminal-features ",xterm-256color:RGB"
setw -g mouse on
#tmux closing
bind -n M-R refresh-client
bind -n M-Q confirm-before -p "Kill Tmux Session? (y/n)" kill-session
# Pane Splitting
unbind '"'
unbind '%'
bind -n M-> split-window -h
bind -n M-. split-window -v
bind -n M-Space new-window -c "#{pane_current_path}"
bind -n M-> split-window -h -c "#{pane_current_path}"
bind -n M-. split-window -v -c "#{pane_current_path}"
# Pane Sizing
bind -n M-H resize-pane -L
@ -31,14 +35,13 @@ bind -n M-1 selectw -t:=1
bind -n M-2 selectw -t:=2
bind -n M-3 selectw -t:=3
bind -n M-4 selectw -t:=4
bind -n M-4 selectw -t:=5
bind -n M-4 selectw -t:=6
bind -n M-4 selectw -t:=7
bind -n M-4 selectw -t:=8
bind -n M-4 selectw -t:=9
bind -n M-5 selectw -t:=5
bind -n M-6 selectw -t:=6
bind -n M-7 selectw -t:=7
bind -n M-8 selectw -t:=8
bind -n M-9 selectw -t:=9
# Window Mutation
bind -n M-Space new-window
bind -n M-Tab last-window
bind -n M-- confirm-before -p "Kill pane #P? (y/n)" kill-pane
bind -n M-= confirm-before -p "Kill window #W? (y/n)" kill-window

231
.config/waybar/config.jsonc Normal file
View File

@ -0,0 +1,231 @@
// -*- mode: jsonc -*-
{
// "layer": "top", // Waybar at top layer
// "position": "bottom", // Waybar position (top|bottom|left|right)
"height": 30, // Waybar height (to be removed for auto height)
// "width": 1280, // Waybar width
"spacing": 4, // Gaps between modules (4px)
// Choose the order of the modules
"modules-left": [
"sway/workspaces",
"sway/mode",
"sway/scratchpad",
"custom/media"
],
"modules-center": [
"sway/window"
],
"modules-right": [
"mpd",
"idle_inhibitor",
"pulseaudio",
"network",
"power-profiles-daemon",
"cpu",
"memory",
"temperature",
"backlight",
"keyboard-state",
"sway/language",
"battery",
"battery#bat2",
"clock",
"tray",
"custom/power"
],
"river/tags": {
"num-tags": 9,
"set-tags": [
1,
2,
3,
4,
5,
6,
7,
8,
9
]
}
// Modules configuration
// "sway/workspaces": {
// "disable-scroll": true,
// "all-outputs": true,
// "warp-on-scroll": false,
// "format": "{name}: {icon}",
// "format-icons": {
// "1": "",
// "2": "",
// "3": "",
// "4": "",
// "5": "",
// "urgent": "",
// "focused": "",
// "default": ""
// }
// },
"keyboard-state": {
"numlock": true,
"capslock": true,
"format": "{name} {icon}",
"format-icons": {
"locked": "",
"unlocked": ""
}
},
"sway/mode": {
"format": "<span style=\"italic\">{}</span>"
},
"sway/scratchpad": {
"format": "{icon} {count}",
"show-empty": false,
"format-icons": ["", ""],
"tooltip": true,
"tooltip-format": "{app}: {title}"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 5,
"consume-icons": {
"on": " "
},
"random-icons": {
"off": "<span color=\"#f53c3c\"></span> ",
"on": " "
},
"repeat-icons": {
"on": " "
},
"single-icons": {
"on": "1 "
},
"state-icons": {
"paused": "",
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "",
"deactivated": ""
}
},
"tray": {
// "icon-size": 21,
"spacing": 10
},
"clock": {
// "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}"
},
"cpu": {
"format": "{usage}% ",
"tooltip": false
},
"memory": {
"format": "{}% "
},
"temperature": {
// "thermal-zone": 2,
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-icons": ["", "", ""]
},
"backlight": {
// "device": "acpi_video1",
"format": "{percent}% {icon}",
"format-icons": ["", "", "", "", "", "", "", "", ""]
},
"battery": {
"states": {
// "good": 95,
"warning": 30,
"critical": 15
},
"format": "{capacity}% {icon}",
"format-full": "{capacity}% {icon}",
"format-charging": "{capacity}% ",
"format-plugged": "{capacity}% ",
"format-alt": "{time} {icon}",
// "format-good": "", // An empty format will hide the module
// "format-full": "",
"format-icons": ["", "", "", "", ""]
},
"battery#bat2": {
"bat": "BAT2"
},
"power-profiles-daemon": {
"format": "{icon}",
"tooltip-format": "Power profile: {profile}\nDriver: {driver}",
"tooltip": true,
"format-icons": {
"default": "",
"performance": "",
"balanced": "",
"power-saver": ""
}
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ipaddr}/{cidr} ",
"tooltip-format": "{ifname} via {gwaddr} ",
"format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠",
"format-alt": "{ifname}: {ipaddr}/{cidr}"
},
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
"format": "{volume}% {icon} {format_source}",
"format-bluetooth": "{volume}% {icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": " {format_source}",
"format-source": "{volume}% ",
"format-source-muted": "",
"format-icons": {
"headphone": "",
"hands-free": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": ["", "", ""]
},
"on-click": "pavucontrol"
},
"custom/media": {
"format": "{icon} {}",
"return-type": "json",
"max-length": 40,
"format-icons": {
"spotify": "",
"default": "🎜"
},
"escape": true,
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
},
"custom/power": {
"format" : "⏻ ",
"tooltip": false,
"menu": "on-click",
"menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
"menu-actions": {
"shutdown": "shutdown",
"reboot": "reboot",
"suspend": "systemctl suspend",
"hibernate": "systemctl hibernate"
}
}
}

327
.config/waybar/style.css Normal file
View File

@ -0,0 +1,327 @@
* {
/* `otf-font-awesome` is required to be installed for icons */
font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
font-size: 13px;
}
window#waybar {
background-color: rgba(43, 48, 59, 0.5);
border-bottom: 3px solid rgba(100, 114, 125, 0.5);
color: #ffffff;
transition-property: background-color;
transition-duration: .5s;
}
window#waybar.hidden {
opacity: 0.2;
}
/*
window#waybar.empty {
background-color: transparent;
}
window#waybar.solo {
background-color: #FFFFFF;
}
*/
window#waybar.termite {
background-color: #3F3F3F;
}
window#waybar.chromium {
background-color: #000000;
border: none;
}
button {
/* Use box-shadow instead of border so the text isn't offset */
box-shadow: inset 0 -3px transparent;
/* Avoid rounded borders under each button name */
border: none;
border-radius: 0;
}
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
button:hover {
background: inherit;
box-shadow: inset 0 -3px #ffffff;
}
/* you can set a style on hover for any module like this */
#pulseaudio:hover {
background-color: #a37800;
}
#workspaces button {
padding: 0 5px;
background-color: transparent;
color: #ffffff;
}
#workspaces button:hover {
background: rgba(0, 0, 0, 0.2);
}
#workspaces button.focused {
background-color: #64727D;
box-shadow: inset 0 -3px #ffffff;
}
#workspaces button.urgent {
background-color: #eb4d4b;
}
#mode {
background-color: #64727D;
box-shadow: inset 0 -3px #ffffff;
}
#clock,
#battery,
#cpu,
#memory,
#disk,
#temperature,
#backlight,
#network,
#pulseaudio,
#wireplumber,
#custom-media,
#tray,
#mode,
#idle_inhibitor,
#scratchpad,
#power-profiles-daemon,
#mpd {
padding: 0 10px;
color: #ffffff;
}
#window,
#workspaces {
margin: 0 4px;
}
/* If workspaces is the leftmost module, omit left margin */
.modules-left > widget:first-child > #workspaces {
margin-left: 0;
}
/* If workspaces is the rightmost module, omit right margin */
.modules-right > widget:last-child > #workspaces {
margin-right: 0;
}
#clock {
background-color: #64727D;
}
#battery {
background-color: #ffffff;
color: #000000;
}
#battery.charging, #battery.plugged {
color: #ffffff;
background-color: #26A65B;
}
@keyframes blink {
to {
background-color: #ffffff;
color: #000000;
}
}
/* Using steps() instead of linear as a timing function to limit cpu usage */
#battery.critical:not(.charging) {
background-color: #f53c3c;
color: #ffffff;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: steps(12);
animation-iteration-count: infinite;
animation-direction: alternate;
}
#power-profiles-daemon {
padding-right: 15px;
}
#power-profiles-daemon.performance {
background-color: #f53c3c;
color: #ffffff;
}
#power-profiles-daemon.balanced {
background-color: #2980b9;
color: #ffffff;
}
#power-profiles-daemon.power-saver {
background-color: #2ecc71;
color: #000000;
}
label:focus {
background-color: #000000;
}
#cpu {
background-color: #2ecc71;
color: #000000;
}
#memory {
background-color: #9b59b6;
}
#disk {
background-color: #964B00;
}
#backlight {
background-color: #90b1b1;
}
#network {
background-color: #2980b9;
}
#network.disconnected {
background-color: #f53c3c;
}
#pulseaudio {
background-color: #f1c40f;
color: #000000;
}
#pulseaudio.muted {
background-color: #90b1b1;
color: #2a5c45;
}
#wireplumber {
background-color: #fff0f5;
color: #000000;
}
#wireplumber.muted {
background-color: #f53c3c;
}
#custom-media {
background-color: #66cc99;
color: #2a5c45;
min-width: 100px;
}
#custom-media.custom-spotify {
background-color: #66cc99;
}
#custom-media.custom-vlc {
background-color: #ffa000;
}
#temperature {
background-color: #f0932b;
}
#temperature.critical {
background-color: #eb4d4b;
}
#tray {
background-color: #2980b9;
}
#tray > .passive {
-gtk-icon-effect: dim;
}
#tray > .needs-attention {
-gtk-icon-effect: highlight;
background-color: #eb4d4b;
}
#idle_inhibitor {
background-color: #2d3436;
}
#idle_inhibitor.activated {
background-color: #ecf0f1;
color: #2d3436;
}
#mpd {
background-color: #66cc99;
color: #2a5c45;
}
#mpd.disconnected {
background-color: #f53c3c;
}
#mpd.stopped {
background-color: #90b1b1;
}
#mpd.paused {
background-color: #51a37a;
}
#language {
background: #00b093;
color: #740864;
padding: 0 5px;
margin: 0 5px;
min-width: 16px;
}
#keyboard-state {
background: #97e1ad;
color: #000000;
padding: 0 0px;
margin: 0 5px;
min-width: 16px;
}
#keyboard-state > label {
padding: 0 5px;
}
#keyboard-state > label.locked {
background: rgba(0, 0, 0, 0.2);
}
#scratchpad {
background: rgba(0, 0, 0, 0.2);
}
#scratchpad.empty {
background-color: transparent;
}
#privacy {
padding: 0;
}
#privacy-item {
padding: 0 5px;
color: white;
}
#privacy-item.screenshare {
background-color: #cf5700;
}
#privacy-item.audio-in {
background-color: #1ca000;
}
#privacy-item.audio-out {
background-color: #0069d4;
}

View File

@ -0,0 +1,5 @@
[screencast]
output_name=eDP-1
max_fps=60
chooser_cmd=slurp -f %o -or
chooser_type=simple

View File

@ -0,0 +1,4 @@
[preferred]
default=gtk
org.freedesktop.impl.portal.ScreenCast=wlr
org.freedesktop.impl.portal.Screenshot=wlr

View File

@ -0,0 +1,10 @@
[opener]
edit = [
{ run = "nvim $0", orphan = true, block = true }
]
[open]
prepend_rules = [
{name = "*/", use = "edit"}
]

15
.gitignore vendored
View File

@ -7,3 +7,18 @@
.config/libreoffice
.config/zoom.conf
.config/zoomus.conf
.config/HTTPie
.config/CrossCode
.config/Electron
.config/glib-2.0
.config/gtk-3.0
.config/procps
.config/discord
.config/pulse
.config/ghc/
.config/nextjs-nodejs/
.config/sxhkd/
.config/vesktop/
.config/bspwm
.config/calibre
.config/discordcanary

View File

@ -4,3 +4,4 @@ install.sh
.config/pulse

15
.zshrc
View File

@ -2,6 +2,19 @@
export XDG_RUNTIME_DIR=/run/user/$(id -u)
export PATH="$PATH:$HOME/.local/bin"
[ -f "/home/cfigueroa/.ghcup/env" ] && . "/home/cfigueroa/.ghcup/env" # ghcup-env
function y() {
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
yazi "$@" --cwd-file="$tmp"
if cwd="$(command cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
builtin cd -- "$cwd"
fi
rm -f -- "$tmp"
}
export XDG_CURRENT_DESKTOP=river
eval "$(starship init zsh)"
[ -f "/home/cfigueroa/.ghcup/env" ] && . "/home/cfigueroa/.ghcup/env" # ghcup-env
. "/home/cfigueroa/.deno/env"

View File

@ -1,14 +1,25 @@
# CLI Tools
sudo xbps-install -y stow xtools neovim tmux yazi zsh starship
sudo xbps-install -Sy void-repo-nonfree
sudo xbps-install -Sy void-repo-multilib
# Variables
$BASE=stow xtools neovim tmux yazi zsh starship unzip
$LICENSES=void-repo-nonfree void-repo-multilib
$GUI=font-firacode river wezterm firefox dbus elogind pipewire wireplumber ffmpeg rofi
$LS=lua-language-server
$LANGS=rustup openjdk21 apache-maven gradle nodejs
$TOOLS=tar xz make curl perl gcc binutils pkg-config waybar
$LIBS=gmp-devel glibc-devel libffi-devel ncurses-devel ncurses-libtinfo-libs
# CLI Tools
sudo xbps-install -y $BASE
sudo xbps-install -Sy $LICENSES
#Dotfiles configuration
mkdir $HOME/.dotfiles
cp ./.stow-local-ignore $HOME/.dotfiles/
cp -r ./.* $HOME/.dotfiles/
cp -r ./* $HOME/.dotfiles/
cd $HOME/.dotfiles && stow . && cd -
#Projects configuration
mkdir --parents ~/projects/rust
mkdir --parents ~/projects/haskell
mkdir --parents ~/projects/java
@ -17,10 +28,8 @@ mkdir --parents ~/projects/javascript
# Setup zsh
chsh -s $(which zsh)
sudo xbps-install -y font-firacode river wezterm firefox dbus elogind pipewire wireplumber ffmpeg eww rofi
sudo xbps-install -y rustup openjdk21 apache-maven gradle nodejs unzip
sudo xbps-install -y binutils curl gcc gmp-devel glibc-devel libffi-devel make ncurses-devel ncurses-libtinfo-libs perl pkg-config tar xz
sudo xbps-install -y lua-language-server
# Additional tools
sudo xbps-install -y $GUI $LANGS $LS $TOOLS $LIBS
sudo npm i -g typescript typescript-language-server
# Setup river
@ -33,6 +42,8 @@ sudo sv up dbus
mkdir -p "${XDG_CONFIG_HOME}/pipewire/pipewire.conf.d"
ln -s /usr/share/examples/pipewire/20-pipewire-pulse.conf "${XDG_CONFIG_HOME}/pipewire/pipewire.conf.d/"
# Haskell
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
###### EXTRA ######

View File

@ -1,3 +1,2 @@
pipewire&
XDG_CURRENT_DESKTOP=sway
dbus-run-session river