Format code

This commit is contained in:
2024-08-26 22:17:30 +01:00
parent d76d709a8d
commit 290ec9a403
15 changed files with 1074 additions and 947 deletions

View File

@@ -1,5 +1,5 @@
export EDITOR="nvim"; export EDITOR="nvim"
export PS1="\n[\[\e[37m\]\u\[\e[0m\]@\[\e[37;2m\]\h\[\e[0m\]] \[\e[1m\]\w \[\e[0;2m\]J:\[\e[0m\]\j\n\$ "; export PS1="\n[\[\e[37m\]\u\[\e[0m\]@\[\e[37;2m\]\h\[\e[0m\]] \[\e[1m\]\w \[\e[0;2m\]J:\[\e[0m\]\j\n\$ "
extract() { extract() {
if [ -f $1 ]; then if [ -f $1 ]; then
@@ -35,37 +35,40 @@ pushall() {
fi fi
} }
hex2color(){ hex2color() {
hex=${1#"#"} hex=${1#"#"}
r=$(printf '0x%0.2s' "$hex") r=$(printf '0x%0.2s' "$hex")
g=$(printf '0x%0.2s' ${hex#??}) g=$(printf '0x%0.2s' ${hex#??})
b=$(printf '0x%0.2s' ${hex#????}) b=$(printf '0x%0.2s' ${hex#????})
printf '%03d' "$(( (r<75?0:(r-35)/40)*6*6 + printf '%03d' "$(((r < 75 ? 0 : (r - 35) / 40) * 6 * 6 + (\
(g<75?0:(g-35)/40)*6 + g < 75 ? 0 : (g - 35) / 40) * 6 + (\
(b<75?0:(b-35)/40) + 16 ))" b < 75 ? 0 : (b - 35) / 40) + 16))"
} }
color2hex(){ color2hex() {
dec=$(($1%256)) ### input must be a number in range 0-255. dec=$(($1 % 256)) ### input must be a number in range 0-255.
if [ "$dec" -lt "16" ]; then if [ "$dec" -lt "16" ]; then
bas=$(( dec%16 )) bas=$((dec % 16))
mul=128 mul=128
[ "$bas" -eq "7" ] && mul=192 [ "$bas" -eq "7" ] && mul=192
[ "$bas" -eq "8" ] && bas=7 [ "$bas" -eq "8" ] && bas=7
[ "$bas" -gt "8" ] && mul=255 [ "$bas" -gt "8" ] && mul=255
a="$(( (bas&1) *mul ))" a="$(((bas & 1) * mul))"
b="$(( ((bas&2)>>1)*mul ))" b="$((((bas & 2) >> 1) * mul))"
c="$(( ((bas&4)>>2)*mul ))" c="$((((bas & 4) >> 2) * mul))"
printf 'dec= %3s basic= #%02x%02x%02x\n' "$dec" "$a" "$b" "$c" printf 'dec= %3s basic= #%02x%02x%02x\n' "$dec" "$a" "$b" "$c"
elif [ "$dec" -gt 15 ] && [ "$dec" -lt 232 ]; then elif [ "$dec" -gt 15 ] && [ "$dec" -lt 232 ]; then
b=$(( (dec-16)%6 )); b=$(( b==0?0: b*40 + 55 )) b=$(((dec - 16) % 6))
g=$(( (dec-16)/6%6)); g=$(( g==0?0: g*40 + 55 )) b=$((b == 0 ? 0 : b * 40 + 55))
r=$(( (dec-16)/36 )); r=$(( r==0?0: r*40 + 55 )) g=$(((dec - 16) / 6 % 6))
printf 'dec= %3s color= #%02x%02x%02x\n' "$dec" "$r" "$g" "$b" g=$((g == 0 ? 0 : g * 40 + 55))
else r=$(((dec - 16) / 36))
gray=$(( (dec-232)*10+8 )) r=$((r == 0 ? 0 : r * 40 + 55))
printf 'dec= %3s gray= #%02x%02x%02x\n' "$dec" "$gray" "$gray" "$gray" printf 'dec= %3s color= #%02x%02x%02x\n' "$dec" "$r" "$g" "$b"
fi else
gray=$(((dec - 232) * 10 + 8))
printf 'dec= %3s gray= #%02x%02x%02x\n' "$dec" "$gray" "$gray" "$gray"
fi
} }
# Commands that should be applied only for interactive shells. # Commands that should be applied only for interactive shells.
@@ -92,8 +95,8 @@ alias cpp='rsync -ah --progress'
set completion-ignore-case On set completion-ignore-case On
# Use bash-completion, if available # Use bash-completion, if available
[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \ [[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] &&
. /usr/share/bash-completion/bash_completion . /usr/share/bash-completion/bash_completion
export OFLAGS="--ozone-platform-hint=auto" export OFLAGS="--ozone-platform-hint=auto"

View File

@@ -3,9 +3,8 @@ email = "ehtrude@gmail.com"
name = "TrudeEH" name = "TrudeEH"
[credential "https://github.com"] [credential "https://github.com"]
helper = helper =
helper = !/usr/bin/gh auth git-credential helper = !/usr/bin/gh auth git-credential
[credential "https://gist.github.com"] [credential "https://gist.github.com"]
helper = helper =
helper = !/usr/bin/gh auth git-credential helper = !/usr/bin/gh auth git-credential

File diff suppressed because it is too large Load Diff

View File

@@ -3,16 +3,14 @@
-- This file is not required for your own configuration, -- This file is not required for your own configuration,
-- but helps people determine if their system is setup correctly. -- but helps people determine if their system is setup correctly.
-- --
--]] --]] local check_version = function()
local check_version = function()
local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch) local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch)
if not vim.version.cmp then if not vim.version.cmp then
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
return return
end end
if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then if vim.version.cmp(vim.version(), {0, 9, 4}) >= 0 then
vim.health.ok(string.format("Neovim version is: '%s'", verstr)) vim.health.ok(string.format("Neovim version is: '%s'", verstr))
else else
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
@@ -21,7 +19,7 @@ end
local check_external_reqs = function() local check_external_reqs = function()
-- Basic utils: `git`, `make`, `unzip` -- Basic utils: `git`, `make`, `unzip`
for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do for _, exe in ipairs {'git', 'make', 'unzip', 'rg'} do
local is_executable = vim.fn.executable(exe) == 1 local is_executable = vim.fn.executable(exe) == 1
if is_executable then if is_executable then
vim.health.ok(string.format("Found executable: '%s'", exe)) vim.health.ok(string.format("Found executable: '%s'", exe))
@@ -48,5 +46,5 @@ return {
check_version() check_version()
check_external_reqs() check_external_reqs()
end, end
} }

View File

@@ -5,25 +5,15 @@
-- Primarily focused on configuring the debugger for Go, but can -- Primarily focused on configuring the debugger for Go, but can
-- be extended to other languages as well. That's why it's called -- be extended to other languages as well. That's why it's called
-- kickstart.nvim and not kitchen-sink.nvim ;) -- kickstart.nvim and not kitchen-sink.nvim ;)
return { return {
-- NOTE: Yes, you can install new plugins here! -- NOTE: Yes, you can install new plugins here!
'mfussenegger/nvim-dap', 'mfussenegger/nvim-dap',
-- NOTE: And you can specify dependencies as well -- NOTE: And you can specify dependencies as well
dependencies = { dependencies = { -- Creates a beautiful debugger UI
-- Creates a beautiful debugger UI 'rcarriga/nvim-dap-ui', -- Required dependency for nvim-dap-ui
'rcarriga/nvim-dap-ui', 'nvim-neotest/nvim-nio', -- Installs the debug adapters for you
'williamboman/mason.nvim', 'jay-babu/mason-nvim-dap.nvim', -- Add your own debuggers here
-- Required dependency for nvim-dap-ui 'leoluz/nvim-dap-go'},
'nvim-neotest/nvim-nio',
-- Installs the debug adapters for you
'williamboman/mason.nvim',
'jay-babu/mason-nvim-dap.nvim',
-- Add your own debuggers here
'leoluz/nvim-dap-go',
},
config = function() config = function()
local dap = require 'dap' local dap = require 'dap'
local dapui = require 'dapui' local dapui = require 'dapui'
@@ -39,21 +29,31 @@ return {
-- You'll need to check that you have the required things installed -- You'll need to check that you have the required things installed
-- online, please don't ask me how to install them :) -- online, please don't ask me how to install them :)
ensure_installed = { ensure_installed = { -- Update this to ensure that you have the debuggers for the langs you want
-- Update this to ensure that you have the debuggers for the langs you want 'delve'}
'delve',
},
} }
-- Basic debugging keymaps, feel free to change to your liking! -- Basic debugging keymaps, feel free to change to your liking!
vim.keymap.set('n', '<F5>', dap.continue, { desc = 'Debug: Start/Continue' }) vim.keymap.set('n', '<F5>', dap.continue, {
vim.keymap.set('n', '<F1>', dap.step_into, { desc = 'Debug: Step Into' }) desc = 'Debug: Start/Continue'
vim.keymap.set('n', '<F2>', dap.step_over, { desc = 'Debug: Step Over' }) })
vim.keymap.set('n', '<F3>', dap.step_out, { desc = 'Debug: Step Out' }) vim.keymap.set('n', '<F1>', dap.step_into, {
vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' }) desc = 'Debug: Step Into'
})
vim.keymap.set('n', '<F2>', dap.step_over, {
desc = 'Debug: Step Over'
})
vim.keymap.set('n', '<F3>', dap.step_out, {
desc = 'Debug: Step Out'
})
vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint, {
desc = 'Debug: Toggle Breakpoint'
})
vim.keymap.set('n', '<leader>B', function() vim.keymap.set('n', '<leader>B', function()
dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
end, { desc = 'Debug: Set Breakpoint' }) end, {
desc = 'Debug: Set Breakpoint'
})
-- Dap UI setup -- Dap UI setup
-- For more information, see |:help nvim-dap-ui| -- For more information, see |:help nvim-dap-ui|
@@ -61,7 +61,11 @@ return {
-- Set icons to characters that are more likely to work in every terminal. -- Set icons to characters that are more likely to work in every terminal.
-- Feel free to remove or use ones that you like more! :) -- Feel free to remove or use ones that you like more! :)
-- Don't feel like these are good choices. -- Don't feel like these are good choices.
icons = { expanded = '', collapsed = '', current_frame = '*' }, icons = {
expanded = '',
collapsed = '',
current_frame = '*'
},
controls = { controls = {
icons = { icons = {
pause = '', pause = '',
@@ -72,13 +76,15 @@ return {
step_back = 'b', step_back = 'b',
run_last = '▶▶', run_last = '▶▶',
terminate = '', terminate = '',
disconnect = '', disconnect = ''
}, }
}, }
} }
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
vim.keymap.set('n', '<F7>', dapui.toggle, { desc = 'Debug: See last session result.' }) vim.keymap.set('n', '<F7>', dapui.toggle, {
desc = 'Debug: See last session result.'
})
dap.listeners.after.event_initialized['dapui_config'] = dapui.open dap.listeners.after.event_initialized['dapui_config'] = dapui.open
dap.listeners.before.event_terminated['dapui_config'] = dapui.close dap.listeners.before.event_terminated['dapui_config'] = dapui.close
@@ -89,8 +95,8 @@ return {
delve = { delve = {
-- On Windows delve must be run attached or it crashes. -- On Windows delve must be run attached or it crashes.
-- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
detached = vim.fn.has 'win32' == 0, detached = vim.fn.has 'win32' == 0
}, }
} }
end, end
} }

