diff --git a/config b/config index 2ece1ea..1eeef7a 100644 --- a/config +++ b/config @@ -1,7 +1,5 @@ # Default config for sway # -# Copy this to ~/.config/sway/config and edit it to your liking. -# # Read `man 5 sway` for a complete reference. # Set default font for sway and monospace font @@ -21,8 +19,8 @@ set $right l set $term foot # Your preferred application launcher #set $menu wmenu-run -set $menu "rofi -show drun" -set $browser firefox +set $menu "wofi -show drun" +set $browser firefox-developer-edition # ... (previous config) @@ -78,7 +76,9 @@ client.background $base # # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) #output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill -output * bg /home/gh0s7/Pictures/xenoblade.jpg fill +#output * bg /home/gh0s7/Pictures/Wallpapers/130036304_p21.png fill +output * bg /home/gh0s7/Pictures/Wallpapers/ThinkPad/TP1024.BMP fill +output eDP-1 scale 1.5 # # Example configuration: # @@ -141,8 +141,9 @@ input * xkb_options caps:escape_shifted_capslock bindsym $mod+d exec $menu bindsym Alt+Space exec $menu - bindsym Ctrl+Alt+F exec $browser - bindsym Ctrl+Alt+L exec swaylock -i ~/Pictures/crychic.jpg -s fill + bindsym Ctrl+Alt+f exec $browser + bindsym Ctrl+Alt+l exec swaylock -i /home/gh0s7/Pictures/Wallpapers/ThinkPad/IBM1024R.BMP -s fill + bindsym Ctrl+Alt+e exec dolphin # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -164,6 +165,8 @@ input * xkb_options caps:escape_shifted_capslock bindsym $mod+$down focus down bindsym $mod+$up focus up bindsym $mod+$right focus right + bindsym Alt+Tab focus right + bindsym Alt+Shift+Tab focus left # Or use $mod+[up|down|left|right] bindsym $mod+Left focus left bindsym $mod+Down focus down @@ -193,7 +196,7 @@ input * xkb_options caps:escape_shifted_capslock bindsym $mod+7 workspace number 7 bindsym $mod+8 workspace number 8 bindsym $mod+9 workspace number 9 - bindsym $mod+0 workspace number 0 + 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 @@ -312,9 +315,8 @@ exec_always waybar include /etc/sway/config.d/* #exec_always fcixt5 -d --replace exec --no-startup-id fcitx5 -d -exec --no-startup-id brightnessctl set 2000 -exec --no-startup-id /usr/libexec/pipewire-launcher -exec_always mako +exec --no-startup-id brightnessctl set 16000 +#exec --no-startup-id /usr/libexec/pipewire-launcher # Idle configuration exec swayidle -w \ timeout 300 'swaylock -f -c 000000' \ diff --git a/starship.toml b/starship.toml new file mode 100644 index 0000000..9048db8 --- /dev/null +++ b/starship.toml @@ -0,0 +1,311 @@ +"$schema" = 'https://starship.rs/config-schema.json' + +# Global Layout +add_newline = true +command_timeout = 1000 + +format = """ +$os\ +$username\ +$hostname\ +$directory\ +$git_branch\ +$git_commit\ +$git_status\ +$docker_context\ +$package\ +$c\ +$cmake\ +$cpp\ +$golang\ +$haskell\ +$java\ +$kotlin\ +$lua\ +$nodejs\ +$python\ +$rust\ +$zig\ +$conda\ +$memory_usage\ +$aws\ +$gcloud\ +$cmd_duration\ +$line_break\ +$character""" + +right_format = """$time""" + +# Module Configuration + +[os] +disabled = false +style = "bold blue" + +[os.symbols] +Alpaquita = " " +Alpine = " " +AlmaLinux = " " +Amazon = " " +Android = " " +AOSC = " " +Arch = " " +Artix = " " +CachyOS = " " +CentOS = " " +Debian = " " +DragonFly = " " +Elementary = " " +Emscripten = " " +EndeavourOS = " " +Fedora = " " +FreeBSD = " " +Garuda = "󰛓 " +Gentoo = " " +HardenedBSD = "󰞌 " +Illumos = "󰈸 " +Ios = "󰀷 " +Kali = " " +Linux = " " +Mabox = " " +Macos = " " +Manjaro = " " +Mariner = " " +MidnightBSD = " " +Mint = " " +NetBSD = " " +NixOS = " " +Nobara = " " +OpenBSD = "󰈺 " +openSUSE = " " +OracleLinux = "󰌷 " +Pop = " " +Raspbian = " " +Redhat = " " +RedHatEnterprise = " " +RockyLinux = " " +Redox = "󰀘 " +Solus = "󰠳 " +SUSE = " " +Ubuntu = " " +Unknown = " " +Void = " " +Windows = "󰍲 " +Zorin = " " + +[time] +disabled = false +style = "bold white" +format = "[$time]($style)" +time_format = "%Y-%m-%d %A %H:%M:%S" + +[username] +style_user = "bold green" +style_root = "bold red" +format = "[$user]($style)" +disabled = false +show_always = true + +[directory] +style = "bold cyan" +truncation_length = 3 +truncation_symbol = "" +truncate_to_repo = true +read_only = " 󰌾" + +[character] +#success_symbol = "[➜](bold green)" +success_symbol = "[❯](bold green)" +#success_symbol = "[](bold green)" +#error_symbol = "[✗](bold red)" +error_symbol = "[❯](bold red)" +vimcmd_symbol = "[V](bold green)" + +[git_branch] +symbol = " " +style = "bold purple" +format = "[$symbol$branch(:$remote_branch)]($style) " + +[git_status] +style = "bold green" +format = '([\[$all_status$ahead_behind\]]($style) )' +conflicted = "🏳" +ahead = "⇡${count}" +behind = "⇣${count}" +diverged = "⇕⇡${ahead_count}⇣${behind_count}" +up_to_date = "✓" +untracked = "?${count}" +stashed = "$${count}" +modified = "!${count}" +staged = "+${count}" +renamed = "»${count}" +deleted = "✘${count}" + +[cmd_duration] +min_time = 2000 +style = "bold pink" + +# Languages and Tools Symbols (Preserving user choices) +[aws] +symbol = " " + +[buf] +symbol = " " + +[bun] +symbol = " " + +[c] +symbol = " " + +[cpp] +symbol = " " + +[cmake] +symbol = " " + +[conda] +symbol = " " + +[crystal] +symbol = " " + +[dart] +symbol = " " + +[deno] +symbol = " " + +[docker_context] +symbol = " " + +[elixir] +symbol = " " + +[elm] +symbol = " " + +[fennel] +symbol = " " + +[fortran] +symbol = " " + +[fossil_branch] +symbol = " " + +[gcloud] +symbol = " " + +[git_commit] +tag_symbol = ' ' +commit_hash_length = 8 +format = "[\\($hash$tag\\)]($style) " +style = "bold green" + +[git_state] +format = '[\($state( $progress_current of $progress_total)\)]($style) ' +style = "bold yellow" + +[git_metrics] +disabled = false +added_style = "bold green" +deleted_style = "bold red" +format = "[+$added]($added_style)/[-$deleted]($deleted_style) " + +[golang] +symbol = " " + +[gradle] +symbol = " " + +[guix_shell] +symbol = " " + +[haskell] +symbol = " " + +[haxe] +symbol = " " + +[hg_branch] +symbol = " " + +[hostname] +ssh_symbol = " " +ssh_only = false +format = "[@$hostname]($style) " +style = "bold cyan" +disabled = false + +[java] +symbol = " " + +[julia] +symbol = " " + +[kotlin] +symbol = " " + +[lua] +symbol = " " + +[memory_usage] +symbol = "󰍛 " + +[meson] +symbol = "󰔷 " + +[nim] +symbol = "󰆥 " + +[nix_shell] +symbol = " " + +[nodejs] +symbol = " " + +[ocaml] +symbol = " " + +[package] +symbol = "󰏗 " + +[perl] +symbol = " " + +[php] +symbol = " " + +[pijul_channel] +symbol = " " + +[pixi] +symbol = "󰏗 " + +[python] +symbol = " " + +[rlang] +symbol = "󰟔 " + +[ruby] +symbol = " " + +[rust] +symbol = "󱘗 " + +[scala] +symbol = " " + +[status] +symbol = " " + +[swift] +symbol = " " + +[xmake] +symbol = " " + +[zig] +symbol = " " diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 32e4609..3a7108e 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -13,7 +13,7 @@ "sway/workspaces", "sway/mode", "sway/scratchpad" - // "custom/media" +// "custom/media" ], "modules-center": [ "sway/window" @@ -34,7 +34,7 @@ "tray", "battery", "clock" -// "custom/power" +// "custom/power" ], // Modules configuration // "sway/workspaces": { @@ -159,12 +159,13 @@ // }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr}/{cidr} ", + "interval": 1, + "format-wifi": "⬇ {bandwidthDownBytes} ⬆ {bandwidthUpBytes}", + "format-ethernet": "⬇ {bandwidthDownBytes} ⬆ {bandwidthUpBytes}", "tooltip-format": "{ifname} via {gwaddr} ", "format-linked": "{ifname} (No IP) ", "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}" + "format-alt": "{essid} {ipaddr}/{cidr}" }, "pulseaudio": { // "scroll-step": 1, // %, can be a float diff --git a/waybar/style.css b/waybar/style.css index 79c9272..68df45f 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -83,7 +83,7 @@ window#waybar.hidden { /* Window Title */ #window { background-color: transparent; - color: @surface0; + color: @text; border-radius: 16px; padding: 0 12px; margin: 0 4px;