1
0
Fork 0

Compare commits

..

No commits in common. "63c6bd2eea29b1b6f3a5f1a3942f723c71b613dd" and "73ddaea19e588f59ca5c62cc4b670754145ef810" have entirely different histories.

6 changed files with 16 additions and 146 deletions

View File

@ -2,5 +2,3 @@
alias cls="clear" alias cls="clear"
alias cfg="/usr/bin/git --git-dir=$HOME/.config.remote/ --work-tree=$HOME" alias cfg="/usr/bin/git --git-dir=$HOME/.config.remote/ --work-tree=$HOME"
alias ls="LC_COLLATE=C ls -la --group-directories-first --color=auto"

View File

@ -73,10 +73,7 @@
create-lockfiles nil create-lockfiles nil
make-backup-files nil make-backup-files nil
auto-save-default nil auto-save-default nil)
tab-width 2
indent-tabs-mode nil)
;;; rhjr/standard-packages ;;; rhjr/standard-packages
(use-package dired-x (use-package dired-x
@ -116,7 +113,6 @@
(set-fringe-mode '(0 . 0)) (set-fringe-mode '(0 . 0))
(pixel-scroll-precision-mode) (pixel-scroll-precision-mode)
(global-display-line-numbers-mode 1) (global-display-line-numbers-mode 1)
(delete-selection-mode 1)
;;; rhjr/packages ;;; rhjr/packages
(use-package magit (use-package magit
@ -131,8 +127,12 @@
(corfu-cycle t) (corfu-cycle t)
(corfu-preview-current nil) (corfu-preview-current nil)
:config :bind
(keymap-unset corfu-map "RET") (:map corfu-map
("TAB" . corfu-next)
([tab] . corfu-next)
("S-TAB" . corfu-previous)
([backtab] . corfu-previous))
:init :init
(global-corfu-mode) (global-corfu-mode)
@ -143,8 +143,8 @@
("C-x 4 b" . consult-buffer-other-window) ("C-x 4 b" . consult-buffer-other-window)
("C-x 5 b" . consult-buffer-other-frame) ("C-x 5 b" . consult-buffer-other-frame)
;; M-s bindings in `search-map' ;; M-s bindings in `search-map'
("C-x f" . consult-find) ("C-f" . consult-find)
("C-x s" . consult-ripgrep)) ("C-s" . consult-ripgrep))
:config :config
(setq consult-find-args (setq consult-find-args
@ -344,7 +344,8 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(package-selected-packages nil)) '(package-selected-packages
'(cape consult corfu corfu-candidate-overlay gruber-darker-theme highlight-parentheses magit orderless vertico)))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

View File

@ -7,7 +7,7 @@
### Variables ### Variables
# #
# Logo key. Use Mod1 for Alt. # Logo key. Use Mod1 for Alt.
set $mod Mod4 set $mod Mod1
# Home row direction keys, like vim # Home row direction keys, like vim
set $left h set $left h
set $down j set $down j
@ -18,7 +18,7 @@ set $term foot
# Your preferred application launcher # Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened # Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on. # on the original workspace that the command was run on.
set $menu rofi -show drun set $menu dmenu_path | dmenu | xargs swaymsg exec --
include /etc/sway/config-vars.d/* include /etc/sway/config-vars.d/*
@ -26,7 +26,6 @@ include /etc/sway/config-vars.d/*
# #
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
output * background #282828 solid_color output * background #282828 solid_color
# #
# Example configuration: # Example configuration:
# #
@ -34,9 +33,6 @@ output * background #282828 solid_color
# #
# You can get the names of your outputs by running: swaymsg -t get_outputs # You can get the names of your outputs by running: swaymsg -t get_outputs
output DP-5 resolution 2560x1440 position 0,0
output DP-6 resolution 2560x1440 position -2560,0
### Idle configuration ### Idle configuration
# #
# Example configuration: # Example configuration:
@ -205,8 +201,7 @@ mode "resize" {
} }
bindsym $mod+r mode "resize" bindsym $mod+r mode "resize"
#gaps outer 10 gaps outer 10
#gaps right -10
# #
# Status Bar: # Status Bar:
@ -216,11 +211,4 @@ bar {
swaybar_command waybar swaybar_command waybar
} }
#
# `flameshot` screenshot tool
#
for_window [app_id="flameshot"] border pixel 0, floating enable, fullscreen disable, move absolute position 0 0
exec flameshot
bindsym Print exec flameshot gui
include /etc/sway/config.d/* include /etc/sway/config.d/*

View File

@ -1,6 +1,5 @@
syntax on syntax on
set mouse=a
set encoding=utf8 set encoding=utf8
set nobackup nowb noswapfile set nobackup nowb noswapfile

View File

@ -1,65 +0,0 @@
{
"layer": "top",
"position": "right",
"height": "100%",
"width": 35,
"margin-right": 10,
"margin-top": 10,
"margin-bottom": 10,
"margin-left": 0,
"modules-left": [ "sway/workspaces" ],
"modules-right": [ "bluetooth", "wireplumber", "network", "custom/lock" ],
"sway/workspaces": {
"on-click": "activate",
"sort-by-number": true,
"format-icons": {
"default": "\uf444"
},
"persistent-workspaces": {
"1": [],
"2": [],
"3": [],
"4": [],
"5": []
},
"disable-scroll": true,
"all-outputs": true
},
"network": {
"on-click": "nm-connection-editor",
"format": "",
"format-ethernet": "\udb83\udc9d",
"format-wifi": "{icon}",
"format-disconnected": "\udb83\udc9c",
"format-icons": ["\udb82\udd2f", "\udb82\udd1f", "\udb82\udd22", "\udb82\udd25", "\udb82\udd28"],
"tooltip-format-wifi": "{essid}",
"tooltip-format-ethernet": "{ifname}",
"tooltip-format-disconnected": "Disconnected"
},
"bluetooth": {
"on-click": "blueman-manager",
"format": "\udb80\udcaf",
"format-disabled": "\udb80\udcb2",
"format-connected": "\udb80\udcb1",
"tooltip-format": "{controller_alias}\t{controller_address}",
"tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{device_enumerate}",
"tooltip-format-enumerate-connected": "{device_alias}\t{device_address}"
},
"wireplumber": {
"on-click": "pavucontrol",
"format": "\udb81\udd7e",
"max-volume": 100,
"scroll-step": 5
},
"custom/lock": {
"format": "\udb80\udf3e",
"on-click": "swaylock -f -c 000000",
"tooltip": false
}
}

View File

@ -1,51 +0,0 @@
@define-color foreground #eeeeee;
@define-color foreground-active #ffdd33;
@define-color foreground-inactive #aaaaaa;
@define-color background #000000;
@define-color background-hover #222222;
* {
font-family: JetBrainsMono Nerd Font;
font-size: 17px;
margin: 0;
padding: 0;
}
#waybar {
color: @foreground;
background-color: @background;
}
/* workspaces */
#workspaces {
padding: 0;
}
#workspaces button {
margin: 0;
padding: .3em 0;
border: none;
}
#workspaces button.focused {
color: @foreground-active;
}
#workspaces button:hover {
border-radius: 0px;
background-color: @background-hover;
border: none;
}
/* system */
#bluetooth, #wireplumber, #network, #tray, #clock, #custom-lock {
padding: 7px 0;
}
#bluetooth:hover, #wireplumber:hover, #network:hover, #tray:hover, #custom-lock:hover {
background-color: @background-hover;
}
#network {
padding-right: 5px;
}