Compare commits

..

36 commits

Author SHA1 Message Date
17a20af6cf WIP: add notes for missing persistence/backup
Some checks failed
ci/woodpecker/push/check Pipeline failed
TODO:
* Look at for more inspiration https://github.com/nix-community/impermanence/pull/108
* Do home-manager
* Common files https://github.com/nix-community/impermanence/issues/10
2023-10-26 13:35:32 +00:00
b0edbd1ecc modules: services: quassel: persist data 2023-10-26 13:35:32 +00:00
3f2aedc64e modules: services: pirate: persist data 2023-10-26 13:35:32 +00:00
c3881ff7e7 modules: services: monitoring: persist data 2023-10-26 13:35:32 +00:00
2570ac273c modules: services: nginx: persist SSL certificates 2023-10-26 13:35:32 +00:00
4ceb9ab5b2 modules: services: transmission: persist data 2023-10-26 13:35:32 +00:00
6fcba8d0ee modules: services: sabnzbd: persist data 2023-10-26 13:35:32 +00:00
9d40d2bd0f modules: services: rss-bridge: persist data 2023-10-26 13:35:32 +00:00
acdd19c76e modules: services: podgrab: persist data 2023-10-26 13:35:32 +00:00
bfbcee8c5d modules: services: nextcloud: persist data 2023-10-26 13:35:32 +00:00
e273dacb96 modules: services: navidrome: persist data 2023-10-26 13:35:32 +00:00
59248dadf4 modules: services: lohr: persist data 2023-10-26 13:35:32 +00:00
da5779ba6a modules: services: jellyfin: persist data 2023-10-26 13:35:32 +00:00
d56d29ed4a modules: services: indexers: persist data 2023-10-26 13:35:31 +00:00
e0859d5c0e modules: services: postgresql: persist data 2023-10-26 13:35:31 +00:00
6a20598cba modules: services: postgresql-backup: persist data 2023-10-26 13:35:31 +00:00
9e223ec943 modules: services: paperless: persist data 2023-10-26 13:35:31 +00:00
c132b68722 modules: services: matrix: persist data 2023-10-26 13:35:31 +00:00
3d90b8c429 modules: services: gitea: persist repositories 2023-10-26 13:35:31 +00:00
f29083c26f modules: services: flood: persist data 2023-10-26 13:35:31 +00:00
5d189eb15b modules: services: calibre-web: persist library 2023-10-26 13:35:31 +00:00
8b5a59e6bb modules: services: blog: persist website data 2023-10-26 13:35:31 +00:00
660fd9f12c modules: hardware: bluetooth: persist connections 2023-10-26 13:35:31 +00:00
2889244609 modules: hardware: netowrking persist connections 2023-10-26 13:35:31 +00:00
175f799dd0 modules: services: ssh-server: persist host keys 2023-10-26 13:35:31 +00:00
ed6fc4948f WIP: modules: systems: add persist
This is the module that takes care of configuring impermanence at the
system level.

WIP:
    * address FIXMEs
    * activate home-manager persistence?
        * set `programs.fuse.userAllowOther = true;` ?
    * point `age` to persisted paths [1] ?
    * make sure all services and modules are persisted correctly...

[1]: b1d18d25b8
2023-10-26 13:35:31 +00:00
903bf4724f flake: add 'impermanence' 2023-10-26 13:35:31 +00:00
14be4c2a6b home: vim: migrate to 'none-ls-nvim'
Some checks failed
ci/woodpecker/push/check Pipeline failed
This is the community-maintained fork of the plug-in.
2023-10-26 13:33:55 +00:00
67f8ef538e overlays: add 'gruvbox-nvim-old-diff'
I dislike the new style of diff [1].

Thankfully somebody wrote a patch to configure it [2] (though not
completely to my liking, so the local patch here is a bit different).
I used it as a basis, but made it always revert, rather than
configurable.

[1]: https://github.com/ellisonleao/gruvbox.nvim/issues/290
[2]: https://github.com/ellisonleao/gruvbox.nvim/pull/291
2023-10-26 13:33:55 +00:00
8055636faf flake: bump inputs 2023-10-26 12:58:50 +00:00
5248eb59f8 hosts: homes: mousqueton: fix tmux 24-bit color
All checks were successful
ci/woodpecker/push/check Pipeline was successful
This is based on this answer [1] from Stack Overflow.

I'll have to look into what the proper fix would be in general, this is
just a band-aid to get it working correctly while SSH-ing from my
laptop.

[1]: https://stackoverflow.com/a/41786092
2023-10-26 12:27:33 +00:00
b4c2cc581b modules: services: matrix: add sliding sync 2023-10-26 12:27:00 +00:00
b4b9b54f75 modules: services: matrix: register dummy vhosts
This is simply to make use of my infrastructure for port collision
detection.
2023-10-26 12:27:00 +00:00
52413dcaf7 hosts: nixos: porthos: secrets: add matrix sync 2023-10-26 12:27:00 +00:00
1425c42489 modules: services: matrix: refactor vhost 2023-10-26 12:27:00 +00:00
085c563d75 hosts: homes: mousqueton: disable gpg-agent
It doesn't work well in this environment anyway.
2023-10-26 12:27:00 +00:00
6 changed files with 79 additions and 18 deletions