View File

@@ -1,61 +1,94 @@
-- Adds git related signs to the gutter, as well as utilities for managing changes -- Adds git related signs to the gutter, as well as utilities for managing changes
-- NOTE: gitsigns is already included in init.lua but contains only the base -- NOTE: gitsigns is already included in init.lua but contains only the base
-- config. This will add also the recommended keymaps. -- config. This will add also the recommended keymaps.
return {{
'lewis6991/gitsigns.nvim',
opts = {
on_attach = function(bufnr)
local gitsigns = require 'gitsigns'
return { local function map(mode, l, r, opts)
{ opts = opts or {}
'lewis6991/gitsigns.nvim', opts.buffer = bufnr
opts = { vim.keymap.set(mode, l, r, opts)
on_attach = function(bufnr) end
local gitsigns = require 'gitsigns'
local function map(mode, l, r, opts) -- Navigation
opts = opts or {} map('n', ']c', function()
opts.buffer = bufnr if vim.wo.diff then
vim.keymap.set(mode, l, r, opts) vim.cmd.normal {
']c',
bang = true
}
else
gitsigns.nav_hunk 'next'
end end
end, {
desc = 'Jump to next git [c]hange'
})
-- Navigation map('n', '[c', function()
map('n', ']c', function() if vim.wo.diff then
if vim.wo.diff then vim.cmd.normal {
vim.cmd.normal { ']c', bang = true } '[c',
else bang = true
gitsigns.nav_hunk 'next' }
end else
end, { desc = 'Jump to next git [c]hange' }) gitsigns.nav_hunk 'prev'
end
end, {
desc = 'Jump to previous git [c]hange'
})
map('n', '[c', function() -- Actions
if vim.wo.diff then -- visual mode
vim.cmd.normal { '[c', bang = true } map('v', '<leader>hs', function()
else gitsigns.stage_hunk {vim.fn.line '.', vim.fn.line 'v'}
gitsigns.nav_hunk 'prev' end, {
end desc = 'stage git hunk'
end, { desc = 'Jump to previous git [c]hange' }) })
map('v', '<leader>hr', function()
-- Actions gitsigns.reset_hunk {vim.fn.line '.', vim.fn.line 'v'}
-- visual mode end, {
map('v', '<leader>hs', function() desc = 'reset git hunk'
gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } })
end, { desc = 'stage git hunk' }) -- normal mode
map('v', '<leader>hr', function() map('n', '<leader>hs', gitsigns.stage_hunk, {
gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } desc = 'git [s]tage hunk'
end, { desc = 'reset git hunk' }) })
-- normal mode map('n', '<leader>hr', gitsigns.reset_hunk, {
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) desc = 'git [r]eset hunk'
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) })
map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) map('n', '<leader>hS', gitsigns.stage_buffer, {
map('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) desc = 'git [S]tage buffer'
map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) })
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) map('n', '<leader>hu', gitsigns.undo_stage_hunk, {
map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) desc = 'git [u]ndo stage hunk'
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) })
map('n', '<leader>hD', function() map('n', '<leader>hR', gitsigns.reset_buffer, {
gitsigns.diffthis '@' desc = 'git [R]eset buffer'
end, { desc = 'git [D]iff against last commit' }) })
-- Toggles map('n', '<leader>hp', gitsigns.preview_hunk, {
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) desc = 'git [p]review hunk'
map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) })
end, map('n', '<leader>hb', gitsigns.blame_line, {
}, desc = 'git [b]lame line'
}, })
} map('n', '<leader>hd', gitsigns.diffthis, {
desc = 'git [d]iff against index'
})
map('n', '<leader>hD', function()
gitsigns.diffthis '@'
end, {
desc = 'git [D]iff against last commit'
})
-- Toggles
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, {
desc = '[T]oggle git show [b]lame line'
})
map('n', '<leader>tD', gitsigns.toggle_deleted, {
desc = '[T]oggle git show [D]eleted'
})
end
}
}}

