tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

alpine: many changes

Browse source 
- updates
- snapserver
- graphana dashboards
- loki
- ddclient
- arr suite, jellyseer
- mautrix fixes
This commit is contained in:
Tristan 2025-01-18 00:18:11 +00:00
parent d1772cb4be
commit 123e7088f5
58 changed files with 2136 additions and 735 deletions
Download patch file Download diff file Expand all files Collapse all files

28
home/programs/git.nix
View file

@ -1,4 +1,4 @@
{
{pkgs, ...}: {
programs.git = {
enable = true;
aliases = {
@ -6,6 +6,32 @@
amend = "commit --amend --no-edit";
sdiff = "diff --staged";
t = "tag --annotate";
bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" ''
url=$1
basename=''${url##*/}
if [[ $2 == -* ]]
then
opts=''${@:2}
name=''${basename%.*}
else
opts=''${@:3}
name=''${2:-''${basename%.*}}
fi
mkdir "$name"
git clone --bare "$url" "$name/.bare" $opts || {
rm -r "$name"
exit 1
}
cd "$name"
echo "gitdir: ./.bare" > .git
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
git fetch origin $opts
''}/bin/bare-clone";
};
delta = {
enable = true;

31
home/programs/graphical.nix
View file

@ -1,10 +1,5 @@
{
pkgs,
lib,
...
}: {
{pkgs, ...}: {
imports = [
./qutebrowser.nix
./pcmanfm.nix
./mpv.nix
./vscode.nix
@ -18,13 +13,11 @@
helvum
# tools
obs-studio
inkscape
libsForQt5.okular
gimp
libreoffice
dbeaver
insomnia
dbeaver-bin
drawio
# entertainment
@ -32,13 +25,16 @@
shortwave
# other
element-desktop
element-desktop-wayland
brave
vieb
bitwarden
logseq
];
programs.obs-studio = {
enable = true;
plugins = [pkgs.obs-studio-plugins.wlrobs];
};
xdg.mimeApps.defaultApplications = {
"application/pdf" = "sioyek.desktop";
};
@ -48,21 +44,10 @@
gtk = {
enable = true;
iconTheme = {
name = "Vimix-Doder";
package = pkgs.vimix-icon-theme;
};
cursorTheme = {
name = "Vanilla-DMZ";
package = pkgs.vanilla-dmz;
size = 24;
};
gtk3.bookmarks = [
"file:///home/tristan/Documents"
"file:///home/tristan/Pictures/Screenshots"
"file:///home/tristan/Downloads"
];
};
programs.librewolf.enable = true;
}

1
home/programs/lf/default.nix
View file

@ -37,6 +37,7 @@ in {
R = "drag";
"<f-2>" = ":rename";
"<enter>" = "open-with";
"<f-5>" = ":reload";
};
programs.lf.extraConfig = ''
set sixel true

30
home/programs/neovim/config.lua
View file

@ -1,30 +0,0 @@
vim.g.mapleader = ' '
vim.g.maplocalleader = ' '
vim.o.relativenumber = true
vim.o.number = true
vim.o.signcolumn = 'yes'
vim.o.tabstop = 2
vim.o.shiftwidth = 2
vim.o.expandtab = true
vim.o.smartindent = true
vim.o.scrolloff = 4
vim.o.undofile = true
vim.o.undodir = vim.fn.expand("$HOME/.local/share/nvim/undo")
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
vim.keymap.set("x", "p", "\"_dP")
vim.keymap.set("n", "<leader>y", "\"+y")
vim.keymap.set("v", "<leader>y", "\"+y")
-- Global mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float)
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)
vim.keymap.set('v', '<C-c>', '"+y')
vim.keymap.set('i', '<C-v>', '<escape>"+p')

67
home/programs/neovim/default.nix
View file

@ -1,61 +1,20 @@
{pkgs, ...}: {
programs.neovim = {
enable = true;
defaultEditor = true;
extraLuaConfig = ''
${builtins.readFile ./config.lua}
'';
extraPackages = with pkgs; [
nodePackages_latest.typescript-language-server
vscode-langservers-extracted
gopls
nil
rust-analyzer
];
plugins = with pkgs.vimPlugins; [
{
plugin = nvim-surround;
type = "lua";
config = ''
require("nvim-surround").setup()
'';
}
{
plugin = comment-nvim;
type = "lua";
config = ''
require("Comment").setup()
'';
}
{
plugin = vimwiki;
config = ''
let g:vimwiki_list = [{'path': '~/Documents/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
'';
}
{
plugin = telescope-nvim;
type = "lua";
config = ''
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
'';
}
{
plugin = nvim-lspconfig;
type = "lua";
config = builtins.readFile ./lspconfig.lua;
}
];
};
{
config,
pkgs,
lib,
...
}: {
programs.nixvim =
{
enable = true;
}
// (import ../../../lib/nixvim.nix {inherit pkgs;});
programs.vscode = {
extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim];
userSettings = {
"vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
"vscode-neovim.neovimExecutablePaths.linux" =
lib.getExe config.programs.nixvim.package;
"extensions.experimental.affinity" = {
"asvetliakov.vscode-neovim" = 1;
};

54
home/programs/neovim/lspconfig.lua
View file

@ -1,54 +0,0 @@
-- Setup language servers.
local lspconfig = require('lspconfig')
local on_attach = function(client)
require'completion'.on_attach(client)
client.server_capabilities.documentFormattingProvider = false
end
lspconfig.tsserver.setup {
on_attach = on_attach
}
lspconfig.eslint.setup {
on_attach = on_attach
}
lspconfig.rust_analyzer.setup {
on_attach = on_attach
}
lspconfig.gopls.setup {}
lspconfig.nil_ls.setup {}
lspconfig.rust_analyzer.setup {}
-- Use LspAttach autocommand to only map the following keys
-- after the language server attaches to the current buffer
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
callback = function(ev)
-- Enable completion triggered by <c-x><c-o>
vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
-- Buffer local mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local opts = { buffer = ev.buf }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
vim.keymap.set('n', '<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts)
vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
vim.keymap.set('n', '<leader>f', function()
vim.lsp.buf.format { async = true }
end, opts)
end,
})

28
home/programs/personal/default.nix
View file

@ -14,20 +14,38 @@
services.nextcloud-client.enable = true;
programs.nixvim.plugins = {
lsp = {
servers.gdscript.enable = true;
};
godot.enable = true;
dap = {
enable = true;
adapters.servers.godot = {
host = "127.0.0.1";
port = 6006;
};
configurations.gdscript = [
{
type = "godot";
request = "launch";
name = "Launch scene";
project = "\${workspaceFolder}";
}
];
};
};
home.packages = with pkgs; [
godot_4
ardour
blender
# musescore
musescore
monero-gui
electrum
xmrig
transmission-remote-gtk
krita
organicmaps
anki
hugo
libsForQt5.neochat
bookworm
jellyfin-mpv-shim
];

16
home/programs/scripts.nix
View file

@ -12,7 +12,6 @@
grim = "${pkgs.grim}/bin/grim";
slurp = "${pkgs.slurp}/bin/slurp";
amixer = "${pkgs.alsa-utils}/bin/amixer";
swaybg = "${pkgs.swaybg}/bin/swaybg";
chafa = "${pkgs.chafa}/bin/chafa";
exiftool = "${pkgs.exiftool}/bin/exiftool";
wc = "${pkgs.coreutils}/bin/wc";
@ -25,6 +24,7 @@
gawk = "${pkgs.gawk}/bin/awk";
hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
sed = "${pkgs.gnused}/bin/sed";
lock = "${pkgs.hyprlock}/bin/hyprlock";
};
in {
programs.scripts = [
@ -55,14 +55,13 @@ in {
echo "$items" | ${my-deps.menu} | xargs -I_ rbw get _ | wl-copy -n
'';
hotkeys = [{key = "P";}];
install = false;
}
{
name = "bwusernamemenu";
text = ''
items="$(rbw list)"
echo "$items" | ${my-deps.menu} | xargs -I_ rbw get --field username _ \
| awk '{print $2}' | wl-copy -n
| wl-copy -n
'';
hotkeys = [
{
@ -70,7 +69,6 @@ in {
key = "P";
}
];
install = false;
}
{
name = "bwotpmenu";
@ -84,7 +82,6 @@ in {
key = "P";
}
];
install = false;
}
{
name = "screenshot";
@ -279,7 +276,7 @@ in {
sleep
hibernate" | ${my-deps.menu})
case $res in
lock) swaylock;;
lock) ${my-deps.lock};;
sleep) systemctl suspend;;
hibernate) systemctl hibernate;;
esac
@ -344,5 +341,12 @@ in {
}
];
}
{
name = "prefetch-url";
text = ''
nix-build -E "with import <nixpkgs> {}; fetchzip {url = \"$1\"; sha256 = lib.fakeSha256; }"
'';
install = true;
}
];
}

43
home/programs/tmux.nix Normal file
View file

@ -0,0 +1,43 @@
{
programs.tmux = {
enable = true;
baseIndex = 1;
escapeTime = 0;
keyMode = "vi";
mouse = true;
terminal = "screen-256color";
historyLimit = 5000;
extraConfig = ''
bind -n M-s split-window -v
bind -n M-v split-window -h
bind -n M-Enter split-window -h
bind -n M-h select-pane -L
bind -n M-j select-pane -D
bind -n M-k select-pane -U
bind -n M-l select-pane -R
bind -n M-q kill-pane
bind -n M-< resize-pane -L 10
bind -n M-> resize-pane -R 10
bind -n M-- resize-pane -D 10
bind -n M-+ resize-pane -U 10
bind -n M-z resize-pane -Z
bind -n M-u copy-mode
bind -n M-p paste-buffer
bind -n M-n next-window
set-option -g renumber-windows on
'';
};
# programs.kitty = {
# enable = true;
# keybindings = {
# "alt+h" = "neighboring_window left";
# "alt+l" = "neighboring_window right";
# "alt+j" = "neighboring_window down";
# "alt+k" = "neighboring_window up";
# "alt+enter" = "new_window";
# };
# shellIntegration.enableZshIntegration = true;
# };
}

3
home/programs/vscode.nix
View file

@ -19,6 +19,9 @@ in {
"gitlens.telemetry.enabled" = false;
"redhat.telemetry.enabled" = false;
"cSpell.language" = "en,en-GB";
"[typescript]" = {
"editor.defaultFormatter" = "vscode.typescript-language-features";
};
};
};

31
home/programs/work.nix
View file

@ -4,6 +4,7 @@
...
}: let
modifier = config.windowManager.modifierKey;
browser = "${pkgs.brave}/opt/brave.com/brave/brave-browser";
pwa = {
slack = "mpagibdhafmlkgpemeicgogjnhclenoc";
teams = "cifhbcnohmdccbgoicgdjpfamggdegmo";
@ -15,23 +16,39 @@ in {
terminal = false;
};
home.packages = with pkgs; [
thunderbird
remmina
home.packages = [
pkgs.thunderbird
pkgs.remmina
(import ../../lib/mkapp.nix "slack" {
inherit pkgs;
inherit pkgs browser;
desktopName = "Slack";
app-id = pwa.slack;
browser = "${brave}/opt/brave.com/brave/brave-browser";
})
(import ../../lib/mkapp.nix "teams" {
inherit pkgs;
browser = "${brave}/opt/brave.com/brave/brave-browser";
inherit pkgs browser;
app-id = pwa.teams;
desktopName = "Microsoft Teams";
})
pkgs.devcontainer
(pkgs.writeShellScriptBin "devcontainer-open" (let
jq = "${pkgs.jq}/bin/jq";
devcontainer = "${pkgs.devcontainer}/bin/devcontainer";
in ''
res=$(${devcontainer} up --workspace-folder .)
outcome=$(echo $res | ${jq} -r '.outcome')
[[ $outcome = "success" ]] || exit 1
containerId=$(echo $res | ${jq} -r '.containerId')
remoteWorkspaceFolder=$(echo $res | ${jq} -r '.remoteWorkspaceFolder')
docker exec -it --workdir=$remoteWorkspaceFolder $containerId bash
''))
];
home.sessionVariables = {
CYPRESS_INSTALL_BINARY = 0;
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
MONGOMS_SYSTEM_BINARY = "${pkgs.callPackage ../../pkgs/mongodb.nix pkgs}/bin/mongod";
};
gtk.gtk3.bookmarks = [
"file:///home/tristan/OneDrive/ OneDrive"
];