feat: add ghostty shader & update lazyvim config & update tmux style
This commit is contained in:
parent
ec3e6697cd
commit
08451237fe
6 changed files with 182 additions and 14 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
font-family = "CaskaydiaCove Nerd Font Mono"
|
font-family = "CaskaydiaCove Nerd Font Mono"
|
||||||
font-size = 16
|
font-size = 16
|
||||||
theme = catppuccin-macchiato
|
theme = catppuccin-macchiato
|
||||||
unfocused-split-opacity = 0.85
|
unfocused-split-opacity = 0.85
|
||||||
|
|
||||||
|
|
@ -13,3 +13,6 @@ window-decoration = false
|
||||||
mouse-hide-while-typing = true
|
mouse-hide-while-typing = true
|
||||||
|
|
||||||
keybind = ctrl+shift+zero=toggle_tab_overview
|
keybind = ctrl+shift+zero=toggle_tab_overview
|
||||||
|
|
||||||
|
custom-shader = ./shader/mnoise.glsl
|
||||||
|
custom-shader-animation = always
|
||||||
|
|
|
||||||
119
home/config/ghostty/shader/mnoise.glsl
Normal file
119
home/config/ghostty/shader/mnoise.glsl
Normal file
|
|
@ -0,0 +1,119 @@
|
||||||
|
vec3 mod289(vec3 x) { return x - floor(x * (1.0 / 289.0)) * 289.0; }
|
||||||
|
vec4 mod289(vec4 x) { return x - floor(x * (1.0 / 289.0)) * 289.0; }
|
||||||
|
vec4 permute(vec4 x) { return mod289(((x * 34.0) + 10.0) * x); }
|
||||||
|
vec4 taylorInvSqrt(vec4 r) { return 1.79284291400159 - 0.85373472095314 * r; }
|
||||||
|
float snoise(vec3 v) {
|
||||||
|
const vec2 C = vec2(1.0 / 6.0, 1.0 / 3.0);
|
||||||
|
const vec4 D = vec4(0.0, 0.5, 1.0, 2.0);
|
||||||
|
|
||||||
|
// First corner
|
||||||
|
vec3 i = floor(v + dot(v, C.yyy));
|
||||||
|
vec3 x0 = v - i + dot(i, C.xxx);
|
||||||
|
|
||||||
|
// Other corners
|
||||||
|
vec3 g = step(x0.yzx, x0.xyz);
|
||||||
|
vec3 l = 1.0 - g;
|
||||||
|
vec3 i1 = min(g.xyz, l.zxy);
|
||||||
|
vec3 i2 = max(g.xyz, l.zxy);
|
||||||
|
|
||||||
|
// x0 = x0 - 0.0 + 0.0 * C.xxx;
|
||||||
|
// x1 = x0 - i1 + 1.0 * C.xxx;
|
||||||
|
// x2 = x0 - i2 + 2.0 * C.xxx;
|
||||||
|
// x3 = x0 - 1.0 + 3.0 * C.xxx;
|
||||||
|
vec3 x1 = x0 - i1 + C.xxx;
|
||||||
|
vec3 x2 = x0 - i2 + C.yyy; // 2.0*C.x = 1/3 = C.y
|
||||||
|
vec3 x3 = x0 - D.yyy; // -1.0+3.0*C.x = -0.5 = -D.y
|
||||||
|
|
||||||
|
// Permutations
|
||||||
|
i = mod289(i);
|
||||||
|
vec4 p = permute(permute(permute(i.z + vec4(0.0, i1.z, i2.z, 1.0)) + i.y +
|
||||||
|
vec4(0.0, i1.y, i2.y, 1.0)) +
|
||||||
|
i.x + vec4(0.0, i1.x, i2.x, 1.0));
|
||||||
|
|
||||||
|
// Gradients: 7x7 points over a square, mapped onto an octahedron.
|
||||||
|
// The ring size 17*17 = 289 is close to a multiple of 49 (49*6 = 294)
|
||||||
|
float n_ = 0.142857142857; // 1.0/7.0
|
||||||
|
vec3 ns = n_ * D.wyz - D.xzx;
|
||||||
|
|
||||||
|
vec4 j = p - 49.0 * floor(p * ns.z * ns.z); // mod(p,7*7)
|
||||||
|
|
||||||
|
vec4 x_ = floor(j * ns.z);
|
||||||
|
vec4 y_ = floor(j - 7.0 * x_); // mod(j,N)
|
||||||
|
|
||||||
|
vec4 x = x_ * ns.x + ns.yyyy;
|
||||||
|
vec4 y = y_ * ns.x + ns.yyyy;
|
||||||
|
vec4 h = 1.0 - abs(x) - abs(y);
|
||||||
|
|
||||||
|
vec4 b0 = vec4(x.xy, y.xy);
|
||||||
|
vec4 b1 = vec4(x.zw, y.zw);
|
||||||
|
|
||||||
|
// vec4 s0 = vec4(lessThan(b0,0.0))*2.0 - 1.0;
|
||||||
|
// vec4 s1 = vec4(lessThan(b1,0.0))*2.0 - 1.0;
|
||||||
|
vec4 s0 = floor(b0) * 2.0 + 1.0;
|
||||||
|
vec4 s1 = floor(b1) * 2.0 + 1.0;
|
||||||
|
vec4 sh = -step(h, vec4(0.0));
|
||||||
|
|
||||||
|
vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
|
||||||
|
vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
|
||||||
|
|
||||||
|
vec3 p0 = vec3(a0.xy, h.x);
|
||||||
|
vec3 p1 = vec3(a0.zw, h.y);
|
||||||
|
vec3 p2 = vec3(a1.xy, h.z);
|
||||||
|
vec3 p3 = vec3(a1.zw, h.w);
|
||||||
|
|
||||||
|
// Normalise gradients
|
||||||
|
vec4 norm =
|
||||||
|
taylorInvSqrt(vec4(dot(p0, p0), dot(p1, p1), dot(p2, p2), dot(p3, p3)));
|
||||||
|
p0 *= norm.x;
|
||||||
|
p1 *= norm.y;
|
||||||
|
p2 *= norm.z;
|
||||||
|
p3 *= norm.w;
|
||||||
|
|
||||||
|
// Mix final noise value
|
||||||
|
vec4 m =
|
||||||
|
max(0.5 - vec4(dot(x0, x0), dot(x1, x1), dot(x2, x2), dot(x3, x3)), 0.0);
|
||||||
|
m = m * m;
|
||||||
|
return 105.0 *
|
||||||
|
dot(m * m, vec4(dot(p0, x0), dot(p1, x1), dot(p2, x2), dot(p3, x3)));
|
||||||
|
}
|
||||||
|
|
||||||
|
float noise2D(vec2 uv) {
|
||||||
|
uvec2 pos = uvec2(floor(uv * 1000.));
|
||||||
|
return float((pos.x * 68657387u ^ pos.y * 361524851u + pos.x) % 890129u) *
|
||||||
|
(1.0 / 890128.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
float roundRectSDF(vec2 center, vec2 size, float radius) {
|
||||||
|
return length(max(abs(center) - size + radius, 0.)) - radius;
|
||||||
|
}
|
||||||
|
|
||||||
|
void mainImage(out vec4 fragColor, in vec2 fragCoord) {
|
||||||
|
vec2 uv = fragCoord / iResolution.xy, sd = vec2(2.), sdh = vec2(1.);
|
||||||
|
vec4 ghosttyCol = texture(iChannel0, uv);
|
||||||
|
float ratio = iResolution.y / iResolution.x,
|
||||||
|
fw = max(fwidth(uv.x), fwidth(uv.y));
|
||||||
|
|
||||||
|
vec2 puv = floor(uv * vec2(60., 60. * ratio)) / 60.;
|
||||||
|
puv +=
|
||||||
|
(smoothstep(0., 0.7, noise2D(puv)) - 0.5) * 0.05 - vec2(0., iTime * 0.08);
|
||||||
|
|
||||||
|
uv = fract(vec2(uv.x, uv.y * ratio) * 10.);
|
||||||
|
float d = roundRectSDF((sd + 0.01) * (uv - .5), sdh, 0.075),
|
||||||
|
d2 = roundRectSDF((sd + 0.065) * (fract(uv * 6.) - .5), sdh, 0.2),
|
||||||
|
noiseTime = iTime * 0.03, noise = snoise(vec3(puv, noiseTime));
|
||||||
|
|
||||||
|
noise += snoise(vec3(puv * 1.1, noiseTime + 0.5)) + .1;
|
||||||
|
noise += snoise(vec3(puv * 2., noiseTime + 0.8));
|
||||||
|
noise = pow(noise, 2.);
|
||||||
|
|
||||||
|
vec3 col1 = vec3(0.), col2 = vec3(0.), col3 = vec3(0.07898),
|
||||||
|
col4 = vec3(0.089184),
|
||||||
|
fcol = mix(mix(mix(col1, col3, smoothstep(0.0, 0.3, noise)), col2,
|
||||||
|
smoothstep(0.0, 0.5, noise)),
|
||||||
|
col4, smoothstep(0.0, 1.0, noise));
|
||||||
|
|
||||||
|
fragColor = vec4(
|
||||||
|
ghosttyCol.rgb +
|
||||||
|
mix(col4, fcol, smoothstep(fw, -fw, d) * smoothstep(fw, -fw, d2)),
|
||||||
|
ghosttyCol.a);
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,18 @@
|
||||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||||
if not vim.loop.fs_stat(lazypath) then
|
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||||
-- bootstrap lazy.nvim
|
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||||
-- stylua: ignore
|
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||||
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
|
if vim.v.shell_error ~= 0 then
|
||||||
|
vim.api.nvim_echo({
|
||||||
|
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||||
|
{ out, "WarningMsg" },
|
||||||
|
{ "\nPress any key to exit..." },
|
||||||
|
}, true, {})
|
||||||
|
vim.fn.getchar()
|
||||||
|
os.exit(1)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
|
vim.opt.rtp:prepend(lazypath)
|
||||||
|
|
||||||
require("lazy").setup({
|
require("lazy").setup({
|
||||||
spec = {
|
spec = {
|
||||||
|
|
@ -34,18 +42,15 @@ require("lazy").setup({
|
||||||
{ import = "lazyvim.plugins.extras.lang.toml" },
|
{ import = "lazyvim.plugins.extras.lang.toml" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.yaml" },
|
{ import = "lazyvim.plugins.extras.lang.yaml" },
|
||||||
{ import = "lazyvim.plugins.extras.linting.eslint" },
|
{ import = "lazyvim.plugins.extras.linting.eslint" },
|
||||||
{ import = "lazyvim.plugins.extras.ui.alpha" },
|
|
||||||
{ import = "lazyvim.plugins.extras.ui.dashboard-nvim" },
|
{ import = "lazyvim.plugins.extras.ui.dashboard-nvim" },
|
||||||
{ import = "lazyvim.plugins.extras.ui.edgy" },
|
{ import = "lazyvim.plugins.extras.ui.edgy" },
|
||||||
{ import = "lazyvim.plugins.extras.ui.mini-animate" },
|
{ import = "lazyvim.plugins.extras.ui.mini-animate" },
|
||||||
{ import = "lazyvim.plugins.extras.ui.mini-indentscope" },
|
{ import = "lazyvim.plugins.extras.ui.mini-indentscope" },
|
||||||
{ import = "lazyvim.plugins.extras.ui.mini-starter" },
|
|
||||||
{ import = "lazyvim.plugins.extras.ui.smear-cursor" },
|
{ import = "lazyvim.plugins.extras.ui.smear-cursor" },
|
||||||
{ import = "lazyvim.plugins.extras.ui.treesitter-context" },
|
{ import = "lazyvim.plugins.extras.ui.treesitter-context" },
|
||||||
{ import = "lazyvim.plugins.extras.util.dot" },
|
{ import = "lazyvim.plugins.extras.util.dot" },
|
||||||
{ import = "lazyvim.plugins.extras.util.mini-hipatterns" },
|
{ import = "lazyvim.plugins.extras.util.mini-hipatterns" },
|
||||||
{ import = "lazyvim.plugins.extras.util.project" },
|
{ import = "lazyvim.plugins.extras.util.project" },
|
||||||
{ import = "lazyvim.plugins.extras.vscode" },
|
|
||||||
-- import/override with your plugins
|
-- import/override with your plugins
|
||||||
{ import = "plugins" },
|
{ import = "plugins" },
|
||||||
},
|
},
|
||||||
|
|
@ -59,7 +64,7 @@ require("lazy").setup({
|
||||||
-- version = "*", -- try installing the latest stable version for plugins that support semver
|
-- version = "*", -- try installing the latest stable version for plugins that support semver
|
||||||
},
|
},
|
||||||
install = { colorscheme = { "tokyonight", "habamax" } },
|
install = { colorscheme = { "tokyonight", "habamax" } },
|
||||||
checker = { enabled = true }, -- automatically check for plugin updates
|
checker = { enabled = true, notify = false }, -- automatically check for plugin updates
|
||||||
performance = {
|
performance = {
|
||||||
rtp = {
|
rtp = {
|
||||||
-- disable some rtp plugins
|
-- disable some rtp plugins
|
||||||
|
|
|
||||||
24
home/config/scripts/getIcons.sh
Normal file
24
home/config/scripts/getIcons.sh
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
get_icons() {
|
||||||
|
local session_name="$1"
|
||||||
|
local result=""
|
||||||
|
|
||||||
|
local panes=($(tmux list-panes -t "$session_name" -F '#{pane_current_command}'))
|
||||||
|
|
||||||
|
for i in "${panes[@]}"; do
|
||||||
|
case "$i" in
|
||||||
|
nvim) result+=" " ;;
|
||||||
|
zsh | *) result+=" " ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "$result"
|
||||||
|
}
|
||||||
|
|
||||||
|
if (($# != 1)); then
|
||||||
|
echo "Usage: $0 <session-name>"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
get_icons "$1"
|
||||||
|
|
@ -57,7 +57,8 @@
|
||||||
stylua
|
stylua
|
||||||
lazygit
|
lazygit
|
||||||
lua51Packages.lua
|
lua51Packages.lua
|
||||||
luajitPackages.magick # neovim
|
lua51Packages.luarocks
|
||||||
|
luajitPackages.magick
|
||||||
vimPlugins.neomake
|
vimPlugins.neomake
|
||||||
|
|
||||||
# Shell
|
# Shell
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, config, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
getIconScript = pkgs.writeShellScriptBin "get-icon" (builtins.readFile ../../home/config/scripts/getIcons.sh);
|
||||||
|
in
|
||||||
{
|
{
|
||||||
programs = {
|
programs = {
|
||||||
gnupg = {
|
gnupg = {
|
||||||
|
|
@ -21,12 +24,25 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
set -gq allow-passthrough on
|
||||||
|
set -g status "on"
|
||||||
|
set -g status-style fg=default,bg=default
|
||||||
|
set -g status-position top
|
||||||
|
set -g status-justify "left"
|
||||||
|
|
||||||
|
set -g status-left "#[fg=#84977f,bg=default,bold] █ session: #S"
|
||||||
|
set -g status-right " #[fg=#828bb8,bg=default,bold]${config.networking.hostName} "
|
||||||
|
|
||||||
|
setw -g window-status-format "#[bg=default] #[fg=#495361,bg=default]#(${getIconScript}/get-icon #I) #W"
|
||||||
|
setw -g window-status-current-format "#[bg=default] #[fg=#7e93a9,bg=default,bold]#(${getIconScript}/get-icon #I) #W"
|
||||||
|
|
||||||
|
|
||||||
set -g default-terminal "xterm-256color"
|
set -g default-terminal "xterm-256color"
|
||||||
set -ga terminal-overrides ",*256col*:Tc"
|
set -ga terminal-overrides ",*256col*:Tc"
|
||||||
set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
|
set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
|
||||||
set-environment -g COLORTERM "truecolor"
|
set-environment -g COLORTERM "truecolor"
|
||||||
set -g prefix C-a
|
set -g prefix C-b
|
||||||
bind-key C-a send-prefix
|
bind-key C-b send-prefix
|
||||||
|
|
||||||
unbind %
|
unbind %
|
||||||
bind | split-window -h
|
bind | split-window -h
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue