Compare commits
No commits in common. "b3b6340199ee0cf663661a07730377847ef44efb" and "0118c251d96e79831490ddceb1a60cf64e8c63fd" have entirely different histories.
b3b6340199
...
0118c251d9
11 changed files with 0 additions and 927 deletions
|
|
@ -1,318 +0,0 @@
|
||||||
# Default settings for amethyst
|
|
||||||
# Repo: `https://github.com/ianyh/Amethyst`
|
|
||||||
#
|
|
||||||
# Note due to issue 1419 (https://github.com/ianyh/Amethyst/issues/1419) some
|
|
||||||
# config values may conflict and not work if they are the same as the default
|
|
||||||
# values for amathyst. You can see these values on github at
|
|
||||||
# https://github.com/ianyh/Amethyst/blob/development/Amethyst/default.amethyst
|
|
||||||
# If you're experiencing conflicts and the settings are the same as the default,
|
|
||||||
# comment out the commands in this file.
|
|
||||||
#
|
|
||||||
# Move this file to: `~/.amethyst.yml`
|
|
||||||
# In order to register changes restart Amethyst.
|
|
||||||
# If you experience issues pulling in the changes you can also quit Amethyst and run: `defaults delete com.amethyst.Amethyst.plist`
|
|
||||||
# This removes the current preferences and causes Amethyst to restart with default preferences and pull configs from this file.
|
|
||||||
|
|
||||||
# layouts - Ordered list of layouts to use by layout key (default tall, wide, fullscreen, and column).
|
|
||||||
layouts:
|
|
||||||
- tall
|
|
||||||
- fullscreen
|
|
||||||
# - tall-right
|
|
||||||
- wide
|
|
||||||
# - two-pane
|
|
||||||
# - middle-wide
|
|
||||||
# - 3column-left
|
|
||||||
# - middle-wide # The legacy name of "3column-middle"
|
|
||||||
# - 3column-right
|
|
||||||
# - 4column-left
|
|
||||||
# - 4column-right
|
|
||||||
- column
|
|
||||||
# - row
|
|
||||||
# - floating
|
|
||||||
# - widescreen-tall
|
|
||||||
# - widescreen-tall-right
|
|
||||||
# - bsp
|
|
||||||
|
|
||||||
# First mod (default option + shift).
|
|
||||||
mod1:
|
|
||||||
- option
|
|
||||||
- shift
|
|
||||||
# - control
|
|
||||||
# - command
|
|
||||||
|
|
||||||
# Second mod (default option + shift + control).
|
|
||||||
mod2:
|
|
||||||
- option
|
|
||||||
- shift
|
|
||||||
- control
|
|
||||||
# - command
|
|
||||||
|
|
||||||
# Commands:
|
|
||||||
# special key values
|
|
||||||
# space
|
|
||||||
# enter
|
|
||||||
# up
|
|
||||||
# right
|
|
||||||
# down
|
|
||||||
# left
|
|
||||||
|
|
||||||
# special characters require quotes
|
|
||||||
# '.'
|
|
||||||
# ','
|
|
||||||
|
|
||||||
# Move to the next layout in the list.
|
|
||||||
cycle-layout:
|
|
||||||
mod: mod1
|
|
||||||
key: space
|
|
||||||
|
|
||||||
# Move to the previous layout in the list.
|
|
||||||
cycle-layout-backward:
|
|
||||||
mod: mod2
|
|
||||||
key: space
|
|
||||||
|
|
||||||
# Shrink the main pane by a percentage of the screen dimension as defined by window-resize-step. Note that not all layouts respond to this command.
|
|
||||||
shrink-main:
|
|
||||||
mod: mod1
|
|
||||||
key: h
|
|
||||||
|
|
||||||
# Expand the main pane by a percentage of the screen dimension as defined by window-resize-step. Note that not all layouts respond to this command.
|
|
||||||
expand-main:
|
|
||||||
mod: mod1
|
|
||||||
key: l
|
|
||||||
|
|
||||||
# Increase the number of windows in the main pane. Note that not all layouts respond to this command.
|
|
||||||
increase-main:
|
|
||||||
mod: mod1
|
|
||||||
key: ','
|
|
||||||
|
|
||||||
# Decrease the number of windows in the main pane. Note that not all layouts respond to this command.
|
|
||||||
decrease-main:
|
|
||||||
mod: mod1
|
|
||||||
key: '.'
|
|
||||||
|
|
||||||
# General purpose command for custom layouts. Functionality is layout-dependent.
|
|
||||||
# command1:
|
|
||||||
# mod: <NONE>
|
|
||||||
# key: <NONE>
|
|
||||||
# General purpose command for custom layouts. Functionality is layout-dependent.
|
|
||||||
# command2:
|
|
||||||
# mod: <NONE>
|
|
||||||
# key: <NONE>
|
|
||||||
# General purpose command for custom layouts. Functionality is layout-dependent.
|
|
||||||
# command3:
|
|
||||||
# mod: <NONE>
|
|
||||||
# key: <NONE>
|
|
||||||
# General purpose command for custom layouts. Functionality is layout-dependent.
|
|
||||||
# command4:
|
|
||||||
# mod: <NONE>
|
|
||||||
# key: <NONE>
|
|
||||||
|
|
||||||
# Focus the next window in the list going counter-clockwise.
|
|
||||||
focus-ccw:
|
|
||||||
mod: mod1
|
|
||||||
key: j
|
|
||||||
|
|
||||||
# Focus the next window in the list going clockwise.
|
|
||||||
focus-cw:
|
|
||||||
mod: mod1
|
|
||||||
key: k
|
|
||||||
|
|
||||||
# Focus the main window in the list.
|
|
||||||
focus-main:
|
|
||||||
mod: mod1
|
|
||||||
key: m
|
|
||||||
|
|
||||||
# Focus the next screen in the list going counter-clockwise.
|
|
||||||
focus-screen-ccw:
|
|
||||||
mod: mod1
|
|
||||||
key: p
|
|
||||||
|
|
||||||
# Focus the next screen in the list going clockwise.
|
|
||||||
focus-screen-cw:
|
|
||||||
mod: mod1
|
|
||||||
key: n
|
|
||||||
|
|
||||||
# Move the currently focused window onto the next screen in the list going counter-clockwise.
|
|
||||||
swap-screen-ccw:
|
|
||||||
mod: mod2
|
|
||||||
key: h
|
|
||||||
|
|
||||||
# Move the currently focused window onto the next screen in the list going clockwise.
|
|
||||||
swap-screen-cw:
|
|
||||||
mod: mod2
|
|
||||||
key: l
|
|
||||||
|
|
||||||
# Swap the position of the currently focused window with the next window in the list going counter-clockwise.
|
|
||||||
swap-ccw:
|
|
||||||
mod: mod2
|
|
||||||
key: j
|
|
||||||
|
|
||||||
# Swap the position of the currently focused window with the next window in the list going clockwise.
|
|
||||||
swap-cw:
|
|
||||||
mod: mod2
|
|
||||||
key: k
|
|
||||||
|
|
||||||
# Swap the position of the currently focused window with the main window in the list.
|
|
||||||
swap-main:
|
|
||||||
mod: mod1
|
|
||||||
key: enter
|
|
||||||
|
|
||||||
# Move focus to the n-th screen in the list; e.g., focus-screen-3 will move mouse focus to the 3rd screen. Note that the main window in the given screen will be focused.
|
|
||||||
#focus-screen-n:
|
|
||||||
# focus-screen-<screen-number>:
|
|
||||||
# mod: mod1
|
|
||||||
# key: y
|
|
||||||
# Move the currently focused window to the n-th screen; e.g., throw-screen-3 will move the window to the 3rd screen.
|
|
||||||
# throw-screen-n:
|
|
||||||
# throw-screen-<screen-number>:
|
|
||||||
# mod: mod1
|
|
||||||
# key: u
|
|
||||||
# Move the currently focused window to the n-th space; e.g., throw-space-3 will move the window to the 3rd space.
|
|
||||||
# throw-space-<screen-number>:
|
|
||||||
# mod: mod1
|
|
||||||
# key: i
|
|
||||||
|
|
||||||
# Select tall layout
|
|
||||||
select-tall-layout:
|
|
||||||
mod: mod1
|
|
||||||
key: a
|
|
||||||
|
|
||||||
# Select wide layout
|
|
||||||
select-wide-layout:
|
|
||||||
mod: mod1
|
|
||||||
key: s
|
|
||||||
|
|
||||||
# Select fullscreen layout
|
|
||||||
select-fullscreen-layout:
|
|
||||||
mod: mod1
|
|
||||||
key: d
|
|
||||||
|
|
||||||
# Select column layout
|
|
||||||
select-column-layout:
|
|
||||||
mod: mod1
|
|
||||||
key: f
|
|
||||||
|
|
||||||
# Move the currently focused window to the space to the left.
|
|
||||||
throw-space-left:
|
|
||||||
mod: mod2
|
|
||||||
key: left
|
|
||||||
|
|
||||||
# Move currently the focused window to the space to the right.
|
|
||||||
throw-space-right:
|
|
||||||
mod: mod2
|
|
||||||
key: right
|
|
||||||
|
|
||||||
# Toggle the floating state of the currently focused window; i.e., if it was floating make it tiled and if it was tiled make it floating.
|
|
||||||
toggle-float:
|
|
||||||
mod: mod1
|
|
||||||
key: t
|
|
||||||
|
|
||||||
# Display the layout HUD with the current layout on each screen.
|
|
||||||
display-current-layout:
|
|
||||||
mod: mod1
|
|
||||||
key: i
|
|
||||||
|
|
||||||
# Turn on or off tiling entirely.
|
|
||||||
toggle-tiling:
|
|
||||||
mod: mod1
|
|
||||||
key: t
|
|
||||||
|
|
||||||
# Rerun the current layout's algorithm.
|
|
||||||
reevaluate-windows:
|
|
||||||
mod: mod1
|
|
||||||
key: z
|
|
||||||
|
|
||||||
# Turn on or off focus-follows-mouse.
|
|
||||||
toggle-focus-follows-mouse:
|
|
||||||
mod: mod2
|
|
||||||
key: x
|
|
||||||
|
|
||||||
# Automatically quit and reopen Amethyst.
|
|
||||||
relaunch-amethyst:
|
|
||||||
mod: mod2
|
|
||||||
key: z
|
|
||||||
|
|
||||||
# disable screen padding on builtin display
|
|
||||||
disable-padding-on-builtin-display: false
|
|
||||||
|
|
||||||
# Boolean flag for whether or not to add margins betwen windows (default false).
|
|
||||||
window-margins: false
|
|
||||||
|
|
||||||
# Boolean flag for whether or not to set window margins if there is only one window on the screen, assuming window margins are enabled (default false).
|
|
||||||
smart-window-margins: false
|
|
||||||
|
|
||||||
# # Add 10px margin between windows
|
|
||||||
# window-margins: true
|
|
||||||
# window-margin-size: 5
|
|
||||||
# The size of the margins between windows (in px, default 0).
|
|
||||||
window-margin-size: 0
|
|
||||||
|
|
||||||
# The max number of windows that may be visible on a screen at one time before
|
|
||||||
# additional windows are minimized. A value of 0 disables the feature.
|
|
||||||
window-max-count: 0
|
|
||||||
|
|
||||||
# The smallest height that a window can be sized to regardless of its layout frame (in px, default 0).
|
|
||||||
window-minimum-height: 0
|
|
||||||
|
|
||||||
# The smallest width that a window can be sized to regardless of its layout frame (in px, default 0)
|
|
||||||
window-minimum-width: 0
|
|
||||||
|
|
||||||
# List of bundle identifiers for applications to either be automatically floating or automatically tiled based on floating-is-blacklist (default []).
|
|
||||||
floating: []
|
|
||||||
|
|
||||||
# Boolean flag determining behavior of the floating list. true if the applications should be floating and all others tiled. false if the applications should be tiled and all others floating (default true).
|
|
||||||
floating-is-blacklist: true
|
|
||||||
|
|
||||||
# true if screen frames should exclude the status bar. false if the screen frames should include the status bar (default false).
|
|
||||||
ignore-menu-bar: false
|
|
||||||
|
|
||||||
# true if windows smaller than a 500px square should be floating by default (default true)
|
|
||||||
float-small-windows: true
|
|
||||||
|
|
||||||
# true if the mouse should move position to the center of a window when it becomes focused (default false). Note that this is largely incompatible with focus-follows-mouse.
|
|
||||||
mouse-follows-focus: false
|
|
||||||
|
|
||||||
# true if the windows underneath the mouse should become focused as the mouse moves (default false). Note that this is largely incompatible with mouse-follows-focus
|
|
||||||
focus-follows-mouse: false
|
|
||||||
|
|
||||||
# true if dragging and dropping windows on to each other should swap their positions (default false).
|
|
||||||
mouse-swaps-windows: false
|
|
||||||
|
|
||||||
# true if changing the frame of a window with the mouse should update the layout to accommodate the change (default false). Note that not all layouts will be able to respond to the change.
|
|
||||||
mouse-resizes-windows: false
|
|
||||||
|
|
||||||
# true to display the name of the layout when a new layout is selected (default true).
|
|
||||||
enables-layout-hud: true
|
|
||||||
|
|
||||||
# true to display the name of the layout when moving to a new space (default true).
|
|
||||||
enables-layout-hud-on-space-change: true
|
|
||||||
|
|
||||||
# true to get updates to beta versions of the software (default false).
|
|
||||||
use-canary-build: false
|
|
||||||
|
|
||||||
# true to insert new windows into the first position and false to insert new windows into the last position (default false).
|
|
||||||
new-windows-to-main: false
|
|
||||||
|
|
||||||
# true to automatically move to a space when throwing a window to it (default true).
|
|
||||||
follow-space-thrown-windows: true
|
|
||||||
|
|
||||||
# The integer percentage of the screen dimension to increment and decrement main pane ratios by (default 5).
|
|
||||||
window-resize-step: 5
|
|
||||||
|
|
||||||
# Padding to apply between windows and the left edge of the screen (in px, default 0).
|
|
||||||
screen-padding-left: 0
|
|
||||||
|
|
||||||
# Padding to apply between windows and the right edge of the screen (in px, default 0).
|
|
||||||
screen-padding-right: 0
|
|
||||||
|
|
||||||
# Padding to apply between windows and the top edge of the screen (in px, default 0).
|
|
||||||
screen-padding-top: 0
|
|
||||||
|
|
||||||
# Padding to apply between windows and the bottom edge of the screen (in px, default 0).
|
|
||||||
screen-padding-bottom: 0
|
|
||||||
|
|
||||||
# true to maintain layout state across application executions (default true).
|
|
||||||
restore-layouts-on-launch: true
|
|
||||||
|
|
||||||
# true to display some optional debug information in the layout HUD (default false).
|
|
||||||
debug-layout-info: false
|
|
||||||
|
|
@ -12,14 +12,7 @@
|
||||||
;; Slightly nicer theme
|
;; Slightly nicer theme
|
||||||
(set-face-attribute 'default nil :font "Menlo" :height 130)
|
(set-face-attribute 'default nil :font "Menlo" :height 130)
|
||||||
|
|
||||||
(advice-add 'risky-local-variable-p :override #'ignore)
|
|
||||||
|
|
||||||
(require 'jg-package)
|
(require 'jg-package)
|
||||||
|
|
||||||
;; Explicitly import the PATH from the shell on MacOS
|
|
||||||
(package-install 'exec-path-from-shell)
|
|
||||||
(exec-path-from-shell-initialize)
|
|
||||||
|
|
||||||
(require 'jg-core)
|
(require 'jg-core)
|
||||||
(require 'jg-display)
|
(require 'jg-display)
|
||||||
(require 'jg-style)
|
(require 'jg-style)
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,6 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
|
|
||||||
;; Auto refresh files changed on disk
|
|
||||||
(global-auto-revert-mode t)
|
|
||||||
|
|
||||||
;; Make it easer to do 'alt-x'
|
;; Make it easer to do 'alt-x'
|
||||||
(global-set-key "\C-x\C-m" 'execute-extended-command)
|
(global-set-key "\C-x\C-m" 'execute-extended-command)
|
||||||
(global-set-key "\C-c\C-m" 'execute-extended-command)
|
(global-set-key "\C-c\C-m" 'execute-extended-command)
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,6 @@
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
(use-package flycheck
|
(use-package flycheck
|
||||||
:init
|
|
||||||
(setq flycheck-python-flake8-executable "flake8")
|
|
||||||
(setq flycheck-python-pylint-executable "pylint")
|
|
||||||
:config
|
:config
|
||||||
(add-hook 'after-init-hook #'global-flycheck-mode))
|
(add-hook 'after-init-hook #'global-flycheck-mode))
|
||||||
|
|
||||||
|
|
@ -20,7 +17,6 @@
|
||||||
(use-package lsp-mode
|
(use-package lsp-mode
|
||||||
:commands (lsp lsp-deferred)
|
:commands (lsp lsp-deferred)
|
||||||
:init
|
:init
|
||||||
(setq lsp-diagnostic-package :none)
|
|
||||||
(setq lsp-keymap-prefix "C-c l") ;; Or 'C-l', 's-l'
|
(setq lsp-keymap-prefix "C-c l") ;; Or 'C-l', 's-l'
|
||||||
:config
|
:config
|
||||||
(lsp-enable-which-key-integration t)
|
(lsp-enable-which-key-integration t)
|
||||||
|
|
|
||||||
|
|
@ -1,236 +0,0 @@
|
||||||
# -*- conf -*-
|
|
||||||
|
|
||||||
# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
|
|
||||||
# term=foot (or xterm-256color if built with -Dterminfo=disabled)
|
|
||||||
# login-shell=no
|
|
||||||
|
|
||||||
# app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode
|
|
||||||
# title=foot
|
|
||||||
# locked-title=no
|
|
||||||
|
|
||||||
font=monospace:size=14
|
|
||||||
# font-bold=<bold variant of regular font>
|
|
||||||
# font-italic=<italic variant of regular font>
|
|
||||||
# font-bold-italic=<bold+italic variant of regular font>
|
|
||||||
# font-size-adjustment=0.5
|
|
||||||
# line-height=<font metrics>
|
|
||||||
# letter-spacing=0
|
|
||||||
# horizontal-letter-offset=0
|
|
||||||
# vertical-letter-offset=0
|
|
||||||
# underline-offset=<font metrics>
|
|
||||||
# underline-thickness=<font underline thickness>
|
|
||||||
# box-drawings-uses-font-glyphs=no
|
|
||||||
# dpi-aware=no
|
|
||||||
|
|
||||||
# initial-window-size-pixels=700x500 # Or,
|
|
||||||
# initial-window-size-chars=<COLSxROWS>
|
|
||||||
# initial-window-mode=windowed
|
|
||||||
# pad=0x0 # optionally append 'center'
|
|
||||||
# resize-by-cells=yes
|
|
||||||
# resize-delay-ms=100
|
|
||||||
|
|
||||||
# bold-text-in-bright=no
|
|
||||||
# word-delimiters=,│`|:"'()[]{}<>
|
|
||||||
# selection-target=primary
|
|
||||||
# workers=<number of logical CPUs>
|
|
||||||
# utmp-helper=/usr/lib/utempter/utempter # When utmp backend is ‘libutempter’ (Linux)
|
|
||||||
# utmp-helper=/usr/libexec/ulog-helper # When utmp backend is ‘ulog’ (FreeBSD)
|
|
||||||
|
|
||||||
[environment]
|
|
||||||
# name=value
|
|
||||||
|
|
||||||
[bell]
|
|
||||||
# urgent=no
|
|
||||||
# notify=no
|
|
||||||
# visual=no
|
|
||||||
# command=
|
|
||||||
# command-focused=no
|
|
||||||
|
|
||||||
#[desktop-notifications]
|
|
||||||
# command=notify-send --wait --app-name ${app-id} --icon ${app-id} --category ${category} --urgency ${urgency} --expire-time ${expire-time} --hint STRING:image-path:${icon} --replace-id ${replace-id} ${action-argument} --print-id -- ${title} ${body}
|
|
||||||
# command-action-argument=--action ${action-name}=${action-label}
|
|
||||||
# close=""
|
|
||||||
# inhibit-when-focused=yes
|
|
||||||
|
|
||||||
|
|
||||||
[scrollback]
|
|
||||||
# lines=1000
|
|
||||||
# multiplier=3.0
|
|
||||||
# indicator-position=relative
|
|
||||||
# indicator-format=""
|
|
||||||
|
|
||||||
[url]
|
|
||||||
# launch=xdg-open ${url}
|
|
||||||
# label-letters=sadfjklewcmpgh
|
|
||||||
# osc8-underline=url-mode
|
|
||||||
# protocols=http, https, ftp, ftps, file, gemini, gopher
|
|
||||||
# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
|
|
||||||
|
|
||||||
[cursor]
|
|
||||||
# style=block
|
|
||||||
# color=<inverse foreground/background>
|
|
||||||
# blink=no
|
|
||||||
# blink-rate=500
|
|
||||||
# beam-thickness=1.5
|
|
||||||
# underline-thickness=<font underline thickness>
|
|
||||||
|
|
||||||
[mouse]
|
|
||||||
# hide-when-typing=no
|
|
||||||
# alternate-scroll-mode=yes
|
|
||||||
|
|
||||||
[touch]
|
|
||||||
# long-press-delay=400
|
|
||||||
|
|
||||||
[colors]
|
|
||||||
# alpha=1.0
|
|
||||||
# background=242424
|
|
||||||
# foreground=ffffff
|
|
||||||
# flash=7f7f00
|
|
||||||
# flash-alpha=0.5
|
|
||||||
|
|
||||||
## Normal/regular colors (color palette 0-7)
|
|
||||||
# regular0=242424 # black
|
|
||||||
# regular1=f62b5a # red
|
|
||||||
# regular2=47b413 # green
|
|
||||||
# regular3=e3c401 # yellow
|
|
||||||
# regular4=24acd4 # blue
|
|
||||||
# regular5=f2affd # magenta
|
|
||||||
# regular6=13c299 # cyan
|
|
||||||
# regular7=e6e6e6 # white
|
|
||||||
|
|
||||||
## Bright colors (color palette 8-15)
|
|
||||||
# bright0=616161 # bright black
|
|
||||||
# bright1=ff4d51 # bright red
|
|
||||||
# bright2=35d450 # bright green
|
|
||||||
# bright3=e9e836 # bright yellow
|
|
||||||
# bright4=5dc5f8 # bright blue
|
|
||||||
# bright5=feabf2 # bright magenta
|
|
||||||
# bright6=24dfc4 # bright cyan
|
|
||||||
# bright7=ffffff # bright white
|
|
||||||
|
|
||||||
## dimmed colors (see foot.ini(5) man page)
|
|
||||||
# dim0=<not set>
|
|
||||||
# ...
|
|
||||||
# dim7=<not-set>
|
|
||||||
|
|
||||||
## The remaining 256-color palette
|
|
||||||
# 16 = <256-color palette #16>
|
|
||||||
# ...
|
|
||||||
# 255 = <256-color palette #255>
|
|
||||||
|
|
||||||
## Misc colors
|
|
||||||
# selection-foreground=<inverse foreground/background>
|
|
||||||
# selection-background=<inverse foreground/background>
|
|
||||||
# jump-labels=<regular0> <regular3> # black-on-yellow
|
|
||||||
# scrollback-indicator=<regular0> <bright4> # black-on-bright-blue
|
|
||||||
# search-box-no-match=<regular0> <regular1> # black-on-red
|
|
||||||
# search-box-match=<regular0> <regular3> # black-on-yellow
|
|
||||||
# urls=<regular3>
|
|
||||||
|
|
||||||
[csd]
|
|
||||||
# preferred=server
|
|
||||||
# size=26
|
|
||||||
# font=<primary font>
|
|
||||||
# color=<foreground color>
|
|
||||||
# hide-when-maximized=no
|
|
||||||
# double-click-to-maximize=yes
|
|
||||||
# border-width=0
|
|
||||||
# border-color=<csd.color>
|
|
||||||
# button-width=26
|
|
||||||
# button-color=<background color>
|
|
||||||
# button-minimize-color=<regular4>
|
|
||||||
# button-maximize-color=<regular2>
|
|
||||||
# button-close-color=<regular1>
|
|
||||||
|
|
||||||
[key-bindings]
|
|
||||||
# scrollback-up-page=Shift+Page_Up
|
|
||||||
# scrollback-up-half-page=none
|
|
||||||
# scrollback-up-line=none
|
|
||||||
# scrollback-down-page=Shift+Page_Down
|
|
||||||
# scrollback-down-half-page=none
|
|
||||||
# scrollback-down-line=none
|
|
||||||
# scrollback-home=none
|
|
||||||
# scrollback-end=none
|
|
||||||
# clipboard-copy=Control+Shift+c XF86Copy
|
|
||||||
# clipboard-paste=Control+Shift+v XF86Paste
|
|
||||||
# primary-paste=Shift+Insert
|
|
||||||
# search-start=Control+Shift+r
|
|
||||||
# font-increase=Control+plus Control+equal Control+KP_Add
|
|
||||||
# font-decrease=Control+minus Control+KP_Subtract
|
|
||||||
# font-reset=Control+0 Control+KP_0
|
|
||||||
# spawn-terminal=Control+Shift+n
|
|
||||||
# minimize=none
|
|
||||||
# maximize=none
|
|
||||||
# fullscreen=none
|
|
||||||
# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
|
|
||||||
# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
|
|
||||||
# pipe-selected=[xargs -r firefox] none
|
|
||||||
# pipe-command-output=[wl-copy] none # Copy last command's output to the clipboard
|
|
||||||
# show-urls-launch=Control+Shift+o
|
|
||||||
# show-urls-copy=none
|
|
||||||
# show-urls-persistent=none
|
|
||||||
# prompt-prev=Control+Shift+z
|
|
||||||
# prompt-next=Control+Shift+x
|
|
||||||
# unicode-input=Control+Shift+u
|
|
||||||
# noop=none
|
|
||||||
|
|
||||||
[search-bindings]
|
|
||||||
# cancel=Control+g Control+c Escape
|
|
||||||
# commit=Return
|
|
||||||
# find-prev=Control+r
|
|
||||||
# find-next=Control+s
|
|
||||||
# cursor-left=Left Control+b
|
|
||||||
# cursor-left-word=Control+Left Mod1+b
|
|
||||||
# cursor-right=Right Control+f
|
|
||||||
# cursor-right-word=Control+Right Mod1+f
|
|
||||||
# cursor-home=Home Control+a
|
|
||||||
# cursor-end=End Control+e
|
|
||||||
# delete-prev=BackSpace
|
|
||||||
# delete-prev-word=Mod1+BackSpace Control+BackSpace
|
|
||||||
# delete-next=Delete
|
|
||||||
# delete-next-word=Mod1+d Control+Delete
|
|
||||||
# extend-char=Shift+Right
|
|
||||||
# extend-to-word-boundary=Control+w Control+Shift+Right
|
|
||||||
# extend-to-next-whitespace=Control+Shift+w
|
|
||||||
# extend-line-down=Shift+Down
|
|
||||||
# extend-backward-char=Shift+Left
|
|
||||||
# extend-backward-to-word-boundary=Control+Shift+Left
|
|
||||||
# extend-backward-to-next-whitespace=none
|
|
||||||
# extend-line-up=Shift+Up
|
|
||||||
# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
|
|
||||||
# primary-paste=Shift+Insert
|
|
||||||
# unicode-input=none
|
|
||||||
# quit=none
|
|
||||||
# scrollback-up-page=Shift+Page_Up
|
|
||||||
# scrollback-up-half-page=none
|
|
||||||
# scrollback-up-line=none
|
|
||||||
# scrollback-down-page=Shift+Page_Down
|
|
||||||
# scrollback-down-half-page=none
|
|
||||||
# scrollback-down-line=none
|
|
||||||
# scrollback-home=none
|
|
||||||
# scrollback-end=none
|
|
||||||
|
|
||||||
[url-bindings]
|
|
||||||
# cancel=Control+g Control+c Control+d Escape
|
|
||||||
# toggle-url-visible=t
|
|
||||||
|
|
||||||
[text-bindings]
|
|
||||||
# \x03=Mod4+c # Map Super+c -> Ctrl+c
|
|
||||||
|
|
||||||
[mouse-bindings]
|
|
||||||
# scrollback-up-mouse=BTN_WHEEL_BACK
|
|
||||||
# scrollback-down-mouse=BTN_WHEEL_FORWARD
|
|
||||||
# font-increase=Control+BTN_WHEEL_BACK
|
|
||||||
# font-decrease=Control+BTN_WHEEL_FORWARD
|
|
||||||
# selection-override-modifiers=Shift
|
|
||||||
# primary-paste=BTN_MIDDLE
|
|
||||||
# select-begin=BTN_LEFT
|
|
||||||
# select-begin-block=Control+BTN_LEFT
|
|
||||||
# select-extend=BTN_RIGHT
|
|
||||||
# select-extend-character-wise=Control+BTN_RIGHT
|
|
||||||
# select-word=BTN_LEFT-2
|
|
||||||
# select-word-whitespace=Control+BTN_LEFT-2
|
|
||||||
# select-quote = BTN_LEFT-3
|
|
||||||
# select-row=BTN_LEFT-4
|
|
||||||
|
|
||||||
# vim: ft=dosini
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
|
|
||||||
# Emacs
|
|
||||||
.ropeproject/
|
|
||||||
.dir-locals.el
|
|
||||||
|
|
||||||
# Mac
|
|
||||||
.DS_Store
|
|
||||||
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
(list (channel (name (quote guix)) (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" (openpgp-fingerprint "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
;; This is an operating system configuration template
|
|
||||||
;; for a "desktop" setup with GNOME and Xfce where the
|
|
||||||
;; root partition is encrypted with LUKS, and a swap file.
|
|
||||||
|
|
||||||
(use-modules (gnu) (gnu packages)
|
|
||||||
(gnu system nss)
|
|
||||||
(gnu services)
|
|
||||||
(srfi srfi-1)
|
|
||||||
(guix utils))
|
|
||||||
|
|
||||||
(use-modules
|
|
||||||
(gnu packages)
|
|
||||||
(nongnu packages linux)
|
|
||||||
(nongnu system linux-initrd))
|
|
||||||
|
|
||||||
(use-service-modules desktop sddm xorg)
|
|
||||||
(use-package-modules certs wm vim terminals)
|
|
||||||
|
|
||||||
(operating-system
|
|
||||||
(host-name "rex")
|
|
||||||
(timezone "Europe/Dublin")
|
|
||||||
(locale "en_GB.utf8")
|
|
||||||
(kernel linux)
|
|
||||||
(initrd microcode-initrd)
|
|
||||||
(firmware (list linux-firmware))
|
|
||||||
|
|
||||||
;; Choose US English keyboard layout. The "altgr-intl"
|
|
||||||
;; variant provides dead keys for accented characters.
|
|
||||||
(keyboard-layout (keyboard-layout "us" "altgr-intl"))
|
|
||||||
|
|
||||||
;; Use the UEFI variant of GRUB with the EFI System
|
|
||||||
;; Partition mounted on /boot/efi.
|
|
||||||
(bootloader (bootloader-configuration
|
|
||||||
(bootloader grub-efi-bootloader)
|
|
||||||
(targets '("/boot/efi"))
|
|
||||||
(keyboard-layout keyboard-layout)))
|
|
||||||
|
|
||||||
;; Specify a mapped device for the encrypted root partition.
|
|
||||||
;; The UUID is that returned by 'cryptsetup luksUUID'.
|
|
||||||
(file-systems (append
|
|
||||||
(list (file-system
|
|
||||||
(device (file-system-label "my-root"))
|
|
||||||
(mount-point "/")
|
|
||||||
(type "ext4"))
|
|
||||||
(file-system
|
|
||||||
(device (uuid "F853-0BDE" 'fat))
|
|
||||||
(mount-point "/boot/efi")
|
|
||||||
(type "vfat")))
|
|
||||||
%base-file-systems))
|
|
||||||
|
|
||||||
;; Specify a swap file for the system, which resides on the
|
|
||||||
;; root file system.
|
|
||||||
(swap-devices '("/dev/nvme0n1p2"))
|
|
||||||
|
|
||||||
;; Create user `bob' with `alice' as its initial password.
|
|
||||||
(users (append
|
|
||||||
(list (user-account
|
|
||||||
(name "jgrogan")
|
|
||||||
(comment "Primary User")
|
|
||||||
(group "users")
|
|
||||||
(supplementary-groups '("wheel" "netdev"
|
|
||||||
"audio" "video")))
|
|
||||||
(user-account
|
|
||||||
(name "guest")
|
|
||||||
(comment "Guest User")
|
|
||||||
(group "users")
|
|
||||||
))
|
|
||||||
%base-user-accounts))
|
|
||||||
|
|
||||||
;; This is where we specify system-wide packages.
|
|
||||||
(packages (append (list
|
|
||||||
;; sway
|
|
||||||
sway
|
|
||||||
swaybg
|
|
||||||
swaylock
|
|
||||||
swayidle
|
|
||||||
wmenu
|
|
||||||
;; shell and editors
|
|
||||||
vim
|
|
||||||
foot)
|
|
||||||
%base-packages))
|
|
||||||
|
|
||||||
(services (append
|
|
||||||
(modify-services %desktop-services
|
|
||||||
(delete gdm-service-type))
|
|
||||||
;; Configure swaylock
|
|
||||||
(list (service screen-locker-service-type
|
|
||||||
(screen-locker-configuration
|
|
||||||
(name "swaylock")
|
|
||||||
(program (file-append swaylock "/bin/swaylock"))
|
|
||||||
(using-pam? #t)
|
|
||||||
(using-setuid? #f)))
|
|
||||||
)))
|
|
||||||
|
|
||||||
|
|
||||||
(name-service-switch %mdns-host-lookup-nss))
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
;; This is a sample Guix Home configuration which can help setup your
|
|
||||||
;; home directory in the same declarative manner as Guix System.
|
|
||||||
;; For more information, see the Home Configuration section of the manual.
|
|
||||||
(define-module (guix-home-config)
|
|
||||||
#:use-module (gnu home)
|
|
||||||
#:use-module (gnu home services)
|
|
||||||
#:use-module (gnu home services shells)
|
|
||||||
#:use-module (gnu services)
|
|
||||||
#:use-module (gnu system shadow))
|
|
||||||
|
|
||||||
(define home-config
|
|
||||||
(home-environment
|
|
||||||
(services
|
|
||||||
(list
|
|
||||||
;; Uncomment the shell you wish to use for your user:
|
|
||||||
;(service home-bash-service-type)
|
|
||||||
;(service home-fish-service-type)
|
|
||||||
;(service home-zsh-service-type)
|
|
||||||
|
|
||||||
(service home-files-service-type
|
|
||||||
`((".guile" ,%default-dotguile)
|
|
||||||
(".Xdefaults" ,%default-xdefaults)))
|
|
||||||
|
|
||||||
(service home-xdg-configuration-files-service-type
|
|
||||||
`(("gdb/gdbinit" ,%default-gdbinit)
|
|
||||||
("nano/nanorc" ,%default-nanorc)))))))
|
|
||||||
|
|
||||||
home-config
|
|
||||||
|
|
@ -1,224 +0,0 @@
|
||||||
# Default config for sway
|
|
||||||
#
|
|
||||||
# Copy this to ~/.config/sway/config and edit it to your liking.
|
|
||||||
#
|
|
||||||
# Read `man 5 sway` for a complete reference.
|
|
||||||
|
|
||||||
### Variables
|
|
||||||
#
|
|
||||||
# Logo key. Use Mod1 for Alt.
|
|
||||||
set $mod Mod4
|
|
||||||
# Home row direction keys, like vim
|
|
||||||
set $left h
|
|
||||||
set $down j
|
|
||||||
set $up k
|
|
||||||
set $right l
|
|
||||||
# Your preferred terminal emulator
|
|
||||||
set $term foot
|
|
||||||
# Your preferred application launcher
|
|
||||||
# Note: pass the final command to swaymsg so that the resulting window can be opened
|
|
||||||
# on the original workspace that the command was run on.
|
|
||||||
set $menu dmenu_path | wmenu | xargs swaymsg exec --
|
|
||||||
|
|
||||||
### Output configuration
|
|
||||||
#
|
|
||||||
# Default wallpaper (more resolutions are available in /gnu/store/wlyzl80yslhxhzbh2cd0lhr3im850zxc-sway-1.9/share/backgrounds/sway/)
|
|
||||||
output * bg /home/jgrogan/.config/wallpaper.png fill
|
|
||||||
#
|
|
||||||
# Example configuration:
|
|
||||||
#
|
|
||||||
output HDMI-A-1 resolution 1920x1080 position 1920,0
|
|
||||||
#
|
|
||||||
# You can get the names of your outputs by running: swaymsg -t get_outputs
|
|
||||||
|
|
||||||
### Idle configuration
|
|
||||||
#
|
|
||||||
# Example configuration:
|
|
||||||
#
|
|
||||||
# exec swayidle -w \
|
|
||||||
# timeout 300 'swaylock -f -c 000000' \
|
|
||||||
# timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
|
|
||||||
# before-sleep 'swaylock -f -c 000000'
|
|
||||||
#
|
|
||||||
# This will lock your screen after 300 seconds of inactivity, then turn off
|
|
||||||
# your displays after another 300 seconds, and turn your screens back on when
|
|
||||||
# resumed. It will also lock your screen before your computer goes to sleep.
|
|
||||||
|
|
||||||
### Input configuration
|
|
||||||
#
|
|
||||||
# Example configuration:
|
|
||||||
#
|
|
||||||
input "10182:3395:DELL0B6B:00_27C6:0D43_Touchpad" {
|
|
||||||
dwt enabled
|
|
||||||
tap enabled
|
|
||||||
natural_scroll enabled
|
|
||||||
middle_emulation enabled
|
|
||||||
}
|
|
||||||
|
|
||||||
input type:keyboard {
|
|
||||||
# Capslock key should work as escape key
|
|
||||||
# See /usr/share/X11/xkb/rules/xorg.lst for options
|
|
||||||
xkb_options ctrl:nocaps
|
|
||||||
xkb_layout "gb"
|
|
||||||
}
|
|
||||||
#
|
|
||||||
# You can get the names of your inputs by running: swaymsg -t get_inputs
|
|
||||||
# Read `man 5 sway-input` for more information about this section.
|
|
||||||
|
|
||||||
### Key bindings
|
|
||||||
#
|
|
||||||
# Basics:
|
|
||||||
#
|
|
||||||
# Start a terminal
|
|
||||||
bindsym $mod+Return exec $term
|
|
||||||
|
|
||||||
# Kill focused window
|
|
||||||
bindsym $mod+Shift+q kill
|
|
||||||
|
|
||||||
# Start your launcher
|
|
||||||
bindsym $mod+d exec $menu
|
|
||||||
|
|
||||||
# Drag floating windows by holding down $mod and left mouse button.
|
|
||||||
# Resize them with right mouse button + $mod.
|
|
||||||
# Despite the name, also works for non-floating windows.
|
|
||||||
# Change normal to inverse to use left mouse button for resizing and right
|
|
||||||
# mouse button for dragging.
|
|
||||||
floating_modifier $mod normal
|
|
||||||
|
|
||||||
# Reload the configuration file
|
|
||||||
bindsym $mod+Shift+c reload
|
|
||||||
|
|
||||||
# Exit sway (logs you out of your Wayland session)
|
|
||||||
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
|
|
||||||
#
|
|
||||||
# Moving around:
|
|
||||||
#
|
|
||||||
# Move your focus around
|
|
||||||
bindsym $mod+$left focus left
|
|
||||||
bindsym $mod+$down focus down
|
|
||||||
bindsym $mod+$up focus up
|
|
||||||
bindsym $mod+$right focus right
|
|
||||||
# Or use $mod+[up|down|left|right]
|
|
||||||
bindsym $mod+Left focus left
|
|
||||||
bindsym $mod+Down focus down
|
|
||||||
bindsym $mod+Up focus up
|
|
||||||
bindsym $mod+Right focus right
|
|
||||||
|
|
||||||
# Move the focused window with the same, but add Shift
|
|
||||||
bindsym $mod+Shift+$left move left
|
|
||||||
bindsym $mod+Shift+$down move down
|
|
||||||
bindsym $mod+Shift+$up move up
|
|
||||||
bindsym $mod+Shift+$right move right
|
|
||||||
# Ditto, with arrow keys
|
|
||||||
bindsym $mod+Shift+Left move left
|
|
||||||
bindsym $mod+Shift+Down move down
|
|
||||||
bindsym $mod+Shift+Up move up
|
|
||||||
bindsym $mod+Shift+Right move right
|
|
||||||
#
|
|
||||||
# Workspaces:
|
|
||||||
#
|
|
||||||
# Switch to workspace
|
|
||||||
bindsym $mod+1 workspace number 1
|
|
||||||
bindsym $mod+2 workspace number 2
|
|
||||||
bindsym $mod+3 workspace number 3
|
|
||||||
bindsym $mod+4 workspace number 4
|
|
||||||
bindsym $mod+5 workspace number 5
|
|
||||||
bindsym $mod+6 workspace number 6
|
|
||||||
bindsym $mod+7 workspace number 7
|
|
||||||
bindsym $mod+8 workspace number 8
|
|
||||||
bindsym $mod+9 workspace number 9
|
|
||||||
bindsym $mod+0 workspace number 10
|
|
||||||
# Move focused container to workspace
|
|
||||||
bindsym $mod+Shift+1 move container to workspace number 1
|
|
||||||
bindsym $mod+Shift+2 move container to workspace number 2
|
|
||||||
bindsym $mod+Shift+3 move container to workspace number 3
|
|
||||||
bindsym $mod+Shift+4 move container to workspace number 4
|
|
||||||
bindsym $mod+Shift+5 move container to workspace number 5
|
|
||||||
bindsym $mod+Shift+6 move container to workspace number 6
|
|
||||||
bindsym $mod+Shift+7 move container to workspace number 7
|
|
||||||
bindsym $mod+Shift+8 move container to workspace number 8
|
|
||||||
bindsym $mod+Shift+9 move container to workspace number 9
|
|
||||||
bindsym $mod+Shift+0 move container to workspace number 10
|
|
||||||
# Note: workspaces can have any name you want, not just numbers.
|
|
||||||
# We just use 1-10 as the default.
|
|
||||||
#
|
|
||||||
# Layout stuff:
|
|
||||||
#
|
|
||||||
# You can "split" the current object of your focus with
|
|
||||||
# $mod+b or $mod+v, for horizontal and vertical splits
|
|
||||||
# respectively.
|
|
||||||
bindsym $mod+b splith
|
|
||||||
bindsym $mod+v splitv
|
|
||||||
|
|
||||||
# Switch the current container between different layout styles
|
|
||||||
bindsym $mod+s layout stacking
|
|
||||||
bindsym $mod+w layout tabbed
|
|
||||||
bindsym $mod+e layout toggle split
|
|
||||||
|
|
||||||
# Make the current focus fullscreen
|
|
||||||
bindsym $mod+f fullscreen
|
|
||||||
|
|
||||||
# Toggle the current focus between tiling and floating mode
|
|
||||||
bindsym $mod+Shift+space floating toggle
|
|
||||||
|
|
||||||
# Swap focus between the tiling area and the floating area
|
|
||||||
bindsym $mod+space focus mode_toggle
|
|
||||||
|
|
||||||
# Move focus to the parent container
|
|
||||||
bindsym $mod+a focus parent
|
|
||||||
#
|
|
||||||
# Scratchpad:
|
|
||||||
#
|
|
||||||
# Sway has a "scratchpad", which is a bag of holding for windows.
|
|
||||||
# You can send windows there and get them back later.
|
|
||||||
|
|
||||||
# Move the currently focused window to the scratchpad
|
|
||||||
bindsym $mod+Shift+minus move scratchpad
|
|
||||||
|
|
||||||
# Show the next scratchpad window or hide the focused scratchpad window.
|
|
||||||
# If there are multiple scratchpad windows, this command cycles through them.
|
|
||||||
bindsym $mod+minus scratchpad show
|
|
||||||
#
|
|
||||||
# Resizing containers:
|
|
||||||
#
|
|
||||||
mode "resize" {
|
|
||||||
# left will shrink the containers width
|
|
||||||
# right will grow the containers width
|
|
||||||
# up will shrink the containers height
|
|
||||||
# down will grow the containers height
|
|
||||||
bindsym $left resize shrink width 10px
|
|
||||||
bindsym $down resize grow height 10px
|
|
||||||
bindsym $up resize shrink height 10px
|
|
||||||
bindsym $right resize grow width 10px
|
|
||||||
|
|
||||||
# Ditto, with arrow keys
|
|
||||||
bindsym Left resize shrink width 10px
|
|
||||||
bindsym Down resize grow height 10px
|
|
||||||
bindsym Up resize shrink height 10px
|
|
||||||
bindsym Right resize grow width 10px
|
|
||||||
|
|
||||||
# Return to default mode
|
|
||||||
bindsym Return mode "default"
|
|
||||||
bindsym Escape mode "default"
|
|
||||||
}
|
|
||||||
bindsym $mod+r mode "resize"
|
|
||||||
|
|
||||||
#
|
|
||||||
# Status Bar:
|
|
||||||
#
|
|
||||||
# Read `man 5 sway-bar` for more information about this section.
|
|
||||||
bar {
|
|
||||||
position top
|
|
||||||
|
|
||||||
# When the status_command prints a new line to stdout, swaybar updates.
|
|
||||||
# The default just shows the current date and time.
|
|
||||||
status_command while date +'%Y-%m-%d %X'; do sleep 1; done
|
|
||||||
|
|
||||||
colors {
|
|
||||||
statusline #ffffff
|
|
||||||
background #323232
|
|
||||||
inactive_workspace #32323200 #32323200 #5c5c5c
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
include /gnu/store/wlyzl80yslhxhzbh2cd0lhr3im850zxc-sway-1.9/etc/sway/config.d/*
|
|
||||||
|
|
@ -31,4 +31,3 @@ alias cdproj="cd $PROJ_DIR"
|
||||||
# Git
|
# Git
|
||||||
alias gpo="git push origin"
|
alias gpo="git push origin"
|
||||||
alias gcb="git checkout branch"
|
alias gcb="git checkout branch"
|
||||||
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue