This commit is contained in:
jay 2023-04-17 01:53:49 +08:00
parent 1b3afa092b
commit 896ca95ce1
6 changed files with 44 additions and 34 deletions

View File

@ -2,8 +2,8 @@
set -x
GO_VERSION="1.20.1"
NODE_VERSION="18.14.2"
GO_VERSION="1.20.3"
NODE_VERSION="18.15.0"
ARCH="{{ .chezmoi.arch }}"
OSTYPE="{{ .chezmoi.os }}"
@ -16,9 +16,9 @@ if [ ! -d "$HOME/apps" ]; then
fi
function install_golang {
if command -v go ; then
return 0
fi
#if command -v go ; then
# return 0
#fi
local tmpDir=$(mktemp -d)
local url="https://go.dev/dl/go$GO_VERSION.$OSTYPE-$ARCH.tar.gz"
@ -38,15 +38,20 @@ function install_golang {
mv "$tmpDir/go" "$HOME/apps/go-${GO_VERSION}"
if [ -L "$HOME/apps/go" ]; then
rm -rf `readlink -f "$HOME/apps/go"`
unlink "$HOME/apps/go"
fi
ln -sf "$HOME/apps/go-${GO_VERSION}" "$HOME/apps/go"
rm -rf "$tmpDir"
}
function install_nodejs {
if command -v node ; then
return 0
fi
#if command -v node ; then
# return 0
#fi
local tmpDir=$(mktemp -d)
local arch=""
@ -82,6 +87,11 @@ function install_nodejs {
mv "$dirs" "$HOME/apps/node-v${NODE_VERSION}"
if [ -L "$HOME/apps/node" ]; then
rm -rf `readlink -f "$HOME/apps/node"`
unlink "$HOME/apps/node"
fi
ln -sf "$HOME/apps/node-v${NODE_VERSION}" "$HOME/apps/node"
rm -rf "$tmpDir"

View File

@ -46,8 +46,8 @@ window:
# Blank space added around the window in pixels. This padding is scaled
# by DPI and the specified value is always added at both opposing sides.
padding:
x: 1
y: 1
x: 5
y: 5
# Spread additional padding evenly around the terminal content.
#dynamic_padding: false
@ -152,7 +152,7 @@ font:
#style: Bold Italic
# Point size
size: 7.0
size: 8.0
# Offset is the extra space around each character. `offset.y` can be thought
# of as modifying the line spacing, and `offset.x` as modifying the letter

View File

@ -5,6 +5,9 @@ XMODIFIERS=@im=fcitx
GLFW_IM_MODULE=fcitx
SDL_IM_MODULE=fcitx
MOZ_ENABLE_WAYLAND=1
#XDG_CURRENT_DESKTOP=sway
#XDG_SESSION_DESKTOP=sway
RTC_USE_PIPEWIRE=true
GDK_BACKEND=wayland,x11
QT_QPA_PLATFORM="wayland;xcb"
CLUTTER_BACKEND=wayland
SDL_VIDEODRIVER=wayland

View File

@ -1,3 +1,4 @@
" vim: set ft=vim:
"*****************************************************************************
""" Vim-Plug core
"*****************************************************************************
@ -89,6 +90,7 @@ Plug 'danilo-augusto/vim-afterglow'
Plug 'vim-scripts/TaskList.vim'
Plug 'google/vim-jsonnet'
Plug 'terrastruct/d2-vim'
Plug 'elkowar/yuck.vim'
call plug#end()
@ -540,9 +542,6 @@ require'nvim-tree'.setup {
hijack_cursor = false,
hijack_netrw = true,
hijack_unnamed_buffer_when_opening = false,
ignore_buffer_on_setup = false,
open_on_setup = false,
open_on_setup_file = false,
open_on_tab = false,
sort_by = "name",
update_cwd = false,
@ -579,7 +578,6 @@ require'nvim-tree'.setup {
update_cwd = false,
ignore_list = {},
},
ignore_ft_on_setup = {},
system_open = {
cmd = nil,
args = {},

View File

@ -6,7 +6,8 @@
// "width": 1280, // Waybar width
"spacing": 2, // Gaps between modules (4px)
// Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
"modules-left": ["wlr/workspaces", "hyprland/submap", "hyprland/window"],
// "modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
"modules-center": [],
"modules-right": [
"idle_inhibitor",
@ -25,8 +26,6 @@
"custom/sep",
"backlight",
"custom/sep",
"keyboard-state",
"custom/sep",
"battery",
"custom/sep",
"clock",
@ -39,6 +38,13 @@
"interval": "once",
"tooltip": false
},
"sway/window": {
"max-length": 40
},
"wlr/workspaces": {
"format": "{name}",
"on-click": "activate"
},
"custom/pipewire": {
"exec": "/home/jay/bin/get-volume.sh",
"interval": "once",
@ -51,9 +57,6 @@
},
"on-click": "pavucontrol"
},
"sway/window": {
"max-length": 40
},
"sway/workspaces": {
"disable-scroll": true,
// "all-outputs": true,
@ -81,15 +84,6 @@
// "default": ""
// }
},
"keyboard-state": {
// "numlock": true,
"capslock": true,
"format": "{name} {icon}",
"format-icons": {
"locked": "",
"unlocked": ""
}
},
"sway/mode": {
"format": "<span style=\"italic\">{}</span>"
},
@ -131,7 +125,7 @@
},
"temperature": {
// "thermal-zone": 2,
"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
"hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
"critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}",
"format": " {temperatureC}°C",

View File

@ -33,7 +33,12 @@ window#waybar.empty #window {
/* border: 1px solid #8fd4ff; */
/* border-radius: 5px; */
}
#workspaces button.focused {
/* #workspaces button.focused { */
/* color: white; */
/* border: 1px solid #8fd4ff; */
/* border-radius: 5px; */
/* } */
#workspaces button.active {
color: white;
border: 1px solid #8fd4ff;
border-radius: 5px;