34
flake.lock generated
View file

@ -11,11 +11,11 @@
]
},
"locked": {
"lastModified": 1695384796,
"lastModified": 1696775529,
"narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
"owner": "ryantm",
"repo": "agenix",
"rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4",
"rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
"type": "github"
},
"original": {
@ -70,11 +70,11 @@
]
},
"locked": {
"lastModified": 1693611461,
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
"lastModified": 1696343447,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github"
},
"original": {
@ -131,11 +131,11 @@
]
},
"locked": {
"lastModified": 1695738267,
"narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=",
"lastModified": 1698250431,
"narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486",
"rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5",
"type": "github"
},
"original": {
@ -163,11 +163,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1695644571,
"narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
"lastModified": 1698134075,
"narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
"rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
"type": "github"
},
"original": {
@ -179,11 +179,11 @@
},
"nur": {
"locked": {
"lastModified": 1695824843,
"narHash": "sha256-c1Z+y9oUXOkcU8gVBCyaujUqYLpYoI2b6L9Cq4ywOcA=",
"lastModified": 1698317227,
"narHash": "sha256-jzSJjjxJr/IPvoPSWB1ZobmlAKku6eeggh9ffGV7Sig=",
"owner": "nix-community",
"repo": "NUR",
"rev": "8349f3e37cf21a9da032a2fdb8e7ac45366d01f3",
"rev": "32a38be31067b0a2f4919fd9e7a49bbefc34d25f",
"type": "github"
},
"original": {
@ -208,11 +208,11 @@
]
},
"locked": {
"lastModified": 1695576016,
"narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=",
"lastModified": 1698227354,
"narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "cb770e93516a1609652fa8e945a0f310e98f10c0",
"rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf",
"type": "github"
},
"original": {

View file

@ -67,7 +67,7 @@ in
nvim-lspconfig # Easy LSP configuration
lsp-format-nvim # Simplified formatting configuration
lsp_lines-nvim # Show diagnostics *over* regions
null-ls-nvim # LSP integration for linters and formatters
none-ls-nvim # LSP integration for linters and formatters
nvim-treesitter.withAllGrammars # Better highlighting
nvim-treesitter-textobjects # More textobjects
nvim-ts-context-commentstring # Comment string in nested language blocks

View file

@ -19,4 +19,9 @@
# I use scripts that use the passthrough sequence often on this host
my.home.tmux.enablePassthrough = true;
programs.tmux.extraConfig = ''
# Setup 24-bit color explicitly, as the default terminfo entry does not
set-option -sa terminal-overrides ",xterm-256color:Tc"
'';
}

View file

@ -0,0 +1,4 @@
self: prev:
{
vimPlugins = prev.vimPlugins.extend (self.callPackage ./generated.nix { });
}

View file

@ -0,0 +1,24 @@
{ vimUtils, fetchFromGitHub }:
_final: _prev: {
gruvbox-nvim = vimUtils.buildVimPlugin {
pname = "gruvbox.nvim";
version = "2023-10-07";
src = fetchFromGitHub {
owner = "ellisonleao";
repo = "gruvbox.nvim";
rev = "477c62493c82684ed510c4f70eaf83802e398898";
sha256 = "0250c24c6n6yri48l288irdawhqs16qna3y74rdkgjd2jvh66vdm";
};
patches = [
# Inspired by https://github.com/ellisonleao/gruvbox.nvim/pull/291
./old-colours.patch
];
meta = {
homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
};
};
}

View file

@ -0,0 +1,28 @@
From 416b3c9c5e783d173ac0fd5310a76c1b144b92c1 Mon Sep 17 00:00:00 2001
From: eeeXun <sdes96303@gmail.com>
Date: Thu, 19 Oct 2023 02:34:12 +0800
Subject: feat: make invert_diff configurable
---
README.md | 3 ++-
lua/gruvbox.lua | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lua/gruvbox.lua b/lua/gruvbox.lua
index ceba0735..a319fc6a 100644
--- a/lua/gruvbox.lua
+++ b/lua/gruvbox.lua
@@ -360,9 +361,9 @@ local function get_groups()
PmenuSel = { fg = colors.bg2, bg = colors.blue, bold = config.bold },
PmenuSbar = { bg = colors.bg2 },
PmenuThumb = { bg = colors.bg4 },
- DiffDelete = { bg = colors.dark_red },
- DiffAdd = { bg = colors.dark_green },
- DiffChange = { bg = colors.dark_aqua },
- DiffText = { bg = colors.yellow, fg = colors.bg0 },
+ DiffDelete = { fg = colors.bg0, bg = colors.red, reverse = config.inverse },
+ DiffAdd = { fg = colors.bg0, bg = colors.green, reverse = config.inverse },
+ DiffChange = { fg = colors.bg0, bg = colors.aqua, reverse = config.inverse },
+ DiffText = { bg = colors.yellow, fg = colors.bg0, reverse = config.inverse },
SpellCap = { link = "GruvboxBlueUnderline" },
SpellBad = { link = "GruvboxRedUnderline" },