diff --git a/desktop/fish/config.fish b/desktop/fish/config.fish index ce8c95e..d606b66 100644 --- a/desktop/fish/config.fish +++ b/desktop/fish/config.fish @@ -1,10 +1,7 @@ if status is-interactive + fish_add_path "/home/eesim/.cargo/bin/" ### Local environment variables - export DENO_INSTALL="/home/eesim/.deno" -end - -if test (tty) = "/dev/tty1" - sway + set -x DENO_INSTALL "/home/eesim/.deno" end if status is-login @@ -14,36 +11,39 @@ if status is-login ssh-add /home/eesim/.ssh/id_ed25519 # Set environment variables in /etc/profile.d/ - exec bash -c "test -e /etc/profile && source /etc/profile" + # exec bash -c "test -e /etc/profile && source /etc/profile" ### Environment Variables # Set nvim to default editor - set -x EDITOR = "/usr/bin/nvim" - set -x SUDO_EDITOR = "/usr/bin/nvim" + set -x EDITOR "/usr/bin/nvim" + set -x SUDO_EDITOR "/usr/bin/nvim" # Set R library location - set -x R_LIBS_USER = "/home/eesim/.local/lib/R" + set -x R_LIBS_USER "/home/eesim/.local/lib/R" # Disable GTK portal - set -x GTK_USE_PORTAL=0 + set -x GTK_USE_PORTAL "0" # Wayland environment variables - set -x XDG_CURRENT_DESKTOP = "sway" - set -x XDG_CURRENT_SESSION = "sway" - set -x XDG_SESSION_TYPE = "wayland" - set -x ELECTRON_OZONE_PLATFORM_HINT = "auto" - set -x QT_QPA_PLATFORM = "wayland;xcb" - set -x SDL_VIDEODRIVER = "wayland,x11" + set -x XDG_CURRENT_DESKTOP "sway" + set -x XDG_CURRENT_SESSION "sway" + set -x XDG_SESSION_TYPE "wayland" + set -x ELECTRON_OZONE_PLATFORM_HINT "auto" + set -x QT_QPA_PLATFORM "wayland;xcb" + set -x SDL_VIDEODRIVER "wayland,x11" # Java fix - set -x _JAVA_AWT_WM_NONREPARENTING = "1" + set -x _JAVA_AWT_WM_NONREPARENTING "1" ### Themes - set -x QT_QPA_PLATFORMTHEME = "qt5ct" + set -x QT_QPA_PLATFORMTHEME "qt5ct" - ### Start fish - exec fish end + +if test (tty) = "/dev/tty1" + sway +end + diff --git a/desktop/nvim/lua/config/keymaps.lua b/desktop/nvim/lua/config/keymaps.lua index c098e41..5b7437e 100644 --- a/desktop/nvim/lua/config/keymaps.lua +++ b/desktop/nvim/lua/config/keymaps.lua @@ -10,6 +10,8 @@ vim.keymap.set('n', 'ff', ':FzfLua files') vim.keymap.set('n', 'fb', ':FzfLua buffers') vim.keymap.set('n', 'rg', ':FzfLua grep_project') + + vim.keymap.set('i', '', '') vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) diff --git a/desktop/nvim/lua/config/plugins/init.lua b/desktop/nvim/lua/config/plugins/init.lua index 615e251..36d2690 100644 --- a/desktop/nvim/lua/config/plugins/init.lua +++ b/desktop/nvim/lua/config/plugins/init.lua @@ -33,6 +33,13 @@ local plugins = { 'jalvesaq/Nvim-R', + { + 'RaafatTurki/hex.nvim', + config = function() + require('hex').setup() + end + }, + } local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" diff --git a/desktop/nvim/lua/config/plugins/lspconfig.lua b/desktop/nvim/lua/config/plugins/lspconfig.lua index ed7b6b5..5adbbc7 100644 --- a/desktop/nvim/lua/config/plugins/lspconfig.lua +++ b/desktop/nvim/lua/config/plugins/lspconfig.lua @@ -24,7 +24,11 @@ lspconfig.rust_analyzer.setup { }, } -local default_servers = {'ccls', 'pylsp', 'typst_lsp', 'r_language_server'} +lspconfig.omnisharp.setup { + cmd = { "dotnet", "/usr/lib/omnisharp-roslyn/OmniSharp.dll"} +} + +local default_servers = {'pylsp', 'ccls', 'typst_lsp', 'r_language_server', 'lua_ls'} for _, lsp in ipairs(default_servers) do lspconfig[lsp].setup { diff --git a/desktop/nvim/lua/config/settings.lua b/desktop/nvim/lua/config/settings.lua index fc1bc65..2a5871c 100644 --- a/desktop/nvim/lua/config/settings.lua +++ b/desktop/nvim/lua/config/settings.lua @@ -36,4 +36,4 @@ vim.opt.completeopt=menuone,noselect vim.opt.undofile=true vim.g['loaded_perl_provider']=0 -vim.g['python3_host_prog']='/usr/bin/python' +vim.g['python3_host_prog']='/usr/bin/python3' diff --git a/desktop/sway/config b/desktop/sway/config index 186f17f..ace8af1 100644 --- a/desktop/sway/config +++ b/desktop/sway/config @@ -111,7 +111,7 @@ set $ws8 "8" set $ws9 "9" set $ws10 "10" -set $MonitorA "DP-1" +set $MonitorA "DP-2" set $MonitorB "HDMI-A-1" # switch to workspace @@ -203,7 +203,7 @@ bindsym $mod+Shift+c reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+Shift+r restart # exit i3 (logs you out of your X session) -bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'" +bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit' # resize window (you can also use the mouse for that) mode "resize" { @@ -262,8 +262,10 @@ bar { bindsym $mod+space exec rofi --no-startup-id -show drun # Set Monitors -output DP-1 mode 3440x1440@144Hz pos 0 0 scale 1 -output HDMI-A-1 mode 1920x1080@75Hz pos 3440 0 +output DP-2 mode 3440x1440@144Hz pos 1920 0 scale 1 +output HDMI-A-1 mode 1920x1080@75Hz pos 0 0 +exec swaybg -o DP-2 -i /home/eesim/Pictures/Wallpapers/wallpaper_scaled_distorted.png +exec swaybg -o HDMI-A-1 -i /home/eesim/Pictures/169Wallpaper.png exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway @@ -275,15 +277,11 @@ exec --no-startup-id wayland-pipewire-idle-inhibit exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec --no-startup-id protonmail-bridge exec --no-startup-id swayidle -w \ - timeout 20 'swaymsg "output * dpms off"' \ + timeout 600 'swaymsg "output * dpms off"' \ resume '/home/eesim/Scripts/ResumeMonitor.sh' exec vorta exec MOZ_ENABLE_WAYLAND=1 firefox -exec vesktop --enable-features=WebRTCPipeWireCapturer exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK -exec sleep 0.2 && swww init - -exec sleep 0.3 && swww img -o DP-1 /home/eesim/Pictures/UWWallpaper.png -exec sleep 0.3 && swww img -o HDMI-A-1 /home/eesim/Pictures/169Wallpaper.png +exec sleep 20 && vesktop --enable-features=WebRTCPipeWireCapturer diff --git a/desktop/waybar/config b/desktop/waybar/config new file mode 100644 index 0000000..47c8269 --- /dev/null +++ b/desktop/waybar/config @@ -0,0 +1,158 @@ +[{ + "layer": "top", // Waybar at top layer + "output": "DP-2", + "position": "top", // Waybar position (top|bottom|left|right) + "height": 30, // Waybar height (to be removed for auto height) + "spacing": 4, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad"], + "modules-center": ["sway/window"], + "modules-right": ["idle_inhibitor", "pulseaudio", "cpu", "memory", "clock"], + // Modules configuration + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": false, + "format": "{name}: {icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "urgent": "", + "focused": "", + "default": "" + } + }, + "sway/mode": { + "format": "{}" + }, + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", ""], + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + // "timezone": "America/New_York", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format": "{:%I:%M %p}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "pulseaudio": { + // "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon}", + "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": ["", "", ""] + }, + }, +}, { + "layer": "bottom", // Waybar at top layer + "output": "HDMI-A-1", + "position": "top", // Waybar position (top|bottom|left|right) + "height": 30, // Waybar height (to be removed for auto height) + "spacing": 4, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": ["sway/workspaces", "sway/mode", "sway/scratchpad"], + "modules-center": ["sway/window"], + "modules-right": ["idle_inhibitor", "pulseaudio", "cpu", "memory", "clock", "tray"], + // Modules configuration + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": false, + "format": "{name}: {icon}", + "format-icons": { + "4": "", + "5": "", + "6": "", + "7": "", + "8": "", + "9": "", + "10": "", + "urgent": "", + "focused": "", + "default": "" + } + }, + "sway/mode": { + "format": "{}" + }, + "sway/scratchpad": { + "format": "{icon} {count}", + "show-empty": false, + "format-icons": ["", ""], + "tooltip": true, + "tooltip-format": "{app}: {title}" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + // "timezone": "America/New_York", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format": "{:%I:%M %p}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "pulseaudio": { + // "scroll-step": 1, // %, can be a float + "format": "{volume}% {icon}", + "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": ["", "", ""] + }, + }, +}] + diff --git a/desktop/waybar/style.css b/desktop/waybar/style.css new file mode 100644 index 0000000..25c10bb --- /dev/null +++ b/desktop/waybar/style.css @@ -0,0 +1,102 @@ +* { + border: none; + border-radius: 0; + font-family: "Ubuntu Nerd Font"; + font-size: 16px; + min-height: 0; +} + +window#waybar { + background: rgba(0, 0, 0, 0.2); + color: white; +} + +#window { + font-weight: bold; + font-family: "Ubuntu"; +} +/* +#workspaces { + padding: 0 5px; +} +*/ + +#workspaces button { + padding: 0 5px; + background: transparent; + color: white; + border-top: 2px solid transparent; +} + +#workspaces button.focused { + color: #c9545d; + border-top: 2px solid #c9545d; +} + +#mode { + background: #64727D; + border-bottom: 3px solid white; +} + +#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode, #idle_inhibitor { + padding: 0 8px; + margin: 0 3px; +} + +#clock { + font-weight: bold; +} + +#battery { +} + +#battery icon { + color: red; +} + +#battery.charging { +} + +@keyframes blink { + to { + background-color: #ffffff; + color: black; + } +} + +#battery.warning:not(.charging) { + color: white; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: infinite; + animation-direction: alternate; +} + +#cpu { +} + +#memory { +} + +#network { +} + +#network.disconnected { + background: #f53c3c; +} + +#pulseaudio { +} + +#pulseaudio.muted { +} + +#custom-spotify { + color: rgb(102, 220, 105); +} + +#tray { +} + +