From 7e6ea5246d2e1664f5725a461e320c61cc4f8ff1 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Wed, 1 Oct 2025 15:42:13 +0200 Subject: [PATCH] update and use new domain for kavita --- flake.lock | 108 ++++++------ home-manager/hyprland/hyprland-settings.nix | 2 +- home-manager/nixvim/lsp.nix | 173 +++++++++++--------- modules/services/adguard.nix | 4 + modules/services/kavita.nix | 2 +- pkgs/hub/default.nix | 2 +- 6 files changed, 153 insertions(+), 138 deletions(-) diff --git a/flake.lock b/flake.lock index 1d73d41..0e24ea0 100644 --- a/flake.lock +++ b/flake.lock @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1757508292, - "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -324,11 +324,11 @@ ] }, "locked": { - "lastModified": 1757808926, - "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -345,11 +345,11 @@ ] }, "locked": { - "lastModified": 1758119172, - "narHash": "sha256-LnVuGLf0PJHqqIHroxEzwXS57mjAdHSrXi0iODKbbiU=", + "lastModified": 1759236626, + "narHash": "sha256-1BjCUU2csqhR5umGYFnOOTU8r8Bi+bnB2SLsr0FLcws=", "owner": "nix-community", "repo": "home-manager", - "rev": "9f408dc51c8e8216a94379e6356bdadbe8b4fef9", + "rev": "9e0453a9b0c8ef22de0355b731d712707daa6308", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -405,11 +405,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758070117, - "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", + "lastModified": 1759143472, + "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", + "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", "type": "github" }, "original": { @@ -421,11 +421,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -460,11 +460,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1758504570, - "narHash": "sha256-Ip1FZU7t84E1vFVFUyIGiNyMD5MYjJWZegrDDL6duwA=", + "lastModified": 1759195531, + "narHash": "sha256-HcfZt5TtuTjTwCYsFUDR9DpjMiTw2GCxhjLiCj2U44s=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "cc5ab1f8e3edfbb7b8a0d41a86a7b38ccea933a0", + "rev": "ec317c6d233fad4ab9a6ab4e8c2c10b0e72b7b1e", "type": "github" }, "original": { @@ -475,11 +475,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1758134550, - "narHash": "sha256-Rj0v5VZuljxG4trz3IHJedEKghNDd1HsK6yVwTNPyJ0=", + "lastModified": 1759249283, + "narHash": "sha256-wLaBS1QIK4jf7pPRVrEMbTHqhGAg3MXm34vTBNZXRdA=", "owner": "nix-community", "repo": "nixvim", - "rev": "0c867f9e635ce70e829a562b20851cfc17a94196", + "rev": "4f03ca05d9add2217554c4706bac84559f1211c6", "type": "github" }, "original": { @@ -520,11 +520,11 @@ ] }, "locked": { - "lastModified": 1758144108, - "narHash": "sha256-fq/Fd89pUrdVcFmw8aNVQoF9UPq7L5gtS/0ioPTUNKg=", + "lastModified": 1759250529, + "narHash": "sha256-GJdt2k+F9rmDkhbc6GgYIG/8mBiXckOOKwcMyyQDsCw=", "owner": "nix-community", "repo": "NUR", - "rev": "47a4f8514d9aecd033d53a84f698a115b3074f2b", + "rev": "e71ae27f8bcebc2e65d17524b906841081eb2dc0", "type": "github" }, "original": { @@ -545,11 +545,11 @@ ] }, "locked": { - "lastModified": 1756961635, - "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -568,11 +568,11 @@ ] }, "locked": { - "lastModified": 1757885130, - "narHash": "sha256-56CMb5W/pgjKLh0bx2ekhn5rde/YmgR63HAqrY9/BCw=", + "lastModified": 1758662783, + "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", "owner": "NuschtOS", "repo": "search", - "rev": "fae3c59a646e00c4b1d359c50b27458a0713d2fd", + "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", "type": "github" }, "original": { @@ -619,11 +619,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1757956156, - "narHash": "sha256-f0W7qbsCqpi6swQ5w8H+0YrAbNwsHgCFDkNRMTJjqrE=", + "lastModified": 1759131326, + "narHash": "sha256-fFhUx2C0Wtz0YkndtnlpSesrqj4lP3d5BUnMprpXtTk=", "owner": "danth", "repo": "stylix", - "rev": "0ce0103b498bb22f899ed8862d8d7f9503ed9cdb", + "rev": "fe74ba4ade9f3bb1496fbff27cc7a0ca873e40c4", "type": "github" }, "original": { @@ -758,11 +758,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -774,11 +774,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -790,11 +790,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -811,11 +811,11 @@ ] }, "locked": { - "lastModified": 1758206697, - "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=", + "lastModified": 1758728421, + "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa", + "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", "type": "github" }, "original": { diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 074bc7a..34b44b3 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -238,7 +238,7 @@ in $mainMod, Print, exec, export OUT=/tmp/$(date +'%s_grim.png') && ${saved-screenshot-cmd}'' '' Shift_L, Print, exec, export OUT=~/Pictures/$(date +'%s_grim.png') && ${saved-screenshot-cmd}'' - "$mainMod, G, exec, ${peek}" # record gif + #"$mainMod, G, exec, ${peek}" # record gif "$mainMod, SPACE, exec, ${rofi} -modi drun -show drun -config ~/.config/rofi/rofidmenu.rasi" " , XF86AudioPlay, exec, ${playerctl} play-pause" " , XF86AudioNext, exec, ${playerctl} next" diff --git a/home-manager/nixvim/lsp.nix b/home-manager/nixvim/lsp.nix index e833329..f86d994 100644 --- a/home-manager/nixvim/lsp.nix +++ b/home-manager/nixvim/lsp.nix @@ -1,92 +1,103 @@ { pkgs, ... }: { + lsp = { + inlayHints.enable = true; + servers = { + bashls.enable = true; + #ccls.enable = true; + clangd.enable = true; + cssls.enable = true; + gopls.enable = true; + clojure_lsp.enable = true; + qmlls = + { + enable = true; + settings.cmd = [ "qmlls" "-E" ]; + }; + nixd = { + enable = true; + settings = { + nixpkgs.expr = ''import { }''; + formatting.command = [ "nixpkgs-fmt" ]; + options.nixos.expr = ''(builtins.getFlake ("/home/kopatz/projects/github/nix-config")).nixosConfigurations.kop-pc.options''; + }; + }; + html.enable = true; + dartls.enable = true; + ts_ls.enable = true; + pylsp.enable = true; + lua_ls.enable = true; + csharp_ls = { + enable = true; + package = pkgs.csharp-ls; + }; + tinymist.enable = true; # typst + }; + keymaps= [ + { + key = "gd"; + lspBufAction = "definition"; + #desc = "LSP: [G]o to [D]efinition"; + } + { + key = "gD"; + lspBufAction = "declaration"; + #desc = "LSP: [G]o to [D]eclaration"; + } + { + key = "gT"; + lspBufAction = "type_definition"; + #desc = "Goto type definition"; + } + { + key = "gr"; + lspBufAction = "references"; + # desc = "LSP: [G]o to [R]eferences"; + } + { + key = "gI"; + lspBufAction = "implementation"; + #desc = "LSP: [G]o to [I]mplementation"; + } + { + key = "K"; + lspBufAction = "hover"; + #desc = "LSP: Show documentation"; + } + { + key = ""; + lspBufAction = "signature_help"; + #desc = "LSP: Show signature help"; + } + { + key = "rn"; + lspBufAction = "rename"; + #desc = "LSP: [R]e[n]ame"; + } + { + key = "ca"; + lspBufAction = "code_action"; + #desc = "LSP: [C]ode [A]ction"; + } + { + key = "ds"; + lspBufAction = "document_symbol"; + #desc = "LSP: [D]ocument [S]ymbols"; + } + { + key = "ws"; + lspBufAction = "workspace_symbol"; + #desc = "LSP [W]orkspace [S]ymbols"; + } + ]; + }; plugins = { otter = { # provide lsp functionality for code embedded in other languages enable = true; settings.handle_leading_whitespace = true; }; - lsp = { - enable = true; - inlayHints = true; - servers = { - bashls.enable = true; - #ccls.enable = true; - clangd.enable = true; - cssls.enable = true; - gopls.enable = true; - clojure_lsp.enable = true; - qmlls = - { - enable = true; - cmd = [ "qmlls" "-E" ]; - }; - nixd = { - enable = true; - settings = { - nixpkgs.expr = ''import { }''; - formatting.command = [ "nixpkgs-fmt" ]; - options.nixos.expr = ''(builtins.getFlake ("/home/kopatz/projects/github/nix-config")).nixosConfigurations.kop-pc.options''; - }; - }; - html.enable = true; - dartls.enable = true; - ts_ls.enable = true; - pylsp.enable = true; - lua_ls.enable = true; - csharp_ls = { - enable = true; - package = pkgs.csharp-ls; - }; - tinymist.enable = true; # typst - }; - keymaps.lspBuf = { - gd = { - action = "definition"; - desc = "LSP: [G]o to [D]efinition"; - }; - gD = { - action = "declaration"; - desc = "LSP: [G]o to [D]eclaration"; - }; - gT = { - action = "type_definition"; - desc = "Goto type definition"; - }; - gr = { - action = "references"; - desc = "LSP: [G]o to [R]eferences"; - }; - gI = { - action = "implementation"; - desc = "LSP: [G]o to [I]mplementation"; - }; - "K" = { - action = "hover"; - desc = "LSP: Show documentation"; - }; - "" = { - action = "signature_help"; - desc = "LSP: Show signature help"; - }; - "rn" = { - action = "rename"; - desc = "LSP: [R]e[n]ame"; - }; - "ca" = { - action = "code_action"; - desc = "LSP: [C]ode [A]ction"; - }; - "ds" = { - action = "document_symbol"; - desc = "LSP: [D]ocument [S]ymbols"; - }; - "ws" = { - action = "workspace_symbol"; - desc = "LSP [W]orkspace [S]ymbols"; - }; - }; - }; + lsp-lines = { enable = true; }; diff --git a/modules/services/adguard.nix b/modules/services/adguard.nix index 6465f8f..a519623 100644 --- a/modules/services/adguard.nix +++ b/modules/services/adguard.nix @@ -110,6 +110,10 @@ in { "domain" = "kopatz.dev"; "answer" = ip; } + { + "domain" = "kavita.kopatz.dev"; + "answer" = ip; + } { "domain" = "kop.oasch.net"; "answer" = ip; diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix index 2f2b5f2..6cd15d5 100644 --- a/modules/services/kavita.nix +++ b/modules/services/kavita.nix @@ -23,7 +23,7 @@ in { }; config = let - fqdn = "kavita-kopatz.duckdns.org"; + fqdn = "kavita.kopatz.dev"; useStepCa = false; # config.services.step-ca.enable; useHttps = cfg.https; baseDir = cfg.dir; diff --git a/pkgs/hub/default.nix b/pkgs/hub/default.nix index 26a7e94..6f21bc8 100644 --- a/pkgs/hub/default.nix +++ b/pkgs/hub/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchGit { url = "git@github.com:oberprofis/hub.git"; ref = "master"; - rev = "fd5b5a1eb29e2ee41352dc320d6ed0d855666270"; + rev = "e180ad2fbdfef9c9845765aab313f84b161d9447"; }; installPhase = '' mkdir -p $out