Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
17c2675299
|
|||
| 0ba0ccf9de | |||
|
e433bfd70a
|
@ -1,24 +1,24 @@
|
||||
general.import = ["~/.config/alacritty/theme.toml"]
|
||||
import = ["~/.config/alacritty/theme.toml"]
|
||||
|
||||
[cursor]
|
||||
style = "Block"
|
||||
unfocused_hollow = false
|
||||
|
||||
[font]
|
||||
size = 13.0
|
||||
size = 7.0
|
||||
|
||||
[font.bold]
|
||||
family = "ZedMono Nerd Font"
|
||||
family = "JetBrainsMono Nerd Font"
|
||||
|
||||
[font.glyph_offset]
|
||||
x = 0
|
||||
y = 0
|
||||
|
||||
[font.italic]
|
||||
family = "ZedMono Nerd Font"
|
||||
family = "JetBrainsMono Nerd Font"
|
||||
|
||||
[font.normal]
|
||||
family = "ZedMono Nerd Font"
|
||||
family = "JetBrainsMono Nerd Font"
|
||||
|
||||
[font.offset]
|
||||
x = 0
|
||||
|
||||
@ -1,4 +1,23 @@
|
||||
general.import = [
|
||||
"~/.config/alacritty/oceanic_next.toml",
|
||||
"~/.config/alacritty/config.toml"
|
||||
]
|
||||
[colors.bright]
|
||||
black = "0x747c84"
|
||||
blue = "0xae95c7"
|
||||
cyan = "0x95aec7"
|
||||
green = "0x95c7ae"
|
||||
magenta = "0xc795ae"
|
||||
red = "0xc7ae95"
|
||||
white = "0xf3f4f5"
|
||||
yellow = "0xaec795"
|
||||
|
||||
[colors.normal]
|
||||
black = "0x1c2023"
|
||||
blue = "0xae95c7"
|
||||
cyan = "0x95aec7"
|
||||
green = "0x95c7ae"
|
||||
magenta = "0xc795ae"
|
||||
red = "0xc7ae95"
|
||||
white = "0xc7ccd1"
|
||||
yellow = "0xaec795"
|
||||
|
||||
[colors.primary]
|
||||
background = "0x141322"
|
||||
foreground = "0xf09db9"
|
||||
|
||||
27
.config/alacritty/dark.yml
Normal file
27
.config/alacritty/dark.yml
Normal file
@ -0,0 +1,27 @@
|
||||
colors:
|
||||
# Default colors
|
||||
primary:
|
||||
background: '0x1c2023'
|
||||
foreground: '0xe07c9f'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '0x1c2023'
|
||||
red: '0xc7ae95'
|
||||
green: '0x95c7ae'
|
||||
yellow: '0xaec795'
|
||||
blue: '0xae95c7'
|
||||
magenta: '0xc795ae'
|
||||
cyan: '0x95aec7'
|
||||
white: '0xc7ccd1'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '0x747c84'
|
||||
red: '0xc7ae95'
|
||||
green: '0x95c7ae'
|
||||
yellow: '0xaec795'
|
||||
blue: '0xae95c7'
|
||||
magenta: '0xc795ae'
|
||||
cyan: '0x95aec7'
|
||||
white: '0xf3f4f5'
|
||||
@ -1,4 +1,4 @@
|
||||
general.import = [
|
||||
import = [
|
||||
"~/.config/alacritty/catppucin-latte.toml",
|
||||
"~/.config/alacritty/config.toml"
|
||||
]
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
# Colors (Oceanic Next)
|
||||
|
||||
# Default colors
|
||||
[colors.primary]
|
||||
background = '#1b2b34'
|
||||
foreground = '#d8dee9'
|
||||
|
||||
# Normal colors
|
||||
[colors.normal]
|
||||
black = '#29414f'
|
||||
red = '#ec5f67'
|
||||
green = '#99c794'
|
||||
yellow = '#fac863'
|
||||
blue = '#6699cc'
|
||||
magenta = '#c594c5'
|
||||
cyan = '#5fb3b3'
|
||||
white = '#65737e'
|
||||
|
||||
# Bright colors
|
||||
[colors.bright]
|
||||
black = '#405860'
|
||||
red = '#ec5f67'
|
||||
green = '#99c794'
|
||||
yellow = '#fac863'
|
||||
blue = '#6699cc'
|
||||
magenta = '#c594c5'
|
||||
cyan = '#5fb3b3'
|
||||
white = '#adb5c0'
|
||||
@ -1,17 +1,17 @@
|
||||
[global]
|
||||
frame_color = "#89b4fa"
|
||||
frame_color = "#f09db9"
|
||||
separator_color= frame
|
||||
|
||||
[urgency_low]
|
||||
background = "#1e1e2e"
|
||||
foreground = "#cdd6f4"
|
||||
background = "#141322"
|
||||
foreground = "#f09db9"
|
||||
|
||||
[urgency_normal]
|
||||
background = "#1e1e2e"
|
||||
foreground = "#cdd6f4"
|
||||
background = "#141322"
|
||||
foreground = "#f09db9"
|
||||
|
||||
[urgency_critical]
|
||||
background = "#1e1e2e"
|
||||
foreground = "#cdd6f4"
|
||||
frame_color = "#fab387"
|
||||
background = "#141322"
|
||||
foreground = "#f09db9"
|
||||
frame_color = "#c7ae95"
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ gtk-application-prefer-dark-theme=1
|
||||
gtk-cursor-theme-name=Oxygen 19 Pink Blossom
|
||||
gtk-key-theme-name=Emacs
|
||||
|
||||
gtk-theme-name=Adwaita
|
||||
gtk-theme-name=Marwaita-s-Dark-Pink
|
||||
gtk-icon-theme-name=Adwaita
|
||||
gtk-font-name=Cantarell 11
|
||||
gtk-cursor-theme-size=0
|
||||
@ -16,3 +16,4 @@ gtk-enable-input-feedback-sounds=1
|
||||
gtk-xft-antialias=1
|
||||
gtk-xft-hinting=1
|
||||
gtk-xft-hintstyle=hintfull
|
||||
gtk-xft-rgba=rgb
|
||||
|
||||
@ -1,28 +1,28 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" },
|
||||
"catppuccin": { "branch": "main", "commit": "65bf0b16f57a3db70d6a93ac68882dd9a31d0565" },
|
||||
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
|
||||
"LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" },
|
||||
"catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
||||
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
|
||||
"conform.nvim": { "branch": "master", "commit": "4dd429fe3f47077f4e50cdaf03f7877ce9b213e0" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
|
||||
"conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
|
||||
"fwatch.nvim": { "branch": "main", "commit": "a691f7349dc66285cd75a1a698dd28bca45f2bf8" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||
"mini.statusline": { "branch": "main", "commit": "813854243156472c9d0bc9c64ea0af159b9b37ca" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "82ab19ebf79c1839d7351f2fed213d1af13a598e" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "38c12cb9ac8e1c547a8472c87df9e9d7c8b1af0d" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
|
||||
"oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
|
||||
"mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
|
||||
"mini.statusline": { "branch": "main", "commit": "b5d23c5356e837f9e6426ffeed9f5acd0629bc07" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "517e4fbb9ef3c0986da7047f44b4b91a2400f93c" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "245da4eb2e52d14b034bbbedec9671e997ede764" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "349660c0d35da06459ee8589af77de2086b652ce" },
|
||||
"transparent.nvim": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" }
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ lspconfig.lua_ls.setup {
|
||||
}
|
||||
|
||||
-- setup multiple servers with same default options
|
||||
local servers = { "ts_ls", "html", "cssls" }
|
||||
local servers = { "tsserver", "html", "cssls" }
|
||||
|
||||
for _, lsp in ipairs(servers) do
|
||||
lspconfig[lsp].setup {
|
||||
|
||||
@ -2,7 +2,6 @@ local plugins = {
|
||||
{ lazy = true, "nvim-lua/plenary.nvim" },
|
||||
|
||||
{ "catppuccin/nvim", name = "catppuccin", priority = 1000 },
|
||||
{ "mhartington/oceanic-next", name = "oceanic-next", priority = 1000 },
|
||||
|
||||
-- file tree
|
||||
{
|
||||
@ -160,6 +159,14 @@ local plugins = {
|
||||
"rktjmp/fwatch.nvim",
|
||||
lazy = true,
|
||||
},
|
||||
|
||||
-- transparent
|
||||
{
|
||||
"xiyaowong/transparent.nvim",
|
||||
config = function()
|
||||
vim.cmd("TransparentEnable")
|
||||
end
|
||||
},
|
||||
}
|
||||
|
||||
require("lazy").setup(plugins, require "plugins.configs.lazy")
|
||||
|
||||
@ -7,14 +7,13 @@ function Set_theme_at(path)
|
||||
theme = theme:gsub("%s+", "")
|
||||
f:close()
|
||||
vim.schedule(function()
|
||||
vim.cmd("colorscheme OceanicNext")
|
||||
-- if (theme == "light") then
|
||||
-- vim.api.nvim_set_option("background", "light")
|
||||
-- vim.cmd("colorscheme catppuccin-latte")
|
||||
-- else
|
||||
-- vim.api.nvim_set_option("background", "dark")
|
||||
-- vim.cmd("colorscheme catppuccin-mocha")
|
||||
-- end
|
||||
if (theme == "light") then
|
||||
vim.api.nvim_set_option("background", "light")
|
||||
vim.cmd("colorscheme catppuccin-latte")
|
||||
else
|
||||
vim.api.nvim_set_option("background", "dark")
|
||||
vim.cmd("colorscheme catppuccin-mocha")
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
@ -19,7 +19,8 @@ set $wallpapers_path $HOME/Wallpapers
|
||||
|
||||
### Output configuration
|
||||
#
|
||||
output * bg `find $wallpapers_path/$(cat $HOME/theme) -type f | grep -v "gitkeep" | shuf -n 1` fill
|
||||
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
|
||||
output * bg `find $wallpapers_path/$([ -z "$DARK_MODE" ] && echo "light" || echo "dark") -type f | grep -v "gitkeep" | shuf -n 1` fill
|
||||
|
||||
# VNC External Monitor
|
||||
output HEADLESS-1 {
|
||||
@ -61,7 +62,7 @@ exec swayidle -w \
|
||||
#
|
||||
bindsym $mod+Shift+n exec swaylock-corrupter
|
||||
# Start a terminal
|
||||
bindsym $mod+Shift+Return exec $term
|
||||
bindsym $mod+Return exec $term
|
||||
|
||||
# Kill focused window
|
||||
bindsym $mod+Shift+q kill
|
||||
@ -230,4 +231,3 @@ exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
||||
exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
||||
exec "systemctl --user import-environment {,WAYLAND_}DISPLAY SWAYSOCK; systemctl --user start sway-session.target"
|
||||
exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target
|
||||
exec emacs-keys-everywhere
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
@define-color rosewater #f5e0dc;
|
||||
|
||||
* {
|
||||
font-family: ZedMonoNerd;
|
||||
font-family: JetBrainsMono;
|
||||
font-size: 12px;
|
||||
color: @text; /* Foreground "black" */
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
@define-color rosewater #f5e0dc;
|
||||
|
||||
* {
|
||||
font-family: ZedMonoNerdFont;
|
||||
font-family: JetBrainsMono;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ window > box {
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background: shade(alpha(@base, 0.0), 0);/*.95);*/
|
||||
background: shade(alpha(@base, 0.6), .95);
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@ window#waybar {
|
||||
|
||||
#workspaces, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #custom-launcher, #custom-power, #tray, #mode, #idle_inhibitor , #mpd, #mpris, #custom-aggietimed {
|
||||
background: @base;
|
||||
border-radius: 8px;
|
||||
border-radius: 12px;
|
||||
border: 2px solid @text;
|
||||
margin-right: 5px;
|
||||
margin-left: 5px;
|
||||
@ -59,7 +59,7 @@ window#waybar {
|
||||
#workspaces {
|
||||
background: @mantle;
|
||||
padding: 2px;
|
||||
border-radius: 8px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
|
||||
@ -30,7 +30,8 @@
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
)
|
||||
'(custom-safe-themes
|
||||
'("bdbb37a5b43210930749d2bebe2ce092dd4abe0597249b883eef00a9814e0013" default)))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
|
||||
@ -14,41 +14,6 @@
|
||||
'("melpa" . "https://melpa.org/packages/") t)
|
||||
#+END_SRC
|
||||
* General emacs
|
||||
** Evil Mode!
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package evil
|
||||
:init
|
||||
(setq evil-want-integration t)
|
||||
(setq evil-want-keybinding nil)
|
||||
(setq evil-want-C-u-scroll t)
|
||||
(setq evil-want-C-i-jump t)
|
||||
(setq evil-shift-width 2)
|
||||
(setq evil-cross-lines t)
|
||||
(setq evil-respect-visual-line-mode t)
|
||||
(setq evil-vsplit-window-below t)
|
||||
(setq evil-split-window-below t)
|
||||
(setq evil-undo-system 'undo-redo)
|
||||
:config
|
||||
(evil-mode 1)
|
||||
(define-key evil-insert-state-map (kbd "C-g") 'evil-normal-state)
|
||||
|
||||
(evil-global-set-key 'motion "j" 'evil-next-visual-line)
|
||||
(evil-global-set-key 'motion "k" 'evil-previous-visual-line)
|
||||
|
||||
(add-hook 'evil-visual-activate-hook #'(lambda () (global-hl-line-mode 0) (message "Hello visual!")))
|
||||
(add-hook 'evil-visual-deactivate-hook #'(lambda () (global-hl-line-mode 1)))
|
||||
|
||||
(setq evil-want-fine-undo t)
|
||||
(evil-set-initial-state 'messages-buffer-mode 'normal))
|
||||
#+END_SRC
|
||||
|
||||
#+RESULTS:
|
||||
: t
|
||||
|
||||
** Ring Bell Sound
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(setq ring-bell-function 'ignore)
|
||||
#+END_SRC
|
||||
** Tab bar mode
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(defun my-tabbar-buffer-groups () ;; customize to show all normal files in one group
|
||||
@ -64,7 +29,6 @@
|
||||
tab-width 2
|
||||
indent-tabs-mode nil)
|
||||
#+END_SRC
|
||||
|
||||
** Line numbers
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(setq display-line-numbers-type 'relative)
|
||||
@ -88,7 +52,6 @@
|
||||
frame-resize-pixelwise t) ;; Use 100% of window space
|
||||
(defun do-frame-config ()
|
||||
(tool-bar-mode -1) ;; System bar
|
||||
(add-to-list 'default-frame-alist '(undecorated . t))
|
||||
(set-fringe-mode '(1 . 1)) ;; Minimize arrows before and after wrapped lines by setting fringe to 1px
|
||||
(toggle-scroll-bar -1))
|
||||
|
||||
@ -100,6 +63,7 @@
|
||||
(do-frame-config)
|
||||
(add-hook 'after-make-frame-functions 'disable-scroll-bars))
|
||||
#+END_SRC
|
||||
#+END_SRC
|
||||
** System path (macos)
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package exec-path-from-shell
|
||||
@ -108,21 +72,7 @@
|
||||
(when (memq window-system '(mac ns x))
|
||||
(exec-path-from-shell-initialize)))
|
||||
#+END_SRC
|
||||
** Fuzy Wuzzy
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package ivy
|
||||
:ensure t)
|
||||
(use-package counsel
|
||||
:ensure t)
|
||||
(ivy-mode 1)
|
||||
(counsel-mode 1)
|
||||
#+END_SRC
|
||||
|
||||
** Electric Pair Mode
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(electric-pair-mode)
|
||||
(electric-quote-mode)
|
||||
#+END_SRC
|
||||
* Theming
|
||||
** Line spacing
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
@ -134,58 +84,21 @@
|
||||
#+END_SRC
|
||||
** Font
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(let ((font "ZedMono Nerd Font-13:style=Regular"))
|
||||
(set-face-attribute 'default nil :font font)
|
||||
(let ((font "JetBrains Mono-10:style=Regular"))
|
||||
(set-face-attribute 'default nil :font font)
|
||||
(set-frame-font font nil t))
|
||||
#+END_SRC
|
||||
|
||||
#+RESULTS:
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
;; This assumes you've installed the package via MELPA.
|
||||
(use-package ligature
|
||||
:config
|
||||
;; Enable the "www" ligature in every possible major mode
|
||||
(ligature-set-ligatures 't '("www"))
|
||||
;; Enable traditional ligature support in eww-mode, if the
|
||||
;; `variable-pitch' face supports it
|
||||
(ligature-set-ligatures 'eww-mode '("ff" "fi" "ffi"))
|
||||
;; Enable all Cascadia Code ligatures in programming modes
|
||||
(ligature-set-ligatures 'prog-mode '("|||>" "<|||" "<==>" "<!--" "####" "~~>" "***" "||=" "||>"
|
||||
":::" "::=" "=:=" "===" "==>" "=!=" "=>>" "=<<" "=/=" "!=="
|
||||
"!!." ">=>" ">>=" ">>>" ">>-" ">->" "->>" "-->" "---" "-<<"
|
||||
"<~~" "<~>" "<*>" "<||" "<|>" "<$>" "<==" "<=>" "<=<" "<->"
|
||||
"<--" "<-<" "<<=" "<<-" "<<<" "<+>" "</>" "###" "#_(" "..<"
|
||||
"..." "+++" "/==" "///" "_|_" "www" "&&" "^=" "~~" "~@" "~="
|
||||
"~>" "~-" "**" "*>" "*/" "||" "|}" "|]" "|=" "|>" "|-" "{|"
|
||||
"[|" "]#" "::" ":=" ":>" ":<" "$>" "==" "=>" "!=" "!!" ">:"
|
||||
">=" ">>" ">-" "-~" "-|" "->" "--" "-<" "<~" "<*" "<|" "<:"
|
||||
"<$" "<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#=" "#!"
|
||||
"##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?" "+>" "++" "?:"
|
||||
"?=" "?." "??" ";;" "/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
|
||||
"\\\\" "://"))
|
||||
;; Enables ligature checks globally in all buffers. You can also do it
|
||||
;; per mode with `ligature-mode'.
|
||||
(global-ligature-mode t))
|
||||
#+END_SRC
|
||||
|
||||
** Highlight indent guides
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package :highlight-indent-guides
|
||||
:ensure t
|
||||
:config
|
||||
(add-hook 'prog-mode-hook 'highlight-indent-guides-mode))
|
||||
#+END_SRC
|
||||
** Catppuccin and theme notify watcher
|
||||
** Doom-modeline && Doom-themes
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package doom-themes
|
||||
:ensure t
|
||||
:config
|
||||
;; Global settings (defaults)
|
||||
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
|
||||
doom-themes-enable-italic nil) ; if nil, italics is universally disabled
|
||||
;; (load-theme 'doom-spacegrey t)
|
||||
(load-theme 'doom-oceanic-next t)
|
||||
doom-themes-enable-italic t) ; if nil, italics is universally disabled
|
||||
(load-theme 'doom-laserwave t)
|
||||
|
||||
;; Enable flashing mode-line on errors
|
||||
(doom-themes-visual-bell-config)
|
||||
;; Enable custom neotree theme (all-the-icons must be installed!)
|
||||
@ -195,38 +108,13 @@
|
||||
(doom-themes-treemacs-config)
|
||||
;; Corrects (and improves) org-mode's native fontification.
|
||||
(doom-themes-org-config))
|
||||
#+END_SRC
|
||||
|
||||
#+RESULTS:
|
||||
: t
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
;; (use-package catppuccin-theme
|
||||
;; :ensure t)
|
||||
;; (require 'filenotify)
|
||||
;;
|
||||
;; (setq *theme-file* "~/theme")
|
||||
;; (defun set-system-theme ()
|
||||
;; (let ((theme
|
||||
;; (with-temp-buffer
|
||||
;; (insert-file-contents *theme-file*)
|
||||
;; (buffer-string)))
|
||||
;; (current-flavor catppuccin-flavor))
|
||||
;; (setq catppuccin-flavor (if (string-prefix-p "dark" theme) 'mocha 'latte))
|
||||
;; (if (not (eq catppuccin-flavor current-flavor))
|
||||
;; (catppuccin-reload))))
|
||||
;;
|
||||
;; (set-system-theme)
|
||||
;; (file-notify-add-watch *theme-file* '(change)
|
||||
;; #'(lambda (event) (set-system-theme)))
|
||||
#+END_SRC
|
||||
** Doom-modeline
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package doom-modeline
|
||||
:ensure t
|
||||
:config
|
||||
(doom-modeline-mode 1))
|
||||
#+END_SRC
|
||||
|
||||
** Icons
|
||||
must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
@ -289,11 +177,6 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
|
||||
org-html-postamble nil
|
||||
org-html-preamble t)
|
||||
#+END_SRC
|
||||
** Roam
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package org-roam
|
||||
:straight t)
|
||||
#+END_SRC
|
||||
** Babel
|
||||
*** Elixir
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
@ -343,6 +226,8 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package magit :ensure t)
|
||||
#+END_SRC
|
||||
|
||||
|
||||
** Autocomplete
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package auto-complete :ensure t)
|
||||
@ -362,69 +247,28 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
|
||||
#+END_SRC
|
||||
** LSP Mode
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package which-key
|
||||
:ensure t
|
||||
:init (which-key-mode))
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(defun lsp-booster--advice-json-parse (old-fn &rest args)
|
||||
"Try to parse bytecode instead of json."
|
||||
(or
|
||||
(when (equal (following-char) ?#)
|
||||
(let ((bytecode (read (current-buffer))))
|
||||
(when (byte-code-function-p bytecode)
|
||||
(funcall bytecode))))
|
||||
(apply old-fn args)))
|
||||
(advice-add (if (progn (require 'json)
|
||||
(fboundp 'json-parse-buffer))
|
||||
'json-parse-buffer
|
||||
'json-read)
|
||||
:around
|
||||
#'lsp-booster--advice-json-parse)
|
||||
|
||||
(defun lsp-booster--advice-final-command (old-fn cmd &optional test?)
|
||||
"Prepend emacs-lsp-booster command to lsp CMD."
|
||||
(let ((orig-result (funcall old-fn cmd test?)))
|
||||
(if (and (not test?) ;; for check lsp-server-present?
|
||||
(not (file-remote-p default-directory)) ;; see lsp-resolve-final-command, it would add extra shell wrapper
|
||||
lsp-use-plists
|
||||
(not (functionp 'json-rpc-connection)) ;; native json-rpc
|
||||
(executable-find "emacs-lsp-booster"))
|
||||
(progn
|
||||
(when-let ((command-from-exec-path (executable-find (car orig-result)))) ;; resolve command from exec-path (in case not found in $PATH)
|
||||
(setcar orig-result command-from-exec-path))
|
||||
(message "Using emacs-lsp-booster for %s!" orig-result)
|
||||
(cons "emacs-lsp-booster" orig-result))
|
||||
orig-result)))
|
||||
(advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command)
|
||||
(use-package company-lsp
|
||||
:after (lsp-mode company))
|
||||
(use-package lsp-mode
|
||||
:ensure t
|
||||
:init
|
||||
(setq lsp-keymap-prefix "C-c l")
|
||||
(setq lsp-file-watch-threshold 5000)
|
||||
:hook ((python-ts-mode . lsp)
|
||||
:hook ((python-ts-mode . lsp) ;; pip install python-lsp-server pyls-black pyls-isort pyls-mypy
|
||||
(elixir-mode . lsp)
|
||||
(rust-mode . lsp)
|
||||
(go-ts-mode . lsp)
|
||||
(go-ts-mode . lsp)
|
||||
(java-mode . lsp)
|
||||
(php-mode . lsp)
|
||||
(c-mode . lsp)
|
||||
(c-ts-mode . lsp)
|
||||
(typescript-ts-mode . lsp)
|
||||
(tsx-ts-mode . lsp)
|
||||
(java-ts-mode . lsp)
|
||||
(kotlin-ts-mode . lsp)
|
||||
(tsx-ts-mode . lsp)
|
||||
(lsp-mode . lsp-enable-which-key-integration))
|
||||
:config
|
||||
(setq lsp-ui-doc-enabled nil)
|
||||
(setq read-process-output-max (* 1024 1024))
|
||||
(setq gc-cons-threshold 100000000)
|
||||
|
||||
(setq lsp-enable-file-watchers nil)
|
||||
:config (progn
|
||||
(lsp-register-custom-settings
|
||||
'(("pyls.plugins.pyls_mypy.enabled" t t)
|
||||
("pyls.plugins.pyls_mypy.live_mode" nil t)
|
||||
("pyls.plugins.pyls_black.enabled" t t)
|
||||
("pyls.plugins.pyls_isort.enabled" t t))))
|
||||
:commands lsp)
|
||||
#+END_SRC
|
||||
|
||||
** Tree-Sitter
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package treesit-auto
|
||||
@ -435,19 +279,6 @@ must run ~(all-the-icons-install-fonts)~ and ~(nerd-fonts-install-fonts)~
|
||||
(global-treesit-auto-mode))
|
||||
#+END_SRC
|
||||
** Languages
|
||||
*** Python
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package python
|
||||
:config
|
||||
(defun python-info-current-defun () nil))
|
||||
(use-package lsp-pyright
|
||||
:ensure t
|
||||
:custom (lsp-pyright-langserver-command "pyright") ;; or basedpyright
|
||||
:hook (python-mode . (lambda ()
|
||||
(require 'lsp-pyright)
|
||||
(lsp)))) ; or lsp-deferred
|
||||
#+END_SRC
|
||||
|
||||
*** Common Lisp
|
||||
**** Rainbow Parentheses
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
@ -551,30 +382,14 @@ After installing the ~rust-analyzer~, the following can be used:
|
||||
#+END_SRC
|
||||
*** Kotlin
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(add-to-list 'treesit-language-source-alist '(kotlin . ("https://github.com/fwcd/tree-sitter-kotlin")))
|
||||
(use-package kotlin-ts-mode
|
||||
:straight (:host gitlab :repo "bricka/emacs-kotlin-ts-mode")
|
||||
:mode "\\.kt\\'")
|
||||
(use-package kotlin-mode
|
||||
:ensure t)
|
||||
#+END_SRC
|
||||
*** Java
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package lsp-java
|
||||
:ensure t
|
||||
:after lsp-mode
|
||||
:config
|
||||
(setq lsp-java-vmargs
|
||||
(list
|
||||
"-Xmx4G"
|
||||
"-XX:+UseG1GC"
|
||||
"-XX:+UseStringDeduplication"
|
||||
"-javaagent:/Users/lizhunt/.emacs.d/lombok.jar"))
|
||||
(add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]\\.bemol\\'")
|
||||
(setq lsp-java-project-resource-filters ["node_modules" ".metadata" "archetype-resources" "META-INF/maven" "runtime" "env"]))
|
||||
|
||||
(add-hook 'java-ts-mode-hook (lambda ()
|
||||
(setq c-basic-offset 4
|
||||
tab-width 4
|
||||
indent-tabs-mode nil)))
|
||||
:config (add-hook 'java-mode-hook 'lsp)
|
||||
:ensure t)
|
||||
#+END_SRC
|
||||
|
||||
*** PHP
|
||||
@ -586,9 +401,8 @@ After installing the ~rust-analyzer~, the following can be used:
|
||||
** Format All The Buffers
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package format-all
|
||||
:bind (("C-c C-f" . format-all-region))
|
||||
:ensure t)
|
||||
;;(add-hook 'prog-mode-hook 'format-all-mode)
|
||||
(add-hook 'prog-mode-hook 'format-all-mode)
|
||||
(add-hook 'astro-ts-mode-hook 'format-all-mode)
|
||||
(add-hook 'format-all-mode-hook 'format-all-ensure-formatter)
|
||||
#+END_SRC
|
||||
@ -605,3 +419,25 @@ After installing the ~rust-analyzer~, the following can be used:
|
||||
("C-c C->" . mc/mark-all-like-this)
|
||||
("C-c C-SPC" . mc/edit-lines)))
|
||||
#+END_SRC
|
||||
* Elcord
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package elcord
|
||||
:config
|
||||
(setq elcord-idle-message "Idling..."
|
||||
elcord-idle-timer 300
|
||||
elcord-refresh-rate 3)
|
||||
:ensure t)
|
||||
(elcord-mode)
|
||||
#+END_SRC
|
||||
* Cookbook
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package org-chef
|
||||
:config
|
||||
(setq org-capture-templates
|
||||
'(("c" "Cookbook" entry (file "~/org/cookbook.org")
|
||||
"%(org-chef-get-recipe-from-url)"
|
||||
:empty-lines 1)
|
||||
("m" "Manual Cookbook" entry (file "~/org/cookbook.org")
|
||||
"* %^{Recipe title: }\n :PROPERTIES:\n :source-url:\n :servings:\n :prep-time:\n :cook-time:\n :ready-in:\n :END:\n** Ingredients\n %?\n** Directions\n\n")))
|
||||
:ensure t)
|
||||
#+END_SRC
|
||||
|
||||
26
.xinitrc
26
.xinitrc
@ -1,27 +1,17 @@
|
||||
#!/bin/sh
|
||||
exec ~/.screenlayout/screenlayout.sh &
|
||||
exec ~/scripts/statusbar.sh &
|
||||
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
export SBCL_HOME=/usr/lib/sbcl
|
||||
export _QWT_TOOLKT=MToolkit
|
||||
|
||||
exec ~/.screenlayout/run.sh &
|
||||
|
||||
exec wmname compiz &
|
||||
|
||||
exec emacs-keys-everywhere &
|
||||
exec picom -b --vsync --backend glx &
|
||||
#exec xmodmap ~/.xmodmap &
|
||||
exec xinput set-prop 10 "Coordinate Transformation Matrix" 1.2 0 0 0 1.2 0 0 0 1.8 &
|
||||
[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
|
||||
|
||||
exec xsetroot -cursor_name left_ptr &
|
||||
exec xset s off &
|
||||
exec xset s off &
|
||||
exec xset b off &
|
||||
exec xset -dpms &
|
||||
|
||||
exec feh --bg-fill --randomize ~/Wallpapers &
|
||||
exec picom -b &
|
||||
|
||||
exec sleep 1s && dunst &
|
||||
exec dunst &
|
||||
|
||||
exec systemd start --user display.target &
|
||||
exec feh --bg-center --randomize ~/Wallpapers &
|
||||
|
||||
/usr/local/bin/stumpwm
|
||||
while type dwm >/dev/null; do dwm 2>/tmp/dwm.log && continue || break ; done
|
||||
|
||||
3
.zshrc
3
.zshrc
@ -61,6 +61,3 @@ alias vim="nvim"
|
||||
# Wasmer
|
||||
export WASMER_DIR="/Users/lizzy/.wasmer"
|
||||
[ -s "$WASMER_DIR/wasmer.sh" ] && source "$WASMER_DIR/wasmer.sh"
|
||||
|
||||
# bun completions
|
||||
[ -s "/Users/lizzy/.bun/_bun" ] && source "/Users/lizzy/.bun/_bun"
|
||||
|
||||
BIN
Wallpapers/.DS_Store
vendored
BIN
Wallpapers/.DS_Store
vendored
Binary file not shown.
BIN
Wallpapers/Cute girly wallpapers.jpeg
Normal file
BIN
Wallpapers/Cute girly wallpapers.jpeg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 176 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.6 MiB |
BIN
Wallpapers/pink pfps.jpeg
Normal file
BIN
Wallpapers/pink pfps.jpeg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 116 KiB |
@ -24,7 +24,14 @@ source /Users/lizzy/.wasmer/wasmer.sh
|
||||
|
||||
eval "$(zoxide init --cmd z zsh)"
|
||||
|
||||
. "$HOME/.cargo/env"
|
||||
# Add the following to your shell init to set up gpg-agent automatically for every shell
|
||||
# Add the following to your shell init to set up gpg-agent automatically for every shell
|
||||
if [ -f ~/.gnupg/.gpg-agent-info ] && [ -n "$(pgrep gpg-agent)" ]; then
|
||||
source ~/.gnupg/.gpg-agent-info
|
||||
export GPG_AGENT_INFO
|
||||
else
|
||||
eval $(gpg-agent --daemon --write-env-file ~/.gnupg/.gpg-agent-info)
|
||||
fi
|
||||
|
||||
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
||||
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
|
||||
eval "$(zoxide init --cmd z zsh)"
|
||||
|
||||
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
||||
@ -6,9 +7,3 @@ fi
|
||||
export GPG_TTY=$(tty)
|
||||
|
||||
. /opt/asdf-vm/asdf.sh
|
||||
|
||||
export PYENV_ROOT="$HOME/.pyenv"
|
||||
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
||||
eval "$(pyenv init -)"
|
||||
|
||||
export PATH=$PATH:/home/lizzy/.pyenv/shims
|
||||
|
||||
16
scripts/machine-specific-zsh/sakomoto.zsh
Normal file
16
scripts/machine-specific-zsh/sakomoto.zsh
Normal file
@ -0,0 +1,16 @@
|
||||
export PATH=$PATH:/home/lizzy/.cargo/bin
|
||||
|
||||
eval "$(zoxide init --cmd z zsh)"
|
||||
|
||||
export GPG_TTY="$(tty)"
|
||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||
gpgconf --launch gpg-agent
|
||||
gpg-connect-agent updatestartuptty /bye > /dev/null
|
||||
|
||||
. /opt/asdf-vm/asdf.sh
|
||||
|
||||
alias cd="z"
|
||||
|
||||
export PYENV_ROOT="$HOME/.pyenv"
|
||||
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
||||
eval "$(pyenv init -)"
|
||||
@ -1,8 +0,0 @@
|
||||
unset SSH_AGENT_PID
|
||||
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
||||
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
||||
fi
|
||||
export GPG_TTY=$(tty)
|
||||
gpg-connect-agent updatestartuptty /bye >/dev/null
|
||||
|
||||
eval "$(zoxide init zsh)"
|
||||
104
scripts/statusbar.sh
Executable file
104
scripts/statusbar.sh
Executable file
@ -0,0 +1,104 @@
|
||||
#!/bin/sh
|
||||
|
||||
usbmon() {
|
||||
usb1=$(lsblk -la | awk '/sdc1/ { print $1 }')
|
||||
usb1mounted=$(lsblk -la | awk '/sdc1/ { print $7 }')
|
||||
|
||||
if [ "$usb1" ]; then
|
||||
if [ -z "$usb1mounted" ]; then
|
||||
echo " |"
|
||||
else
|
||||
echo " $usb1 |"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
battery() {
|
||||
percentage=$(acpi -b | awk '{ print $4; }' | tr -d "%" | tr -d ",")
|
||||
state=$(acpi -b | awk '{ print $3; }' | tr -d ",")
|
||||
if [ $state = "Discharging" ]; then
|
||||
if [ $percentage -gt 75 ]; then
|
||||
state=""
|
||||
elif [ $percentage -gt 50 ]; then
|
||||
state=""
|
||||
elif [ $percentage -gt 25 ]; then
|
||||
state=""
|
||||
else
|
||||
state=""
|
||||
fi
|
||||
elif [ $state = "Full" ]; then
|
||||
state=""
|
||||
elif [ $state = "Charging" ]; then
|
||||
state=""
|
||||
fi
|
||||
echo "$state $percentage %"
|
||||
}
|
||||
|
||||
fsmon() {
|
||||
ROOTPART=$(df -h | awk '/\/$/ { print $3}')
|
||||
HOMEPART=$(df -h | awk '/\/home/ { print $3}')
|
||||
SWAPPART=$(cat /proc/swaps | awk '/\// { print $4 }')
|
||||
|
||||
echo " $ROOTPART $HOMEPART $SWAPPART"
|
||||
}
|
||||
|
||||
ram() {
|
||||
mem=$(free -h | awk '/Mem:/ { print $3 }' | cut -f1 -d 'i')
|
||||
echo "$mem"
|
||||
}
|
||||
|
||||
cpu() {
|
||||
read -r cpu a b c previdle rest < /proc/stat
|
||||
prevtotal=$((a+b+c+previdle))
|
||||
sleep 0.5
|
||||
read -r cpu a b c idle rest < /proc/stat
|
||||
total=$((a+b+c+idle))
|
||||
cpu=$((100*( (total-prevtotal) - (idle-previdle) ) / (total-prevtotal) ))
|
||||
echo "$cpu"%
|
||||
}
|
||||
|
||||
network() {
|
||||
conntype=$(ip route | awk '/default/ { print substr($5,1,1) }')
|
||||
|
||||
if [ -z "$conntype" ]; then
|
||||
echo " down"
|
||||
elif [ "$conntype" = "e" ]; then
|
||||
echo " up"
|
||||
elif [ "$conntype" = "w" ]; then
|
||||
echo " up"
|
||||
fi
|
||||
}
|
||||
|
||||
volume_pa() {
|
||||
muted=$(pactl list sinks | awk '/Mute:/ { print $2 }')
|
||||
vol=$(pactl list sinks | grep Volume: | awk 'FNR == 1 { print $5 }' | cut -f1 -d '%')
|
||||
|
||||
if [ "$muted" = "yes" ]; then
|
||||
echo " muted"
|
||||
else
|
||||
if [ "$vol" -ge 65 ]; then
|
||||
echo " $vol%"
|
||||
elif [ "$vol" -ge 40 ]; then
|
||||
echo " $vol%"
|
||||
elif [ "$vol" -ge 0 ]; then
|
||||
echo " $vol%"
|
||||
fi
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
clock() {
|
||||
dte=$(date +"%D")
|
||||
time=$(date +"%H:%M")
|
||||
|
||||
echo " $dte $time"
|
||||
}
|
||||
|
||||
main() {
|
||||
while true; do
|
||||
dwm -s " $(usbmon) $(ram) | $(cpu) | $(battery) | $(network) | $(volume_pa) | $(clock)"
|
||||
sleep 1
|
||||
done
|
||||
}
|
||||
|
||||
main
|
||||
@ -1 +1 @@
|
||||
Subproject commit 1821e8d5289c2875d8af7654604251e717357242
|
||||
Subproject commit 9fc402499bd5d768141585e271c899c5fd3c3a77
|
||||
Loading…
Reference in New Issue
Block a user