diff --git a/.vimrc b/.vimrc index 18bfbda..dc160ce 100644 --- a/.vimrc +++ b/.vimrc @@ -31,6 +31,7 @@ call plug#end() " copy&paste from system clipboard +set clipboard=unnamedplus vnoremap y "+y vnoremap p "+p diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index 53a92bb..1cef752 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -3,7 +3,7 @@ background = "#000000" foreground = "#ffffff" [font] -size = 9.0 +size = 14.0 [font.bold] family = "terminus" diff --git a/backup-configs.sh b/backup-configs.sh new file mode 100755 index 0000000..6638cda --- /dev/null +++ b/backup-configs.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + + +cp ~/.config/nvim/init.vim ./init.vim +cp ~/.vimrc ./.vimrc +cp ~/vimconfigbase.vim ./vimconfigbase.vim +cp ~/.tmux.conf ./.tmux.conf + +mkdir -p sway +cp ~/.config/sway/config ./sway/config +cp ~/.config/sway/status.sh ./sway/status.sh + +mkdir -p alacritty +cp ~/.config/alacritty/alacritty.toml ./alacritty/alacritty.toml diff --git a/nixos/common-configuration.nix b/nixos/common-configuration.nix index 982a4ce..a391be5 100644 --- a/nixos/common-configuration.nix +++ b/nixos/common-configuration.nix @@ -21,9 +21,9 @@ LC_TIME = "es_ES.UTF-8"; }; - services.displayManager = { - defaultSession = "none+i3"; - }; +# services.displayManager = { +# defaultSession = "none+i3"; +# }; services.xserver = { xkb = { # Configure keymap in X11 layout = "us"; @@ -31,20 +31,40 @@ }; enable=true; - #displayManager = { - # defaultSession = "none+i3"; - #}; - windowManager.i3 = { - enable=true; - extraPackages = with pkgs; [ - dmenu - i3status - i3lock - ]; - }; +# #displayManager = { +# # defaultSession = "none+i3"; +# #}; +# windowManager.i3 = { +# enable=true; +# extraPackages = with pkgs; [ +# dmenu +# i3status +# i3lock +# ]; +# }; }; + # --- sway wm config: + services.xserver.displayManager.gdm.enable=true; + services.xserver.displayManager.gdm.wayland=false; + #services.xserver.displayManager.plasma5.enable=true; + # Enable the gnome-keyring secrets vault. + # Will be exposed through DBus to programs willing to store secrets. + services.gnome.gnome-keyring.enable = true; + # enable sway wm + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + }; + security.polkit.enable = true; + # --- end of sway config. environment.systemPackages = with pkgs; [ + # sway wm utilities + grim # screenshot functionality + slurp # screenshot functionality + wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout + mako # notification system developed by swaywm maintainer + # utilities wget tmux @@ -65,6 +85,7 @@ xfce.xfce4-screenshooter pulseaudio usbutils + time # code editors vim @@ -124,8 +145,9 @@ #gcc clang clang-tools - pkg-config + openssl.dev + stdenv rustup wabt # wasm binary toolkit @@ -137,12 +159,14 @@ opam # ocaml package manager, for coq packages go (python3.withPackages(ps: with ps; [ - matplotlib numpy qmk + matplotlib numpy + qmk meshtastic esptool # meshtastic related unicodeit ])) pipx nodejs + pnpm # other qmk diff --git a/sway/config b/sway/config new file mode 100644 index 0000000..f231093 --- /dev/null +++ b/sway/config @@ -0,0 +1,248 @@ +# Default config for sway +# +# Copy this to ~/.config/sway/config and edit it to your liking. +# +# Read `man 5 sway` for a complete reference. + +### Variables +# +# Logo key. Use Mod1 for Alt. +set $mod Mod4 +# Home row direction keys, like vim +set $left h +set $down j +set $up k +set $right l +# Your preferred terminal emulator +set $term alacritty +# Your preferred application launcher +set $menu wmenu-run + +### Output configuration +# +# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/) +# output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +output * bg ~/Sync-tablet/wallpapers/geometry02_croped1920x1080.png fill +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs +output HDMI-A-1 resolution 3840x2160 position 1920 0 +output eDP-1 resolution 1920x1200 position 0 0 + +### Idle configuration +# +# Example configuration: +# +# exec swayidle -w \ +# timeout 300 'swaylock -f -c 000000' \ +# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ +# before-sleep 'swaylock -f -c 000000' +# +# This will lock your screen after 300 seconds of inactivity, then turn off +# your displays after another 300 seconds, and turn your screens back on when +# resumed. It will also lock your screen before your computer goes to sleep. + +# lock screen +bindsym $mod+Control+l exec swaylock -i ~/Sync/wallpapers/geometry02_croped1920x1080_pixelized.png -c 000000 + +bindsym $mod+Control+d exec poweroff + +### Input configuration +# +# Example configuration: +# +# input "2:14:SynPS/2_Synaptics_TouchPad" { +# dwt enabled +# tap enabled +# natural_scroll enabled +# middle_emulation enabled +# } +# +# You can get the names of your inputs by running: swaymsg -t get_inputs +# Read `man 5 sway-input` for more information about this section. + +### Key bindings +# +# Basics: +# + # Start a terminal + bindsym $mod+Return exec $term + + # Kill focused window + bindsym $mod+Shift+q kill + + # Start your launcher + bindsym $mod+d exec $menu + + # Drag floating windows by holding down $mod and left mouse button. + # Resize them with right mouse button + $mod. + # Despite the name, also works for non-floating windows. + # Change normal to inverse to use left mouse button for resizing and right + # mouse button for dragging. + floating_modifier $mod normal + + # Reload the configuration file + bindsym $mod+Shift+c reload + + # Exit sway (logs you out of your Wayland 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' +# +# Moving around: +# + # Move your focus around + bindsym $mod+$left focus left + bindsym $mod+$down focus down + bindsym $mod+$up focus up + bindsym $mod+$right focus right + # Or use $mod+[up|down|left|right] + bindsym $mod+Left focus left + bindsym $mod+Down focus down + bindsym $mod+Up focus up + bindsym $mod+Right focus right + + # Move the focused window with the same, but add Shift + bindsym $mod+Shift+$left move left + bindsym $mod+Shift+$down move down + bindsym $mod+Shift+$up move up + bindsym $mod+Shift+$right move right + # Ditto, with arrow keys + bindsym $mod+Shift+Left move left + bindsym $mod+Shift+Down move down + bindsym $mod+Shift+Up move up + bindsym $mod+Shift+Right move right +# +# Workspaces: +# + # Switch to workspace + bindsym $mod+1 workspace number 1 + bindsym $mod+2 workspace number 2 + bindsym $mod+3 workspace number 3 + bindsym $mod+4 workspace number 4 + bindsym $mod+5 workspace number 5 + bindsym $mod+6 workspace number 6 + bindsym $mod+7 workspace number 7 + bindsym $mod+8 workspace number 8 + bindsym $mod+9 workspace number 9 + bindsym $mod+0 workspace number 10 + # Move focused container to workspace + bindsym $mod+Shift+1 move container to workspace number 1 + bindsym $mod+Shift+2 move container to workspace number 2 + bindsym $mod+Shift+3 move container to workspace number 3 + bindsym $mod+Shift+4 move container to workspace number 4 + bindsym $mod+Shift+5 move container to workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6 + bindsym $mod+Shift+7 move container to workspace number 7 + bindsym $mod+Shift+8 move container to workspace number 8 + bindsym $mod+Shift+9 move container to workspace number 9 + bindsym $mod+Shift+0 move container to workspace number 10 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. +# +# Layout stuff: +# + # You can "split" the current object of your focus with + # $mod+b or $mod+v, for horizontal and vertical splits + # respectively. + bindsym $mod+b splith + bindsym $mod+v splitv + + # Switch the current container between different layout styles + bindsym $mod+s layout stacking + bindsym $mod+w layout tabbed + bindsym $mod+e layout toggle split + + # Make the current focus fullscreen + bindsym $mod+f fullscreen + + # Toggle the current focus between tiling and floating mode + bindsym $mod+Shift+space floating toggle + + # Swap focus between the tiling area and the floating area + bindsym $mod+space focus mode_toggle + + # Move focus to the parent container + bindsym $mod+a focus parent +# +# Scratchpad: +# + # Sway has a "scratchpad", which is a bag of holding for windows. + # You can send windows there and get them back later. + + # Move the currently focused window to the scratchpad + bindsym $mod+Shift+minus move scratchpad + + # Show the next scratchpad window or hide the focused scratchpad window. + # If there are multiple scratchpad windows, this command cycles through them. + bindsym $mod+minus scratchpad show +# +# Resizing containers: +# +mode "resize" { + # left will shrink the containers width + # right will grow the containers width + # up will shrink the containers height + # down will grow the containers height + bindsym $left resize shrink width 10px + bindsym $down resize grow height 10px + bindsym $up resize shrink height 10px + bindsym $right resize grow width 10px + + # Ditto, with arrow keys + bindsym Left resize shrink width 10px + bindsym Down resize grow height 10px + bindsym Up resize shrink height 10px + bindsym Right resize grow width 10px + + # Return to default mode + bindsym Return mode "default" + bindsym Escape mode "default" +} +bindsym $mod+r mode "resize" +# +# Utilities: +# + # Special keys to adjust volume via PulseAudio + bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle + bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5% + bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5% + bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle + # Special keys to adjust brightness via brightnessctl + bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- + bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ + # Special key to take a screenshot with grim + bindsym Print exec grim + +# +# Status Bar: +# +# Read `man 5 sway-bar` for more information about this section. +bar { + position bottom + status_command while ~/.config/sway/status.sh; do sleep 1; done + + # When the status_command prints a new line to stdout, swaybar updates. + # The default just shows the current date and time. + # status_command while date +'%Y-%m-%d %X'; do sleep 1; done + + colors { + statusline #ffffff + background #000000 + inactive_workspace #32323200 #32323200 #5c5c5c + } +} + +default_border pixel 1 + +# shortcut to switch regular/bold font in alacritty configuration +bindsym $mod+Control+b exec sed -i 's/\"Regular\"#tag_for_shortcut/\"Bold\"#tag_for_shortcut/g' ~/.config/alacritty/alacritty.toml +bindsym $mod+Control+Shift+b exec sed -i 's/\"Bold\"#tag_for_shortcut/\"Regular\"#tag_for_shortcut/g' ~/.config/alacritty/alacritty.toml + +# move current workspace to another display +bindsym $mod+Control+k move workspace to output HDMI-A-1 +# bindsym $mod+Control+k move workspace to output DP-1 +bindsym $mod+Control+j move workspace to output eDP-1 + +include /etc/sway/config.d/* diff --git a/sway/status.sh b/sway/status.sh new file mode 100755 index 0000000..4d37ef0 --- /dev/null +++ b/sway/status.sh @@ -0,0 +1,23 @@ +# sway config at ~/.config/sway/config calls this script, through line: +# status_command while ~/.config/sway/status.sh; do sleep 1; done +# Changes should be applied when saving this script, if not, use +# "killall swaybar" and $mod+Shift+c to reload the configuration. + +uptime_formatted=$(uptime | cut -d ',' -f1 | cut -d ' ' -f4,5) + +# date and time format: Tue 2025-08-19 22:37 +date_formatted=$(date "+%a %F %H:%M") + +volume=$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}') +muted=$(pactl get-sink-mute @DEFAULT_SINK@ | awk '{print $2}') +# if [ "$MUTED" = "yes" ]; then // TODO +# echo "🔇 Muted" +# else +# echo "🔊 $VOLUME" +# fi + +battery_status=$(cat /sys/class/power_supply/BAT0/status) # "Full", "Discharging", or "Charging" +battery_capacity=$(cat /sys/class/power_supply/BAT0/capacity) # % + +# 💎 💻 💡 🔌 ⚡ 📁 \| 🐧 +echo $uptime_formatted ↑ $volume $muted 🔊 $battery_status $battery_capacity% 🔋 $date_formatted diff --git a/vimconfigbase.vim b/vimconfigbase.vim index b94c400..a6ba3db 100644 --- a/vimconfigbase.vim +++ b/vimconfigbase.vim @@ -38,7 +38,7 @@ set sidescrolloff=5 " keep at least 5 lines left/right " set textwidth=80 " toggle for paste mode -set pastetoggle= +"set pastetoggle= " NOTE: not supported in latest release of neovim (yes in vim) " set ignorecase " do case insensitive search set incsearch " show incremental search results as you type