Compare commits
16 commits
0eb5824af8
...
3d5f25dc9c
Author | SHA1 | Date | |
---|---|---|---|
3d5f25dc9c | |||
54d97e55d9 | |||
45a78e44b4 | |||
4da58e8adc | |||
96bca1f669 | |||
d7000927a3 | |||
f4feb18c9a | |||
49f2ada271 | |||
a121569f84 | |||
da236805f5 | |||
6efc109f1c | |||
ff2c16e55e | |||
5938a873b3 | |||
b676b70273 | |||
1bbd87d36e | |||
d6d6498ee9 |
15 changed files with 225 additions and 153 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -23,11 +23,11 @@
|
||||||
},
|
},
|
||||||
"catppuccin": {
|
"catppuccin": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732703064,
|
"lastModified": 1732838231,
|
||||||
"narHash": "sha256-n8XOmn0WGtQhAMJKTnhL/3ttV2ZahPRf6gtlqZ6R4QE=",
|
"narHash": "sha256-KJTRqfEcGpONBK/6BkMdWmbGth0r/nYWY3k/rvZl4es=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "2e2bdecf0bae287d74947cd5cf967c5c499c23c1",
|
"rev": "becc64812c8d6af24dedc2f75c5c63ebf778a115",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -119,11 +119,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732784553,
|
"lastModified": 1732871643,
|
||||||
"narHash": "sha256-S3PiqgTS8ST07ihFDL2cPExoxHcd9I8ITecpgMz+s4M=",
|
"narHash": "sha256-YrjBqjdNvOSGtYDR4ijVqQwDB6fwhLx//p162TlrkzM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "fb81e75180369a888db920df8f6097fbf2f603e9",
|
"rev": "ca218dbd42ae4b16bc4378a06f5f1310b69a32af",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -485,11 +485,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732793095,
|
"lastModified": 1732884235,
|
||||||
"narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=",
|
"narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2f7739d01080feb4549524e8f6927669b61c6ee3",
|
"rev": "819f682269f4e002884702b87e445c82840c68f2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -871,11 +871,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732632634,
|
"lastModified": 1732749044,
|
||||||
"narHash": "sha256-+G7n/ZD635aN0sEXQLynU7pWMd3PKDM7yBIXvYmjABQ=",
|
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6f6076c37180ea3a916f84928cf3a714c5207a30",
|
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
8
hmModules/chirp/default.nix
Normal file
8
hmModules/chirp/default.nix
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
let
|
||||||
|
in
|
||||||
|
# nixpkgs = builtins.getFlake "github:NixOS/nixpkgs/932fc16b263f26803d3960e4400bc13dde84a972";
|
||||||
|
# chirp = nixpkgs.legacyPackages.${pkgs.system}.chirp;
|
||||||
|
{
|
||||||
|
home.packages = [ pkgs.chirp ];
|
||||||
|
}
|
|
@ -123,9 +123,20 @@
|
||||||
(use-package rainbow-delimiters
|
(use-package rainbow-delimiters
|
||||||
:hook (prog-mode . rainbow-delimiters-mode))
|
:hook (prog-mode . rainbow-delimiters-mode))
|
||||||
|
|
||||||
|
(use-package pulsar
|
||||||
|
:after (consult imenu)
|
||||||
|
:config
|
||||||
|
(pulsar-global-mode)
|
||||||
|
;; TODO use :hook (I've tried but it didn't work, why?)
|
||||||
|
(add-hook 'consult-after-jump-hook #'pulsar-recenter-top)
|
||||||
|
(add-hook 'consult-after-jump-hook #'pulsar-reveal-entry)
|
||||||
|
(add-hook 'imenu-after-jump-hook #'pulsar-recenter-top)
|
||||||
|
(add-hook 'imenu-after-jump-hook #'pulsar-reveal-entry)
|
||||||
|
(add-hook 'next-error-hook #'pulsar-pulse-line)
|
||||||
|
)
|
||||||
|
|
||||||
(use-package clipetty
|
(use-package clipetty
|
||||||
:delight
|
:delight
|
||||||
:ensure t
|
|
||||||
:hook (after-init . global-clipetty-mode))
|
:hook (after-init . global-clipetty-mode))
|
||||||
|
|
||||||
(use-package nerd-icons)
|
(use-package nerd-icons)
|
||||||
|
@ -158,7 +169,7 @@
|
||||||
(indent-bars-color-by-depth '(:regexp "outline-\\([0-9]+\\)" :blend 0.4))
|
(indent-bars-color-by-depth '(:regexp "outline-\\([0-9]+\\)" :blend 0.4))
|
||||||
(indent-bars-no-stipple-char (string-to-char "┋"))
|
(indent-bars-no-stipple-char (string-to-char "┋"))
|
||||||
(indent-bars-prefer-character 't) ;; so it works also in terminal
|
(indent-bars-prefer-character 't) ;; so it works also in terminal
|
||||||
)
|
)
|
||||||
|
|
||||||
(use-package diredfl
|
(use-package diredfl
|
||||||
:config (diredfl-global-mode))
|
:config (diredfl-global-mode))
|
||||||
|
@ -263,7 +274,7 @@
|
||||||
'("s" . meow-kill)
|
'("s" . meow-kill)
|
||||||
'("t" . meow-till)
|
'("t" . meow-till)
|
||||||
'("u" . meow-undo)
|
'("u" . meow-undo)
|
||||||
'("U" . meow-undo-in-selection)
|
'("U" . vundo)
|
||||||
'("/" . meow-visit)
|
'("/" . meow-visit)
|
||||||
'("v" . meow-visit)
|
'("v" . meow-visit)
|
||||||
'("w" . meow-mark-word)
|
'("w" . meow-mark-word)
|
||||||
|
@ -378,7 +389,8 @@
|
||||||
("C-c F" . consult-ripgrep)
|
("C-c F" . consult-ripgrep)
|
||||||
("C-c f" . consult-find)
|
("C-c f" . consult-find)
|
||||||
("C-c l" . consult-line)
|
("C-c l" . consult-line)
|
||||||
("C-c m" . wconsult-mark)
|
("C-c L" . consult-focus-lines)
|
||||||
|
("C-c m" . consult-mark)
|
||||||
("C-c o o" . consult-outline)
|
("C-c o o" . consult-outline)
|
||||||
("C-c e" . consult-flymake))
|
("C-c e" . consult-flymake))
|
||||||
:custom
|
:custom
|
||||||
|
@ -387,7 +399,8 @@
|
||||||
|
|
||||||
(use-package orderless
|
(use-package orderless
|
||||||
:custom
|
:custom
|
||||||
(completion-styles '(orderless)))
|
(completion-styles '(orderless basic))
|
||||||
|
(completion-category-overrides '((file (styles basic partial-completion)))))
|
||||||
|
|
||||||
(use-package embark
|
(use-package embark
|
||||||
:bind (("C-'" . embark-act)
|
:bind (("C-'" . embark-act)
|
||||||
|
@ -550,6 +563,10 @@
|
||||||
:hook ((lisp-mode . enable-paredit-mode)
|
:hook ((lisp-mode . enable-paredit-mode)
|
||||||
(emacs-lisp-mode . enable-paredit-mode)))
|
(emacs-lisp-mode . enable-paredit-mode)))
|
||||||
|
|
||||||
|
(use-package aggressive-indent
|
||||||
|
:hook ((lisp-mode . aggressive-indent-mode)
|
||||||
|
(emacs-lisp-mode . aggressive-indent-mode)))
|
||||||
|
|
||||||
(use-package eldoc
|
(use-package eldoc
|
||||||
:delight)
|
:delight)
|
||||||
|
|
||||||
|
@ -560,7 +577,7 @@
|
||||||
(eldoc-box-lighter "ElBox")
|
(eldoc-box-lighter "ElBox")
|
||||||
:bind (("C-c h" . eldoc-box-help-at-point)))
|
:bind (("C-c h" . eldoc-box-help-at-point)))
|
||||||
|
|
||||||
(use-package diff-hl
|
(use-package diff-hl
|
||||||
:init
|
:init
|
||||||
(global-diff-hl-mode 1)
|
(global-diff-hl-mode 1)
|
||||||
(diff-hl-margin-mode 1))
|
(diff-hl-margin-mode 1))
|
||||||
|
@ -652,17 +669,18 @@
|
||||||
|
|
||||||
(use-package popper
|
(use-package popper
|
||||||
:custom
|
:custom
|
||||||
(popper-reference-buffers '("\*Messages\*"
|
(popper-reference-buffers
|
||||||
|
'("\*Messages\*"
|
||||||
"Output\*$"
|
"Output\*$"
|
||||||
"\\*Async Shell Command\\*"
|
"\\*Async Shell Command\\*"
|
||||||
(completion-list-mode . hide)
|
(completion-list-mode . hide)
|
||||||
help-mode
|
help-mode
|
||||||
compilation-mode
|
compilation-mode
|
||||||
"^\\*Nix-REPL*\\*$" nix-repl-mode ;eshell as a popup
|
"^\\*Nix-REPL*\\*$" nix-repl-mode
|
||||||
"^\\*.+-eshell.*\\*$" eshell-mode ;eshell as a popup
|
"^\\*.+-eshell.*\\*$" eshell-mode
|
||||||
"^\\*shell.*\\*$" shell-mode ;shell as a popup
|
"^\\*shell.*\\*$" shell-mode
|
||||||
"^\\*term.*\\*$" term-mode ;term as a popup
|
"^\\*term.*\\*$" term-mode
|
||||||
"^\\*eat.*\\*$" eat-mode ;eat as a popup
|
"^\\*eat.*\\*$" eat-mode
|
||||||
))
|
))
|
||||||
(popper-window-height 0.33)
|
(popper-window-height 0.33)
|
||||||
(popper-echo-lines 1)
|
(popper-echo-lines 1)
|
||||||
|
@ -762,7 +780,7 @@ This is meant to be an helper to be called from the window manager."
|
||||||
(set-face-font 'org-modern-tag "Iosevka Comfy-14")
|
(set-face-font 'org-modern-tag "Iosevka Comfy-14")
|
||||||
(set-face-font 'org-modern-date-active "Iosevka Comfy-14")
|
(set-face-font 'org-modern-date-active "Iosevka Comfy-14")
|
||||||
(set-face-font 'org-modern-date-inactive "Iosevka Comfy-14")))
|
(set-face-font 'org-modern-date-inactive "Iosevka Comfy-14")))
|
||||||
)
|
)
|
||||||
|
|
||||||
(use-package org-roam
|
(use-package org-roam
|
||||||
:custom
|
:custom
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
services.gpg-agent = {
|
services.gpg-agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableSshSupport = true;
|
enableSshSupport = true;
|
||||||
sshKeys = [ "CE2FD0D9BECBD8876811714925066CC257413416" ];
|
|
||||||
extraConfig =
|
extraConfig =
|
||||||
let
|
let
|
||||||
pinentryRofi = pkgs.writeShellApplication {
|
pinentryRofi = pkgs.writeShellApplication {
|
||||||
|
|
|
@ -46,7 +46,6 @@ in
|
||||||
$DRY_RUN_CMD echo ${hosts.sisko} >> "${config.user.home}/.ssh/authorized_keys"
|
$DRY_RUN_CMD echo ${hosts.sisko} >> "${config.user.home}/.ssh/authorized_keys"
|
||||||
$DRY_RUN_CMD echo ${hosts.kirk} >> "${config.user.home}/.ssh/authorized_keys"
|
$DRY_RUN_CMD echo ${hosts.kirk} >> "${config.user.home}/.ssh/authorized_keys"
|
||||||
$DRY_RUN_CMD echo ${users.ccr-ssh} >> "${config.user.home}/.ssh/authorized_keys"
|
$DRY_RUN_CMD echo ${users.ccr-ssh} >> "${config.user.home}/.ssh/authorized_keys"
|
||||||
$DRY_RUN_CMD echo ${users.ccr-gpg} >> "${config.user.home}/.ssh/authorized_keys"
|
|
||||||
|
|
||||||
if [[ ! -d "${sshdDirectory}" ]]; then
|
if [[ ! -d "${sshdDirectory}" ]]; then
|
||||||
$DRY_RUN_CMD rm $VERBOSE_ARG --recursive --force "${sshdTmpDirectory}"
|
$DRY_RUN_CMD rm $VERBOSE_ARG --recursive --force "${sshdTmpDirectory}"
|
||||||
|
|
|
@ -90,6 +90,7 @@
|
||||||
"libreoffice"
|
"libreoffice"
|
||||||
"emacs"
|
"emacs"
|
||||||
"vial"
|
"vial"
|
||||||
|
"chirp"
|
||||||
];
|
];
|
||||||
extraGroups = [ ];
|
extraGroups = [ ];
|
||||||
backupPaths = [ ];
|
backupPaths = [ ];
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
keys = {
|
keys = {
|
||||||
users = {
|
users = {
|
||||||
ccr-gpg = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5cEUx25pnZiH3eBrE2xNbJ92gJiKSznDUNRzcEL4ti6FlJm+75p4q0hgdqHwStR8+uCWBL6viVFCGutOVMFE5MX1Oc3A8fJdR6H9Rrwvk/1UQzqzc9tWxw1qPLKz+fnPDomjOvNofghCWQRwX3Xf1HnIqvRwELpNbR9i+/cHkDGzLJxkstbt4gol8ywMPkw02QdKk8s5MEd1vawxc+7Chs0JPW57RDqDYFErYys52JLeAViCBB9bofF+KT42LuRXKSjWlvCV9kR5TL49vUeBgzMQWMh++WQdN4m9lpqFqYyc75I49/E0HGf8LChDSS+hvRnb5MbtnVGjEA4WDHyldmJCvUNob5CUo4FjoSPRi+S/J3Ads8D4JVwaJOJEVqmMKEhiQ0Hzk4hwe3eV/VumlZj4U/QjaCrqqi4TW/iP0gNRfzcfiM+G/z5R7w1NMUpTX7oilyKjMQmGnXB857D3SSptS7dwh5OiKhVmrQMRCduooUsj236abqLU28K//RnxhOgh8kDGgoUHApnTiMZNKhgLiR42lKrubNcW1tAAqoNyFLMwwXeMLjh0iP1b5y8ntfNPNIcGb7vcwpS24z/aIjW7rQ4J7x5EBphHGhys6ne+irdhOM8c7kFr+c8+Q2oU0YAtFuMYztAFOHm1e20X00Zvys2nuee+hT9F1NungAQ== andrea.ciceri@autistici.org";
|
|
||||||
ccr-ssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzCmDCtlGscpesHuoiruVWD2IjYEFtaIl9Y2JZGiOAyf3V17KPx0MikcknfmxSHi399SxppiaXQHxo/1wjGxXkXNTTv6h1fBuqwhJE6C8+ZSV+gal81vEnXX+/9w2FQqtVgnG2/mO7oJ0e3FY+6kFpOsGEhYexoGt/UxIpAZoqIN+CWNhJIASUkneaZWtgwiL8Afb59kJQ2E7WbBu+PjYZ/s5lhPobhlkz6s8rkhItvYdiSHT0DPDKvp1oEbxsxd4E4cjJFbahyS8b089NJd9gF5gs0b74H/2lUUymnl63cV37Mp4iXB4rtE69MbjqsGEBKTPumLualmc8pOGBHqWIdhAqGdZQeBajcb6VK0E3hcU0wBB+GJgm7KUzlAHGdC3azY0KlHMrLaZN0pBrgCVR6zBNWtZz2B2qMBZ8Cw+K4vut8GuspdXZscID10U578GxQvJAB9CdxNUtrzSmKX2UtZPB1udWjjIAlejzba4MG73uXgQEdv0NcuHNwaLuCWxTUT5QQF18IwlJ23Mg8aPK8ojUW5A+kGHAu9wtgZVcX1nS5cmYKSgLzcP1LA1l9fTJ1vqBSuy38GTdUzfzz7AbnkRfGPj2ALDgyx17Rc5ommjc1k0gFoeIqiLaxEs5FzDcRyo7YvZXPsGeIqNCYwQWw3+U+yUEJby8bxGb2d/6YQ== andrea.ciceri@autistici.org";
|
ccr-ssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzCmDCtlGscpesHuoiruVWD2IjYEFtaIl9Y2JZGiOAyf3V17KPx0MikcknfmxSHi399SxppiaXQHxo/1wjGxXkXNTTv6h1fBuqwhJE6C8+ZSV+gal81vEnXX+/9w2FQqtVgnG2/mO7oJ0e3FY+6kFpOsGEhYexoGt/UxIpAZoqIN+CWNhJIASUkneaZWtgwiL8Afb59kJQ2E7WbBu+PjYZ/s5lhPobhlkz6s8rkhItvYdiSHT0DPDKvp1oEbxsxd4E4cjJFbahyS8b089NJd9gF5gs0b74H/2lUUymnl63cV37Mp4iXB4rtE69MbjqsGEBKTPumLualmc8pOGBHqWIdhAqGdZQeBajcb6VK0E3hcU0wBB+GJgm7KUzlAHGdC3azY0KlHMrLaZN0pBrgCVR6zBNWtZz2B2qMBZ8Cw+K4vut8GuspdXZscID10U578GxQvJAB9CdxNUtrzSmKX2UtZPB1udWjjIAlejzba4MG73uXgQEdv0NcuHNwaLuCWxTUT5QQF18IwlJ23Mg8aPK8ojUW5A+kGHAu9wtgZVcX1nS5cmYKSgLzcP1LA1l9fTJ1vqBSuy38GTdUzfzz7AbnkRfGPj2ALDgyx17Rc5ommjc1k0gFoeIqiLaxEs5FzDcRyo7YvZXPsGeIqNCYwQWw3+U+yUEJby8bxGb2d/6YQ== andrea.ciceri@autistici.org";
|
||||||
oneplus8t = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8da1Mf11vXFF0kVDgxocVoGwpHHMEs9emS9T+v8hLb oneplus8t";
|
oneplus8t = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8da1Mf11vXFF0kVDgxocVoGwpHHMEs9emS9T+v8hLb oneplus8t";
|
||||||
hercules-ci-agent = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPupm00BiveTIYF6CNwuMijF5VvEaPDMjvt+vMlAy+N hercules-ci-agent";
|
hercules-ci-agent = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPupm00BiveTIYF6CNwuMijF5VvEaPDMjvt+vMlAy+N hercules-ci-agent";
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
services.adguardhome = {
|
services.adguardhome = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 3000;
|
port = 3000;
|
||||||
|
mutableSettings = true;
|
||||||
settings = {
|
settings = {
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
@ -11,4 +12,7 @@
|
||||||
53
|
53
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [ 53 ];
|
networking.firewall.allowedUDPPorts = [ 53 ];
|
||||||
|
environment.persistence."/persist".directories = [
|
||||||
|
"/var/lib/AdGuardHome"
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
|
fleetFlake,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
@ -24,6 +25,7 @@ let
|
||||||
curl
|
curl
|
||||||
tea
|
tea
|
||||||
attic-client
|
attic-client
|
||||||
|
fleetFlake.packages.${pkgs.system}.forgejo-report-checks
|
||||||
]
|
]
|
||||||
}; do
|
}; do
|
||||||
for bin in "$dir"/bin/*; do
|
for bin in "$dir"/bin/*; do
|
||||||
|
|
|
@ -1,11 +1,35 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
theme = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/catppuccin/gitea/releases/download/v1.0.1/catppuccin-gitea.tar.gz";
|
||||||
|
hash = "sha256-et5luA3SI7iOcEIQ3CVIu0+eiLs8C/8mOitYlWQa/uI=";
|
||||||
|
stripRoot = false;
|
||||||
|
};
|
||||||
|
in
|
||||||
{
|
{
|
||||||
|
systemd.services = {
|
||||||
|
forgejo = {
|
||||||
|
preStart =
|
||||||
|
let
|
||||||
|
inherit (config.services.forgejo) stateDir;
|
||||||
|
in
|
||||||
|
lib.mkAfter ''
|
||||||
|
rm -rf ${stateDir}/custom/public/assets
|
||||||
|
mkdir -p ${stateDir}/custom/public/assets
|
||||||
|
ln -sf ${theme} ${stateDir}/custom/public/assets/css
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
services.forgejo = {
|
services.forgejo = {
|
||||||
# TODO migrate to Postgres
|
# TODO migrate to Postgres
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs.forgejo;
|
||||||
settings = {
|
settings = {
|
||||||
DEFAULT = {
|
DEFAULT = {
|
||||||
RUN_MODE = "prod"; # set to prod for better logs (worse performance)
|
RUN_MODE = "prod"; # set to prod for better logs (worse performance)
|
||||||
|
@ -18,6 +42,7 @@
|
||||||
HTTP_PORT = 3002;
|
HTTP_PORT = 3002;
|
||||||
ROOT_URL = "https://git.aciceri.dev";
|
ROOT_URL = "https://git.aciceri.dev";
|
||||||
};
|
};
|
||||||
|
federation.ENABLED = true;
|
||||||
mailer = {
|
mailer = {
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
PROTOCOL = "smtp+starttls";
|
PROTOCOL = "smtp+starttls";
|
||||||
|
@ -29,6 +54,20 @@
|
||||||
other = {
|
other = {
|
||||||
SHOW_FOOTER_VERSION = false;
|
SHOW_FOOTER_VERSION = false;
|
||||||
};
|
};
|
||||||
|
ui = {
|
||||||
|
DEFAULT_THEME = "catppuccin-mocha-blue";
|
||||||
|
THEMES = builtins.concatStringsSep "," (
|
||||||
|
[ "auto,forgejo-auto,forgejo-dark,forgejo-light,arc-gree,gitea" ]
|
||||||
|
++ (map (name: lib.removePrefix "theme-" (lib.removeSuffix ".css" name)) (
|
||||||
|
builtins.attrNames (builtins.readDir theme)
|
||||||
|
))
|
||||||
|
);
|
||||||
|
};
|
||||||
|
"ui.meta" = {
|
||||||
|
AUTHOR = "Andrea Ciceri";
|
||||||
|
DESCRIPTION = "My personal git forge";
|
||||||
|
KEYWORDS = "git,self-hosted,forgejo,open-source,nix,nixos";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
secrets.mailer.PASSWD = config.age.secrets.autistici-password.path;
|
secrets.mailer.PASSWD = config.age.secrets.autistici-password.path;
|
||||||
dump.enable = true;
|
dump.enable = true;
|
||||||
|
|
|
@ -13,8 +13,8 @@ let
|
||||||
garmin_connect = pkgs.fetchFromGitHub {
|
garmin_connect = pkgs.fetchFromGitHub {
|
||||||
owner = "cyberjunky";
|
owner = "cyberjunky";
|
||||||
repo = "home-assistant-garmin_connect";
|
repo = "home-assistant-garmin_connect";
|
||||||
rev = "d42edcabc67ba6a7f960e849c8aaec1aabef87c0";
|
rev = "e2deaed42b66c982b150ca9a9e543031ad51228c";
|
||||||
hash = "sha256-KqbP6TpH9B0/AjtsW5TcWSNgUhND+w8rO6X8fHqtsDI=";
|
hash = "sha256-TtrcgLGnhNRBF1SqKMkPlEi/XEBUtDAnaWfzkh50+D8=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -51,6 +51,10 @@ in
|
||||||
"wake_on_lan"
|
"wake_on_lan"
|
||||||
"prometheus"
|
"prometheus"
|
||||||
];
|
];
|
||||||
|
customComponents = with pkgs.home-assistant-custom-components; [
|
||||||
|
tuya_local
|
||||||
|
localtuya
|
||||||
|
];
|
||||||
extraPackages =
|
extraPackages =
|
||||||
python3Packages: with python3Packages; [
|
python3Packages: with python3Packages; [
|
||||||
# used by pun_sensor
|
# used by pun_sensor
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
HostKey /ssh_initrd_host_ed25519_key
|
HostKey /ssh_initrd_host_ed25519_key
|
||||||
'';
|
'';
|
||||||
authorizedKeys = with (import ../../lib).keys; [
|
authorizedKeys = with (import ../../lib).keys; [
|
||||||
users.ccr-gpg
|
|
||||||
users.ccr-ssh
|
users.ccr-ssh
|
||||||
hosts.sisko
|
hosts.sisko
|
||||||
];
|
];
|
||||||
|
|
|
@ -117,6 +117,7 @@ let
|
||||||
agenix
|
agenix
|
||||||
solidity-mode
|
solidity-mode
|
||||||
telega
|
telega
|
||||||
|
aggressive-indent
|
||||||
# org-re-reveal # FIXME very not nice hash mismatch when building
|
# org-re-reveal # FIXME very not nice hash mismatch when building
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
@ -126,6 +127,8 @@ let
|
||||||
ef-themes
|
ef-themes
|
||||||
indent-bars
|
indent-bars
|
||||||
ement
|
ement
|
||||||
|
vundo
|
||||||
|
pulsar
|
||||||
])
|
])
|
||||||
++ (with nongnuPackages; [
|
++ (with nongnuPackages; [
|
||||||
eat
|
eat
|
||||||
|
|
|
@ -6,16 +6,17 @@ from os import environ
|
||||||
|
|
||||||
client = AuthenticatedClient(base_url=environ["GITHUB_API_URL"], token=environ["GITHUB_TOKEN"])
|
client = AuthenticatedClient(base_url=environ["GITHUB_API_URL"], token=environ["GITHUB_TOKEN"])
|
||||||
|
|
||||||
print("hello")
|
|
||||||
|
|
||||||
with open('result.json', 'r') as file:
|
with open('result.json', 'r') as file:
|
||||||
data = json.load(file)
|
data = json.load(file)
|
||||||
|
|
||||||
|
print("Reporting statuses acording to the following result.json")
|
||||||
|
print(json.dumps(data, indent=2))
|
||||||
|
|
||||||
for result in data['results']:
|
for result in data['results']:
|
||||||
attr = result['attr']
|
attr = result['attr']
|
||||||
success = result['success']
|
success = result['success']
|
||||||
type = result['type']
|
type = result['type']
|
||||||
print(attr)
|
print(f"Report status success={success} for {type} {attr}")
|
||||||
response = repo_create_status.sync_detailed(
|
response = repo_create_status.sync_detailed(
|
||||||
owner="aciceri",
|
owner="aciceri",
|
||||||
repo="nixfleet",
|
repo="nixfleet",
|
||||||
|
@ -24,7 +25,9 @@ for result in data['results']:
|
||||||
body=CreateStatusOption(
|
body=CreateStatusOption(
|
||||||
context=type,
|
context=type,
|
||||||
description=attr,
|
description=attr,
|
||||||
target_url="https://google.com",
|
target_url="https://git.aciceri.dev", # FIXME
|
||||||
state="success" if success else "failure" # ma be pending,success,failure,error_message
|
state="success" if success else "failure" # ma be pending,success,failure,error_message
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
print("Done reporting statuses")
|
||||||
|
|
|
@ -6,7 +6,6 @@ with keys.users;
|
||||||
{
|
{
|
||||||
"cachix-personal-token.age".publicKeys = [
|
"cachix-personal-token.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
kirk
|
kirk
|
||||||
sisko
|
sisko
|
||||||
|
@ -15,90 +14,85 @@ with keys.users;
|
||||||
];
|
];
|
||||||
"magit-forge-github-token.age".publicKeys = [
|
"magit-forge-github-token.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
kirk
|
kirk
|
||||||
];
|
];
|
||||||
"git-workspace-tokens.age".publicKeys = [
|
"git-workspace-tokens.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
kirk
|
kirk
|
||||||
picard
|
picard
|
||||||
];
|
];
|
||||||
"hydra-admin-password.age".publicKeys = [
|
"hydra-admin-password.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
];
|
];
|
||||||
"hydra-github-token.age".publicKeys = [
|
"hydra-github-token.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
];
|
];
|
||||||
"cache-private-key.age".publicKeys = [
|
"cache-private-key.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
];
|
];
|
||||||
"autistici-password.age".publicKeys = [
|
"autistici-password.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
kirk
|
kirk
|
||||||
picard
|
picard
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"hercules-ci-join-token.age".publicKeys = [
|
"hercules-ci-join-token.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
sisko
|
sisko
|
||||||
picard
|
picard
|
||||||
];
|
];
|
||||||
"hercules-ci-binary-caches.age".publicKeys = [
|
"hercules-ci-binary-caches.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
sisko
|
sisko
|
||||||
picard
|
picard
|
||||||
];
|
];
|
||||||
"hercules-ci-secrets-json.age".publicKeys = [
|
"hercules-ci-secrets-json.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
mothership
|
mothership
|
||||||
sisko
|
sisko
|
||||||
picard
|
picard
|
||||||
];
|
];
|
||||||
"minio-credentials.age".publicKeys = [
|
"minio-credentials.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
picard
|
picard
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"aws-credentials.age".publicKeys = [
|
"aws-credentials.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
picard
|
picard
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"nextcloud-admin-pass.age".publicKeys = [
|
"nextcloud-admin-pass.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"home-planimetry.age".publicKeys = [
|
"home-planimetry.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"home-assistant-token.age".publicKeys = [
|
"home-assistant-token.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"chatgpt-token.age".publicKeys = [
|
"chatgpt-token.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
kirk
|
kirk
|
||||||
mothership
|
mothership
|
||||||
picard
|
picard
|
||||||
|
@ -106,86 +100,86 @@ with keys.users;
|
||||||
];
|
];
|
||||||
"cloudflare-dyndns-api-token.age".publicKeys = [
|
"cloudflare-dyndns-api-token.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"restic-hetzner-password.age".publicKeys = [
|
"restic-hetzner-password.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
picard
|
picard
|
||||||
sisko
|
sisko
|
||||||
kirk
|
kirk
|
||||||
];
|
];
|
||||||
"hass-ssh-key.age".publicKeys = [
|
"hass-ssh-key.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"grafana-password.age".publicKeys = [
|
"grafana-password.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"matrix-registration-shared-secret.age".publicKeys = [
|
"matrix-registration-shared-secret.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"matrix-sliding-sync-secret.age".publicKeys = [
|
"matrix-sliding-sync-secret.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"forgejo-runners-token.age".publicKeys = [
|
"forgejo-runners-token.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
picard
|
picard
|
||||||
];
|
];
|
||||||
"forgejo-nix-access-tokens.age".publicKeys = [
|
"forgejo-nix-access-tokens.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
picard
|
picard
|
||||||
];
|
];
|
||||||
"garmin-collector-environment.age".publicKeys = [
|
"garmin-collector-environment.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"hetzner-storage-box-sisko-ssh-password.age".publicKeys = [
|
"hetzner-storage-box-sisko-ssh-password.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"sisko-restic-password.age".publicKeys = [
|
"sisko-restic-password.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"sisko-attic-environment-file.age".publicKeys = [
|
"sisko-attic-environment-file.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
|
|
||||||
# WireGuard
|
# WireGuard
|
||||||
"picard-wireguard-private-key.age".publicKeys = [
|
"picard-wireguard-private-key.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
picard
|
picard
|
||||||
];
|
];
|
||||||
"sisko-wireguard-private-key.age".publicKeys = [
|
"sisko-wireguard-private-key.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
sisko
|
sisko
|
||||||
];
|
];
|
||||||
"kirk-wireguard-private-key.age".publicKeys = [
|
"kirk-wireguard-private-key.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
kirk
|
kirk
|
||||||
];
|
];
|
||||||
"deltaflyer-wireguard-private-key.age".publicKeys = [
|
"deltaflyer-wireguard-private-key.age".publicKeys = [
|
||||||
ccr-ssh
|
ccr-ssh
|
||||||
ccr-gpg
|
|
||||||
deltaflyer
|
deltaflyer
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue