mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
feat: update to 23.11
This commit is contained in:
@@ -1,11 +1,7 @@
|
|||||||
{
|
{pkgs, ...}: {
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.bluezFull;
|
package = pkgs.bluez;
|
||||||
settings.general = {
|
settings.general = {
|
||||||
enable = "Source,Sink,Media,Socket";
|
enable = "Source,Sink,Media,Socket";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ in {
|
|||||||
mode = "400";
|
mode = "400";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.syncthing = rec {
|
services.syncthing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
user = "kfm";
|
user = "kfm";
|
||||||
openDefaultPorts = true;
|
openDefaultPorts = true;
|
||||||
@@ -103,21 +103,23 @@ in {
|
|||||||
dataDir = "/home/kfm/.config/syncthing";
|
dataDir = "/home/kfm/.config/syncthing";
|
||||||
cert = config.age.secrets.syncthing-cert.path;
|
cert = config.age.secrets.syncthing-cert.path;
|
||||||
key = config.age.secrets.syncthing-key.path;
|
key = config.age.secrets.syncthing-key.path;
|
||||||
inherit ((import ../lib).syncthing) devices;
|
settings = {
|
||||||
folders = let
|
inherit ((import ../lib).syncthing) devices;
|
||||||
cloud-dir = "${config.users.users.me.home}/cloud";
|
folders = let
|
||||||
in {
|
cloud-dir = "${config.users.users.me.home}/cloud";
|
||||||
"${cloud-dir}/syncthing/zotero/storage".devices = ["kabsa" "manakish"];
|
in {
|
||||||
"${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
|
"${cloud-dir}/syncthing/zotero/storage".devices = ["kabsa" "manakish"];
|
||||||
"${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
|
"${cloud-dir}/syncthing/common".devices = ["kabsa" "manakish"];
|
||||||
"${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
|
"${cloud-dir}/syncthing/library".devices = ["kabsa" "manakish" "heym"];
|
||||||
"${cloud-dir}/syncthing/obsidian" = {
|
"${cloud-dir}/syncthing/mundoiu".devices = ["kabsa" "manakish" "heym"];
|
||||||
devices = ["kabsa" "manakish" "heym"];
|
"${cloud-dir}/syncthing/obsidian" = {
|
||||||
id = "3r1hu-3barr";
|
devices = ["kabsa" "manakish" "heym"];
|
||||||
};
|
id = "3r1hu-3barr";
|
||||||
"${cloud-dir}/syncthing/music" = {
|
};
|
||||||
devices = ["kabsa" "manakish" "heym" "zaatar"];
|
"${cloud-dir}/syncthing/music" = {
|
||||||
id = "music";
|
devices = ["kabsa" "manakish" "heym" "zaatar"];
|
||||||
|
id = "music";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ in {
|
|||||||
users.users.me = {
|
users.users.me = {
|
||||||
name = "kfm";
|
name = "kfm";
|
||||||
description = kieran.name;
|
description = kieran.name;
|
||||||
passwordFile = config.age.secrets.kfm-password.path;
|
hashedPasswordFile = config.age.secrets.kfm-password.path;
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
uid = 1000;
|
uid = 1000;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -52,9 +52,9 @@
|
|||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
fonts = {
|
fonts = {
|
||||||
enableDefaultFonts = true;
|
enableDefaultPackages = true;
|
||||||
fontDir.enable = true;
|
fontDir.enable = true;
|
||||||
fonts = with pkgs; [
|
packages = with pkgs; [
|
||||||
alegreya
|
alegreya
|
||||||
alegreya-sans
|
alegreya-sans
|
||||||
amiri
|
amiri
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ in {
|
|||||||
"Alt+j" = "add video-pan-y -0.05";
|
"Alt+j" = "add video-pan-y -0.05";
|
||||||
};
|
};
|
||||||
scripts = [
|
scripts = [
|
||||||
pkgs.mpvScripts.youtube-quality
|
pkgs.mpvScripts.quality-menu
|
||||||
niveumPackages.mpv-visualizer
|
niveumPackages.mpv-visualizer
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ in {
|
|||||||
electrum
|
electrum
|
||||||
inkscape
|
inkscape
|
||||||
astrolog
|
astrolog
|
||||||
unstablePackages.obsidian
|
obsidian
|
||||||
anki-bin # flashcards
|
anki-bin # flashcards
|
||||||
jbofihe # lojbanic software
|
jbofihe # lojbanic software
|
||||||
zoom-us # video conferencing
|
zoom-us # video conferencing
|
||||||
@@ -200,7 +200,7 @@ in {
|
|||||||
par
|
par
|
||||||
qrencode
|
qrencode
|
||||||
|
|
||||||
inputs.menstruation-backend.defaultPackage.x86_64-linux
|
# inputs.menstruation-backend.defaultPackage.x86_64-linux
|
||||||
inputs.agenix.packages.x86_64-linux.default
|
inputs.agenix.packages.x86_64-linux.default
|
||||||
inputs.recht.defaultPackage.x86_64-linux
|
inputs.recht.defaultPackage.x86_64-linux
|
||||||
|
|
||||||
@@ -285,7 +285,7 @@ in {
|
|||||||
libreoffice
|
libreoffice
|
||||||
# gnumeric
|
# gnumeric
|
||||||
dia
|
dia
|
||||||
unstablePackages.pandoc
|
pandoc
|
||||||
niveumPackages.man-pandoc
|
niveumPackages.man-pandoc
|
||||||
typst
|
typst
|
||||||
# proselint
|
# proselint
|
||||||
|
|||||||
185
flake.lock
generated
185
flake.lock
generated
@@ -11,11 +11,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696775529,
|
"lastModified": 1701216516,
|
||||||
"narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
|
"narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
|
"rev": "13ac9ac6d68b9a0896e3d43a082947233189e247",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -211,6 +211,25 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"fenix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs_4",
|
||||||
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1701757414,
|
||||||
|
"narHash": "sha256-63epDkdiHYkiOLg061HsMK5Of4s4M4sUAWteZrkWynE=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "fenix",
|
||||||
|
"rev": "3d2215d896636efe29b71c8b9b2857d3d093f9c9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "fenix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -281,11 +300,11 @@
|
|||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1701680307,
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -295,6 +314,24 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_4": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_3"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1701680307,
|
||||||
|
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1676283394,
|
"lastModified": 1676283394,
|
||||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||||
@@ -371,16 +408,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699748081,
|
"lastModified": 1700814205,
|
||||||
"narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",
|
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "04bac349d585c9df38d78e0285b780a140dc74a4",
|
"rev": "aeb2232d7a32530d3448318790534d196bf9427a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-23.05",
|
"ref": "release-23.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -451,22 +488,16 @@
|
|||||||
},
|
},
|
||||||
"menstruation-backend_2": {
|
"menstruation-backend_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"fenix": "fenix",
|
||||||
"flake-utils"
|
"flake-utils": "flake-utils_4",
|
||||||
],
|
"nixpkgs": "nixpkgs_5"
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"rust-overlay": [
|
|
||||||
"rust-overlay"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1677075142,
|
"lastModified": 1701812852,
|
||||||
"narHash": "sha256-0RXVZcK2YtPckd/3+jb+yLpeXZ6jnQe25w9idztDXi8=",
|
"narHash": "sha256-KUWi0BzEUVQDdR4hQiITVoyGWl4RsvcrGVgftYROmBk=",
|
||||||
"owner": "kmein",
|
"owner": "kmein",
|
||||||
"repo": "menstruation.rs",
|
"repo": "menstruation.rs",
|
||||||
"rev": "e34af4393963cdbadb456b7b9ae2e95e6db7b8a3",
|
"rev": "a1f90393f198d437459bd7db791e2f7ba9e4198f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -818,11 +849,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable_2": {
|
"nixpkgs-unstable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700354440,
|
"lastModified": 1701812053,
|
||||||
"narHash": "sha256-J7v2VCFnya2xsKc3W6HoxMK6dNy5h52dZ4k75pa9dQ8=",
|
"narHash": "sha256-vFL4wWrdDWNlwYvugyQ8gSmoxHQzOYpoM7bdfgKUUP8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3fe4f799067d0458b386bdb4fbdaea55315e8ee0",
|
"rev": "6a937597be7852efba210335c02596e0a33098d8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -863,21 +894,53 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700097215,
|
"lastModified": 1701436327,
|
||||||
"narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=",
|
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f",
|
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"ref": "nixos-23.05",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1701436327,
|
||||||
|
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_6": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1701539137,
|
||||||
|
"narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-23.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659446231,
|
"lastModified": 1659446231,
|
||||||
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
|
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
|
||||||
@@ -893,7 +956,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615532953,
|
"lastModified": 1615532953,
|
||||||
"narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
|
"narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
|
||||||
@@ -1019,11 +1082,11 @@
|
|||||||
},
|
},
|
||||||
"nur_2": {
|
"nur_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700347453,
|
"lastModified": 1701812680,
|
||||||
"narHash": "sha256-T/a9YAJczC8wfpAQJ7GKI9+WB/s0wfezmMZqxaY9+zc=",
|
"narHash": "sha256-AUGWR2wkUf5hAf825jgyTN0CdT0+SxT4G9U4esUcQg0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "ce4bf2a6f08aea6c6824cffd7f511058764d83ab",
|
"rev": "0647be9dcaf61dfa3f367ad08aa11d77f35b5aa6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1124,7 +1187,7 @@
|
|||||||
"menstruation-telegram": "menstruation-telegram_2",
|
"menstruation-telegram": "menstruation-telegram_2",
|
||||||
"nix-on-droid": "nix-on-droid_2",
|
"nix-on-droid": "nix-on-droid_2",
|
||||||
"nixinate": "nixinate_2",
|
"nixinate": "nixinate_2",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"nixpkgs-old": "nixpkgs-old_2",
|
"nixpkgs-old": "nixpkgs-old_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable_2",
|
"nixpkgs-unstable": "nixpkgs-unstable_2",
|
||||||
"nur": "nur_2",
|
"nur": "nur_2",
|
||||||
@@ -1140,6 +1203,23 @@
|
|||||||
"wallpapers": "wallpapers_2"
|
"wallpapers": "wallpapers_2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"rust-analyzer-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1701721820,
|
||||||
|
"narHash": "sha256-fKcg/YWrCc2ZT4hUvx2bPd+xCTAnQYcd0oDI1cpN07U=",
|
||||||
|
"owner": "rust-lang",
|
||||||
|
"repo": "rust-analyzer",
|
||||||
|
"rev": "2d66f6df252896cfbd7bd24be6ee0c124369b1b7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "rust-lang",
|
||||||
|
"ref": "nightly",
|
||||||
|
"repo": "rust-analyzer",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
@@ -1177,11 +1257,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700273673,
|
"lastModified": 1701742626,
|
||||||
"narHash": "sha256-0XD4JvrQiZ9BDFdH3VTwqZVXTYzOfS7DVblvqHBnWgE=",
|
"narHash": "sha256-ASuWURoeuV7xKZEVSCJsdHidrgprJexNkFWU/cfZ5LE=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "616074a1b2a71bbe44da4cc29a64255aecb8d541",
|
"rev": "1f48c08cae1b2c4d5f201a77abfe31fc3b95a4cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1235,11 +1315,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689276466,
|
"lastModified": 1701811923,
|
||||||
"narHash": "sha256-T+1f2GsTDzfiEasSPntbaSsJvpJxZ78a5g6CL4NyAK0=",
|
"narHash": "sha256-t9yJn8/K5d+p8vwRNjX3hG5lq40pc8MPR2QlbXM/lCc=",
|
||||||
"owner": "kmein",
|
"owner": "kmein",
|
||||||
"repo": "scripts",
|
"repo": "scripts",
|
||||||
"rev": "55dff522684f342f4e970116ab374ba999539288",
|
"rev": "3ba064bdedeedd4ad524f91b9fac9caf38386f17",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1334,6 +1414,21 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"telebots": {
|
"telebots": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
@@ -1355,8 +1450,8 @@
|
|||||||
},
|
},
|
||||||
"telebots_2": {
|
"telebots_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_5",
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1677156381,
|
"lastModified": 1677156381,
|
||||||
@@ -1491,7 +1586,7 @@
|
|||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
"flake-utils"
|
"flake-utils"
|
||||||
],
|
],
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_8"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615819231,
|
"lastModified": 1615819231,
|
||||||
|
|||||||
10
flake.nix
10
flake.nix
@@ -5,14 +5,14 @@
|
|||||||
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.05";
|
home-manager.url = "github:nix-community/home-manager/release-23.11";
|
||||||
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.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
|
||||||
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";
|
||||||
@@ -29,9 +29,9 @@
|
|||||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
|
coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
menstruation-backend.inputs.flake-utils.follows = "flake-utils";
|
# menstruation-backend.inputs.flake-utils.follows = "flake-utils";
|
||||||
menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
|
# menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
|
# menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
|
||||||
menstruation-telegram.inputs.flake-utils.follows = "flake-utils";
|
menstruation-telegram.inputs.flake-utils.follows = "flake-utils";
|
||||||
menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
|
menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
|
||||||
menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
|
menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ in {
|
|||||||
defaults.email = kieran.email;
|
defaults.email = kieran.email;
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users.root.passwordFile = config.age.secrets.root.path;
|
users.users.root.hashedPasswordFile = config.age.secrets.root.path;
|
||||||
|
|
||||||
environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
|
environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
lib,
|
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
storageBoxMountPoint = "/mnt/storagebox";
|
storageBoxMountPoint = "/mnt/storagebox";
|
||||||
@@ -48,10 +47,9 @@ in {
|
|||||||
|
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud26;
|
package = pkgs.nextcloud27;
|
||||||
|
|
||||||
https = true;
|
https = true;
|
||||||
enableBrokenCiphersForSSE = false;
|
|
||||||
|
|
||||||
autoUpdateApps = {
|
autoUpdateApps = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -104,9 +102,11 @@ in {
|
|||||||
ensureUsers = [
|
ensureUsers = [
|
||||||
{
|
{
|
||||||
name = "nextcloud";
|
name = "nextcloud";
|
||||||
ensurePermissions."DATABASE ${config.services.nextcloud.config.dbname}" = "ALL PRIVILEGES";
|
ensureDBOwnership = true;
|
||||||
|
# ensurePermissions."DATABASE ${config.services.nextcloud.config.dbname}" = "ALL PRIVILEGES";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
package = pkgs.postgresql_14;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts."cloud.kmein.de" = {
|
services.nginx.virtualHosts."cloud.kmein.de" = {
|
||||||
|
|||||||
@@ -24,13 +24,15 @@ in {
|
|||||||
dataDir = "${mpd-directory}/.config/syncthing";
|
dataDir = "${mpd-directory}/.config/syncthing";
|
||||||
cert = config.age.secrets.syncthing-cert.path;
|
cert = config.age.secrets.syncthing-cert.path;
|
||||||
key = config.age.secrets.syncthing-key.path;
|
key = config.age.secrets.syncthing-key.path;
|
||||||
devices = {
|
settings = {
|
||||||
inherit ((import ../../lib).syncthing.devices) kabsa manakish heym;
|
devices = {
|
||||||
};
|
inherit ((import ../../lib).syncthing.devices) kabsa manakish heym;
|
||||||
folders."${config.services.mpd.musicDirectory}/sync" = {
|
};
|
||||||
devices = ["heym" "kabsa" "manakish"];
|
folders."${config.services.mpd.musicDirectory}/sync" = {
|
||||||
id = "music";
|
devices = ["heym" "kabsa" "manakish"];
|
||||||
type = "receiveonly";
|
id = "music";
|
||||||
|
type = "receiveonly";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user