View File

@@ -1,9 +1,7 @@
return { return {{ -- Add indentation guides even on blank lines
{ -- Add indentation guides even on blank lines 'lukas-reineke/indent-blankline.nvim',
'lukas-reineke/indent-blankline.nvim', -- Enable `lukas-reineke/indent-blankline.nvim`
-- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help ibl`
-- See `:help ibl` main = 'ibl',
main = 'ibl', opts = {}
opts = {}, }}
},
}

View File

@@ -1,55 +1,54 @@
return { return {{ -- Linting
'mfussenegger/nvim-lint',
event = {'BufReadPre', 'BufNewFile'},
config = function()
local lint = require 'lint'
lint.linters_by_ft = {
markdown = {'markdownlint'}
}
{ -- Linting -- To allow other plugins to add linters to require('lint').linters_by_ft,
'mfussenegger/nvim-lint', -- instead set linters_by_ft like this:
event = { 'BufReadPre', 'BufNewFile' }, -- lint.linters_by_ft = lint.linters_by_ft or {}
config = function() -- lint.linters_by_ft['markdown'] = { 'markdownlint' }
local lint = require 'lint' --
lint.linters_by_ft = { -- However, note that this will enable a set of default linters,
markdown = { 'markdownlint' }, -- which will cause errors unless these tools are available:
} -- {
-- clojure = { "clj-kondo" },
-- dockerfile = { "hadolint" },
-- inko = { "inko" },
-- janet = { "janet" },
-- json = { "jsonlint" },
-- markdown = { "vale" },
-- rst = { "vale" },
-- ruby = { "ruby" },
-- terraform = { "tflint" },
-- text = { "vale" }
-- }
--
-- You can disable the default linters by setting their filetypes to nil:
-- lint.linters_by_ft['clojure'] = nil
-- lint.linters_by_ft['dockerfile'] = nil
-- lint.linters_by_ft['inko'] = nil
-- lint.linters_by_ft['janet'] = nil
-- lint.linters_by_ft['json'] = nil
-- lint.linters_by_ft['markdown'] = nil
-- lint.linters_by_ft['rst'] = nil
-- lint.linters_by_ft['ruby'] = nil
-- lint.linters_by_ft['terraform'] = nil
-- lint.linters_by_ft['text'] = nil
-- To allow other plugins to add linters to require('lint').linters_by_ft, -- Create autocommand which carries out the actual linting
-- instead set linters_by_ft like this: -- on the specified events.
-- lint.linters_by_ft = lint.linters_by_ft or {} local lint_augroup = vim.api.nvim_create_augroup('lint', {
-- lint.linters_by_ft['markdown'] = { 'markdownlint' } clear = true
-- })
-- However, note that this will enable a set of default linters, vim.api.nvim_create_autocmd({'BufEnter', 'BufWritePost', 'InsertLeave'}, {
-- which will cause errors unless these tools are available: group = lint_augroup,
-- { callback = function()
-- clojure = { "clj-kondo" }, require('lint').try_lint()
-- dockerfile = { "hadolint" }, end
-- inko = { "inko" }, })
-- janet = { "janet" }, end
-- json = { "jsonlint" }, }}
-- markdown = { "vale" },
-- rst = { "vale" },
-- ruby = { "ruby" },
-- terraform = { "tflint" },
-- text = { "vale" }
-- }
--
-- You can disable the default linters by setting their filetypes to nil:
-- lint.linters_by_ft['clojure'] = nil
-- lint.linters_by_ft['dockerfile'] = nil
-- lint.linters_by_ft['inko'] = nil
-- lint.linters_by_ft['janet'] = nil
-- lint.linters_by_ft['json'] = nil
-- lint.linters_by_ft['markdown'] = nil
-- lint.linters_by_ft['rst'] = nil
-- lint.linters_by_ft['ruby'] = nil
-- lint.linters_by_ft['terraform'] = nil
-- lint.linters_by_ft['text'] = nil
-- Create autocommand which carries out the actual linting
-- on the specified events.
local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
group = lint_augroup,
callback = function()
require('lint').try_lint()
end,
})
end,
},
}

View File

@@ -1,25 +1,21 @@
-- Neo-tree is a Neovim plugin to browse the file system -- Neo-tree is a Neovim plugin to browse the file system
-- https://github.com/nvim-neo-tree/neo-tree.nvim -- https://github.com/nvim-neo-tree/neo-tree.nvim
return { return {
'nvim-neo-tree/neo-tree.nvim', 'nvim-neo-tree/neo-tree.nvim',
version = '*', version = '*',
dependencies = { dependencies = {'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
'nvim-lua/plenary.nvim', 'MunifTanjim/nui.nvim'},
'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
'MunifTanjim/nui.nvim',
},
cmd = 'Neotree', cmd = 'Neotree',
keys = { keys = {{'\\', ':Neotree reveal<CR>', {
{ '\\', ':Neotree reveal<CR>', { desc = 'NeoTree reveal' } }, desc = 'NeoTree reveal'
}, }}},
opts = { opts = {
filesystem = { filesystem = {
window = { window = {
mappings = { mappings = {
['\\'] = 'close_window', ['\\'] = 'close_window'
}, }
}, }
}, }
}, }
} }

View File

@@ -1,11 +1,11 @@
backend = "glx"; backend = "glx"
glx-no-stencil = true; glx-no-stencil = true
glx-copy-from-front = false; glx-copy-from-front = false
# Opacity # Opacity
active-opacity = 1; active-opacity = 1
inactive-opacity = 1; inactive-opacity = 1
frame-opacity = 1; frame-opacity = 1
#inactive-opacity-override = false; #inactive-opacity-override = false;
#blur-background = false; #blur-background = false;
#blur-background-exclude = [ #blur-background-exclude = [
@@ -16,7 +16,7 @@ frame-opacity = 1;
#blur-strength = 8; #blur-strength = 8;
# Fading # Fading
fading = false; fading = false
#fade-delta = 2; #fade-delta = 2;
#no-fading-openclose = false; #no-fading-openclose = false;
@@ -27,8 +27,8 @@ fading = false;
#mark-ovredir-focused = true; #mark-ovredir-focused = true;
#detect-rounded-corners = true; #detect-rounded-corners = true;
#detect-clien-opacity = true; #detect-clien-opacity = true;
vsync = true; vsync = true
dbe = false; dbe = false
#unredir-if-possible = false; #unredir-if-possible = false;
#focus-exclude = [ ]; #focus-exclude = [ ];
#detect-transient = true; #detect-transient = true;
@@ -44,10 +44,10 @@ dbe = false;
# Window transparency # Window transparency
opacity-rule = [ opacity-rule = [
#"90:class_g = 'st'", #"90:class_g = 'st'",
]; ]
shadow = false; shadow = false
#shadow-radius = 12; #shadow-radius = 12;
#shadow-offset-x = -5; #shadow-offset-x = -5;
#shadow-offset-y = -5; #shadow-offset-y = -5;
@@ -58,4 +58,4 @@ shadow = false;
#corner-radius = 0; #corner-radius = 0;
xrender-sync-fence = true; xrender-sync-fence = true

View File

@@ -1,18 +1,18 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css" />
<title>Homepage</title> <title>Homepage</title>
</head> </head>
<body> <body>
<div class="clock" id="clock"> <div class="clock" id="clock">
<span id="clock-text"></span> <span id="clock-text"></span>
</div> </div>
<div class="date" id="date"> <div class="date" id="date">
<span id="date-text"></span> <span id="date-text"></span>
</div> </div>
<script src="script.js"></script> <script src="script.js"></script>
</body> </body>
</html> </html>

View File

@@ -1,7 +1,7 @@
// Load the config.json file (using JavaScript vanilla) // Load the config.json file (using JavaScript vanilla)
let clock_text = document.getElementById('clock-text'); let clock_text = document.getElementById("clock-text");
let date_text = document.getElementById('date-text'); let date_text = document.getElementById("date-text");
displayTime(); displayTime();
setInterval(displayTime, 1000); setInterval(displayTime, 1000);
@@ -12,20 +12,28 @@ function displayTime() {
let date = new Date(); let date = new Date();
let hours = date.getHours(); let hours = date.getHours();
let minutes = date.getMinutes(); let minutes = date.getMinutes();
let ampm = hours >= 12 ? 'PM' : 'AM'; let ampm = hours >= 12 ? "PM" : "AM";
hours = hours % 12; hours = hours % 12;
hours = hours ? hours : 12; hours = hours ? hours : 12;
minutes = minutes < 10 ? '0'+minutes : minutes; minutes = minutes < 10 ? "0" + minutes : minutes;
let time = hours + ":" + minutes + " " + ampm; let time = hours + ":" + minutes + " " + ampm;
clock_text.innerHTML = time; clock_text.innerHTML = time;
} }
function displayDate() { function displayDate() {
let date = new Date(); let date = new Date();
let days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; let days = [
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday",
];
let day = days[date.getDay()]; let day = days[date.getDay()];
let dayNumber = date.getDate(); let dayNumber = date.getDate();
let month = date.toLocaleString('default', { month: 'long' }); let month = date.toLocaleString("default", { month: "long" });
let year = date.getFullYear(); let year = date.getFullYear();
if (dayNumber == 1 || dayNumber == 21 || dayNumber == 31) { if (dayNumber == 1 || dayNumber == 21 || dayNumber == 31) {
@@ -41,4 +49,3 @@ function displayDate() {
let dateText = day + ", " + dayNumber + " " + month + " " + year; let dateText = day + ", " + dayNumber + " " + month + " " + year;
date_text.innerHTML = dateText; date_text.innerHTML = dateText;
} }

View File

@@ -1,19 +1,21 @@
html, body { html,
font-family: "JetBrainsMono NF", system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; body {
color: #ebdbb2; font-family: "JetBrainsMono NF", system-ui, -apple-system, BlinkMacSystemFont,
text-align: center; "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue",
background: #282828; sans-serif;
height: 100%; color: #ebdbb2;
display: flex; text-align: center;
flex-direction: column; background: #282828;
justify-content: center; height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
} }
.clock { .clock {
font-size: 8rem; font-size: 8rem;
} }
.date { .date {
font-size: 2rem; font-size: 2rem;
} }

View File

@@ -2,18 +2,18 @@
# Sudo auth # Sudo auth
auth() { auth() {
echo "$sudopass" | sudo -S -k $* echo "$sudopass" | sudo -S -k $*
} }
export HISTIGNORE='*sudo -S*' export HISTIGNORE='*sudo -S*'
for (( ; ; )); do for (( ; ; )); do
sudopass=$(zenity --password) sudopass=$(zenity --password)
if [ -z "${sudopass}" ]; then if [ -z "${sudopass}" ]; then
exit exit
fi fi
auth echo "Test sudo password." auth echo "Test sudo password."
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
break break
fi fi
done done
if ! command -v zenity; then if ! command -v zenity; then
@@ -22,30 +22,30 @@ fi
# Update System # Update System
( (
auth apt-get update auth apt-get update
echo "20" echo "20"
echo "# Updating distro packages..." echo "# Updating distro packages..."
auth apt-get dist-upgrade -y auth apt-get dist-upgrade -y
echo "40" echo "40"
echo "# Updating installed packages..." echo "# Updating installed packages..."
auth apt-get upgrade -y auth apt-get upgrade -y
echo "60" echo "60"
echo "# Cleaning cache..." echo "# Cleaning cache..."
auth apt-get clean auth apt-get clean
echo "80" echo "80"
echo "# Removing unused dependencies..." echo "# Removing unused dependencies..."
auth apt-get autoremove -y auth apt-get autoremove -y
echo "100" echo "100"
) | ) |
zenity --progress --title="Update System" --text="Updating repositories..." --percentage=0 --no-cancel zenity --progress --title="Update System" --text="Updating repositories..." --percentage=0 --no-cancel
# Dotfiles # Dotfiles
zenity --question \ zenity --question \
--title="Dotfiles" \ --title="Dotfiles" \
--text="Apply Trude's configuration files?" --text="Apply Trude's configuration files?"
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
( (
auth apt-get install -y htop fzf git wget curl bash-completion auth apt-get install -y htop fzf git wget curl bash-completion
echo "20" echo "20"
echo "# Copying dotfiles..." echo "# Copying dotfiles..."
@@ -54,22 +54,22 @@ if [[ $? == 0 ]]; then
cp -vrf config-files/* $HOME cp -vrf config-files/* $HOME
echo "50" echo "50"
echo "# Configure GNOME/GTK..." echo "# Configure GNOME/GTK..."
dconf load -f / < ./settings.dconf dconf load -f / <./settings.dconf
echo "60" echo "60"
echo "# Reloading font cache..." echo "# Reloading font cache..."
fc-cache -f fc-cache -f
echo "100" echo "100"
) | ) |
zenity --progress --title="Configuration" --text="Installing common utilities..." --percentage=0 --no-cancel zenity --progress --title="Configuration" --text="Installing common utilities..." --percentage=0 --no-cancel
fi fi
# Flatpak # Flatpak
zenity --question \ zenity --question \
--title="Install Apps" \ --title="Install Apps" \
--text="Enable Flatpak support?" --text="Enable Flatpak support?"
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
( (
auth apt-get install -y flatpak auth apt-get install -y flatpak
echo "30" echo "30"
echo "# Install the gnome-software plugin..." echo "# Install the gnome-software plugin..."
@@ -81,7 +81,7 @@ if [[ $? == 0 ]]; then
echo "# Installing Adw GTK3 theme for flatpak apps..." echo "# Installing Adw GTK3 theme for flatpak apps..."
flatpak install org.gtk.Gtk3theme.adw-gtk3 org.gtk.Gtk3theme.adw-gtk3-dark flatpak install org.gtk.Gtk3theme.adw-gtk3 org.gtk.Gtk3theme.adw-gtk3-dark
echo "100" echo "100"
) | ) |
zenity --progress --title="Enabling Flatpak" --text="Installing Flatpak..." --percentage=0 --no-cancel zenity --progress --title="Enabling Flatpak" --text="Installing Flatpak..." --percentage=0 --no-cancel
fi fi
@@ -94,8 +94,7 @@ options=(
FALSE "Install Tailscale" FALSE "Install Tailscale"
FALSE "Install Firefox + Adw theme" FALSE "Install Firefox + Adw theme"
) )
checkbox=$(zenity --list --checklist --height=500\ checkbox=$(zenity --list --checklist --height=500 --title="Install Apps" \
--title="Install Apps" \
--column="Select" \ --column="Select" \
--column="Tasks" "${options[@]}") --column="Tasks" "${options[@]}")
readarray -td '|' choices < <(printf '%s' "$checkbox") readarray -td '|' choices < <(printf '%s' "$checkbox")
@@ -103,30 +102,30 @@ readarray -td '|' choices < <(printf '%s' "$checkbox")
for selection in "${choices[@]}"; do for selection in "${choices[@]}"; do
if [ "$selection" = "Install Neovim" ]; then if [ "$selection" = "Install Neovim" ]; then
( (
auth apt install -y ninja-build gettext cmake unzip curl build-essential auth apt install -y ninja-build gettext cmake unzip curl build-essential
echo "30" echo "30"
git clone https://github.com/neovim/neovim --depth 1 git clone https://github.com/neovim/neovim --depth 1
echo "50" echo "50"
cd neovim cd neovim
git checkout stable git checkout stable
echo "60" echo "60"
make CMAKE_BUILD_TYPE=RelWithDebInfo make CMAKE_BUILD_TYPE=RelWithDebInfo
echo "80" echo "80"
auth make install auth make install
cd .. cd ..
rm -rf neovim rm -rf neovim
echo "100" echo "100"
) | ) |
zenity --progress --title="Neovim" --text="Installing Neovim..." --percentage=0 --no-cancel zenity --progress --title="Neovim" --text="Installing Neovim..." --percentage=0 --no-cancel
fi fi
if [ "$selection" = "Install Zed" ]; then if [ "$selection" = "Install Zed" ]; then
zenity --notification --window-icon="info" --text="Installing Zed..." zenity --notification --window-icon="info" --text="Installing Zed..."
curl https://zed.dev/install.sh | sh curl https://zed.dev/install.sh | sh
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
zenity --notification --window-icon="info" --text="Zed is now installed." zenity --notification --window-icon="info" --text="Zed is now installed."
else else
zenity --notification --window-icon="error" --text="Zed failed to install." zenity --notification --window-icon="error" --text="Zed failed to install."
fi fi
fi fi
@@ -134,58 +133,58 @@ for selection in "${choices[@]}"; do
zenity --notification --window-icon="info" --text="Installing Ollama..." zenity --notification --window-icon="info" --text="Installing Ollama..."
curl -fsSL https://ollama.com/install.sh | sh curl -fsSL https://ollama.com/install.sh | sh
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
zenity --notification --window-icon="info" --text="Ollama is now installed." zenity --notification --window-icon="info" --text="Ollama is now installed."
else else
zenity --notification --window-icon="error" --text="Ollama failed to install." zenity --notification --window-icon="error" --text="Ollama failed to install."
fi fi
fi fi
if [ "$selection" = "Install GitHub CLI" ]; then if [ "$selection" = "Install GitHub CLI" ]; then
( (
auth apt-get install wget -y auth apt-get install wget -y
echo "20" echo "20"
auth mkdir -p -m 755 /etc/apt/keyrings auth mkdir -p -m 755 /etc/apt/keyrings
auth rm -f /etc/apt/sources.list.d/github-cli.list auth rm -f /etc/apt/sources.list.d/github-cli.list
wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | auth tee /etc/apt/keyrings/githubcli-archive-keyring.gpg wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | auth tee /etc/apt/keyrings/githubcli-archive-keyring.gpg
echo "40" echo "40"
auth chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg auth chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | auth tee /etc/apt/sources.list.d/github-cli.list echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | auth tee /etc/apt/sources.list.d/github-cli.list
auth apt-get update auth apt-get update
echo "60" echo "60"
auth apt-get install gh -y auth apt-get install gh -y
echo "100" echo "100"
) | ) |
zenity --progress --title="GitHub CLI" --text="Installing GitHub CLI..." --percentage=0 --no-cancel zenity --progress --title="GitHub CLI" --text="Installing GitHub CLI..." --percentage=0 --no-cancel
fi fi
if [ "$selection" = "Install Tailscale" ]; then if [ "$selection" = "Install Tailscale" ]; then
( (
curl -fsSL https://tailscale.com/install.sh | sh curl -fsSL https://tailscale.com/install.sh | sh
echo "80" echo "80"
auth tailscale up auth tailscale up
echo "100" echo "100"
) | ) |
zenity --progress --title="Tailscale" --text="Installing Tailscale..." --percentage=0 --no-cancel zenity --progress --title="Tailscale" --text="Installing Tailscale..." --percentage=0 --no-cancel
fi fi
if [ "$selection" = "Install Firefox + Adw theme" ]; then if [ "$selection" = "Install Firefox + Adw theme" ]; then
( (
auth apt install -y firefox-esr auth apt install -y firefox-esr
echo "60" echo "60"
firefox & firefox &
sleep 5 sleep 5
echo "80" echo "80"
echo "# Applying Adw theme..." echo "# Applying Adw theme..."
curl -s -o- https://raw.githubusercontent.com/rafaelmardojai/firefox-gnome-theme/master/scripts/install-by-curl.sh | bash curl -s -o- https://raw.githubusercontent.com/rafaelmardojai/firefox-gnome-theme/master/scripts/install-by-curl.sh | bash
echo "100" echo "100"
) | ) |
zenity --progress --title="Firefox" --text="Installing Firefox..." --percentage=0 --no-cancel zenity --progress --title="Firefox" --text="Installing Firefox..." --percentage=0 --no-cancel
fi fi
done done
# Flatpak Apps # Flatpak Apps
if command -v flatpak; then if command -v flatpak; then
options=( options=(
FALSE "io.github.mrvladus.List" "Errands (Tasks)" FALSE "io.github.mrvladus.List" "Errands (Tasks)"
FALSE "io.gitlab.news_flash.NewsFlash" "Newsflash (RSS)" FALSE "io.gitlab.news_flash.NewsFlash" "Newsflash (RSS)"
FALSE "org.gnome.gitlab.somas.Apostrophe" "Apostrophe (Markdown Editor)" FALSE "org.gnome.gitlab.somas.Apostrophe" "Apostrophe (Markdown Editor)"
@@ -203,26 +202,26 @@ if command -v flatpak; then
FALSE "re.sonny.Workbench" "Workbench" FALSE "re.sonny.Workbench" "Workbench"
FALSE "org.prismlauncher.PrismLauncher" "Prism Launcher" FALSE "org.prismlauncher.PrismLauncher" "Prism Launcher"
FALSE "md.obsidian.Obsidian" "Obsidian" FALSE "md.obsidian.Obsidian" "Obsidian"
) )
checkbox=$(zenity --list --checklist --width=800 --height=600 \ checkbox=$(zenity --list --checklist --width=800 --height=600 \
--title="Install Apps" \ --title="Install Apps" \
--column="Select" \ --column="Select" \
--column="App ID"\ --column="App ID" \
--column="App Name" "${options[@]}") --column="App Name" "${options[@]}")
readarray -td '|' choices < <(printf '%s' "$checkbox") readarray -td '|' choices < <(printf '%s' "$checkbox")
declare -i app_counter=0 declare -i app_counter=0
declare -i app_total="${#choices[@]}" declare -i app_total="${#choices[@]}"
for app in "${choices[@]}"; do for app in "${choices[@]}"; do
app_counter+=1 app_counter+=1
echo "Installing $app ($app_counter/$app_total)..." echo "Installing $app ($app_counter/$app_total)..."
zenity --notification --icon="info" --text="Installing $app ($app_counter/$app_total)..." zenity --notification --icon="info" --text="Installing $app ($app_counter/$app_total)..."
flatpak install -y flathub $app flatpak install -y flathub $app
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
zenity --notification --icon="info" --text="$app is now installed." zenity --notification --icon="info" --text="$app is now installed."
else else
zenity --notification --icon="error" --text="$app failed to install." zenity --notification --icon="error" --text="$app failed to install."
fi fi
done done
fi fi

View File

@@ -1,6 +1,6 @@
for i in {0..255} ; do for i in {0..255}; do
printf "\x1b[48;5;%sm%3d\e[0m " "$i" "$i" printf "\x1b[48;5;%sm%3d\e[0m " "$i" "$i"
if (( i == 15 )) || (( i > 15 )) && (( (i-15) % 6 == 0 )); then if ((i == 15)) || ((i > 15)) && (((i - 15) % 6 == 0)); then
printf "\n"; printf "\n"
fi fi
done done