Compare commits
4 Commits
master
...
d3ddf13024
| Author | SHA1 | Date | |
|---|---|---|---|
| d3ddf13024 | |||
| d377f00905 | |||
| f380299780 | |||
| 27118bd9f3 |
@ -369,7 +369,7 @@ program = "nu"
|
|||||||
[window]
|
[window]
|
||||||
{% if demo %}
|
{% if demo %}
|
||||||
opacity = 1.0
|
opacity = 1.0
|
||||||
{% elif os == "darwin" %}
|
{% elif hostname == "corona" || hostname == "corona.local" %}
|
||||||
opacity = 0.95
|
opacity = 0.95
|
||||||
{% else %}
|
{% else %}
|
||||||
opacity = 0.90
|
opacity = 0.90
|
||||||
|
|||||||
@ -1,220 +0,0 @@
|
|||||||
{
|
|
||||||
"appearance": {
|
|
||||||
"anim": {
|
|
||||||
"durations": {
|
|
||||||
"scale": 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"font": {
|
|
||||||
"family": {
|
|
||||||
"material": "Material Symbols Rounded",
|
|
||||||
"mono": "CaskaydiaCove NF",
|
|
||||||
"sans": "Rubik"
|
|
||||||
},
|
|
||||||
"size": {
|
|
||||||
"scale": 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"padding": {
|
|
||||||
"scale": 1
|
|
||||||
},
|
|
||||||
"rounding": {
|
|
||||||
"scale": 1
|
|
||||||
},
|
|
||||||
"spacing": {
|
|
||||||
"scale": 1
|
|
||||||
},
|
|
||||||
"transparency": {
|
|
||||||
"enabled": false,
|
|
||||||
"base": 0.85,
|
|
||||||
"layers": 0.4
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"general": {
|
|
||||||
"apps": {
|
|
||||||
"terminal": [
|
|
||||||
"foot"
|
|
||||||
],
|
|
||||||
"audio": [
|
|
||||||
"pavucontrol"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"background": {
|
|
||||||
"desktopClock": {
|
|
||||||
"enabled": false
|
|
||||||
},
|
|
||||||
"enabled": true,
|
|
||||||
"visualiser": {
|
|
||||||
"enabled": true,
|
|
||||||
"autoHide": true,
|
|
||||||
"rounding": 1,
|
|
||||||
"spacing": 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bar": {
|
|
||||||
"clock": {
|
|
||||||
"showIcon": false
|
|
||||||
},
|
|
||||||
"dragThreshold": 20,
|
|
||||||
"entries": [
|
|
||||||
{
|
|
||||||
"id": "logo",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "workspaces",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "spacer",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "activeWindow",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "spacer",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "tray",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "clock",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "statusIcons",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "idleInhibitor",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "power",
|
|
||||||
"enabled": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"persistent": false,
|
|
||||||
"showOnHover": true,
|
|
||||||
"status": {
|
|
||||||
"showAudio": false,
|
|
||||||
"showBattery": true,
|
|
||||||
"showBluetooth": true,
|
|
||||||
"showMicrophone": false,
|
|
||||||
"showKbLayout": false,
|
|
||||||
"showNetwork": true
|
|
||||||
},
|
|
||||||
"tray": {
|
|
||||||
"background": true,
|
|
||||||
"recolour": true
|
|
||||||
},
|
|
||||||
"workspaces": {
|
|
||||||
"activeIndicator": true,
|
|
||||||
"activeLabel": "",
|
|
||||||
"activeTrail": false,
|
|
||||||
"groupIconsByApp": true,
|
|
||||||
"groupingRespectsLayout": true,
|
|
||||||
"windowRighClickContext": true,
|
|
||||||
"label": "◦",
|
|
||||||
"occupiedBg": true,
|
|
||||||
"occupiedLabel": "⊙",
|
|
||||||
"showWindows": true,
|
|
||||||
"shown": 4,
|
|
||||||
"windowIconImage": false,
|
|
||||||
"focusedWindowBlob": true,
|
|
||||||
"windowIconGap": 0,
|
|
||||||
"windowIconSize": 30
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"border": {
|
|
||||||
"rounding": 25,
|
|
||||||
"thickness": 10
|
|
||||||
},
|
|
||||||
"dashboard": {
|
|
||||||
"mediaUpdateInterval": 500,
|
|
||||||
"showOnHover": true
|
|
||||||
},
|
|
||||||
"launcher": {
|
|
||||||
"actionPrefix": ">",
|
|
||||||
"dragThreshold": 50,
|
|
||||||
"vimKeybinds": false,
|
|
||||||
"enableDangerousActions": false,
|
|
||||||
"maxShown": 8,
|
|
||||||
"maxWallpapers": 9,
|
|
||||||
"specialPrefix": "@",
|
|
||||||
"useFuzzy": {
|
|
||||||
"apps": false,
|
|
||||||
"actions": false,
|
|
||||||
"schemes": false,
|
|
||||||
"variants": false,
|
|
||||||
"wallpapers": false
|
|
||||||
},
|
|
||||||
"showOnHover": false
|
|
||||||
},
|
|
||||||
"lock": {
|
|
||||||
"recolourLogo": false
|
|
||||||
},
|
|
||||||
"notifs": {
|
|
||||||
"actionOnClick": false,
|
|
||||||
"clearThreshold": 0.3,
|
|
||||||
"defaultExpireTimeout": 5000,
|
|
||||||
"expandThreshold": 20,
|
|
||||||
"expire": false
|
|
||||||
},
|
|
||||||
"osd": {
|
|
||||||
"enabled": true,
|
|
||||||
"enableBrightness": true,
|
|
||||||
"enableMicrophone": true,
|
|
||||||
"hideDelay": 2000
|
|
||||||
},
|
|
||||||
"paths": {
|
|
||||||
"mediaGif": "root:/assets/bongocat.gif",
|
|
||||||
"sessionGif": "root:/assets/kurukuru.gif",
|
|
||||||
"wallpaperDir": "~/.config/wallpapers/"
|
|
||||||
},
|
|
||||||
"services": {
|
|
||||||
"audioIncrement": 0.1,
|
|
||||||
"defaultPlayer": "Spotify",
|
|
||||||
"gpuType": "",
|
|
||||||
"playerAliases": [
|
|
||||||
{
|
|
||||||
"from": "com.github.th_ch.youtube_music",
|
|
||||||
"to": "YT Music"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"weatherLocation": "",
|
|
||||||
"useFahrenheit": false,
|
|
||||||
"useTwelveHourClock": false,
|
|
||||||
"smartScheme": true,
|
|
||||||
"visualiserBars": 45
|
|
||||||
},
|
|
||||||
"session": {
|
|
||||||
"dragThreshold": 30,
|
|
||||||
"vimKeybinds": true,
|
|
||||||
"commands": {
|
|
||||||
"logout": [
|
|
||||||
"loginctl",
|
|
||||||
"terminate-user",
|
|
||||||
""
|
|
||||||
],
|
|
||||||
"shutdown": [
|
|
||||||
"systemctl",
|
|
||||||
"poweroff"
|
|
||||||
],
|
|
||||||
"hibernate": [
|
|
||||||
"systemctl",
|
|
||||||
"hibernate"
|
|
||||||
],
|
|
||||||
"reboot": [
|
|
||||||
"systemctl",
|
|
||||||
"reboot"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
434
tree/.config/dunst/dunstrc
Normal file
434
tree/.config/dunst/dunstrc
Normal file
@ -0,0 +1,434 @@
|
|||||||
|
# See dunst(5) for all configuration options
|
||||||
|
|
||||||
|
[global]
|
||||||
|
### Display ###
|
||||||
|
|
||||||
|
# Which monitor should the notifications be displayed on.
|
||||||
|
monitor = 0
|
||||||
|
|
||||||
|
# Display notification on focused monitor. Possible modes are:
|
||||||
|
# mouse: follow mouse pointer
|
||||||
|
# keyboard: follow window with keyboard focus
|
||||||
|
# none: don't follow anything
|
||||||
|
#
|
||||||
|
# "keyboard" needs a window manager that exports the
|
||||||
|
# _NET_ACTIVE_WINDOW property.
|
||||||
|
# This should be the case for almost all modern window managers.
|
||||||
|
#
|
||||||
|
# If this option is set to mouse or keyboard, the monitor option
|
||||||
|
# will be ignored.
|
||||||
|
follow = none
|
||||||
|
|
||||||
|
### Geometry ###
|
||||||
|
|
||||||
|
# dynamic width from 0 to 300
|
||||||
|
# width = (0, 300)
|
||||||
|
# constant width of 300
|
||||||
|
width = 300
|
||||||
|
|
||||||
|
# The maximum height of a single notification, excluding the frame.
|
||||||
|
height = 300
|
||||||
|
|
||||||
|
# Position the notification in the top right corner
|
||||||
|
origin = top-right
|
||||||
|
|
||||||
|
# Offset from the origin
|
||||||
|
offset = 10x50
|
||||||
|
|
||||||
|
# Scale factor. It is auto-detected if value is 0.
|
||||||
|
scale = 0
|
||||||
|
|
||||||
|
# Maximum number of notification (0 means no limit)
|
||||||
|
notification_limit = 0
|
||||||
|
|
||||||
|
### Progress bar ###
|
||||||
|
|
||||||
|
# Turn on the progess bar. It appears when a progress hint is passed with
|
||||||
|
# for example dunstify -h int:value:12
|
||||||
|
progress_bar = true
|
||||||
|
|
||||||
|
# Set the progress bar height. This includes the frame, so make sure
|
||||||
|
# it's at least twice as big as the frame width.
|
||||||
|
progress_bar_height = 10
|
||||||
|
|
||||||
|
# Set the frame width of the progress bar
|
||||||
|
progress_bar_frame_width = 1
|
||||||
|
|
||||||
|
# Set the minimum width for the progress bar
|
||||||
|
progress_bar_min_width = 150
|
||||||
|
|
||||||
|
# Set the maximum width for the progress bar
|
||||||
|
progress_bar_max_width = 300
|
||||||
|
|
||||||
|
|
||||||
|
# Show how many messages are currently hidden (because of
|
||||||
|
# notification_limit).
|
||||||
|
indicate_hidden = yes
|
||||||
|
|
||||||
|
# The transparency of the window. Range: [0; 100].
|
||||||
|
# This option will only work if a compositing window manager is
|
||||||
|
# present (e.g. xcompmgr, compiz, etc.). (X11 only)
|
||||||
|
transparency = 0
|
||||||
|
|
||||||
|
# Draw a line of "separator_height" pixel height between two
|
||||||
|
# notifications.
|
||||||
|
# Set to 0 to disable.
|
||||||
|
separator_height = 2
|
||||||
|
|
||||||
|
# Padding between text and separator.
|
||||||
|
padding = 8
|
||||||
|
|
||||||
|
# Horizontal padding.
|
||||||
|
horizontal_padding = 8
|
||||||
|
|
||||||
|
# Padding between text and icon.
|
||||||
|
text_icon_padding = 0
|
||||||
|
|
||||||
|
# Defines width in pixels of frame around the notification window.
|
||||||
|
# Set to 0 to disable.
|
||||||
|
frame_width = 3
|
||||||
|
|
||||||
|
# Defines color of the frame around the notification window.
|
||||||
|
frame_color = "#aaaaaa"
|
||||||
|
|
||||||
|
# Define a color for the separator.
|
||||||
|
# possible values are:
|
||||||
|
# * auto: dunst tries to find a color fitting to the background;
|
||||||
|
# * foreground: use the same color as the foreground;
|
||||||
|
# * frame: use the same color as the frame;
|
||||||
|
# * anything else will be interpreted as a X color.
|
||||||
|
separator_color = frame
|
||||||
|
|
||||||
|
# Sort messages by urgency.
|
||||||
|
sort = yes
|
||||||
|
|
||||||
|
# Don't remove messages, if the user is idle (no mouse or keyboard input)
|
||||||
|
# for longer than idle_threshold seconds.
|
||||||
|
# Set to 0 to disable.
|
||||||
|
# A client can set the 'transient' hint to bypass this. See the rules
|
||||||
|
# section for how to disable this if necessary
|
||||||
|
# idle_threshold = 120
|
||||||
|
|
||||||
|
### Text ###
|
||||||
|
|
||||||
|
font = Monospace 8
|
||||||
|
|
||||||
|
# The spacing between lines. If the height is smaller than the
|
||||||
|
# font height, it will get raised to the font height.
|
||||||
|
line_height = 0
|
||||||
|
|
||||||
|
# Possible values are:
|
||||||
|
# full: Allow a small subset of html markup in notifications:
|
||||||
|
# <b>bold</b>
|
||||||
|
# <i>italic</i>
|
||||||
|
# <s>strikethrough</s>
|
||||||
|
# <u>underline</u>
|
||||||
|
#
|
||||||
|
# For a complete reference see
|
||||||
|
# <https://docs.gtk.org/Pango/pango_markup.html>.
|
||||||
|
#
|
||||||
|
# strip: This setting is provided for compatibility with some broken
|
||||||
|
# clients that send markup even though it's not enabled on the
|
||||||
|
# server. Dunst will try to strip the markup but the parsing is
|
||||||
|
# simplistic so using this option outside of matching rules for
|
||||||
|
# specific applications *IS GREATLY DISCOURAGED*.
|
||||||
|
#
|
||||||
|
# no: Disable markup parsing, incoming notifications will be treated as
|
||||||
|
# plain text. Dunst will not advertise that it has the body-markup
|
||||||
|
# capability if this is set as a global setting.
|
||||||
|
#
|
||||||
|
# It's important to note that markup inside the format option will be parsed
|
||||||
|
# regardless of what this is set to.
|
||||||
|
markup = full
|
||||||
|
|
||||||
|
# The format of the message. Possible variables are:
|
||||||
|
# %a appname
|
||||||
|
# %s summary
|
||||||
|
# %b body
|
||||||
|
# %i iconname (including its path)
|
||||||
|
# %I iconname (without its path)
|
||||||
|
# %p progress value if set ([ 0%] to [100%]) or nothing
|
||||||
|
# %n progress value if set without any extra characters
|
||||||
|
# %% Literal %
|
||||||
|
# Markup is allowed
|
||||||
|
format = "<b>%s</b>\n%b"
|
||||||
|
|
||||||
|
# Alignment of message text.
|
||||||
|
# Possible values are "left", "center" and "right".
|
||||||
|
alignment = left
|
||||||
|
|
||||||
|
# Vertical alignment of message text and icon.
|
||||||
|
# Possible values are "top", "center" and "bottom".
|
||||||
|
vertical_alignment = center
|
||||||
|
|
||||||
|
# Show age of message if message is older than show_age_threshold
|
||||||
|
# seconds.
|
||||||
|
# Set to -1 to disable.
|
||||||
|
show_age_threshold = 60
|
||||||
|
|
||||||
|
# Specify where to make an ellipsis in long lines.
|
||||||
|
# Possible values are "start", "middle" and "end".
|
||||||
|
ellipsize = middle
|
||||||
|
|
||||||
|
# Ignore newlines '\n' in notifications.
|
||||||
|
ignore_newline = no
|
||||||
|
|
||||||
|
# Stack together notifications with the same content
|
||||||
|
stack_duplicates = true
|
||||||
|
|
||||||
|
# Hide the count of stacked notifications with the same content
|
||||||
|
hide_duplicate_count = false
|
||||||
|
|
||||||
|
# Display indicators for URLs (U) and actions (A).
|
||||||
|
show_indicators = yes
|
||||||
|
|
||||||
|
### Icons ###
|
||||||
|
|
||||||
|
# Align icons left/right/top/off
|
||||||
|
icon_position = left
|
||||||
|
|
||||||
|
# Scale small icons up to this size, set to 0 to disable. Helpful
|
||||||
|
# for e.g. small files or high-dpi screens. In case of conflict,
|
||||||
|
# max_icon_size takes precedence over this.
|
||||||
|
min_icon_size = 0
|
||||||
|
|
||||||
|
# Scale larger icons down to this size, set to 0 to disable
|
||||||
|
max_icon_size = 32
|
||||||
|
|
||||||
|
# Paths to default icons.
|
||||||
|
icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
|
||||||
|
|
||||||
|
### History ###
|
||||||
|
|
||||||
|
# Should a notification popped up from history be sticky or timeout
|
||||||
|
# as if it would normally do.
|
||||||
|
sticky_history = yes
|
||||||
|
|
||||||
|
# Maximum amount of notifications kept in history
|
||||||
|
history_length = 20
|
||||||
|
|
||||||
|
### Misc/Advanced ###
|
||||||
|
|
||||||
|
# dmenu path.
|
||||||
|
dmenu = /usr/bin/dmenu -p dunst:
|
||||||
|
|
||||||
|
# Browser for opening urls in context menu.
|
||||||
|
browser = /usr/bin/xdg-open
|
||||||
|
|
||||||
|
# Always run rule-defined scripts, even if the notification is suppressed
|
||||||
|
always_run_script = true
|
||||||
|
|
||||||
|
# Define the title of the windows spawned by dunst
|
||||||
|
title = Dunst
|
||||||
|
|
||||||
|
# Define the class of the windows spawned by dunst
|
||||||
|
class = Dunst
|
||||||
|
|
||||||
|
# Define the corner radius of the notification window
|
||||||
|
# in pixel size. If the radius is 0, you have no rounded
|
||||||
|
# corners.
|
||||||
|
# The radius will be automatically lowered if it exceeds half of the
|
||||||
|
# notification height to avoid clipping text and/or icons.
|
||||||
|
corner_radius = 0
|
||||||
|
|
||||||
|
# Ignore the dbus closeNotification message.
|
||||||
|
# Useful to enforce the timeout set by dunst configuration. Without this
|
||||||
|
# parameter, an application may close the notification sent before the
|
||||||
|
# user defined timeout.
|
||||||
|
ignore_dbusclose = false
|
||||||
|
|
||||||
|
### Wayland ###
|
||||||
|
# These settings are Wayland-specific. They have no effect when using X11
|
||||||
|
|
||||||
|
# Uncomment this if you want to let notications appear under fullscreen
|
||||||
|
# applications (default: overlay)
|
||||||
|
# layer = top
|
||||||
|
|
||||||
|
# Set this to true to use X11 output on Wayland.
|
||||||
|
force_xwayland = false
|
||||||
|
|
||||||
|
### Legacy
|
||||||
|
|
||||||
|
# Use the Xinerama extension instead of RandR for multi-monitor support.
|
||||||
|
# This setting is provided for compatibility with older nVidia drivers that
|
||||||
|
# do not support RandR and using it on systems that support RandR is highly
|
||||||
|
# discouraged.
|
||||||
|
#
|
||||||
|
# By enabling this setting dunst will not be able to detect when a monitor
|
||||||
|
# is connected or disconnected which might break follow mode if the screen
|
||||||
|
# layout changes.
|
||||||
|
force_xinerama = false
|
||||||
|
|
||||||
|
### mouse
|
||||||
|
|
||||||
|
# Defines list of actions for each mouse event
|
||||||
|
# Possible values are:
|
||||||
|
# * none: Don't do anything.
|
||||||
|
# * do_action: Invoke the action determined by the action_name rule. If there is no
|
||||||
|
# such action, open the context menu.
|
||||||
|
# * open_url: If the notification has exactly one url, open it. If there are multiple
|
||||||
|
# ones, open the context menu.
|
||||||
|
# * close_current: Close current notification.
|
||||||
|
# * close_all: Close all notifications.
|
||||||
|
# * context: Open context menu for the notification.
|
||||||
|
# * context_all: Open context menu for all notifications.
|
||||||
|
# These values can be strung together for each mouse event, and
|
||||||
|
# will be executed in sequence.
|
||||||
|
mouse_left_click = close_current
|
||||||
|
mouse_middle_click = do_action, close_current
|
||||||
|
mouse_right_click = close_all
|
||||||
|
|
||||||
|
# Experimental features that may or may not work correctly. Do not expect them
|
||||||
|
# to have a consistent behaviour across releases.
|
||||||
|
[experimental]
|
||||||
|
# Calculate the dpi to use on a per-monitor basis.
|
||||||
|
# If this setting is enabled the Xft.dpi value will be ignored and instead
|
||||||
|
# dunst will attempt to calculate an appropriate dpi value for each monitor
|
||||||
|
# using the resolution and physical size. This might be useful in setups
|
||||||
|
# where there are multiple screens with very different dpi values.
|
||||||
|
per_monitor_dpi = false
|
||||||
|
|
||||||
|
|
||||||
|
[urgency_low]
|
||||||
|
# IMPORTANT: colors have to be defined in quotation marks.
|
||||||
|
# Otherwise the "#" and following would be interpreted as a comment.
|
||||||
|
frame_color = "#1D918B"
|
||||||
|
foreground = "#FFEE79"
|
||||||
|
background = "#18191E"
|
||||||
|
timeout = 5
|
||||||
|
|
||||||
|
[urgency_normal]
|
||||||
|
frame_color = "#D16BB7"
|
||||||
|
foreground = "#FFEE79"
|
||||||
|
background = "#18191E"
|
||||||
|
timeout = 10
|
||||||
|
|
||||||
|
[urgency_critical]
|
||||||
|
frame_color = "#FC2929"
|
||||||
|
foreground = "#FFFF00"
|
||||||
|
background = "#18191E"
|
||||||
|
timeout = 10
|
||||||
|
|
||||||
|
# Every section that isn't one of the above is interpreted as a rules to
|
||||||
|
# override settings for certain messages.
|
||||||
|
#
|
||||||
|
# Messages can be matched by
|
||||||
|
# appname (discouraged, see desktop_entry)
|
||||||
|
# body
|
||||||
|
# category
|
||||||
|
# desktop_entry
|
||||||
|
# icon
|
||||||
|
# match_transient
|
||||||
|
# msg_urgency
|
||||||
|
# stack_tag
|
||||||
|
# summary
|
||||||
|
#
|
||||||
|
# and you can override the
|
||||||
|
# background
|
||||||
|
# foreground
|
||||||
|
# format
|
||||||
|
# frame_color
|
||||||
|
# fullscreen
|
||||||
|
# new_icon
|
||||||
|
# set_stack_tag
|
||||||
|
# set_transient
|
||||||
|
# set_category
|
||||||
|
# timeout
|
||||||
|
# urgency
|
||||||
|
# icon_position
|
||||||
|
# skip_display
|
||||||
|
# history_ignore
|
||||||
|
# action_name
|
||||||
|
# word_wrap
|
||||||
|
# ellipsize
|
||||||
|
# alignment
|
||||||
|
# hide_text
|
||||||
|
#
|
||||||
|
# Shell-like globbing will get expanded.
|
||||||
|
#
|
||||||
|
# Instead of the appname filter, it's recommended to use the desktop_entry filter.
|
||||||
|
# GLib based applications export their desktop-entry name. In comparison to the appname,
|
||||||
|
# the desktop-entry won't get localized.
|
||||||
|
#
|
||||||
|
# SCRIPTING
|
||||||
|
# You can specify a script that gets run when the rule matches by
|
||||||
|
# setting the "script" option.
|
||||||
|
# The script will be called as follows:
|
||||||
|
# script appname summary body icon urgency
|
||||||
|
# where urgency can be "LOW", "NORMAL" or "CRITICAL".
|
||||||
|
#
|
||||||
|
# NOTE: It might be helpful to run dunst -print in a terminal in order
|
||||||
|
# to find fitting options for rules.
|
||||||
|
|
||||||
|
# Disable the transient hint so that idle_threshold cannot be bypassed from the
|
||||||
|
# client
|
||||||
|
#[transient_disable]
|
||||||
|
# match_transient = yes
|
||||||
|
# set_transient = no
|
||||||
|
#
|
||||||
|
# Make the handling of transient notifications more strict by making them not
|
||||||
|
# be placed in history.
|
||||||
|
#[transient_history_ignore]
|
||||||
|
# match_transient = yes
|
||||||
|
# history_ignore = yes
|
||||||
|
|
||||||
|
# fullscreen values
|
||||||
|
# show: show the notifications, regardless if there is a fullscreen window opened
|
||||||
|
# delay: displays the new notification, if there is no fullscreen window active
|
||||||
|
# If the notification is already drawn, it won't get undrawn.
|
||||||
|
# pushback: same as delay, but when switching into fullscreen, the notification will get
|
||||||
|
# withdrawn from screen again and will get delayed like a new notification
|
||||||
|
#[fullscreen_delay_everything]
|
||||||
|
# fullscreen = delay
|
||||||
|
#[fullscreen_show_critical]
|
||||||
|
# msg_urgency = critical
|
||||||
|
# fullscreen = show
|
||||||
|
|
||||||
|
#[espeak]
|
||||||
|
# summary = "*"
|
||||||
|
# script = dunst_espeak.sh
|
||||||
|
|
||||||
|
#[script-test]
|
||||||
|
# summary = "*script*"
|
||||||
|
# script = dunst_test.sh
|
||||||
|
|
||||||
|
#[ignore]
|
||||||
|
# # This notification will not be displayed
|
||||||
|
# summary = "foobar"
|
||||||
|
# skip_display = true
|
||||||
|
|
||||||
|
#[history-ignore]
|
||||||
|
# # This notification will not be saved in history
|
||||||
|
# summary = "foobar"
|
||||||
|
# history_ignore = yes
|
||||||
|
|
||||||
|
#[skip-display]
|
||||||
|
# # This notification will not be displayed, but will be included in the history
|
||||||
|
# summary = "foobar"
|
||||||
|
# skip_display = yes
|
||||||
|
|
||||||
|
#[signed_on]
|
||||||
|
# appname = Pidgin
|
||||||
|
# summary = "*signed on*"
|
||||||
|
# urgency = low
|
||||||
|
#
|
||||||
|
#[signed_off]
|
||||||
|
# appname = Pidgin
|
||||||
|
# summary = *signed off*
|
||||||
|
# urgency = low
|
||||||
|
#
|
||||||
|
#[says]
|
||||||
|
# appname = Pidgin
|
||||||
|
# summary = *says*
|
||||||
|
# urgency = critical
|
||||||
|
#
|
||||||
|
#[twitter]
|
||||||
|
# appname = Pidgin
|
||||||
|
# summary = *twitter.com*
|
||||||
|
# urgency = normal
|
||||||
|
#
|
||||||
|
#[stack-volumes]
|
||||||
|
# appname = "some_volume_notifiers"
|
||||||
|
# set_stack_tag = "volume"
|
||||||
|
#
|
||||||
|
# vim: ft=cfg
|
||||||
@ -163,15 +163,6 @@ scale trough {
|
|||||||
background: $lowlight2;
|
background: $lowlight2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toggleable {
|
|
||||||
transition: border 0.5s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toggleable.on {
|
|
||||||
border-left: solid 2px green;
|
|
||||||
border-right: solid 2px green;
|
|
||||||
}
|
|
||||||
|
|
||||||
.clickable {
|
.clickable {
|
||||||
transition: background-color 0.2s;
|
transition: background-color 0.2s;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,14 +40,12 @@
|
|||||||
(speaker)
|
(speaker)
|
||||||
(temperature)
|
(temperature)
|
||||||
(battery)
|
(battery)
|
||||||
(ram)
|
|
||||||
(box :class "thingy" (systray :orientation "v"))
|
(box :class "thingy" (systray :orientation "v"))
|
||||||
(color_scheme)
|
(color_scheme)
|
||||||
(xwayland)
|
(xwayland)
|
||||||
(kb_layout)
|
(kb_layout)
|
||||||
(date)
|
(date)
|
||||||
(clock)
|
(clock)
|
||||||
(notifications)
|
|
||||||
(lock)
|
(lock)
|
||||||
))
|
))
|
||||||
|
|
||||||
@ -139,21 +137,6 @@
|
|||||||
(label :text "${current_temp / 1000}°")
|
(label :text "${current_temp / 1000}°")
|
||||||
))
|
))
|
||||||
|
|
||||||
(defwidget ram []
|
|
||||||
(box :orientation "v"
|
|
||||||
:valign "end"
|
|
||||||
:class "thingy"
|
|
||||||
(label :text "RAM")
|
|
||||||
(circular-progress
|
|
||||||
:thickness 4.0
|
|
||||||
:value {EWW_RAM.used_mem_perc}
|
|
||||||
:class {
|
|
||||||
EWW_RAM?.used_mem_perc > 80 ? "battery-gauge low" :
|
|
||||||
"battery-gauge"
|
|
||||||
}
|
|
||||||
)
|
|
||||||
))
|
|
||||||
|
|
||||||
(defwidget battery []
|
(defwidget battery []
|
||||||
(box :orientation "v"
|
(box :orientation "v"
|
||||||
:valign "end"
|
:valign "end"
|
||||||
@ -192,15 +175,17 @@
|
|||||||
: "wmutils xwayland start && ${EWW_CMD} update xwayland_on=true"
|
: "wmutils xwayland start && ${EWW_CMD} update xwayland_on=true"
|
||||||
}
|
}
|
||||||
:hexpand true
|
:hexpand true
|
||||||
:class {"thingy clickable toggleable" + (xwayland_on ? " on" : "")}
|
:class "thingy clickable"
|
||||||
(label :text "XWL")
|
(label :text {
|
||||||
|
xwayland_on ? "Xwa" : "Way"
|
||||||
|
})
|
||||||
))
|
))
|
||||||
|
|
||||||
(defwidget kb_layout []
|
(defwidget kb_layout []
|
||||||
(button :onclick "wmutils next-keyboard-layout"
|
(button :onclick "niri msg action switch-layout next"
|
||||||
:hexpand true
|
:hexpand true
|
||||||
:class "thingy clickable"
|
:class "thingy clickable"
|
||||||
(label :text keyboard_layout)
|
(label :text "KBL")
|
||||||
))
|
))
|
||||||
|
|
||||||
(defwidget date []
|
(defwidget date []
|
||||||
@ -222,14 +207,6 @@
|
|||||||
(label :text current_minute)
|
(label :text current_minute)
|
||||||
))
|
))
|
||||||
|
|
||||||
(defwidget notifications []
|
|
||||||
(button :orientation "v"
|
|
||||||
:valign "end"
|
|
||||||
:onclick "swaync-client -t -sw"
|
|
||||||
:class "bigthingy clickable"
|
|
||||||
(label :text "🕭")
|
|
||||||
))
|
|
||||||
|
|
||||||
(defwidget lock []
|
(defwidget lock []
|
||||||
(button :orientation "v"
|
(button :orientation "v"
|
||||||
:valign "end"
|
:valign "end"
|
||||||
@ -277,8 +254,6 @@
|
|||||||
(defpoll current_month :interval "60s" "date +%b")
|
(defpoll current_month :interval "60s" "date +%b")
|
||||||
(defpoll current_temp :interval "5s" "cat /sys/class/thermal/thermal_zone*/temp")
|
(defpoll current_temp :interval "5s" "cat /sys/class/thermal/thermal_zone*/temp")
|
||||||
|
|
||||||
(defpoll keyboard_layout :interval "5s" "wmutils keyboard-layout --short")
|
|
||||||
|
|
||||||
(defpoll xwayland_on :interval "5s" "wmutils xwayland is-running")
|
(defpoll xwayland_on :interval "5s" "wmutils xwayland is-running")
|
||||||
|
|
||||||
(defvar vpn_status "{'icon': '-', 'class': 'disconnected'}" )
|
(defvar vpn_status "{'icon': '-', 'class': 'disconnected'}" )
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
icon-theme=hicolor
|
|
||||||
lines=10
|
|
||||||
prompt="▶ "
|
|
||||||
width=32
|
|
||||||
font=FiraSans,Sans:size=18
|
|
||||||
line-height=27
|
|
||||||
|
|
||||||
[colors]
|
|
||||||
# akira pink
|
|
||||||
text=e0c1c1ff
|
|
||||||
|
|
||||||
background=151515aa
|
|
||||||
selection=282a36ff
|
|
||||||
|
|
||||||
match=ebebebff
|
|
||||||
selection-match=ffffffff
|
|
||||||
|
|
||||||
selection-text=d4d4d4ff
|
|
||||||
border=f65d76ff
|
|
||||||
|
|
||||||
[border]
|
|
||||||
width=3
|
|
||||||
radius=24
|
|
||||||
@ -1,4 +1,2 @@
|
|||||||
{% if hostname != "pinenote" %}
|
|
||||||
[Settings]
|
[Settings]
|
||||||
gtk-application-prefer-dark-theme = true
|
gtk-application-prefer-dark-theme = true
|
||||||
{% end %}
|
|
||||||
@ -1,5 +1,2 @@
|
|||||||
{% if hostname != "pinenote" %}
|
|
||||||
[Settings]
|
[Settings]
|
||||||
gtk-application-prefer-dark-theme = true
|
gtk-application-prefer-dark-theme = true
|
||||||
{% end %}
|
|
||||||
|
|
||||||
10
tree/.config/helix/config.toml
Normal file
10
tree/.config/helix/config.toml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
theme = "gruvbox"
|
||||||
|
|
||||||
|
[editor]
|
||||||
|
auto-format = true
|
||||||
|
#line-number = "relative"
|
||||||
|
|
||||||
|
[editor.cursor-shape]
|
||||||
|
insert = "bar"
|
||||||
|
normal = "block"
|
||||||
|
select = "underline"
|
||||||
@ -1,21 +0,0 @@
|
|||||||
{% if light %}
|
|
||||||
theme = "gruvbox_light"
|
|
||||||
{% else %}
|
|
||||||
theme = "gruvbox"
|
|
||||||
{% end %}
|
|
||||||
|
|
||||||
[editor]
|
|
||||||
auto-format = true
|
|
||||||
#line-number = "relative"
|
|
||||||
|
|
||||||
[editor.cursor-shape]
|
|
||||||
insert = "bar"
|
|
||||||
normal = "block"
|
|
||||||
select = "underline"
|
|
||||||
|
|
||||||
[keys.select]
|
|
||||||
X = "extend_line_above" # Extend the selection with the line above the selection
|
|
||||||
|
|
||||||
[keys.normal]
|
|
||||||
X = "extend_line_above" # Extend the selection with the line above the selection
|
|
||||||
C-n = "extend_search_next" # Add next search result to selection
|
|
||||||
@ -1,6 +1,2 @@
|
|||||||
[[language]]
|
[[language]]
|
||||||
name = "rust"
|
name = "rust"
|
||||||
diagnostic-severity = "info" # don't show hints
|
|
||||||
|
|
||||||
[language-server.qmlls]
|
|
||||||
command = "qmlls6"
|
|
||||||
|
|||||||
@ -6,10 +6,12 @@ general {
|
|||||||
background {
|
background {
|
||||||
monitor =
|
monitor =
|
||||||
|
|
||||||
|
{% if hostname == "sputnik" %}
|
||||||
# make background transparent, used in combination with screenlock-video
|
# make background transparent, used in combination with screenlock-video
|
||||||
#color = rgba(00000000)
|
color = rgba(00000000)
|
||||||
|
{% else %}
|
||||||
path = ~/.config/wallpapers/6000x3376/akira.jpg
|
path = ~/.config/wallpapers/6000x3376/akira.jpg
|
||||||
|
{% end %}
|
||||||
}
|
}
|
||||||
|
|
||||||
input-field {
|
input-field {
|
||||||
@ -51,7 +53,7 @@ input-field {
|
|||||||
# ferris image in the center
|
# ferris image in the center
|
||||||
image {
|
image {
|
||||||
monitor =
|
monitor =
|
||||||
path = ~/.config/hypr/ferris-stamp.png
|
path = ~/.config/wallpapers/ferris-stamp.png
|
||||||
rounding = 0
|
rounding = 0
|
||||||
size = 300
|
size = 300
|
||||||
position = 0, 0
|
position = 0, 0
|
||||||
|
|||||||
@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
environment {
|
environment {
|
||||||
DISPLAY ":0"
|
DISPLAY ":0"
|
||||||
ELECTRON_OZONE_PLATFORM_HINT "auto"
|
|
||||||
QT_QPA_PLATFORMTHEME "qt5ct"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
|
// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
|
||||||
@ -21,36 +19,17 @@ input {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Focus windows and outputs automatically when moving the mouse into them.
|
// Focus windows and outputs automatically when moving the mouse into them.
|
||||||
focus-follows-mouse max-scroll-amount="0%"
|
focus-follows-mouse
|
||||||
|
|
||||||
{% if hostname == "sputnik" %}
|
|
||||||
tablet {
|
|
||||||
map-to-output "Microstep MSI MAG342CQR DB6H262101804"
|
|
||||||
}
|
|
||||||
{% end %}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
clipboard {
|
// https://gdthub.com/YaLTeR/niri/wiki/Configuration:-Outputs
|
||||||
disable-primary // disable middle-click paste
|
|
||||||
}
|
|
||||||
|
|
||||||
// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
|
|
||||||
// `niri msg outputs`
|
// `niri msg outputs`
|
||||||
output "Microstep MSI MAG342CQR DB6H262101804" {
|
|
||||||
mode "3440x1440@144.000"
|
|
||||||
position x=1152 y=387
|
|
||||||
scale 1.25
|
|
||||||
}
|
|
||||||
|
|
||||||
output "Dell Inc. DELL U2724DE 1MV5L04" {
|
output "Dell Inc. DELL U2724DE 1MV5L04" {
|
||||||
mode "2560x1440@120.000"
|
mode "2560x1440@120.000"
|
||||||
position x=0 y=0
|
}
|
||||||
transform "270"
|
|
||||||
scale 1.25
|
|
||||||
|
|
||||||
// layout {
|
output "Microstep MSI MAG342CQR DB6H262101804" {
|
||||||
// gaps 0
|
mode "3440x1440@100.000" // TODO: Get cable that supports 144Hz
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
output "eDP-1" {
|
output "eDP-1" {
|
||||||
@ -67,23 +46,7 @@ output "DP-2" {
|
|||||||
// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
|
// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
|
||||||
layout {
|
layout {
|
||||||
// Set gaps around windows in logical pixels.
|
// Set gaps around windows in logical pixels.
|
||||||
{% if hostname == "sputnik" %}
|
|
||||||
gaps 2 // TODO: fix output-specific layout
|
|
||||||
{% else %}
|
|
||||||
gaps 12
|
gaps 12
|
||||||
{% end %}
|
|
||||||
|
|
||||||
// Struts shrink the area occupied by windows, similarly to layer-shell panels.
|
|
||||||
// You can think of them as a kind of outer gaps. They are set in logical pixls.
|
|
||||||
// Left and right struts will cause the next window to the side to always be visible.
|
|
||||||
// Top and bottom struts will simply add outer gaps in addition to the area occupied by
|
|
||||||
// layer-shell panels and regular gaps.
|
|
||||||
struts {
|
|
||||||
left -12
|
|
||||||
right -12
|
|
||||||
top -12
|
|
||||||
bottom -12
|
|
||||||
}
|
|
||||||
|
|
||||||
// When to center a column when changing focus, options are:
|
// When to center a column when changing focus, options are:
|
||||||
// - "never", default behavior, focusing an off-screen column will keep at the left
|
// - "never", default behavior, focusing an off-screen column will keep at the left
|
||||||
@ -110,10 +73,6 @@ layout {
|
|||||||
off
|
off
|
||||||
}
|
}
|
||||||
|
|
||||||
shadow {
|
|
||||||
on
|
|
||||||
}
|
|
||||||
|
|
||||||
// You can also add a border. It's similar to the focus ring, but always visible.
|
// You can also add a border. It's similar to the focus ring, but always visible.
|
||||||
border {
|
border {
|
||||||
// The settings are the same as for the focus ring.
|
// The settings are the same as for the focus ring.
|
||||||
@ -125,11 +84,25 @@ layout {
|
|||||||
// active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
|
// active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
|
||||||
// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
|
// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Struts shrink the area occupied by windows, similarly to layer-shell panels.
|
||||||
|
// You can think of them as a kind of outer gaps. They are set in logical pixls.
|
||||||
|
// Left and right struts will cause the next window to the side to always be visible.
|
||||||
|
// Top and bottom struts will simply add outer gaps in addition to the area occupied by
|
||||||
|
// layer-shell panels and regular gaps.
|
||||||
|
struts {
|
||||||
|
// left 64
|
||||||
|
// right 64
|
||||||
|
// top 64
|
||||||
|
// bottom 64
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
spawn-at-startup "hyprpaper"
|
spawn-at-startup "hyprpaper"
|
||||||
|
spawn-at-startup "eww" "daemon"
|
||||||
|
spawn-at-startup "eww" "open" "bar0"
|
||||||
|
spawn-at-startup "eww" "open" "bar1"
|
||||||
spawn-at-startup "swayidle" "-w" // ~/.config/swayidle/config
|
spawn-at-startup "swayidle" "-w" // ~/.config/swayidle/config
|
||||||
spawn-at-startup "qs" "-p" "/etc/quickshell/niri-caelestia-shell"
|
|
||||||
|
|
||||||
// Uncomment this line to ask the clients to omit their client-side decorations if possible.
|
// Uncomment this line to ask the clients to omit their client-side decorations if possible.
|
||||||
// If the client will specifically ask for CSD, the request will be honored.
|
// If the client will specifically ask for CSD, the request will be honored.
|
||||||
@ -255,48 +228,26 @@ vec4 close_color(vec3 coords_geo, vec3 size_geo) {
|
|||||||
// Find more information on the wiki:
|
// Find more information on the wiki:
|
||||||
// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
|
// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
|
||||||
|
|
||||||
|
// Work around WezTerm's initial configure bug
|
||||||
|
// by setting an empty default-column-width.
|
||||||
window-rule {
|
window-rule {
|
||||||
geometry-corner-radius 22
|
geometry-corner-radius 16
|
||||||
clip-to-geometry true
|
clip-to-geometry true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Indicate screencasted windows with red colors.
|
|
||||||
window-rule {
|
window-rule {
|
||||||
match is-window-cast-target=true
|
// This regular expression is intentionally made as specific as possible,
|
||||||
|
// since this is the default config, and we want no false positives.
|
||||||
focus-ring {
|
// You can get away with just app-id="wezterm" if you want.
|
||||||
active-color "#f38ba8"
|
match app-id=r#"^org\.wezfurlong\.wezterm$"#
|
||||||
inactive-color "#7d0d2d"
|
|
||||||
}
|
|
||||||
|
|
||||||
border {
|
|
||||||
inactive-color "#7d0d2d"
|
|
||||||
}
|
|
||||||
|
|
||||||
shadow {
|
|
||||||
color "#7d0d2d70"
|
|
||||||
}
|
|
||||||
|
|
||||||
tab-indicator {
|
|
||||||
active-color "#f38ba8"
|
|
||||||
inactive-color "#7d0d2d"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
window-rule {
|
window-rule {
|
||||||
match title="Volume Indicator"
|
match title="Volume"
|
||||||
geometry-corner-radius 35
|
geometry-corner-radius 35
|
||||||
min-width 300
|
min-width 300
|
||||||
max-width 300
|
max-width 300
|
||||||
min-height 100
|
min-height 100
|
||||||
max-height 100
|
max-height 100
|
||||||
open-floating true
|
|
||||||
default-floating-position x=35 y=35 relative-to="top-right"
|
|
||||||
}
|
|
||||||
|
|
||||||
window-rule {
|
|
||||||
match app-id="Mullvad VPN"
|
|
||||||
default-floating-position x=5 y=10 relative-to="bottom-left"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// block out password managers from screen capture.
|
// block out password managers from screen capture.
|
||||||
@ -307,18 +258,6 @@ window-rule {
|
|||||||
block-out-from "screen-capture"
|
block-out-from "screen-capture"
|
||||||
}
|
}
|
||||||
|
|
||||||
window-rule {
|
|
||||||
match title="Virtual Machine Manager"
|
|
||||||
match app-id="virt-manager"
|
|
||||||
//max-width 400
|
|
||||||
}
|
|
||||||
|
|
||||||
window-rule {
|
|
||||||
match app-id="com.nextcloud.desktopclient.nextcloud"
|
|
||||||
open-floating true
|
|
||||||
default-floating-position x=5 y=10 relative-to="bottom-left"
|
|
||||||
}
|
|
||||||
|
|
||||||
binds {
|
binds {
|
||||||
// Keys consist of modifiers separated by + signs, followed by an XKB key name
|
// Keys consist of modifiers separated by + signs, followed by an XKB key name
|
||||||
// in the end. To find an XKB name for a particular key, you may use a program
|
// in the end. To find an XKB name for a particular key, you may use a program
|
||||||
@ -332,13 +271,11 @@ binds {
|
|||||||
|
|
||||||
// Mod-Shift-/, which is usually the same as Mod-?,
|
// Mod-Shift-/, which is usually the same as Mod-?,
|
||||||
// shows a list of important hotkeys.
|
// shows a list of important hotkeys.
|
||||||
Mod+Shift+Plus { show-hotkey-overlay; }
|
Mod+Shift+Slash { show-hotkey-overlay; }
|
||||||
|
|
||||||
Mod+Return { spawn "ghostty"; }
|
Mod+Return { spawn "alacritty"; }
|
||||||
Mod+Plus { spawn "loginctl" "lock-session"; }
|
Mod+D { spawn "fuzzel"; }
|
||||||
|
Mod+Plus { spawn "loginctl lock-session"; }
|
||||||
// TODO: why do i have to use spawn-sh?
|
|
||||||
Mod+D { spawn "qs" "-p" "/etc/quickshell/niri-caelestia-shell" "ipc" "call" "drawers" "toggle" "launcher"; }
|
|
||||||
|
|
||||||
// You can also use a shell:
|
// You can also use a shell:
|
||||||
// Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
|
// Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
|
||||||
@ -354,9 +291,6 @@ binds {
|
|||||||
|
|
||||||
Mod+Q { close-window; }
|
Mod+Q { close-window; }
|
||||||
|
|
||||||
Mod+Space { switch-focus-between-floating-and-tiling; }
|
|
||||||
Mod+Ctrl+Space { toggle-window-floating; }
|
|
||||||
|
|
||||||
Mod+Left { focus-column-left; }
|
Mod+Left { focus-column-left; }
|
||||||
Mod+Down { focus-window-down; }
|
Mod+Down { focus-window-down; }
|
||||||
Mod+Up { focus-window-up; }
|
Mod+Up { focus-window-up; }
|
||||||
@ -398,6 +332,14 @@ binds {
|
|||||||
Mod+Shift+Ctrl+K { move-column-to-monitor-up; }
|
Mod+Shift+Ctrl+K { move-column-to-monitor-up; }
|
||||||
Mod+Shift+Ctrl+L { move-column-to-monitor-right; }
|
Mod+Shift+Ctrl+L { move-column-to-monitor-right; }
|
||||||
|
|
||||||
|
// Alternatively, there are commands to move just a single window:
|
||||||
|
// Mod+Shift+Ctrl+Left { move-window-to-monitor-left; }
|
||||||
|
// ...
|
||||||
|
|
||||||
|
// And you can also move a whole workspace to another monitor:
|
||||||
|
// Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; }
|
||||||
|
// ...
|
||||||
|
|
||||||
Mod+Page_Down { focus-workspace-down; }
|
Mod+Page_Down { focus-workspace-down; }
|
||||||
Mod+Page_Up { focus-workspace-up; }
|
Mod+Page_Up { focus-workspace-up; }
|
||||||
Mod+U { focus-workspace-down; }
|
Mod+U { focus-workspace-down; }
|
||||||
@ -407,13 +349,15 @@ binds {
|
|||||||
Mod+Ctrl+U { move-column-to-workspace-down; }
|
Mod+Ctrl+U { move-column-to-workspace-down; }
|
||||||
Mod+Ctrl+I { move-column-to-workspace-up; }
|
Mod+Ctrl+I { move-column-to-workspace-up; }
|
||||||
|
|
||||||
|
// Alternatively, there are commands to move just a single window:
|
||||||
|
// Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
|
||||||
|
// ...
|
||||||
|
|
||||||
Mod+Shift+Page_Down { move-workspace-down; }
|
Mod+Shift+Page_Down { move-workspace-down; }
|
||||||
Mod+Shift+Page_Up { move-workspace-up; }
|
Mod+Shift+Page_Up { move-workspace-up; }
|
||||||
Mod+Shift+U { move-workspace-down; }
|
Mod+Shift+U { move-workspace-down; }
|
||||||
Mod+Shift+I { move-workspace-up; }
|
Mod+Shift+I { move-workspace-up; }
|
||||||
|
|
||||||
Mod+Backspace { toggle-overview; }
|
|
||||||
|
|
||||||
// You can bind mouse wheel scroll ticks using the following syntax.
|
// You can bind mouse wheel scroll ticks using the following syntax.
|
||||||
// These binds will change direction based on the natural-scroll setting.
|
// These binds will change direction based on the natural-scroll setting.
|
||||||
//
|
//
|
||||||
@ -481,7 +425,6 @@ binds {
|
|||||||
|
|
||||||
Mod+Comma { consume-window-into-column; }
|
Mod+Comma { consume-window-into-column; }
|
||||||
Mod+Period { expel-window-from-column; }
|
Mod+Period { expel-window-from-column; }
|
||||||
Mod+W { toggle-column-tabbed-display; }
|
|
||||||
|
|
||||||
// There are also commands that consume or expel a single window to the side.
|
// There are also commands that consume or expel a single window to the side.
|
||||||
// Mod+BracketLeft { consume-or-expel-window-left; }
|
// Mod+BracketLeft { consume-or-expel-window-left; }
|
||||||
@ -519,23 +462,10 @@ binds {
|
|||||||
Ctrl+Print { screenshot-screen; }
|
Ctrl+Print { screenshot-screen; }
|
||||||
Alt+Print { screenshot-window; }
|
Alt+Print { screenshot-window; }
|
||||||
|
|
||||||
// Switch to the next keyboard layout
|
|
||||||
Mod+Tab { spawn "wmutils" "next-keyboard-layout"; }
|
|
||||||
|
|
||||||
// The quit action will show a confirmation dialog to avoid accidental exits.
|
// The quit action will show a confirmation dialog to avoid accidental exits.
|
||||||
Mod+Shift+E { quit; }
|
Mod+Shift+E { quit; }
|
||||||
|
|
||||||
// Powers off the monitors. To turn them back on, do any input like
|
// Powers off the monitors. To turn them back on, do any input like
|
||||||
// moving the mouse or pressing any other key.
|
// moving the mouse or pressing any other key.
|
||||||
// Mod+Shift+P { power-off-monitors; }
|
Mod+Shift+P { power-off-monitors; }
|
||||||
|
|
||||||
// Dynamic screencasting target
|
|
||||||
Mod+Slash { clear-dynamic-cast-target; }
|
|
||||||
Mod+Ctrl+Slash { set-dynamic-cast-window; }
|
|
||||||
Mod+Shift+Slash { set-dynamic-cast-monitor; }
|
|
||||||
|
|
||||||
// Debugging
|
|
||||||
Mod+Shift+Ctrl+T { toggle-debug-tint; }
|
|
||||||
Mod+Shift+Ctrl+O { debug-toggle-opaque-regions; }
|
|
||||||
Mod+Shift+Ctrl+D { debug-toggle-damage; }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,18 +7,22 @@
|
|||||||
# And here is the theme collection
|
# And here is the theme collection
|
||||||
# https://github.com/nushell/nu_scripts/tree/main/themes
|
# https://github.com/nushell/nu_scripts/tree/main/themes
|
||||||
|
|
||||||
|
|
||||||
|
# Use fish for external completion
|
||||||
let fish_completer = {|spans|
|
let fish_completer = {|spans|
|
||||||
fish --command $"complete '--do-complete=($spans | str replace --all "'" "\\'" | str join ' ')'"
|
# if the current command is an alias, get it's expansion
|
||||||
| from tsv --flexible --noheaders --no-infer
|
let expanded_alias = (scope aliases | where name == $spans.0 | get -i 0 | get -i expansion)
|
||||||
| rename value description
|
|
||||||
| update value {|row|
|
# overwrite
|
||||||
let value = $row.value
|
let spans = (if $expanded_alias != null {
|
||||||
let need_quote = ['\' ',' '[' ']' '(' ')' ' ' '\t' "'" '"' "`"] | any {$in in $value}
|
# put the first word of the expanded alias first in the span
|
||||||
if ($need_quote and ($value | path exists)) {
|
$spans | skip 1 | prepend ($expanded_alias | split row " " | take 1)
|
||||||
let expanded_path = if ($value starts-with ~) {$value | path expand --no-symlink} else {$value}
|
} else { $spans })
|
||||||
$'"($expanded_path | str replace --all "\"" "\\\"")"'
|
|
||||||
} else {$value}
|
|
||||||
}
|
fish --command $'complete "--do-complete=($spans | str join " ")"'
|
||||||
|
| $"value(char tab)description(char newline)" + $in
|
||||||
|
| from tsv --flexible --no-infer
|
||||||
}
|
}
|
||||||
|
|
||||||
source theme.nu
|
source theme.nu
|
||||||
@ -114,7 +118,8 @@ $env.config = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
filesize: {
|
filesize: {
|
||||||
unit: "binary" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
|
metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
|
||||||
|
format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
|
||||||
}
|
}
|
||||||
|
|
||||||
cursor_shape: {
|
cursor_shape: {
|
||||||
@ -669,7 +674,6 @@ alias gpu = git push -u origin
|
|||||||
alias gsta = git stash push
|
alias gsta = git stash push
|
||||||
alias gstp = git stash pop
|
alias gstp = git stash pop
|
||||||
alias gw = git switch
|
alias gw = git switch
|
||||||
alias lg = lazygit
|
|
||||||
alias bt = bluetoothctl
|
alias bt = bluetoothctl
|
||||||
alias d = cd ~/.config/dotfiles/tree
|
alias d = cd ~/.config/dotfiles/tree
|
||||||
alias xo = xdg-open
|
alias xo = xdg-open
|
||||||
@ -678,10 +682,6 @@ alias xo = xdg-open
|
|||||||
source ~/.local/nu/readelf.nu
|
source ~/.local/nu/readelf.nu
|
||||||
source ~/.local/nu/mullvad.nu
|
source ~/.local/nu/mullvad.nu
|
||||||
source ~/.local/nu/git.nu
|
source ~/.local/nu/git.nu
|
||||||
source ~/.local/nu/tailscale.nu
|
|
||||||
{% if os == "darwin" %}
|
|
||||||
source ~/.local/nu/macos.nu
|
|
||||||
{% end %}
|
|
||||||
|
|
||||||
# init zoxide
|
# init zoxide
|
||||||
source ~/.cache/zoxide.nu
|
source ~/.cache/zoxide.nu
|
||||||
@ -87,7 +87,6 @@ $env.PATH = ($env.PATH | split row (char esep) | prepend [
|
|||||||
($env.HOME + "/.cargo/bin"),
|
($env.HOME + "/.cargo/bin"),
|
||||||
($env.HOME + "/.radicle/bin"),
|
($env.HOME + "/.radicle/bin"),
|
||||||
($env.HOME + "/.volta/bin"),
|
($env.HOME + "/.volta/bin"),
|
||||||
($env.HOME + "/.orbstack/bin"), # docker on macos
|
|
||||||
])
|
])
|
||||||
|
|
||||||
# auto-detect which ssh-agent to use
|
# auto-detect which ssh-agent to use
|
||||||
@ -101,7 +100,7 @@ if ("XDG_RUNTIME_DIR" in $env) {
|
|||||||
|
|
||||||
$env.GPG_TTY = (tty)
|
$env.GPG_TTY = (tty)
|
||||||
$env.BROWSER = "firefox"
|
$env.BROWSER = "firefox"
|
||||||
$env.EDITOR = "helix"
|
$env.EDITOR = "nvim"
|
||||||
$env.DEFMT_LOG = "info"
|
$env.DEFMT_LOG = "info"
|
||||||
$env.MOZ_ENABLE_WAYLAND = "1"
|
$env.MOZ_ENABLE_WAYLAND = "1"
|
||||||
$env.VOLTA_HOME = $"($env.HOME)/.volta"
|
$env.VOLTA_HOME = $"($env.HOME)/.volta"
|
||||||
|
|||||||
@ -22,9 +22,7 @@ vim.opt.rtp:prepend(lazypath)
|
|||||||
-- TODO: get colored renders working
|
-- TODO: get colored renders working
|
||||||
vim.g.rustaceanvim = {
|
vim.g.rustaceanvim = {
|
||||||
-- Plugin configuration
|
-- Plugin configuration
|
||||||
tools = {
|
tools = {},
|
||||||
float_win_config = { border = 'rounded' },
|
|
||||||
},
|
|
||||||
|
|
||||||
-- LSP configuration
|
-- LSP configuration
|
||||||
server = {
|
server = {
|
||||||
@ -38,12 +36,7 @@ vim.g.rustaceanvim = {
|
|||||||
end,
|
end,
|
||||||
default_settings = {
|
default_settings = {
|
||||||
['rust-analyzer'] = {
|
['rust-analyzer'] = {
|
||||||
checkOnSave = true,
|
checkOnSave = { overrideCommand = "cargo check --message-format=json-diagnostic-rendered-ansi" },
|
||||||
check = {
|
|
||||||
overrideCommand = {
|
|
||||||
"cargo", "check", "--message-format=json-diagnostic-rendered-ansi",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
settings = function(project_root)
|
settings = function(project_root)
|
||||||
@ -98,22 +91,17 @@ require("mason").setup({
|
|||||||
},
|
},
|
||||||
ensure_installed = language_servers,
|
ensure_installed = language_servers,
|
||||||
})
|
})
|
||||||
require("mason-lspconfig").setup {
|
require("mason-lspconfig").setup_handlers {
|
||||||
automatic_enable = {
|
|
||||||
exclude = {
|
|
||||||
-- rust_analyzer is managed by rustaceanvim
|
-- rust_analyzer is managed by rustaceanvim
|
||||||
"rust_analyzer",
|
['rust_analyzer'] = function() end
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
require("mason-lspconfig").setup()
|
||||||
|
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
for _, l in pairs(language_servers) do
|
for _,l in pairs(language_servers) do
|
||||||
lspconfig[l].setup {}
|
lspconfig[l].setup {}
|
||||||
end
|
end
|
||||||
|
|
||||||
require('dapui').setup();
|
|
||||||
|
|
||||||
local compare = require "cmp.config.compare"
|
local compare = require "cmp.config.compare"
|
||||||
require('cmp').setup.filetype({ "rust" }, {
|
require('cmp').setup.filetype({ "rust" }, {
|
||||||
sorting = {
|
sorting = {
|
||||||
@ -143,7 +131,7 @@ require('cmp').setup.filetype({ "rust" }, {
|
|||||||
vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
|
vim.cmd [[autocmd BufWritePre * lua vim.lsp.buf.format()]]
|
||||||
|
|
||||||
-- Completion Plugin Setup
|
-- Completion Plugin Setup
|
||||||
local cmp = require 'cmp'
|
local cmp = require'cmp'
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
-- Enable LSP snippets
|
-- Enable LSP snippets
|
||||||
snippet = {
|
snippet = {
|
||||||
@ -170,20 +158,20 @@ cmp.setup({
|
|||||||
sources = {
|
sources = {
|
||||||
{ name = 'path' }, -- file paths
|
{ name = 'path' }, -- file paths
|
||||||
{ name = 'nvim_lsp', keyword_length = 3 }, -- from language server
|
{ name = 'nvim_lsp', keyword_length = 3 }, -- from language server
|
||||||
{ name = 'nvim_lsp_signature_help' }, -- display function signatures with current parameter emphasized
|
{ name = 'nvim_lsp_signature_help'}, -- display function signatures with current parameter emphasized
|
||||||
{ name = 'nvim_lua', keyword_length = 2 }, -- complete neovim's Lua runtime API such vim.lsp.*
|
{ name = 'nvim_lua', keyword_length = 2 }, -- complete neovim's Lua runtime API such vim.lsp.*
|
||||||
{ name = 'buffer', keyword_length = 2 }, -- source current buffer
|
{ name = 'buffer', keyword_length = 2 }, -- source current buffer
|
||||||
{ name = 'vsnip', keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
{ name = 'vsnip', keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
||||||
{ name = 'calc' }, -- source for math calculation
|
{ name = 'calc'}, -- source for math calculation
|
||||||
},
|
},
|
||||||
window = {
|
window = {
|
||||||
completion = cmp.config.window.bordered(),
|
completion = cmp.config.window.bordered(),
|
||||||
documentation = cmp.config.window.bordered(),
|
documentation = cmp.config.window.bordered(),
|
||||||
},
|
},
|
||||||
formatting = {
|
formatting = {
|
||||||
fields = { 'menu', 'abbr', 'kind' },
|
fields = {'menu', 'abbr', 'kind'},
|
||||||
format = function(entry, item)
|
format = function(entry, item)
|
||||||
local menu_icon = {
|
local menu_icon ={
|
||||||
nvim_lsp = 'λ',
|
nvim_lsp = 'λ',
|
||||||
vsnip = '⋗',
|
vsnip = '⋗',
|
||||||
buffer = 'Ω',
|
buffer = 'Ω',
|
||||||
@ -202,7 +190,7 @@ require('nvim-treesitter.configs').setup {
|
|||||||
auto_install = true,
|
auto_install = true,
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true,
|
enable = true,
|
||||||
additional_vim_regex_highlighting = false,
|
additional_vim_regex_highlighting=false,
|
||||||
},
|
},
|
||||||
ident = { enable = true },
|
ident = { enable = true },
|
||||||
rainbow = {
|
rainbow = {
|
||||||
|
|||||||
@ -8,7 +8,7 @@ dap.adapters.codelldb = {
|
|||||||
port = "${port}",
|
port = "${port}",
|
||||||
executable = {
|
executable = {
|
||||||
command = codelldb_bin,
|
command = codelldb_bin,
|
||||||
args = { "--port", "${port}" },
|
args = {"--port", "${port}"},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -33,7 +33,7 @@ dap.configurations.cpp = {
|
|||||||
handle:close()
|
handle:close()
|
||||||
|
|
||||||
-- Trim the result
|
-- Trim the result
|
||||||
pid = pid:match("^%s*(.-)%s*$")
|
pid = pid:match( "^%s*(.-)%s*$" )
|
||||||
return pid
|
return pid
|
||||||
end,
|
end,
|
||||||
stopOnEntry = true,
|
stopOnEntry = true,
|
||||||
@ -75,7 +75,7 @@ dap.configurations.cpp = {
|
|||||||
handle:close()
|
handle:close()
|
||||||
|
|
||||||
-- Trim the result
|
-- Trim the result
|
||||||
pid = pid:match("^%s*(.-)%s*$")
|
pid = pid:match( "^%s*(.-)%s*$" )
|
||||||
return pid
|
return pid
|
||||||
end,
|
end,
|
||||||
initCommands = {
|
initCommands = {
|
||||||
|
|||||||
@ -1,96 +1,15 @@
|
|||||||
local telescope = require('telescope.builtin')
|
local telescope = require('telescope.builtin')
|
||||||
local wk = require('which-key')
|
local wk = require('which-key')
|
||||||
local harpoon = require("harpoon")
|
|
||||||
local telescope_conf = require("telescope.config").values
|
|
||||||
harpoon:setup()
|
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>f', telescope.find_files, { desc = "File picker" })
|
vim.keymap.set('n', '<leader>f', telescope.find_files, { desc = "File picker" })
|
||||||
vim.keymap.set('n', '<leader>g', telescope.live_grep, { desc = "Grep recursively" })
|
vim.keymap.set('n', '<leader>g', telescope.live_grep, { desc = "Grep recursively" })
|
||||||
vim.keymap.set('n', '<leader>b', telescope.buffers, { desc = "Buffer picker" })
|
vim.keymap.set('n', '<leader>b', telescope.buffers, { desc = "Buffer picker" })
|
||||||
vim.keymap.set('n', '<leader>?', telescope.help_tags, { desc = "Help tags picker" })
|
vim.keymap.set('n', '<leader>?', telescope.help_tags, { desc = "Help tags picker" })
|
||||||
vim.keymap.set('n', '<leader>s', telescope.treesitter, { desc = "Treesitter symbol picker" })
|
vim.keymap.set('n', '<leader>s', telescope.treesitter, { desc = "Treesitter symbol picker" })
|
||||||
vim.keymap.set('n', '<leader>j', telescope.jumplist, { desc = "Jumplist" })
|
|
||||||
vim.keymap.set('n', '<leader>u', ":TodoTelescope<Enter>", { desc = "Grep for TODOs" })
|
vim.keymap.set('n', '<leader>u', ":TodoTelescope<Enter>", { desc = "Grep for TODOs" })
|
||||||
vim.keymap.set('n', 'U', ":redo<Enter>", {})
|
vim.keymap.set('n', 'U', ":redo<Enter>", {})
|
||||||
vim.keymap.set('n', '<leader>p', ":b#<Enter>", { desc = "Go to last buffer" })
|
vim.keymap.set('n', '<leader>p', ":b#<Enter>", { desc = "Go to last buffer" })
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
local function toggle_telescope(harpoon_files)
|
|
||||||
local displayer = require("telescope.pickers.entry_display").create({
|
|
||||||
separator = " | ",
|
|
||||||
items = {
|
|
||||||
--{ width = 0.1 },
|
|
||||||
{ width = 0.9 },
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
local harpoons = {}
|
|
||||||
for _, item in ipairs(harpoon_files.items) do
|
|
||||||
table.insert(harpoons, {
|
|
||||||
filepath = item.value,
|
|
||||||
col = item.context.col,
|
|
||||||
row = item.context.row,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
require("telescope.pickers").new({}, {
|
|
||||||
prompt_title = "Harpoon",
|
|
||||||
finder = require("telescope.finders").new_table({
|
|
||||||
results = harpoons,
|
|
||||||
entry_maker = function(entry)
|
|
||||||
--vim.print("mapping entry")
|
|
||||||
--vim.print(entry)
|
|
||||||
local filepath_with_row = string.format("%s:%d", entry.filepath, entry.row)
|
|
||||||
return {
|
|
||||||
-- Value to display. Required. type=any
|
|
||||||
--value = { "foo", entry.filepath, },
|
|
||||||
value = entry,
|
|
||||||
|
|
||||||
-- Whether to display the entry. Optional. type=bool
|
|
||||||
valid = true,
|
|
||||||
|
|
||||||
-- Optional. type=string|function
|
|
||||||
--display = entry.filepath,
|
|
||||||
display = function(entry)
|
|
||||||
return displayer({
|
|
||||||
-- NOTE: the number of elements must match the
|
|
||||||
-- configuration passed to `displayer` above
|
|
||||||
--{ "foobar" },
|
|
||||||
{ filepath_with_row }
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
|
|
||||||
-- Used for filtering. Optional. type=string
|
|
||||||
ordinal = filepath_with_row,
|
|
||||||
|
|
||||||
-- File to open when pressing enter. Optional. type=string
|
|
||||||
filename = entry.filepath,
|
|
||||||
|
|
||||||
-- Buffer to open when pressing enter. Optional. type=number
|
|
||||||
-- bufnr = 0,
|
|
||||||
|
|
||||||
-- Line number of file/buffer to open. Optional. type=number
|
|
||||||
lnum = entry.row,
|
|
||||||
|
|
||||||
-- Line number of file/buffer to open. Optional. type=number
|
|
||||||
col = entry.row,
|
|
||||||
}
|
|
||||||
end
|
|
||||||
}),
|
|
||||||
previewer = telescope_conf.grep_previewer({}),
|
|
||||||
sorter = telescope_conf.generic_sorter({}),
|
|
||||||
}):find()
|
|
||||||
end
|
|
||||||
vim.keymap.set("n", "<leader>h", function() toggle_telescope(harpoon:list()) end,
|
|
||||||
{ desc = "Open harpoon window" })
|
|
||||||
vim.keymap.set("n", "<leader>H", function() harpoon:list():add() end,
|
|
||||||
{ desc = "Launch harpoon" })
|
|
||||||
-- Toggle previous & next buffers stored within Harpoon list
|
|
||||||
--vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end)
|
|
||||||
--vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
|
|
||||||
|
|
||||||
|
|
||||||
-- Use LspAttach autocommand to only map the following keys
|
-- Use LspAttach autocommand to only map the following keys
|
||||||
-- after the language server attaches to the current buffer
|
-- after the language server attaches to the current buffer
|
||||||
vim.api.nvim_create_autocmd('LspAttach', {
|
vim.api.nvim_create_autocmd('LspAttach', {
|
||||||
@ -103,19 +22,14 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
|||||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||||
vim.keymap.set('n', '<leader>ld', telescope.lsp_definitions, { desc = "Show definitons", buffer = ev.buf })
|
vim.keymap.set('n', '<leader>ld', telescope.lsp_definitions, { desc = "Show definitons", buffer = ev.buf })
|
||||||
vim.keymap.set('n', '<leader>lr', telescope.lsp_references, { desc = "Show references", buffer = ev.buf })
|
vim.keymap.set('n', '<leader>lr', telescope.lsp_references, { desc = "Show references", buffer = ev.buf })
|
||||||
vim.keymap.set('n', '<leader>li', telescope.lsp_implementations,
|
vim.keymap.set('n', '<leader>li', telescope.lsp_implementations, { desc = "Show implementations", buffer = ev.buf })
|
||||||
{ desc = "Show implementations", buffer = ev.buf })
|
vim.keymap.set('n', '<leader>lt', telescope.lsp_type_definitions, { desc = "Show type definitions", buffer = ev.buf })
|
||||||
vim.keymap.set('n', '<leader>lt', telescope.lsp_type_definitions,
|
|
||||||
{ desc = "Show type definitions", buffer = ev.buf })
|
|
||||||
vim.keymap.set('n', '<leader>le', telescope.diagnostics, { desc = "Show diagnostics", buffer = ev.buf })
|
vim.keymap.set('n', '<leader>le', telescope.diagnostics, { desc = "Show diagnostics", buffer = ev.buf })
|
||||||
vim.keymap.set('n', '<leader>ls', telescope.lsp_workspace_symbols,
|
vim.keymap.set('n', '<leader>ls', telescope.lsp_workspace_symbols, { desc = "Show workspace symbols", buffer = ev.buf })
|
||||||
{ desc = "Show workspace symbols", buffer = ev.buf })
|
|
||||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = ev.buf })
|
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = ev.buf })
|
||||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, { buffer = ev.buf })
|
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, { buffer = ev.buf })
|
||||||
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder,
|
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, { desc = "Add workspace folder", buffer = ev.buf })
|
||||||
{ desc = "Add workspace folder", buffer = ev.buf })
|
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, { desc = "Remove workspace folder", buffer = ev.buf })
|
||||||
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder,
|
|
||||||
{ desc = "Remove workspace folder", buffer = ev.buf })
|
|
||||||
vim.keymap.set('n', '<leader>wl', function()
|
vim.keymap.set('n', '<leader>wl', function()
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||||
end, { desc = "List workspace folders", buffer = ev.buf })
|
end, { desc = "List workspace folders", buffer = ev.buf })
|
||||||
@ -126,6 +40,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
|||||||
{ "<leader>l", desc = "Language server stuff" },
|
{ "<leader>l", desc = "Language server stuff" },
|
||||||
{ "<leader>w", desc = "Workspace stuff" },
|
{ "<leader>w", desc = "Workspace stuff" },
|
||||||
})
|
})
|
||||||
|
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
local opt = vim.opt
|
local opt = vim.opt
|
||||||
|
|
||||||
-- Use system clipboard
|
-- Use system clipboard
|
||||||
vim.opt.clipboard = "unnamedplus"
|
vim.opt.clipboard="unnamedplus"
|
||||||
|
|
||||||
-- [[ Context ]]
|
-- [[ Context ]]
|
||||||
opt.colorcolumn = '100' -- str: Show col for max line length
|
opt.colorcolumn = '100' -- str: Show col for max line length
|
||||||
@ -13,7 +13,7 @@ opt.signcolumn = "yes" -- str: Show the sign column
|
|||||||
-- [[ Filetypes ]]
|
-- [[ Filetypes ]]
|
||||||
opt.encoding = 'utf8' -- str: String encoding to use
|
opt.encoding = 'utf8' -- str: String encoding to use
|
||||||
-- opt.fileencoding = 'utf8' -- str: File encoding to use
|
-- opt.fileencoding = 'utf8' -- str: File encoding to use
|
||||||
vim.filetype.add({ extension = { wgsl = "wgsl" } })
|
vim.filetype.add({extension = {wgsl = "wgsl"}})
|
||||||
|
|
||||||
-- [[ Theme ]]
|
-- [[ Theme ]]
|
||||||
opt.syntax = "ON" -- str: Allow syntax highlighting
|
opt.syntax = "ON" -- str: Allow syntax highlighting
|
||||||
@ -43,10 +43,11 @@ opt.splitbelow = true -- bool: Place new window below the current one
|
|||||||
-- noselect: Do not select, force to select one from the menu
|
-- noselect: Do not select, force to select one from the menu
|
||||||
-- shortness: avoid showing extra messages when using completion
|
-- shortness: avoid showing extra messages when using completion
|
||||||
-- updatetime: set updatetime for CursorHold
|
-- updatetime: set updatetime for CursorHold
|
||||||
vim.opt.completeopt = { 'menuone', 'noselect', 'noinsert' }
|
vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'}
|
||||||
vim.opt.shortmess = vim.opt.shortmess + { c = true }
|
vim.opt.shortmess = vim.opt.shortmess + { c = true}
|
||||||
vim.api.nvim_set_option('updatetime', 300)
|
vim.api.nvim_set_option('updatetime', 300)
|
||||||
|
|
||||||
-- Uncomment to enable treesitter folding by default
|
-- Uncomment to enable treesitter folding by default
|
||||||
--vim.wo.foldmethod = 'expr'
|
--vim.wo.foldmethod = 'expr'
|
||||||
--vim.wo.foldexpr = 'nvim_treesitter#foldexpr()'
|
--vim.wo.foldexpr = 'nvim_treesitter#foldexpr()'
|
||||||
|
|
||||||
|
|||||||
@ -36,32 +36,6 @@ require("lazy").setup({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{ 'rktjmp/fwatch.nvim' },
|
{ 'rktjmp/fwatch.nvim' },
|
||||||
{
|
|
||||||
"folke/snacks.nvim",
|
|
||||||
priority = 1000,
|
|
||||||
lazy = false,
|
|
||||||
opts = {
|
|
||||||
bigfile = { enabled = true },
|
|
||||||
notifier = { enabled = true },
|
|
||||||
quickfile = { enabled = true },
|
|
||||||
statuscolumn = { enabled = true },
|
|
||||||
words = { enabled = true },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"folke/flash.nvim",
|
|
||||||
event = "VeryLazy",
|
|
||||||
---@type Flash.Config
|
|
||||||
opts = {},
|
|
||||||
-- stylua: ignore
|
|
||||||
keys = {
|
|
||||||
{ "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
|
|
||||||
{ "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
|
|
||||||
{ "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
|
|
||||||
{ "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
|
|
||||||
{ "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
-- -- language server stuff
|
-- -- language server stuff
|
||||||
{ 'williamboman/mason.nvim' },
|
{ 'williamboman/mason.nvim' },
|
||||||
@ -69,13 +43,10 @@ require("lazy").setup({
|
|||||||
{ 'neovim/nvim-lspconfig' },
|
{ 'neovim/nvim-lspconfig' },
|
||||||
{
|
{
|
||||||
'mrcjkb/rustaceanvim',
|
'mrcjkb/rustaceanvim',
|
||||||
version = '^6',
|
version = '^4',
|
||||||
lazy = false, -- This plugin is already lazy
|
lazy = false, -- This plugin is already lazy
|
||||||
},
|
},
|
||||||
{ 'mfussenegger/nvim-dap' },
|
{ 'mfussenegger/nvim-dap' },
|
||||||
{ 'rcarriga/nvim-dap-ui', dependencies = { 'mfussenegger/nvim-dap', 'nvim-neotest/nvim-nio' } },
|
|
||||||
{ 'theHamsta/nvim-dap-virtual-text' },
|
|
||||||
{ 'jay-babu/mason-nvim-dap.nvim' },
|
|
||||||
|
|
||||||
-- -- nushell support
|
-- -- nushell support
|
||||||
-- --use { 'LhKipp/nvim-nu', run = function() vim.fn[':TSInstall nu'] end} }
|
-- --use { 'LhKipp/nvim-nu', run = function() vim.fn[':TSInstall nu'] end} }
|
||||||
@ -96,16 +67,9 @@ require("lazy").setup({
|
|||||||
{ 'hrsh7th/vim-vsnip' },
|
{ 'hrsh7th/vim-vsnip' },
|
||||||
{ 'ryo33/nvim-cmp-rust' },
|
{ 'ryo33/nvim-cmp-rust' },
|
||||||
|
|
||||||
{
|
{ 'nvim-telescope/telescope.nvim', branch = '0.1.x',
|
||||||
'nvim-telescope/telescope.nvim',
|
|
||||||
branch = '0.1.x',
|
|
||||||
dependencies = { 'nvim-lua/plenary.nvim' }
|
dependencies = { 'nvim-lua/plenary.nvim' }
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"ThePrimeagen/harpoon",
|
|
||||||
branch = "harpoon2",
|
|
||||||
dependencies = { "nvim-lua/plenary.nvim" }
|
|
||||||
},
|
|
||||||
|
|
||||||
-- -- status line
|
-- -- status line
|
||||||
{ 'linrongbin16/lsp-progress.nvim' },
|
{ 'linrongbin16/lsp-progress.nvim' },
|
||||||
@ -117,6 +81,6 @@ require("lazy").setup({
|
|||||||
-- automatically check for plugin updates
|
-- automatically check for plugin updates
|
||||||
checker = {
|
checker = {
|
||||||
enabled = true,
|
enabled = true,
|
||||||
notify = false,
|
notify=false,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@ -16,8 +16,8 @@ require('lualine').setup {
|
|||||||
options = {
|
options = {
|
||||||
icons_enabled = true,
|
icons_enabled = true,
|
||||||
theme = 'auto',
|
theme = 'auto',
|
||||||
component_separators = { left = '', right = '' },
|
component_separators = { left = '', right = ''},
|
||||||
section_separators = { left = '', right = '' },
|
section_separators = { left = '', right = ''},
|
||||||
disabled_filetypes = {
|
disabled_filetypes = {
|
||||||
statusline = {},
|
statusline = {},
|
||||||
winbar = {},
|
winbar = {},
|
||||||
@ -32,22 +32,22 @@ require('lualine').setup {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
sections = {
|
sections = {
|
||||||
lualine_a = { 'mode' },
|
lualine_a = {'mode'},
|
||||||
lualine_b = { 'branch', 'diff', 'diagnostics' },
|
lualine_b = {'branch', 'diff', 'diagnostics'},
|
||||||
lualine_c = { 'filename' },
|
lualine_c = {'filename'},
|
||||||
lualine_x = {
|
lualine_x = {
|
||||||
function()
|
function()
|
||||||
return require('lsp-progress').progress()
|
return require('lsp-progress').progress()
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
lualine_y = { 'encoding', 'fileformat', 'filetype' },
|
lualine_y = {'encoding', 'fileformat', 'filetype'},
|
||||||
lualine_z = { 'location' }
|
lualine_z = {'location'}
|
||||||
},
|
},
|
||||||
inactive_sections = {
|
inactive_sections = {
|
||||||
lualine_a = {},
|
lualine_a = {},
|
||||||
lualine_b = {},
|
lualine_b = {},
|
||||||
lualine_c = { 'filename' },
|
lualine_c = {'filename'},
|
||||||
lualine_x = { 'location' },
|
lualine_x = {'location'},
|
||||||
lualine_y = {},
|
lualine_y = {},
|
||||||
lualine_z = {}
|
lualine_z = {}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -22,7 +22,7 @@ require("gruvbox").setup({
|
|||||||
palette_overrides = {},
|
palette_overrides = {},
|
||||||
overrides = {},
|
overrides = {},
|
||||||
dim_inactive = false,
|
dim_inactive = false,
|
||||||
transparent_mode = not vim.g.neovide,
|
transparent_mode = true,
|
||||||
})
|
})
|
||||||
|
|
||||||
require('color-scheme')
|
require('color-scheme')
|
||||||
|
|||||||
@ -19,20 +19,20 @@ format = "[$hostname]($style) in "
|
|||||||
disabled = true
|
disabled = true
|
||||||
{% end %}
|
{% end %}
|
||||||
|
|
||||||
#[custom.stl]
|
[custom.stl]
|
||||||
#description = "time logger"
|
description = "time logger"
|
||||||
#when = "stl stat -f /home/hulthe/.stld" # touch the file, but don't create it
|
when = "stl stat -f /home/hulthe/.stld" # touch the file, but don't create it
|
||||||
#command = "cat /home/hulthe/.stld"
|
command = "cat /home/hulthe/.stld"
|
||||||
#symbol = "🕑"
|
symbol = "🕑"
|
||||||
#style = "italic bright-purple"
|
style = "italic bright-purple"
|
||||||
#format = "[$symbol ($output )]($style)"
|
format = "[$symbol ($output )]($style)"
|
||||||
{% if demo %}
|
{% if demo %}
|
||||||
#disabled = true
|
disabled = true
|
||||||
{% end %}
|
{% end %}
|
||||||
|
|
||||||
|
|
||||||
{% if demo %}
|
|
||||||
# hide all persondata while in demo mode
|
# hide all persondata while in demo mode
|
||||||
|
{% if demo %}
|
||||||
[directory]
|
[directory]
|
||||||
truncation_length = 1
|
truncation_length = 1
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{% if hostname == "sputnik" %}
|
{% if hostname == "sputnik" %}
|
||||||
lock '$HOME/.local/bin/screenlock'
|
lock '$HOME/.local/bin/screenlock-video'
|
||||||
{% else %}
|
{% else %}
|
||||||
lock '$HOME/.local/bin/screenlock'
|
lock '$HOME/.local/bin/screenlock'
|
||||||
{% end %}
|
{% end %}
|
||||||
|
|||||||
@ -1,99 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "/etc/xdg/swaync/configSchema.json",
|
|
||||||
"positionX": "right",
|
|
||||||
"positionY": "top",
|
|
||||||
"control-center-margin-top": 10,
|
|
||||||
"control-center-margin-bottom": 10,
|
|
||||||
"control-center-margin-left": 10,
|
|
||||||
"notification-icon-size": 64,
|
|
||||||
"notification-body-image-height": 100,
|
|
||||||
"notification-body-image-width": 200,
|
|
||||||
"timeout": 10,
|
|
||||||
"timeout-low": 5,
|
|
||||||
"timeout-critical": 0,
|
|
||||||
"fit-to-screen": false,
|
|
||||||
"control-center-width": 500,
|
|
||||||
"control-center-height": 1033,
|
|
||||||
"notification-window-width": 500,
|
|
||||||
"keyboard-shortcuts": true,
|
|
||||||
"image-visibility": "when-available",
|
|
||||||
"transition-time": 200,
|
|
||||||
"hide-on-clear": false,
|
|
||||||
"hide-on-action": true,
|
|
||||||
"script-fail-notify": true,
|
|
||||||
"widgets": [
|
|
||||||
"buttons-grid",
|
|
||||||
"volume",
|
|
||||||
"backlight"
|
|
||||||
],
|
|
||||||
"widget-config": {
|
|
||||||
"title": {
|
|
||||||
"text": "Notification Center",
|
|
||||||
"clear-all-button": true,
|
|
||||||
"button-text": " Clear"
|
|
||||||
},
|
|
||||||
"dnd": {
|
|
||||||
"text": "Do Not Disturb"
|
|
||||||
},
|
|
||||||
"label": {
|
|
||||||
"max-lines": 1,
|
|
||||||
"text": "Notification Center"
|
|
||||||
},
|
|
||||||
"mpris": {
|
|
||||||
"image-size": 50,
|
|
||||||
"image-radius": 5
|
|
||||||
},
|
|
||||||
"volume": {
|
|
||||||
"label": ""
|
|
||||||
},
|
|
||||||
"backlight": {
|
|
||||||
"label": ""
|
|
||||||
},
|
|
||||||
"buttons-grid": {
|
|
||||||
"actions": [
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "systemctl poweroff"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "systemctl reboot"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "swaylock-corrupter"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "swaymsg exit"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "swaync-client -C"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
|
|
||||||
"type": "toggle"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "pactl set-source-mute @DEFAULT_SOURCE@ toggle",
|
|
||||||
"type": "toggle"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "iwgtk"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "blueman-manager"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "",
|
|
||||||
"command": "kooha"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,307 +0,0 @@
|
|||||||
|
|
||||||
@define-color cc-bg rgba(26, 27, 38, 1);
|
|
||||||
/* @define-color noti-border-color rgba(255, 255, 255, 0.15); */
|
|
||||||
@define-color noti-border-color #f65d76;
|
|
||||||
@define-color noti-bg rgb(17, 17, 27);
|
|
||||||
@define-color noti-bg-darker rgb(43, 43, 57);
|
|
||||||
@define-color noti-bg-hover rgb(27, 27, 43);
|
|
||||||
@define-color noti-bg-focus rgba(27, 27, 27, 0.6);
|
|
||||||
@define-color noti-close-bg rgba(255, 255, 255, 0.1);
|
|
||||||
@define-color noti-close-bg-hover rgba(255, 255, 255, 0.15);
|
|
||||||
@define-color text-color rgba(169, 177, 214, 1);
|
|
||||||
@define-color text-color-disabled rgb(150, 150, 150);
|
|
||||||
@define-color bg-selected rgb(0, 128, 255);
|
|
||||||
|
|
||||||
* {
|
|
||||||
font-family: JetBrainsMono NFM SemiBold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.control-center .notification-row:focus,
|
|
||||||
.control-center .notification-row:hover {
|
|
||||||
opacity: 1;
|
|
||||||
background: @noti-bg-darker;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-row {
|
|
||||||
outline: none;
|
|
||||||
margin: 0px;
|
|
||||||
padding: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification {
|
|
||||||
background: @cc-bg;
|
|
||||||
border: 2px solid @noti-border-color;
|
|
||||||
border-radius: 12px;
|
|
||||||
margin: 6px 8px 0px 0px;
|
|
||||||
padding: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-content {
|
|
||||||
background: @cc-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-default-action {
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-button {
|
|
||||||
background: #f7768e;
|
|
||||||
color: @cc-bg;
|
|
||||||
text-shadow: none;
|
|
||||||
padding: 0px;
|
|
||||||
border-radius: 0px;
|
|
||||||
margin-top: 5px;
|
|
||||||
margin-right: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-button:hover {
|
|
||||||
box-shadow: none;
|
|
||||||
background: #f7768e;
|
|
||||||
transition: all 0.15s ease-in-out;
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-action {
|
|
||||||
border: 2px solid #34548a;
|
|
||||||
border-top: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-default-action:hover,
|
|
||||||
.notification-action:hover {
|
|
||||||
color: #7aa2f7;
|
|
||||||
background: @cc-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-default-action:not(:only-child) {
|
|
||||||
border-bottom-left-radius: 7px;
|
|
||||||
border-bottom-right-radius: 7px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-action:first-child {
|
|
||||||
border-bottom-left-radius: 10px;
|
|
||||||
background: #1b1b2b;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-action:last-child {
|
|
||||||
border-bottom-right-radius: 10px;
|
|
||||||
background: #1b1b2b;
|
|
||||||
}
|
|
||||||
|
|
||||||
.inline-reply {
|
|
||||||
margin-top: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.inline-reply-entry {
|
|
||||||
background: @noti-bg-darker;
|
|
||||||
color: @text-color;
|
|
||||||
caret-color: @text-color;
|
|
||||||
border: 1px solid @noti-border-color;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.inline-reply-button {
|
|
||||||
margin-left: 4px;
|
|
||||||
background: @noti-bg;
|
|
||||||
border: 1px solid @noti-border-color;
|
|
||||||
border-radius: 5px;
|
|
||||||
color: @text-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
.inline-reply-button:disabled {
|
|
||||||
background: initial;
|
|
||||||
color: @text-color-disabled;
|
|
||||||
border: 1px solid transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.inline-reply-button:hover {
|
|
||||||
background: @noti-bg-hover;
|
|
||||||
}
|
|
||||||
|
|
||||||
.image {
|
|
||||||
border-radius: 0px;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.summary {
|
|
||||||
font-size: 16px;
|
|
||||||
font-weight: 700;
|
|
||||||
background: transparent;
|
|
||||||
color: rgba(158, 206, 106, 1);
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.time {
|
|
||||||
font-size: 16px;
|
|
||||||
font-weight: 700;
|
|
||||||
background: transparent;
|
|
||||||
color: @text-color;
|
|
||||||
text-shadow: none;
|
|
||||||
margin-right: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.body {
|
|
||||||
font-size: 15px;
|
|
||||||
font-weight: 400;
|
|
||||||
background: transparent;
|
|
||||||
color: @text-color;
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.control-center {
|
|
||||||
background: @cc-bg;
|
|
||||||
border: 2px solid #34548a;
|
|
||||||
border-radius: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.control-center-list {
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.control-center-list-placeholder {
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.floating-notifications {
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.blank-window {
|
|
||||||
background: alpha(black, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-title {
|
|
||||||
color: #7aa2f7;
|
|
||||||
background: @noti-bg-darker;
|
|
||||||
padding: 5px 10px;
|
|
||||||
margin: 10px 10px 5px 10px;
|
|
||||||
font-size: 1.5rem;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-title > button {
|
|
||||||
font-size: 1rem;
|
|
||||||
color: @text-color;
|
|
||||||
text-shadow: none;
|
|
||||||
background: @noti-bg;
|
|
||||||
box-shadow: none;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-title > button:hover {
|
|
||||||
background: #f7768e;
|
|
||||||
color: @cc-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-dnd {
|
|
||||||
background: @noti-bg-darker;
|
|
||||||
padding: 5px 10px;
|
|
||||||
margin: 5px 10px;
|
|
||||||
border-radius: 5px;
|
|
||||||
font-size: large;
|
|
||||||
color: #7aa2f7;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-dnd > switch {
|
|
||||||
border-radius: 5px;
|
|
||||||
background: #7aa2f7;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-dnd > switch:checked {
|
|
||||||
background: #f7768e;
|
|
||||||
border: 1px solid #f7768e;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-dnd > switch slider,
|
|
||||||
.widget-dnd > switch:checked slider {
|
|
||||||
background: @cc-bg;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-label {
|
|
||||||
margin: 10px 10px 5px 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-label > label {
|
|
||||||
font-size: 1rem;
|
|
||||||
color: @text-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-mpris {
|
|
||||||
color: @text-color;
|
|
||||||
background: @noti-bg-darker;
|
|
||||||
padding: 5px 10px;
|
|
||||||
margin: 5px 10px 5px 10px;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-mpris > box > button {
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-mpris-player {
|
|
||||||
padding: 5px 10px;
|
|
||||||
margin: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-mpris-title {
|
|
||||||
font-weight: 700;
|
|
||||||
font-size: 1.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-mpris-subtitle {
|
|
||||||
font-size: 1.1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-buttons-grid {
|
|
||||||
font-size: x-large;
|
|
||||||
padding: 5px;
|
|
||||||
margin: 10px 10px 5px 10px;
|
|
||||||
border-radius: 0px;
|
|
||||||
background: @noti-bg-darker;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-buttons-grid > flowbox > flowboxchild > button {
|
|
||||||
margin: 3px;
|
|
||||||
background: @cc-bg;
|
|
||||||
border-radius: 0px;
|
|
||||||
color: @text-color;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-buttons-grid > flowbox > flowboxchild > button:hover {
|
|
||||||
background: rgba(122, 162, 247, 1);
|
|
||||||
color: @cc-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-buttons-grid > flowbox > flowboxchild > button:checked {
|
|
||||||
background: rgb(158, 206, 106);
|
|
||||||
color: @cc-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-menubar > box > .menu-button-bar > button {
|
|
||||||
border: none;
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.topbar-buttons > button {
|
|
||||||
border: none;
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-volume {
|
|
||||||
background: @noti-bg-darker;
|
|
||||||
padding: 5px;
|
|
||||||
margin: 5px 10px;
|
|
||||||
border-radius: 0px;
|
|
||||||
font-size: 2rem;
|
|
||||||
color: #7aa2f7;
|
|
||||||
}
|
|
||||||
|
|
||||||
.widget-backlight {
|
|
||||||
background: @noti-bg-darker;
|
|
||||||
padding: 5px;
|
|
||||||
margin: 5px 10px;
|
|
||||||
border-radius: 0px;
|
|
||||||
font-size: 2rem;
|
|
||||||
color: #7aa2f7;
|
|
||||||
}
|
|
||||||
|
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 156 KiB |
44
tree/.face
44
tree/.face
@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg
|
|
||||||
width="120"
|
|
||||||
height="120"
|
|
||||||
viewBox="0 0 31.75 31.75"
|
|
||||||
version="1.1"
|
|
||||||
id="svg8"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
|
||||||
<defs
|
|
||||||
id="defs2" />
|
|
||||||
<metadata
|
|
||||||
id="metadata5">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>image/svg+xml</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
id="layer1"
|
|
||||||
style="display:inline">
|
|
||||||
<path
|
|
||||||
style="fill:#ffffff;stroke-width:0.177246"
|
|
||||||
d="m 13.134179,31.651166 c -1.367874,-0.18043 -3.4872278,-0.85238 -4.780367,-1.51563 -1.871747,-0.96002 -4.179215,-3.22966 -5.0074297,-4.92534 -1.5914865,-3.25839 -1.6801158,-7.72336 -0.2278948,-11.48085 1.0247424,-2.65144 2.7098602,-4.5706201 5.4768881,-6.2376401 4.4640374,-2.6894 6.9208324,-4.59636 8.5218534,-6.61464 0.435944,-0.54955 0.851411,-0.9404 0.923263,-0.86855 0.34663,0.34663 0.709996,2.45556 0.596276,3.46071 l -0.118698,1.04918 0.543199,-0.3868 c 0.298763,-0.21273 0.754695,-0.66407 1.013185,-1.00297 0.258491,-0.3389 0.531184,-0.55268 0.605988,-0.47507 0.277608,0.28804 0.872923,2.3693 0.872923,3.05181 0,0.78189 -0.07309,0.70941 2.140938,2.12277 3.360595,2.14527 5.28622,5.2741001 5.845846,9.4985401 0.238089,1.79727 0.119928,4.12317 -0.289284,5.69424 -0.438918,1.68512 -1.295306,3.20011 -2.596637,4.59356 -2.715779,2.90803 -6.119638,4.1954 -10.928887,4.13338 -1.132683,-0.0146 -2.298705,-0.0581 -2.591161,-0.0967 z m 5.683631,-1.1265 c 5.074026,-0.89873 8.492767,-3.70496 9.49005,-7.7898 0.358508,-1.46844 0.317005,-5.28368 -0.07569,-6.95754 -0.594746,-2.53514 -2.005266,-4.78931 -3.64922,-5.8318801 -1.428352,-0.90583 -1.561881,-0.82384 -2.840659,1.7442101 -0.615739,1.23654 -1.777129,3.21756 -2.580868,4.40229 l -1.461342,2.15404 0.927607,0.3153 c 1.188141,0.40386 2.476979,1.20634 2.848748,1.77373 0.272049,0.4152 0.269021,0.4806 -0.04735,1.02231 -0.778356,1.33273 -2.272203,1.79512 -5.849412,1.81056 l -2.340153,0.0101 -2.489801,2.46697 c -2.6276133,2.60352 -2.8788341,3.03045 -2.0880964,3.54856 1.8126654,1.18771 7.0732674,1.8772 10.1561944,1.33115 z m 3.183004,-13.17071 c -0.205126,-0.14999 -0.329285,-0.4602 -0.329285,-0.8227 0,-0.96498 1.087198,-1.43355 1.715448,-0.73934 0.872429,0.96402 -0.338235,2.3283 -1.386163,1.56204 z m -3.186586,4.78402 c 1.133944,-0.30198 1.619925,-0.56299 1.85054,-0.9939 0.246861,-0.46126 -0.269147,-0.94676 -1.770094,-1.66543 -1.062457,-0.50872 -1.296906,-0.55176 -3.013183,-0.55311 -1.794444,-0.001 -1.910137,0.0225 -3.231141,0.66815 -1.860639,0.90936 -2.118197,1.48499 -0.948717,2.12031 1.182601,0.64245 5.357705,0.89133 7.112595,0.42398 z m -5.26747,-0.96936 c -1.113796,-0.13246 -1.303724,-0.23853 -1.149022,-0.64168 0.08921,-0.23246 0.582443,-0.27351 3.286452,-0.27351 1.749822,0 3.307658,0.0484 3.461858,0.10758 0.350902,0.13466 0.365077,0.53097 0.02367,0.66198 -0.432127,0.16582 -4.555272,0.2726 -5.622968,0.14563 z m -3.7845902,-3.81466 c 0.7343882,-0.537 0.2478022,-1.88618 -0.6802563,-1.88618 -0.5030742,0 -0.9992445,0.51278 -0.9992445,1.03268 0,0.90987 0.9453857,1.39029 1.6795008,0.8535 z"
|
|
||||||
id="path865" />
|
|
||||||
<path
|
|
||||||
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
|
||||||
d="m 7.5967544,-6.2400058 c 0,0 -0.041418,0.1031026 -0.02862,0.2093299 0.012798,0.1062273 0.084435,0.1741091 0.084435,0.1741091 l -0.083147,0.088222 c 0,0 -0.1053512,-0.138166 -0.073877,-0.2774823 0.031474,-0.1393166 0.1012092,-0.1941783 0.101209,-0.1941787 z"
|
|
||||||
id="path1039" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="layer2"
|
|
||||||
style="display:none" />
|
|
||||||
<g
|
|
||||||
id="layer3"
|
|
||||||
style="display:none" />
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 3.9 KiB |
@ -12,7 +12,7 @@
|
|||||||
rebase = true
|
rebase = true
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = helix
|
editor = nvim
|
||||||
|
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
|
|||||||
@ -14,8 +14,8 @@ sudo pacman --needed -S \
|
|||||||
brightnessctl \
|
brightnessctl \
|
||||||
curl \
|
curl \
|
||||||
difftastic \
|
difftastic \
|
||||||
|
dunst \
|
||||||
dust \
|
dust \
|
||||||
ddcutil \
|
|
||||||
exa \
|
exa \
|
||||||
fd \
|
fd \
|
||||||
fish \
|
fish \
|
||||||
@ -27,10 +27,7 @@ sudo pacman --needed -S \
|
|||||||
htop \
|
htop \
|
||||||
hyprland \
|
hyprland \
|
||||||
hyprpaper \
|
hyprpaper \
|
||||||
i2c-tools \
|
|
||||||
lazygit \
|
|
||||||
luarocks \
|
luarocks \
|
||||||
man-db man-pages \
|
|
||||||
neovim \
|
neovim \
|
||||||
nerd-fonts \
|
nerd-fonts \
|
||||||
niri \
|
niri \
|
||||||
@ -40,7 +37,6 @@ sudo pacman --needed -S \
|
|||||||
nushell \
|
nushell \
|
||||||
openbsd-netcat \
|
openbsd-netcat \
|
||||||
pamixer \
|
pamixer \
|
||||||
qt5ct \
|
|
||||||
qt5-wayland \
|
qt5-wayland \
|
||||||
qt6-wayland \
|
qt6-wayland \
|
||||||
ripgrep \
|
ripgrep \
|
||||||
@ -49,7 +45,6 @@ sudo pacman --needed -S \
|
|||||||
starship \
|
starship \
|
||||||
swayidle \
|
swayidle \
|
||||||
swaylock \
|
swaylock \
|
||||||
swaync \
|
|
||||||
tig \
|
tig \
|
||||||
tree-sitter tree-sitter-cli \
|
tree-sitter tree-sitter-cli \
|
||||||
vim \
|
vim \
|
||||||
|
|||||||
@ -5,7 +5,7 @@ set -x
|
|||||||
notify-send "Connecting to Högtalare"
|
notify-send "Connecting to Högtalare"
|
||||||
|
|
||||||
bluetoothctl power on
|
bluetoothctl power on
|
||||||
if bluetoothctl connect E8:26:CF:33:2D:BA; then
|
if bluetoothctl connect 04:FE:A1:71:4C:70; then
|
||||||
notify-send "Connected"
|
notify-send "Connected"
|
||||||
else
|
else
|
||||||
notify-send "Failed to connect to Högtalare"
|
notify-send "Failed to connect to Högtalare"
|
||||||
|
|||||||
@ -1,53 +0,0 @@
|
|||||||
#!/usr/bin/env fish
|
|
||||||
|
|
||||||
# Extend the container in mullvadvpn-app with some useful dev tools and run it.
|
|
||||||
|
|
||||||
cd $HOME/proj/mullvadvpn-app
|
|
||||||
|
|
||||||
set base_tag (cat building/android-container-image.txt)
|
|
||||||
set custom_tag "$base_tag-extra"
|
|
||||||
|
|
||||||
# check if image exists
|
|
||||||
if not podman image inspect $custom_tag >/dev/null
|
|
||||||
echo "Building custom image"
|
|
||||||
set tmp_dockerfile (mktemp)
|
|
||||||
echo "
|
|
||||||
FROM $base_tag
|
|
||||||
|
|
||||||
RUN apt-get update -y && apt-get upgrade -y && apt-get install -y \
|
|
||||||
fish \
|
|
||||||
procps
|
|
||||||
|
|
||||||
# cargo-binstall
|
|
||||||
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
|
|
||||||
|
|
||||||
RUN cargo binstall bacon cargo-watch zoxide starship exa
|
|
||||||
|
|
||||||
|
|
||||||
RUN curl -L --proto '=https' -sSf https://git.nubo.sh/hulthe/df/raw/branch/master/manager/setup.sh | bash
|
|
||||||
|
|
||||||
RUN tee /entrypoint.sh <<EOF
|
|
||||||
#!/bin/bash
|
|
||||||
(cd ~/.config/dotfiles && git pull && dotfiles)
|
|
||||||
|
|
||||||
exec \"\\\$@\"
|
|
||||||
EOF
|
|
||||||
|
|
||||||
RUN chmod +x /entrypoint.sh
|
|
||||||
|
|
||||||
ENTRYPOINT [\"/entrypoint.sh\"]
|
|
||||||
|
|
||||||
" > $tmp_dockerfile
|
|
||||||
|
|
||||||
|
|
||||||
podman build -f $tmp_dockerfile -t $custom_tag || exit 1
|
|
||||||
rm $tmp_dockerfile
|
|
||||||
end
|
|
||||||
|
|
||||||
podman run --rm -it \
|
|
||||||
--hostname mullpod \
|
|
||||||
-v .:/build \
|
|
||||||
-v cargo-target:/cargo-target:Z \
|
|
||||||
-v cargo-registry:/root/.cargo/registry:Z \
|
|
||||||
-v gradle-cache:/root/.gradle:Z \
|
|
||||||
$custom_tag mold -run fish
|
|
||||||
@ -9,4 +9,4 @@ if ps -e | grep " $LOCKPROG\$"
|
|||||||
exit 1
|
exit 1
|
||||||
end
|
end
|
||||||
|
|
||||||
ba $LOCKPROG $argv
|
$LOCKPROG $argv
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
# Utility commands for macos
|
|
||||||
|
|
||||||
def "net route 4" [
|
|
||||||
] {
|
|
||||||
netstat -rnl -f inet | tail +4 | from ssv -m 1 | into int Refs Use Mtu
|
|
||||||
}
|
|
||||||
|
|
||||||
def "net route 6" [
|
|
||||||
] {
|
|
||||||
netstat -rnl -f inet6 | tail +4 | from ssv -m 1 | into int Refs Use Mtu
|
|
||||||
}
|
|
||||||
|
|
||||||
def "net fw rule" [
|
|
||||||
--anchor (-a): string
|
|
||||||
] {
|
|
||||||
sudo pfctl -sr -a $anchor | lines
|
|
||||||
}
|
|
||||||
|
|
||||||
def "net fw nat" [
|
|
||||||
--anchor (-a): string
|
|
||||||
] {
|
|
||||||
sudo pfctl -sn -a $anchor | lines
|
|
||||||
}
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# Get a Mullvad api access token from an account number
|
# Get a Mullvad api access token from an account number
|
||||||
def "m token" [
|
def m-token [
|
||||||
account: string # Mullvad account number
|
account: string # Mullvad account number
|
||||||
] {
|
] {
|
||||||
(http post https://api.mullvad.net/auth/v1/token
|
(http post https://api.mullvad.net/auth/v1/token
|
||||||
@ -8,7 +8,7 @@ def "m token" [
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Add a device to a mullvad account
|
# Add a device to a mullvad account
|
||||||
def "m add device" [
|
def m-add-device [
|
||||||
account: string # Mullvad account number
|
account: string # Mullvad account number
|
||||||
] {
|
] {
|
||||||
let token = (m-token $account)
|
let token = (m-token $account)
|
||||||
@ -23,258 +23,3 @@ def "m add device" [
|
|||||||
kind: "App",
|
kind: "App",
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
# Get mullvad-daemon system path
|
|
||||||
def "m daemon path" []: nothing -> string {
|
|
||||||
match (uname).kernel-name {
|
|
||||||
Linux => "/usr/bin/mullvad-daemon",
|
|
||||||
Darwin => "/Applications/Mullvad VPN.app/Contents/Resources/mullvad-daemon",
|
|
||||||
_ => (panic "Unknown Kernel"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Return true if mullvad-daemon is running
|
|
||||||
def "m daemon is-running" [
|
|
||||||
# Only return true if mullvad-daemon is running as a launch daemon
|
|
||||||
--system (-s),
|
|
||||||
] {
|
|
||||||
let procs = (^ps aux | lines)
|
|
||||||
if $system {
|
|
||||||
$procs | any { |line| $line =~ (m daemon path) }
|
|
||||||
} else {
|
|
||||||
$procs | any { |line| $line =~ "mullvad-daemon" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def dns [
|
|
||||||
--server (-s): string,
|
|
||||||
name: string,
|
|
||||||
] {
|
|
||||||
# HACK: turn the optional argument into a list. not sure how to pass it to nslookup otherwise.
|
|
||||||
let server = ([$server] | compact)
|
|
||||||
|
|
||||||
let ipv4 = (dig $name A | lines | skip until {|l| $l =~ "ANSWER SECTION" } | skip 1 | take until { |l| $l == "" } | split column "\t" -c | rename host ttl _ type addr) | reject _
|
|
||||||
let ipv6 = (dig $name AAAA | lines | skip until {|l| $l =~ "ANSWER SECTION" } | skip 1 | take until { |l| $l == "" } | split column "\t" -c | rename host ttl _ type addr) | reject _
|
|
||||||
|
|
||||||
$ipv4 | append $ipv6
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# Build and run mullvad-daemon
|
|
||||||
def "m daemon" [
|
|
||||||
--release (-r)
|
|
||||||
# Force userspace wireguard
|
|
||||||
--userwg
|
|
||||||
# Use wireguard-go over GotaTun
|
|
||||||
--wggo
|
|
||||||
# Use stagemole
|
|
||||||
--stagemole
|
|
||||||
# Attach GDB
|
|
||||||
--gdb
|
|
||||||
# Add counters and such to nft rules
|
|
||||||
--debug-fw
|
|
||||||
] {
|
|
||||||
mut daemon_args = []
|
|
||||||
mut cargo_flags = []
|
|
||||||
mut envs = [
|
|
||||||
MULLVAD_RESOURCE_DIR=./dist-assets/
|
|
||||||
]
|
|
||||||
|
|
||||||
if $release {
|
|
||||||
$cargo_flags ++= [--release]
|
|
||||||
}
|
|
||||||
|
|
||||||
if $stagemole {
|
|
||||||
$cargo_flags ++= [--features api-override]
|
|
||||||
$envs ++= [
|
|
||||||
MULLVAD_API_HOST=api.stagemole.eu
|
|
||||||
MULLVAD_API_ADDR=(dns api.stagemole.eu | where type == A | get 0.addr):443
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
if $debug_fw {
|
|
||||||
$envs ++= [TALPID_FIREWALL_DEBUG=1]
|
|
||||||
}
|
|
||||||
|
|
||||||
if $userwg {
|
|
||||||
$envs ++= [TALPID_FORCE_USERSPACE_WIREGUARD=1]
|
|
||||||
}
|
|
||||||
|
|
||||||
if $wggo {
|
|
||||||
$cargo_flags ++= [--features wireguard-go]
|
|
||||||
}
|
|
||||||
|
|
||||||
if (m daemon is-running --system) {
|
|
||||||
print "daemon is loaded, stopping..."
|
|
||||||
|
|
||||||
match (uname).kernel-name {
|
|
||||||
Linux => {
|
|
||||||
sudo systemctl stop mullvad-daemon
|
|
||||||
},
|
|
||||||
Darwin => {
|
|
||||||
sudo launchctl unload -w /Library/LaunchDaemons/net.mullvad.daemon.plist
|
|
||||||
},
|
|
||||||
_ => (panic "Unknown Kernel"),
|
|
||||||
}
|
|
||||||
} else if (m daemon is-running) {
|
|
||||||
print "mulvad-daemon is running in another terminal"
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if $gdb {
|
|
||||||
$daemon_args ++= [gdb --args]
|
|
||||||
}
|
|
||||||
|
|
||||||
let daemon_path = if $release {
|
|
||||||
$daemon_args ++= [$"($env.CARGO_TARGET_DIR)/release/mullvad-daemon"]
|
|
||||||
} else {
|
|
||||||
$daemon_args ++= [$"($env.CARGO_TARGET_DIR)/debug/mullvad-daemon"]
|
|
||||||
}
|
|
||||||
|
|
||||||
# increase verbosity
|
|
||||||
$daemon_args ++= ["-vv"]
|
|
||||||
|
|
||||||
cargo b ...$cargo_flags
|
|
||||||
sudo ...$envs ...$daemon_args
|
|
||||||
}
|
|
||||||
|
|
||||||
def "m android cli" [
|
|
||||||
...args
|
|
||||||
] {
|
|
||||||
let socket_filename = "rpc-socket"
|
|
||||||
sudo MULLVAD_RPC_SOCKET_PATH=(sudo fd $socket_filename ~/.local/share/waydroid) mullvad ...$args
|
|
||||||
}
|
|
||||||
|
|
||||||
def "m android start" [
|
|
||||||
] {
|
|
||||||
print "starting net.mullvad.mullvadvpn"
|
|
||||||
adb shell am start -n net.mullvad.mullvadvpn/.ui.MainActivity;
|
|
||||||
|
|
||||||
# TODO: the waydroid cli is bork in the nix flake
|
|
||||||
# waydroid app launch net.mullvad.mullvadvpn
|
|
||||||
}
|
|
||||||
|
|
||||||
def "m android stop" [
|
|
||||||
] {
|
|
||||||
let app_pid = (ps | where name =~ mullvadvpn | get -o pid.0)
|
|
||||||
if $app_pid != null {
|
|
||||||
print $"kill net.mullvad.mullvadvpn [($app_pid)]"
|
|
||||||
sudo kill $app_pid
|
|
||||||
} else {
|
|
||||||
print "net.mullvad.mullvadvpn is not running"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def "m android run" [
|
|
||||||
] {
|
|
||||||
print "hack: making sure we're disconnected"
|
|
||||||
do --ignore-errors { m android cli disconnect }
|
|
||||||
|
|
||||||
print "compiling apk"
|
|
||||||
./gradlew installOssProdDebug
|
|
||||||
|
|
||||||
m android start
|
|
||||||
}
|
|
||||||
|
|
||||||
def "m android reload-daemon" [
|
|
||||||
] {
|
|
||||||
let daemon_path = (fd libmullvad_jni.so ~/.local/share/waydroid/ | lines | get -o 0)
|
|
||||||
if $daemon_path == null {
|
|
||||||
print "Can't find libmullvad_jni.so, hot-reload not available. Is the app installed?"
|
|
||||||
exit
|
|
||||||
}
|
|
||||||
|
|
||||||
m android stop
|
|
||||||
|
|
||||||
print "re-compiling libmullvad_jni.so"
|
|
||||||
./gradlew app:cargoBuildX86_64;
|
|
||||||
|
|
||||||
print "Executing hot-swap!"
|
|
||||||
sudo cp ~/.cargo/target/x86_64-linux-android/debug/libmullvad_jni.so $daemon_path;
|
|
||||||
|
|
||||||
m android start
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def "m e2e list" [
|
|
||||||
...args
|
|
||||||
] {
|
|
||||||
print "Building test utils"
|
|
||||||
cargo b --target aarch64-apple-darwin
|
|
||||||
|
|
||||||
let test_manager = $"($env.CARGO_TARGET_DIR)/aarch64-apple-darwin/debug/test-manager"
|
|
||||||
|
|
||||||
print "Listing tests"
|
|
||||||
^$test_manager list-tests ...$args | from tsv | into int priority | sort-by priority name
|
|
||||||
}
|
|
||||||
|
|
||||||
def "m e2e run" [
|
|
||||||
account: string
|
|
||||||
vm: string
|
|
||||||
--skip: list<string>
|
|
||||||
--display (-d)
|
|
||||||
...tests
|
|
||||||
] {
|
|
||||||
let commit = (git rev-parse HEAD | take 6 | decode)
|
|
||||||
print $"Current commit: ($commit)"
|
|
||||||
|
|
||||||
let dist = "../dist"
|
|
||||||
print $"Looking in ($dist)"
|
|
||||||
|
|
||||||
let pkg_ext = match (uname).kernel-name {
|
|
||||||
"Linux" => "rpm", # TODO: rpm
|
|
||||||
"Darwin" => "pkg",
|
|
||||||
_ => (panic "Unknown kernel"),
|
|
||||||
}
|
|
||||||
let target = match (uname).kernel-name {
|
|
||||||
"Linux" => "x86_64-unknown-linux-musl",
|
|
||||||
"Darwin" => "aarch64-apple-darwin",
|
|
||||||
_ => (panic "Unknown kernel"),
|
|
||||||
}
|
|
||||||
|
|
||||||
let pkgs = (ls $dist | where name =~ $".*\\.($pkg_ext)")
|
|
||||||
let pkgs = ($pkgs | where name =~ $commit)
|
|
||||||
|
|
||||||
if ($pkgs | is-empty) {
|
|
||||||
print $"No .($pkg_ext) for current commit found."
|
|
||||||
print "Run ./build.sh"
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($pkgs | length) > 1 {
|
|
||||||
print $"Multiple .($pkg_ext):s for current commit found."
|
|
||||||
print "Make sure there's only one"
|
|
||||||
print ...$pkgs
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
let pkg = ($pkgs | get 0.name)
|
|
||||||
|
|
||||||
print $"Using ($pkg)"
|
|
||||||
|
|
||||||
print "Building test utils"
|
|
||||||
|
|
||||||
cargo b --release --target $target -p test-runner -p connection-checker
|
|
||||||
cargo b -p test-manager
|
|
||||||
|
|
||||||
let test_manager = $"($env.CARGO_TARGET_DIR)/debug/test-manager"
|
|
||||||
let bin_dir = $"($env.CARGO_TARGET_DIR)/($target)/release/"
|
|
||||||
|
|
||||||
mut args = [
|
|
||||||
--vm $vm
|
|
||||||
--account $account
|
|
||||||
--app-package $pkg
|
|
||||||
--runner-dir $bin_dir
|
|
||||||
]
|
|
||||||
if $display {
|
|
||||||
$args ++= [--display]
|
|
||||||
}
|
|
||||||
for s in $skip {
|
|
||||||
$args ++= ["--skip" $s]
|
|
||||||
}
|
|
||||||
let args = $args
|
|
||||||
|
|
||||||
print "Running tests"
|
|
||||||
RUST_LOG=debug ^$test_manager run-tests -v ...$args ...$tests
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Inpect ELF-files
|
# Inpect ELF-files
|
||||||
def elf [
|
def elf [
|
||||||
elf: glob # ELF-file to inspect
|
elf: string # ELF-file to inspect
|
||||||
get?: cell-path
|
get?: cell-path
|
||||||
] {
|
] {
|
||||||
if $get == null {
|
if $get == null {
|
||||||
|
|||||||
@ -1,71 +0,0 @@
|
|||||||
# Get networking info about tailscale peers
|
|
||||||
def "tailscale peer" [
|
|
||||||
hostname?: string
|
|
||||||
get_field?: cell-path
|
|
||||||
]: nothing -> any {
|
|
||||||
let get_field = ($get_field | default ([] | into cell-path))
|
|
||||||
|
|
||||||
let status = (^tailscale status --json | from json)
|
|
||||||
|
|
||||||
let peers = ($status | get Peer)
|
|
||||||
|
|
||||||
if $peers == null {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
let peers = ($peers | transpose key fields | flatten fields)
|
|
||||||
|
|
||||||
let peers = ($peers | each { |peer|
|
|
||||||
let ipv4 = $peer.TailscaleIPs | where { |ip| "." in $ip } | first
|
|
||||||
let ipv6 = $peer.TailscaleIPs | where { |ip| ":" in $ip } | first
|
|
||||||
|
|
||||||
{
|
|
||||||
host: $peer.HostName,
|
|
||||||
ipv4: $ipv4,
|
|
||||||
ipv6: $ipv6,
|
|
||||||
online: $peer.Online,
|
|
||||||
active: $peer.Active,
|
|
||||||
rx: ($peer.RxBytes | into filesize),
|
|
||||||
tx: ($peer.TxBytes | into filesize),
|
|
||||||
dns: ($peer.DNSName),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
if $hostname == null {
|
|
||||||
return $peers
|
|
||||||
}
|
|
||||||
|
|
||||||
let peers = ($peers | where host == $hostname)
|
|
||||||
if ($peers | is-empty) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
$peers | first | get $get_field
|
|
||||||
}
|
|
||||||
|
|
||||||
# SSH to a tailscale peer
|
|
||||||
def "tailscale ssh" [
|
|
||||||
user_hostname: string
|
|
||||||
...ssh_flags: string
|
|
||||||
]: nothing -> any {
|
|
||||||
let hostname = ($user_hostname | parse -r "([^@]*@)?(?<hostname>.*)" | get 0.hostname)
|
|
||||||
ssh -o $"HostName (tailscale peer $hostname | get ipv6)" $user_hostname ...$ssh_flags
|
|
||||||
}
|
|
||||||
|
|
||||||
# SCP to a tailscale peer
|
|
||||||
def "tailscale scp" [
|
|
||||||
from: string
|
|
||||||
to: string
|
|
||||||
...ssh_flags: string
|
|
||||||
]: nothing -> any {
|
|
||||||
|
|
||||||
let options = (
|
|
||||||
[$from, $to] |
|
|
||||||
parse -r "([^@]*@)?(?<hostname>.*):(?<path>.*)" |
|
|
||||||
each { |it| $"HostName (tailscale peer $it.hostname | get ipv6)" } |
|
|
||||||
each { |option| ["-o", $option] } |
|
|
||||||
flatten
|
|
||||||
)
|
|
||||||
|
|
||||||
scp ...$options $from $to ...$ssh_flags
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user