Compare commits

..

6 Commits

Author SHA1 Message Date
Alexander Heldt
389c1e73f4 Update komga-comictracker input 2026-02-14 11:20:26 +01:00
Alexander Heldt
e5c9fcea33 manatee: Fix komga-comicbooktracker credentials file permissions 2026-02-14 11:18:51 +01:00
Alexander Heldt
1dbcb4439a pinwheel: Fix eglot code action indicator in emacs 2026-02-14 11:08:52 +01:00
Alexander Heldt
b26fb44824 pinwheel: Unpin nh from local nixpkgs to use cached builds 2026-02-14 11:08:44 +01:00
Alexander Heldt
48e352f015 pinwheel: Disable use of ssh defaults (as they're inlined) 2026-02-14 11:05:51 +01:00
Alexander Heldt
e575a147cd pinwheel: Fix pants use of system 2026-02-14 11:05:51 +01:00
6 changed files with 35 additions and 17 deletions

42
flake.lock generated
View File

@@ -580,11 +580,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771059880, "lastModified": 1771064292,
"narHash": "sha256-geYxweHQAvgfRJb0/peLnzIxb5sFnjfPLsuLseeXh/o=", "narHash": "sha256-nxcgONb6iAA1AJc9A6e/lRrsDj/sKWMlfivCHD1BsYk=",
"ref": "main", "ref": "main",
"rev": "e44339362fc80e968bb94fb019f860e673fc84ac", "rev": "51f0ba7e87f4d7ef8ae034ee16360deb4c7d7551",
"revCount": 27, "revCount": 29,
"type": "git", "type": "git",
"url": "ssh://gitea@git.ppp.pm:1122/alex/komga-comictracker.git" "url": "ssh://gitea@git.ppp.pm:1122/alex/komga-comictracker.git"
}, },
@@ -617,9 +617,7 @@
}, },
"nh": { "nh": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1770930949, "lastModified": 1770930949,
@@ -690,16 +688,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771008912, "lastModified": 1770770419,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa", "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -720,6 +718,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1771008912,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pppdotpm-site": { "pppdotpm-site": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -778,7 +792,7 @@
"nix-gc-env": "nix-gc-env", "nix-gc-env": "nix-gc-env",
"nix-jetbrains-plugins": "nix-jetbrains-plugins", "nix-jetbrains-plugins": "nix-jetbrains-plugins",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"pppdotpm-site": "pppdotpm-site", "pppdotpm-site": "pppdotpm-site",
"whib-backend": "whib-backend", "whib-backend": "whib-backend",
"whib-frontend": "whib-frontend" "whib-frontend": "whib-frontend"

View File

@@ -13,7 +13,6 @@
nh = { nh = {
url = "github:viperML/nh"; url = "github:viperML/nh";
inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-gc-env.url = "github:Julow/nix-gc-env"; nix-gc-env.url = "github:Julow/nix-gc-env";

View File

@@ -47,6 +47,8 @@ in
age.secrets = { age.secrets = {
"komga-comicbooktracker-credentials" = { "komga-comicbooktracker-credentials" = {
file = ../../../../secrets/manatee/komga-comicbooktracker-credentials.age; file = ../../../../secrets/manatee/komga-comicbooktracker-credentials.age;
owner = "alex";
group = "users";
}; };
}; };
}; };

View File

@@ -555,6 +555,9 @@ Setup prefix for keybindings.
) )
) )
:custom
(eglot-code-action-indications nil)
:hook ( :hook (
(eglot-managed-mode . mp-eglot-eldoc) (eglot-managed-mode . mp-eglot-eldoc)
(go-mode . eglot-ensure) (go-mode . eglot-ensure)

View File

@@ -3,6 +3,7 @@
home-manager.users.alex = { home-manager.users.alex = {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false;
matchBlocks = { matchBlocks = {
"manatee" = { "manatee" = {

View File

@@ -1,5 +1,4 @@
{ {
system,
pkgs, pkgs,
lib, lib,
... ...
@@ -11,7 +10,7 @@ let
match = match =
v: l: builtins.elemAt (lib.lists.findFirst (x: (if_let v (builtins.elemAt x 0)) != null) null l) 1; v: l: builtins.elemAt (lib.lists.findFirst (x: (if_let v (builtins.elemAt x 0)) != null) null l) 1;
package = match { platform = system; } [ package = match { platform = pkgs.stdenv.hostPlatform.system; } [
[ [
{ platform = "aarch64-linux"; } { platform = "aarch64-linux"; }
{ {