kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00
Code Releases Activity

update to 24.05

Browse Source
This commit is contained in:
Kierán Meinhardt
2024-06-03 07:27:01 +02:00
parent b8bf6b2b71
commit 1ffae8e5c9
24 changed files with 236 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configs/aerc.nix
View File

@@ -99,8 +99,7 @@ in {
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}"; passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-posteo.path}";
himalaya = { himalaya = {
enable = true; enable = true;
backend = "imap"; settings.backend = "imap";
sender = "smtp";
}; };
aerc.extraAccounts.pgp-key-id = "9EDE82CC72A343A95266D0F444857074A3ACC8B7"; aerc.extraAccounts.pgp-key-id = "9EDE82CC72A343A95266D0F444857074A3ACC8B7";
}; };

2
configs/alacritty.nix
View File

@@ -60,7 +60,7 @@ in {
programs.alacritty = { programs.alacritty = {
enable = true; enable = true;
settings = { settings = {
key_bindings = [ keyboard.bindings = [
{ {
key = "Plus"; key = "Plus";
mods = "Control"; mods = "Control";

31
configs/default.nix
View File

@@ -67,12 +67,10 @@ in {
pkgs.capitaine-cursors pkgs.capitaine-cursors
]; ];
home-manager.users.me = { stylix.cursor = {
home.pointerCursor = { name = "capitaine-cursors-white";
name = "capitaine-cursors-white"; package = pkgs.capitaine-cursors;
package = pkgs.capitaine-cursors; size = 12;
size = 12;
};
}; };
} }
{ {
@@ -121,19 +119,19 @@ in {
}; };
} }
{ {
services.displayManager = {
autoLogin = {
enable = true;
user = config.users.users.me.name;
};
};
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager = { displayManager.lightdm = {
autoLogin = { enable = true;
greeters.gtk = {
enable = true; enable = true;
user = config.users.users.me.name; indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
};
lightdm = {
enable = true;
greeters.gtk = {
enable = true;
indicators = ["~spacer" "~host" "~spacer" "~session" "~power"];
};
}; };
}; };
}; };
@@ -189,6 +187,7 @@ in {
} }
{ {
home-manager.users.me.home.stateVersion = "22.05"; home-manager.users.me.home.stateVersion = "22.05";
home-manager.backupFileExtension = "bak";
} }
{ {
systemd.user.services.udiskie = { systemd.user.services.udiskie = {

3
configs/fu-berlin.nix
View File

@@ -55,8 +55,7 @@ in {
}; };
himalaya = { himalaya = {
enable = true; enable = true;
backend = "imap"; settings.backend = "imap";
sender = "smtp";
}; };
}); });
}; };

6
configs/hu-berlin.nix
View File

@@ -75,8 +75,7 @@ in {
aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text); aerc.extraAccounts.signature-file = toString (pkgs.writeText "signature" signature.text);
himalaya = { himalaya = {
enable = true; enable = true;
backend = "imap"; settings.backend = "imap";
sender = "smtp";
}; };
signature = { signature = {
showSignature = "append"; showSignature = "append";
@@ -100,8 +99,7 @@ in {
address = "admin.alew.vglsprwi@hu-berlin.de"; address = "admin.alew.vglsprwi@hu-berlin.de";
himalaya = { himalaya = {
enable = true; enable = true;
backend = "imap"; settings.backend = "imap";
sender = "smtp";
}; };
aliases = ["${userName}@hu-berlin.de"]; aliases = ["${userName}@hu-berlin.de"];
passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-dslalewa.path}"; passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.email-password-dslalewa.path}";

2
configs/i3.nix
View File

@@ -91,8 +91,8 @@ in {
environment.systemPackages = [dashboard]; environment.systemPackages = [dashboard];
services.displayManager.defaultSession = "none+i3";
services.xserver = { services.xserver = {
displayManager.defaultSession = "none+i3";
windowManager.i3 = { windowManager.i3 = {
enable = true; enable = true;
package = pkgs.i3-gaps; package = pkgs.i3-gaps;

11
configs/keyboard.nix
View File

@@ -18,16 +18,17 @@
}; };
defaultLanguage = "de"; defaultLanguage = "de";
in { in {
services.libinput.enable = true;
# man 7 xkeyboard-config # man 7 xkeyboard-config
services.xserver = { services.xserver = {
exportConfiguration = true; # link /usr/share/X11 properly exportConfiguration = true; # link /usr/share/X11 properly
layout = "de"; xkb.layout = "de";
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png # T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
# buckwalter: http://www.qamus.org/transliteration.htm # buckwalter: http://www.qamus.org/transliteration.htm
xkbVariant = "T3"; xkb.variant = "T3";
xkbOptions = commaSep xkbOptions; xkb.options = commaSep xkbOptions;
libinput.enable = true; xkb.dir = pkgs.symlinkJoin {
xkbDir = pkgs.symlinkJoin {
name = "x-keyboard-directory"; name = "x-keyboard-directory";
paths = [ paths = [
"${pkgs.xkeyboard_config}/etc/X11/xkb" "${pkgs.xkeyboard_config}/etc/X11/xkb"

2
configs/packages.nix
View File

@@ -168,7 +168,7 @@ in {
niveumPackages.menu-calc niveumPackages.menu-calc
nix-prefetch-git nix-prefetch-git
niveumPackages.nix-git niveumPackages.nix-git
nixfmt nixfmt-rfc-style
par par
qrencode qrencode

2
configs/printing.nix
View File

@@ -12,7 +12,7 @@ in {
]; ];
# allow connecting to .local printers # allow connecting to .local printers
services.avahi.nssmdns = true; services.avahi.nssmdns4 = true;
hardware.printers.ensurePrinters = [ hardware.printers.ensurePrinters = [
{ {

8
configs/sound.nix
View File

@@ -19,14 +19,6 @@
publish.userServices = true; publish.userServices = true;
}; };
environment.etc."pipewire/pipewire-pulse.conf.d/50-network-party.conf".text = ''
context.exec = [
{ path = "pactl" args = "load-module module-native-protocol-tcp" }
{ path = "pactl" args = "load-module module-zeroconf-discover" }
{ path = "pactl" args = "load-module module-zeroconf-publish" }
]
'';
environment.systemPackages = [ environment.systemPackages = [
pkgs.pavucontrol pkgs.pavucontrol
pkgs.ncpamixer pkgs.ncpamixer

187
flake.lock generated
View File

@@ -12,11 +12,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1714136352, "lastModified": 1716561646,
"narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -71,16 +71,112 @@
"type": "github" "type": "github"
} }
}, },
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1622559957,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"type": "github"
}
},
"base16-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"owner": "tinted-theming",
"repo": "base16-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-foot",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1696727917,
"narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-kitty": {
"flake": false,
"locked": {
"lastModified": 1665001328,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
"owner": "kdrag0n",
"repo": "base16-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
"type": "github"
},
"original": {
"owner": "kdrag0n",
"repo": "base16-kitty",
"type": "github"
}
},
"base16-tmux": {
"flake": false,
"locked": {
"lastModified": 1696725902,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming",
"repo": "base16-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-tmux",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1663659192,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
"owner": "chriskempson",
"repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
"type": "github"
},
"original": {
"owner": "chriskempson",
"repo": "base16-vim",
"type": "github"
}
},
"base16_2": { "base16_2": {
"inputs": { "inputs": {
"fromYaml": "fromYaml_2" "fromYaml": "fromYaml_2"
}, },
"locked": { "locked": {
"lastModified": 1689633990, "lastModified": 1708890466,
"narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", "rev": "665b3c6748534eb766c777298721cece9453fdae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -379,6 +475,23 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1713702291,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "46.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -409,16 +522,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714043624, "lastModified": 1716736833,
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -848,11 +961,11 @@
}, },
"nixpkgs-unstable_2": { "nixpkgs-unstable_2": {
"locked": { "locked": {
"lastModified": 1714309312, "lastModified": 1717349865,
"narHash": "sha256-VHZcvTcbQ9GS0UB1FIIitqq+oOOYnYcz1Q6Q/U9HfBw=", "narHash": "sha256-L2c9eFbDDJ+JXoDOs1wS5PAFzpNbNZlDwkik6ZQjeCc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3b61d595b17f2e3410bcc79c473060e098829eb8", "rev": "61c9a947dc4e36bef442007f7203f102b7e9ed0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -941,16 +1054,16 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1713995372, "lastModified": 1717144377,
"narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dd37924974b9202f8226ed5d74a252a9785aedf8", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -1097,11 +1210,11 @@
}, },
"nur_2": { "nur_2": {
"locked": { "locked": {
"lastModified": 1714304964, "lastModified": 1717346712,
"narHash": "sha256-qVenqLZCvtLlJs/BnoCI8aFJTKnvTBZR+c4iPIHnrjs=", "narHash": "sha256-QjFwg6M1dBj+2DhTvDOhvvybvSxXK0fJn1FuqbWhi1o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b196e8da8e8a49495973a09c66722feecf6105d2", "rev": "8587d6c2d6bef3775387336a8456702789cbfb0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1179,11 +1292,11 @@
}, },
"retiolum_2": { "retiolum_2": {
"locked": { "locked": {
"lastModified": 1710877137, "lastModified": 1715540413,
"narHash": "sha256-oc6CXM2abODnQ4q+/A5a+9SXrdRVp5pwyv7rKO/YUiw=", "narHash": "sha256-K2JRa9OrnA1ypL4CWJpe6/23EM5nqY6YF3MkATTW7jA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "3506e34e564a777015718007ec9b8847fcd38637", "rev": "e847829a0d491fa85e6a083ed634d461e5779d5c",
"revCount": 339, "revCount": 340,
"type": "git", "type": "git",
"url": "https://git.thalheim.io/Mic92/retiolum" "url": "https://git.thalheim.io/Mic92/retiolum"
}, },
@@ -1272,11 +1385,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714270637, "lastModified": 1717294752,
"narHash": "sha256-sq/0YEupY9yoRpg9ft8r2sjoRo84MQipionTuk4w1YI=", "narHash": "sha256-QhlS52cEQyx+iVcgrEoCnEEpWUA6uLdmeLRxk935inI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "44f8738f4b9805f7c60118c48f85da835839311a", "rev": "b46857a406d207a1de74e792ef3b83e800c30e08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1376,7 +1489,14 @@
"stylix_2": { "stylix_2": {
"inputs": { "inputs": {
"base16": "base16_2", "base16": "base16_2",
"base16-fish": "base16-fish",
"base16-foot": "base16-foot",
"base16-helix": "base16-helix",
"base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
], ],
@@ -1385,16 +1505,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690463825, "lastModified": 1717268716,
"narHash": "sha256-LILKFcKNVxYcYmzCB2+Gswyob5XrPJAF1YBExFR2yak=", "narHash": "sha256-hKM/D6Ni3+Ihvmy8pF+rOFgIqhphOEHUWqxJd+5ZV6Y=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "5c829554280f3139ddbfce8561d7430efbf2abfb", "rev": "3befd5d693a2669dc7d2086b57298838ff71f24b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "danth",
"ref": "release-23.05",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@@ -1574,11 +1693,11 @@
"voidrice_2": { "voidrice_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711631614, "lastModified": 1716485119,
"narHash": "sha256-MlOLv6/CKm1sSmikYaNDvglE/3sROZnjmacG0GP4rXM=", "narHash": "sha256-ZVqQNyjzibAhUYuUkyH481iTjnIo0R8+cJT8ln2Ui1Q=",
"owner": "Lukesmithxyz", "owner": "Lukesmithxyz",
"repo": "voidrice", "repo": "voidrice",
"rev": "cf4a12acb3a70951fd59d67e0738bf3ab2d1045c", "rev": "c95a16916d5c71288e5e49a78d0621943c89a682",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
flake.nix
View File

@@ -5,20 +5,20 @@
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
coptic-dictionary.url = "github:kmein/coptic-dictionary"; coptic-dictionary.url = "github:kmein/coptic-dictionary";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/release-24.05";
menstruation-backend.url = "github:kmein/menstruation.rs"; menstruation-backend.url = "github:kmein/menstruation.rs";
menstruation-telegram.url = "github:kmein/menstruation-telegram"; menstruation-telegram.url = "github:kmein/menstruation-telegram";
nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05"; nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
nixinate.url = "github:matthewcroughan/nixinate"; nixinate.url = "github:matthewcroughan/nixinate";
nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0"; nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/master"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
recht.url = "github:kmein/recht"; recht.url = "github:kmein/recht";
retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum"; retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum";
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
scripts.url = "github:kmein/scripts"; scripts.url = "github:kmein/scripts";
stylix.url = "github:danth/stylix/release-23.05"; stylix.url = "github:danth/stylix";
telebots.url = "github:kmein/telebots"; telebots.url = "github:kmein/telebots";
tinc-graph.url = "github:kmein/tinc-graph"; tinc-graph.url = "github:kmein/tinc-graph";
voidrice.url = "github:Lukesmithxyz/voidrice"; voidrice.url = "github:Lukesmithxyz/voidrice";
@@ -113,14 +113,21 @@
lib.attrsets.nameValuePair "deploy-${hostname}" { lib.attrsets.nameValuePair "deploy-${hostname}" {
type = "app"; type = "app";
program = toString (pkgs.writers.writeDash "deploy-${hostname}" '' program = toString (pkgs.writers.writeDash "deploy-${hostname}" ''
exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --max-jobs 2 --log-format internal-json --flake .?submodules=1#${hostname} --build-host ${targets.${hostname}} --target-host ${targets.${hostname}} 2>&1 | ${pkgs.nix-output-monitor}/bin/nom --json exec ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch \
--max-jobs 2 \
--log-format internal-json \
--flake .?submodules=1#${hostname} \
--target-host ${targets.${hostname}} 2>&1 \
| ${pkgs.nix-output-monitor}/bin/nom --json
''); '');
}) (builtins.attrNames self.nixosConfigurations)) }) (builtins.attrNames self.nixosConfigurations))
// { // {
deploy-ful = { deploy-ful = {
type = "app"; type = "app";
program = toString (pkgs.writers.writeDash "deploy-ful" '' program = toString (pkgs.writers.writeDash "deploy-ful" ''
exec ${pkgs.nix}/bin/nix run .?submodules=1#nixinate.ful --log-format internal-json 2>&1 | ${pkgs.nix-output-monitor}/bin/nom --json exec ${pkgs.nix}/bin/nix run .?submodules=1#nixinate.ful \
--log-format internal-json 2>&1 \
| ${pkgs.nix-output-monitor}/bin/nom --json
''); '');
}; };
}; };

8
systems/fatteh/configuration.nix
View File

@@ -26,14 +26,14 @@ in {
retiolum-rsa = { retiolum-rsa = {
file = ../../secrets/fatteh-retiolum-privateKey-rsa.age; file = ../../secrets/fatteh-retiolum-privateKey-rsa.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
retiolum-ed25519 = { retiolum-ed25519 = {
file = ../../secrets/fatteh-retiolum-privateKey-ed25519.age; file = ../../secrets/fatteh-retiolum-privateKey-ed25519.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
restic.file = ../../secrets/restic.age; restic.file = ../../secrets/restic.age;
syncthing-cert.file = ../../secrets/fatteh-syncthing-cert.age; syncthing-cert.file = ../../secrets/fatteh-syncthing-cert.age;

8
systems/ful/configuration.nix
View File

@@ -39,14 +39,14 @@ in {
retiolum-rsa = { retiolum-rsa = {
file = ../../secrets/ful-retiolum-privateKey-rsa.age; file = ../../secrets/ful-retiolum-privateKey-rsa.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
retiolum-ed25519 = { retiolum-ed25519 = {
file = ../../secrets/ful-retiolum-privateKey-ed25519.age; file = ../../secrets/ful-retiolum-privateKey-ed25519.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
root.file = ../../secrets/ful-root.age; root.file = ../../secrets/ful-root.age;
restic.file = ../../secrets/restic.age; restic.file = ../../secrets/restic.age;

6
systems/ful/hledger.nix
View File

@@ -5,11 +5,7 @@
}: { }: {
services.hledger-web = { services.hledger-web = {
enable = true; enable = true;
capabilities = { allow = "edit";
add = true;
view = true;
manage = false;
};
serveApi = false; # serve only the JSON API serveApi = false; # serve only the JSON API
baseUrl = "https://ledger.kmein.de"; baseUrl = "https://ledger.kmein.de";
journalFiles = [ journalFiles = [

1
systems/ful/radio.nix
View File

@@ -126,6 +126,7 @@ in {
systemd.services.radio = { systemd.services.radio = {
environment.TMPDIR = liquidsoapDirectory; environment.TMPDIR = liquidsoapDirectory;
wants = ["network-online.target"];
serviceConfig = { serviceConfig = {
RuntimeMaxSec = "${toString (5 * 60 * 60)}s"; RuntimeMaxSec = "${toString (5 * 60 * 60)}s";
Restart = "always"; Restart = "always";

10
systems/kabsa/configuration.nix
View File

@@ -31,21 +31,21 @@ in {
retiolum-rsa = { retiolum-rsa = {
file = ../../secrets/kabsa-retiolum-privateKey-rsa.age; file = ../../secrets/kabsa-retiolum-privateKey-rsa.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
retiolum-ed25519 = { retiolum-ed25519 = {
file = ../../secrets/kabsa-retiolum-privateKey-ed25519.age; file = ../../secrets/kabsa-retiolum-privateKey-ed25519.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
restic.file = ../../secrets/restic.age; restic.file = ../../secrets/restic.age;
syncthing-cert.file = ../../secrets/kabsa-syncthing-cert.age; syncthing-cert.file = ../../secrets/kabsa-syncthing-cert.age;
syncthing-key.file = ../../secrets/kabsa-syncthing-key.age; syncthing-key.file = ../../secrets/kabsa-syncthing-key.age;
}; };
environment.systemPackages = [pkgs.minecraft pkgs.zeroad]; environment.systemPackages = [pkgs.zeroad];
networking = { networking = {
hostName = "kabsa"; hostName = "kabsa";

8
systems/makanek/configuration.nix
View File

@@ -88,14 +88,14 @@ in {
retiolum-rsa = { retiolum-rsa = {
file = ../../secrets/makanek-retiolum-privateKey-rsa.age; file = ../../secrets/makanek-retiolum-privateKey-rsa.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
retiolum-ed25519 = { retiolum-ed25519 = {
file = ../../secrets/makanek-retiolum-privateKey-ed25519.age; file = ../../secrets/makanek-retiolum-privateKey-ed25519.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
restic.file = ../../secrets/restic.age; restic.file = ../../secrets/restic.age;
}; };

15
systems/makanek/monitoring/loki.nix
View File

@@ -21,14 +21,13 @@
max_chunk_age = "1h"; # All chunks will be flushed when they hit this age, default is 1h max_chunk_age = "1h"; # All chunks will be flushed when they hit this age, default is 1h
chunk_target_size = 1048576; # Loki will attempt to build chunks up to 1.5MB, flushing first if chunk_idle_period or max_chunk_age is reached first chunk_target_size = 1048576; # Loki will attempt to build chunks up to 1.5MB, flushing first if chunk_idle_period or max_chunk_age is reached first
chunk_retain_period = "30s"; # Must be greater than index read cache TTL if using an index cache (Default index read cache TTL is 5m) chunk_retain_period = "30s"; # Must be greater than index read cache TTL if using an index cache (Default index read cache TTL is 5m)
max_transfer_retries = 0; # Chunk transfers disabled
}; };
schema_config.configs = [ schema_config.configs = [
{ {
from = "2020-10-24"; from = "2020-10-24";
store = "boltdb-shipper"; store = "tsdb";
object_store = "filesystem"; object_store = "filesystem";
schema = "v11"; schema = "v13";
index = { index = {
prefix = "index_"; prefix = "index_";
period = "24h"; period = "24h";
@@ -36,23 +35,21 @@
} }
]; ];
storage_config = { storage_config = {
boltdb_shipper = { tsdb_shipper = {
active_index_directory = "/tmp/loki/boltdb-shipper-active"; active_index_directory = "/tmp/loki/tsdb-shipper-active";
cache_location = "/tmp/loki/boltdb-shipper-cache"; cache_location = "/tmp/loki/tsdb-shipper-cache";
cache_ttl = "24h"; # Can be increased for faster performance over longer query periods, uses more disk space cache_ttl = "24h"; # Can be increased for faster performance over longer query periods, uses more disk space
shared_store = "filesystem";
}; };
filesystem.directory = "/tmp/loki/chunks"; filesystem.directory = "/tmp/loki/chunks";
}; };
compactor = { compactor = {
working_directory = "/tmp/loki/boltdb-shipper-compactor"; working_directory = "/tmp/loki/boltdb-shipper-compactor";
shared_store = "filesystem";
}; };
limits_config = { limits_config = {
reject_old_samples = true; reject_old_samples = true;
reject_old_samples_max_age = "168h"; reject_old_samples_max_age = "168h";
allow_structured_metadata = false;
}; };
chunk_store_config.max_look_back_period = "0s";
table_manager = { table_manager = {
retention_deletes_enabled = false; retention_deletes_enabled = false;
retention_period = "0s"; retention_period = "0s";

2
systems/makanek/nextcloud.nix
View File

@@ -47,7 +47,7 @@ in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud27; package = pkgs.nextcloud29;
https = true; https = true;

8
systems/manakish/configuration.nix
View File

@@ -21,14 +21,14 @@ in {
retiolum-rsa = { retiolum-rsa = {
file = ../../secrets/manakish-retiolum-privateKey-rsa.age; file = ../../secrets/manakish-retiolum-privateKey-rsa.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
retiolum-ed25519 = { retiolum-ed25519 = {
file = ../../secrets/manakish-retiolum-privateKey-ed25519.age; file = ../../secrets/manakish-retiolum-privateKey-ed25519.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
syncthing-cert.file = ../../secrets/manakish-syncthing-cert.age; syncthing-cert.file = ../../secrets/manakish-syncthing-cert.age;
syncthing-key.file = ../../secrets/manakish-syncthing-key.age; syncthing-key.file = ../../secrets/manakish-syncthing-key.age;

8
systems/tabula/configuration.nix
View File

@@ -18,14 +18,14 @@ in {
retiolum-rsa = { retiolum-rsa = {
file = ../../secrets/tabula-retiolum-privateKey-rsa.age; file = ../../secrets/tabula-retiolum-privateKey-rsa.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
retiolum-ed25519 = { retiolum-ed25519 = {
file = ../../secrets/tabula-retiolum-privateKey-ed25519.age; file = ../../secrets/tabula-retiolum-privateKey-ed25519.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
}; };

8
systems/tahina/configuration.nix
View File

@@ -18,14 +18,14 @@ in {
retiolum-rsa = { retiolum-rsa = {
file = ../../secrets/tahina-retiolum-privateKey-rsa.age; file = ../../secrets/tahina-retiolum-privateKey-rsa.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
retiolum-ed25519 = { retiolum-ed25519 = {
file = ../../secrets/tahina-retiolum-privateKey-ed25519.age; file = ../../secrets/tahina-retiolum-privateKey-ed25519.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
}; };

8
systems/zaatar/configuration.nix
View File

@@ -35,14 +35,14 @@ in {
retiolum-rsa = { retiolum-rsa = {
file = ../../secrets/zaatar-retiolum-privateKey-rsa.age; file = ../../secrets/zaatar-retiolum-privateKey-rsa.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
retiolum-ed25519 = { retiolum-ed25519 = {
file = ../../secrets/zaatar-retiolum-privateKey-ed25519.age; file = ../../secrets/zaatar-retiolum-privateKey-ed25519.age;
mode = "400"; mode = "400";
owner = "tinc.retiolum"; owner = "tinc-retiolum";
group = "tinc.retiolum"; group = "tinc-retiolum";
}; };
restic = { restic = {
file = ../../secrets/restic.age; file = ../../secrets/restic.age;