daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Various updates

Browse source
This commit is contained in:
Daniel Kempkens 2023-01-22 13:47:36 +01:00
parent 3140293552
commit 2c436c149c
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
7 changed files with 124 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
container/webserver/config.nix
View file

@ -4,6 +4,8 @@
systemd.tmpfiles.rules = [
"d /etc/container-webserver/weewx 0755 421 421"
"d /etc/container-webserver/weewx/html 0755 421 421"
"d /etc/container-webserver/nitter 0755 0 0"
];
# mosquitto
@ -30,4 +32,12 @@
uid = 421;
gid = 421;
};
# nitter
environment.etc."container-webserver/nitter/nitter.conf" = {
source = ../../secret/container/webserver/config/nitter.conf;
mode = "0644";
uid = 0;
gid = 0;
};
}

20
container/webserver/default.nix
View file

@ -34,7 +34,25 @@ in
volumes = [
"/etc/container-webserver/weewx:/data"
];
labels = secret.container.webserver.weewx.labels;
inherit (secret.container.webserver.weewx) labels;
};
};
nitter = {
service = {
image = "zedeus/nitter:latest";
container_name = "nitter";
restart = "unless-stopped";
ports = [ "127.0.0.1:8001:8080" ];
environment = {
"TZ" = "Europe/Berlin";
};
volumes = [
"/etc/container-webserver/nitter/nitter.conf:/src/nitter.conf"
];
labels = {
"com.centurylinklabs.watchtower.enable" = "true";
};
};
};
};

30
flake.lock
View file

@ -117,11 +117,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1674041176,
"narHash": "sha256-cMf1BQzI39nHQ0H/mOatthbbI3392qLmJ9gU0u520P4=",
"lastModified": 1674250603,
"narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2c29ae48f9a149151bdd82f429ac61d4412c312a",
"rev": "275ab728912006eecb549338a50f24f294a7cfb7",
"type": "github"
},
"original": {
@ -140,11 +140,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1674014440,
"narHash": "sha256-mtnizpeeEQd8R0P3PzsEUhvsJLyOZArFfd561+XFGtk=",
"lastModified": 1674285754,
"narHash": "sha256-7EKYM0Cdd0AOSQ4+lyLgLSTLOS4yRCgWqJfgMrOss/I=",
"owner": "neovim",
"repo": "neovim",
"rev": "0aae7f386042593aecfc8237020899d0e94fe8e4",
"rev": "7ef5e363d360f86c5d8d403e90ed256f4de798ec",
"type": "github"
},
"original": {
@ -161,11 +161,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1674029710,
"narHash": "sha256-q3aLm+GP1Sb9UbscKeEIQn3iHAHwnPkoNcPpDYGF+Qo=",
"lastModified": 1674288814,
"narHash": "sha256-Mso2c8XcbMwL+r8BIuEU8WwVJiO6A0HVZHbRFQEd9og=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "143360847b210b782e0d5075d2617fbaf116e2f3",
"rev": "4e7c0bc2a80f67e300906d090546f91b4c4c44db",
"type": "github"
},
"original": {
@ -181,11 +181,11 @@
]
},
"locked": {
"lastModified": 1673684553,
"narHash": "sha256-fgMWX0uqUeHloAqYU4kRLr0SfytLYqlpXwmo3NKawdI=",
"lastModified": 1674289364,
"narHash": "sha256-d1J8GfZZDXKA9WWXVSagESmGgT0kMHhZbFFbR2vOqNY=",
"owner": "nifoc",
"repo": "nix-overlay",
"rev": "0efbc2ea94a9ae8890ebb20ccda586d7c6b3e022",
"rev": "e5dfd883d89c9ff69faaec492f4e45af89162ac0",
"type": "github"
},
"original": {
@ -212,11 +212,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1673947312,
"narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=",
"lastModified": 1674236650,
"narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2d38b664b4400335086a713a0036aafaa002c003",
"rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5",
"type": "github"
},
"original": {

28
home/config/nvim/nifoc/statuscolumn.fnl
View file

@ -9,22 +9,42 @@
aucmd vim.api.nvim_create_autocmd]
;; Cache
(fn clear-cache [bufnr key]
(fn maybe-setup-buffer-cache! [bufnr key]
(when (= (. cache bufnr) nil)
(tset cache bufnr {}))
(when (= (. cache bufnr key) nil)
(tset cache bufnr key {})))
(fn clear-cache! [bufnr key]
(tset cache bufnr key {}))
(fn clear-diagnostics-cache! [bufnr diagnostics]
(let [key :diagnostics
namespaces (vim.tbl_map (fn [d]
d.namespace)
diagnostics)
cleared-namespaces {}]
(each [_ ns (pairs namespaces)]
(when (= (. cleared-namespaces ns) nil)
(local current-cache (. cache bufnr key))
(tset cache bufnr key (vim.tbl_filter #(not= $1.ns ns) current-cache))
(tset cleared-namespaces ns true)))))
(fn update-cache-diagnostics [bufnr diagnostics]
(clear-cache bufnr :diagnostics)
(maybe-setup-buffer-cache! bufnr :diagnostics)
(clear-diagnostics-cache! bufnr diagnostics)
(each [_ diagnostic (pairs diagnostics)]
(let [lnum (+ diagnostic.lnum 1)
current (. cache bufnr :diagnostics lnum)]
(when (or (= current nil) (< diagnostic.severity current.severity))
(tset cache bufnr :diagnostics lnum
{:severity diagnostic.severity :col diagnostic.col})))))
{:severity diagnostic.severity
:col diagnostic.col
:ns diagnostic.namespace})))))
(fn update-cache-gitsigns [bufnr]
(clear-cache bufnr :gitsigns)
(maybe-setup-buffer-cache! bufnr :gitsigns)
(clear-cache! bufnr :gitsigns)
(let [signs (?. (vim.fn.sign_getplaced bufnr
{:group :gitsigns_vimfn_signs_})
1 :signs)]

20
home/config/wezterm/config.fnl
View file

@ -10,11 +10,19 @@
(fn extract-tab-info [title]
(match title
(where t (t:find "^nvim%s"))
{:title (title:gsub "^nvim%s(.*)" "%1") :icon " " :color "#019833"}
{:title (t:gsub "^nvim%s(.*)" "%1") :icon " " :color "#019833"}
(where t (t:find "^git%s"))
{:title (t:gsub "^git%s(.*)" "%1") :icon " " :color "#41535B"}
(where t (t:find "^mix%s"))
{:title (t:gsub "^mix%s(.*)" "%1") :icon " " :color "#A074C4"}
(where t (t:find "^iex%s")) {: title :icon " " :color "#A074C4"}
(where t (t:find "^upa%s")) {: title :icon " " :color "#7EBAE4"}
(where t (t:find "^upp%s")) {: title :icon " " :color "#7EBAE4"}
(where t (t:find "^nrsw%s")) {: title :icon " " :color "#7EBAE4"}
(where t (t:find "^ssh%s")) {: title :icon " " :color "#F4C82D"}
(where t (t:find "^scp%s")) {: title :icon " " :color "#F4C82D"}
(where t (t:find :^instagram-)) {: title :icon " " :color "#FB2179"}
(where t (t:find :^immich-)) {: title :icon " " :color "#31A352"}
_ {: title :icon " " :color "#F8F8F2"}))
(wezterm.on :format-tab-title
@ -63,7 +71,7 @@
:use_fancy_tab_bar false
:hide_tab_bar_if_only_one_tab true
:tab_bar_at_bottom true
:tab_max_width 48
:tab_max_width 32
:colors {:tab_bar {:background colors.inactive-background
:new_tab {:bg_color colors.inactive-background
:fg_color colors.inactive-foreground}}}
@ -87,7 +95,13 @@
:action (wezterm.action.ScrollToPrompt -1)}
{:key :DownArrow
:mods :SHIFT
:action (wezterm.action.ScrollToPrompt 1)}]
:action (wezterm.action.ScrollToPrompt 1)}
{:key :LeftArrow
:mods :CMD
:action (wezterm.action.ActivateTabRelative -1)}
{:key :RightArrow
:mods :CMD
:action (wezterm.action.ActivateTabRelative 1)}]
;; Mouse
:mouse_bindings [; Only select text and don't open hyperlinks
{:event {:Up {:streak 1 :button :Left}}

78
home/programs/nvim/plugins.nix
View file

@ -36,12 +36,12 @@ rec {
};
nvim-web-devicons = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
version = "2023-01-09";
version = "2023-01-22";
src = pkgs.fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
rev = "6c38926351372ea87034dec26182b62c835ff3bc";
sha256 = "1qvpzja9j9hlnafmmsw5bjbbcf2fbn260bmcsmdy7pi17mrd5aha";
rev = "13d06d74afad093d8312fe051633b55f24049c16";
sha256 = "07qixz6l1dyy84l14mbx6jwrmpmwdgvj8crq9vxqh44w5gwjr3qs";
fetchSubmodules = false;
};
};
@ -91,33 +91,33 @@ rec {
};
leap-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-01-03";
version = "2023-01-19";
src = pkgs.fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "a968ab4250840dc879e805f918b4f3b892310a12";
sha256 = "1yirhsyybynpjmjp02jfcd5i9anklnj3wklcxb9i522ia6w67hsd";
rev = "ff4c3663e5a0a0ecbb3fffbc8318825def35d2aa";
sha256 = "1pxm1b3crqmvbmds5cjfnqirvqbjqzc6vc59i6jsr8i79vymf16z";
fetchSubmodules = false;
};
};
dracula-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "dracula.nvim";
version = "2022-12-22";
version = "2023-01-19";
src = pkgs.fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
rev = "9195c478cf05c3369131a7a9c606cbbc5247b0c6";
sha256 = "12288w7071d9s4sfv0bd7bzahrmwds9yabqzfpapassr8958w84j";
rev = "a0b129d7dea51b317fa8064f13b29f68004839c4";
sha256 = "0q7ly95hp123z9z8qh4sih5a53dnbxv0jxa80b1s7d6h1wpr2w5j";
fetchSubmodules = false;
};
};
nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: {
version = "2023-01-18";
version = "2023-01-22";
src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "622baacdc1b22cdfd73bc98c07bb5654a090bcac";
sha256 = "1svyixp527vdc4rx29fyqn7r2qi40s00v3m6dj75l5nyb8kyby7k";
rev = "405fe27cd1b81faadd08fd5895dc54a34154103e";
sha256 = "15f4r0205qhw5jcbxs2vg4f06r4zixw4qfd76yzldnlsga7hmclr";
fetchSubmodules = false;
};
});
@ -145,12 +145,12 @@ rec {
};
telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "telescope.nvim";
version = "2023-01-16";
version = "2023-01-22";
src = pkgs.fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "2f32775405f6706348b71d0bb8a15a22852a61e4";
sha256 = "166mzzwv95ab8yr4aadr6vy9fp6l64sj2kihhif5qis4k71qshkz";
rev = "dce1156ca103b8222e4abbfc63f9c6887abf5ec6";
sha256 = "194jkn7a4xh5733n8n1n8n9mwibvadkxj6vw44xvwd01w0db6zhx";
fetchSubmodules = false;
};
};
@ -225,23 +225,23 @@ rec {
};
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-01-18";
version = "2023-01-22";
src = pkgs.fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "a59ba78f164f586d47a2f315dc3d021a630768d0";
sha256 = "0xpfsml6zydhl2ml3avc88125ziz1j93h9p8vb5ndjifcbi8lf9j";
rev = "85cd2ecacd8805614efe3fb3a5146ac7d0f88a17";
sha256 = "0fhfqf4rag58q64wfrlfzyw87n3zv24gnwr9inn3i63b27r57w83";
fetchSubmodules = false;
};
};
nvim-jdtls = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2023-01-18";
version = "2023-01-20";
src = pkgs.fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "0a9c88dc0eee8bbe41cac4d3e16475a3c78f1242";
sha256 = "16ari6m1jj1xvaaf9n118qsdcc30x55r9drf3x2s689h0f3kvj64";
rev = "beb9101fb4a8a4f2655e691980b4c82a27d2e920";
sha256 = "1j56xz39wfdxinmzi83qfb6gljnag8a590wvyjg9c8m7ssd0ixw6";
fetchSubmodules = false;
};
};
@ -280,12 +280,12 @@ rec {
};
nvim-lint = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lint";
version = "2023-01-18";
version = "2023-01-21";
src = pkgs.fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-lint";
rev = "edd7bab99613849c8cccddcebece47aabb9e86b8";
sha256 = "096vjyl6wl1y027pbn81773mjzfahswk4y5aj5b6gg9vwchzyf46";
rev = "57a52fce9b4a045f0b371a4ca5cbb535b9db0bdd";
sha256 = "0bliv6vzgqk6nz0wk334gkbsdmkzxv38rjs0pf7jdk5azvgczslh";
fetchSubmodules = false;
};
};
@ -302,23 +302,23 @@ rec {
};
LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "LuaSnip";
version = "2023-01-18";
version = "2023-01-20";
src = pkgs.fetchFromGitHub {
owner = "L3MON4D3";
repo = "LuaSnip";
rev = "af60ac12fa1349dbad479fc1e95d5aea977c0c37";
sha256 = "0mvvqasakdigvxjccp4x20r9zm0dzwszb3phd32hy9f3hpbkccy1";
rev = "8c23e1af82bdafa86556a36c4e075079dd167771";
sha256 = "12gpj62z67lnjly2x9f9addsrg58dr70alnwf0k4d0izf24qxknf";
fetchSubmodules = false;
};
};
friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2023-01-17";
version = "2023-01-19";
src = pkgs.fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "320865dfe76c03a5c60513d4f34ca22effae56f2";
sha256 = "1dv065sh908qc2y0larn027wijsc4n2msr30npg4lba227j613px";
rev = "046e4d3491baf664e0eef5231d28beb49333578b";
sha256 = "1ywp6lfzdx4k1pj6fzxd703zcvwrfkbmcmggds267bjgadrfbbnc";
fetchSubmodules = false;
};
};
@ -445,12 +445,12 @@ rec {
};
nvim-autopairs = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
version = "2023-01-08";
version = "2023-01-21";
src = pkgs.fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
rev = "f00eb3b766c370cb34fdabc29c760338ba9e4c6c";
sha256 = "147s9mq3vlvsf4wzm0x5aiwr374zhi3d6d2b9y52iwndwjvjkh0b";
rev = "31042a5823b55c4bfb30efcbba2fc1b5b53f90dc";
sha256 = "1jiwwmm87d2i76jgimk40mydsg2jddpl7q9axy94g6411hkdq261";
fetchSubmodules = false;
};
};
@ -522,12 +522,12 @@ rec {
};
virt-column-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "virt-column.nvim";
version = "2022-09-21";
version = "2023-01-20";
src = pkgs.fetchFromGitHub {
owner = "lukas-reineke";
repo = "virt-column.nvim";
rev = "36fa3be9cba9195081e934b4f9729021726c5889";
sha256 = "097ki3ms89a2m2kvv3fg43dq7cfj6j62n3g58fmr945j5a7srssj";
rev = "93b40ea038f676f5a72d7d1f2336fe7b051fc0ce";
sha256 = "02r90cqx31ja7cglfliqw0wbsm8fxh5q784wapk82zlv1p7c8ip8";
fetchSubmodules = false;
};
};
@ -555,12 +555,12 @@ rec {
};
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "gitsigns.nvim";
version = "2023-01-13";
version = "2023-01-20";
src = pkgs.fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "addd6e174a85fc1c4007ab0b65d77e6555b417bf";
sha256 = "09gnk8szbdxc26g46hyjw6zb41i9nswz7pxcadmx9x2f0j9sma3m";
rev = "7b37bd5c2dd4d7abc86f2af096af79120608eeca";
sha256 = "19kna3rjdzfx2ys07jwb413saj9dg25i9ym6r8037r7h65h42yz2";
fetchSubmodules = false;
};
};

BIN
secret/container/webserver/config/nitter.conf Normal file
View file

Binary file not shown.