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

feat: upgrade to 23.05

Browse Source
This commit is contained in:
Kierán Meinhardt
2023-06-06 19:59:27 +02:00
parent 479742c5a5
commit f9326b19ab
13 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/default.nix
View File

@@ -31,7 +31,7 @@ in {
}; };
} }
{ {
boot.cleanTmpDir = true; boot.tmp.cleanOnBoot = true;
boot.loader.timeout = 1; boot.loader.timeout = 1;
} }
{ {

6
configs/packages.nix
View File

@@ -124,7 +124,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
@@ -261,9 +261,9 @@ in {
libreoffice libreoffice
# gnumeric # gnumeric
dia dia
unstablePackages.pandoc pandoc
niveumPackages.man-pandoc niveumPackages.man-pandoc
unstablePackages.typst typst
# proselint # proselint
asciidoctor asciidoctor
wordnet wordnet

6
configs/sshd.nix
View File

@@ -11,8 +11,10 @@ in {
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [sshPort]; ports = [sshPort];
passwordAuthentication = false; settings = {
forwardX11 = true; PasswordAuthentication = false;
X11Forwarding = true;
};
}; };
users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs; users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;

6
configs/telegram-bots/default.nix
View File

@@ -57,7 +57,7 @@ in {
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
description = "Telegram reverse bot"; description = "Telegram reverse bot";
path = [pkgs.ffmpeg]; path = [pkgs.ffmpeg];
enable = true; enable = false;
script = '' script = ''
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-reverse TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-reverse
''; '';
@@ -69,7 +69,7 @@ in {
systemd.services.telegram-betacode = { systemd.services.telegram-betacode = {
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
description = "Telegram beta code bot"; description = "Telegram beta code bot";
enable = true; enable = false;
script = '' script = ''
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-betacode TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-betacode
''; '';
@@ -80,7 +80,7 @@ in {
systemd.services.telegram-proverb = { systemd.services.telegram-proverb = {
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
description = "Telegram proverb bot"; description = "Telegram proverb bot";
enable = true; enable = false;
script = '' script = ''
TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-proverb TELEGRAM_BOT_TOKEN="$(cat "$CREDENTIALS_DIRECTORY/token")" ${telebots}/bin/telegram-proverb
''; '';

19
flake.lock generated
View File

@@ -84,22 +84,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"utils": [
"flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1681092193, "lastModified": 1685599623,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -178,16 +175,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1684398685, "lastModified": 1685865905,
"narHash": "sha256-TRE62m91iZ5ArVMgA+uj22Yda8JoQuuhc9uwZ+NoX+0=", "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "628d4bb6e9f4f0c30cfd9b23d3c1cdcec9d3cb5c", "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

5
flake.nix
View File

@@ -4,11 +4,11 @@
inputs = { inputs = {
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
home-manager.url = "github:nix-community/home-manager/release-22.11"; home-manager.url = "github:nix-community/home-manager/release-23.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";
nixinate.url = "github:matthewcroughan/nixinate"; nixinate.url = "github:matthewcroughan/nixinate";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
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";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@@ -24,7 +24,6 @@
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
agenix.inputs.home-manager.follows = "home-manager"; agenix.inputs.home-manager.follows = "home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.utils.follows = "flake-utils";
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";

28
lib/i3status-rust.nix
View File

@@ -13,7 +13,7 @@
''; '';
in { in {
theme = { theme = {
name = "plain"; theme = "plain";
overrides = { overrides = {
critical_fg = colours.red.bright; critical_fg = colours.red.bright;
good_fg = colours.green.bright; good_fg = colours.green.bright;
@@ -30,15 +30,14 @@ in {
separator_fg = colours.black.bright; separator_fg = colours.black.bright;
}; };
}; };
icons.name = "awesome6"; icons.icons = "awesome6";
icons.overrides.rss = "";
icons.overrides.vpn = ""; icons.overrides.vpn = "";
icons.overrides.irc = ""; icons.overrides.irc = "";
block = [ block = [
{ {
block = "weather"; block = "weather";
autolocate = true; autolocate = true;
format = "{location}: {temp}C"; format = "$icon $location: $temp";
service = { service = {
name = "openweathermap"; name = "openweathermap";
city_id = "2950159"; city_id = "2950159";
@@ -73,12 +72,6 @@ in {
info = ["total"]; info = ["total"];
warning = ["mention" "review_requested" "team_mention" "manual" "invitation" "assign" "subscribed"]; warning = ["mention" "review_requested" "team_mention" "manual" "invitation" "assign" "subscribed"];
} }
{
block = "custom";
interval = 10;
command = "newsboat-unread-count";
json = true;
}
{ {
block = "custom"; block = "custom";
interval = 10; interval = 10;
@@ -153,6 +146,12 @@ in {
json = true; json = true;
hide_when_empty = true; hide_when_empty = true;
} }
{
block = "service_status";
service = "hu-vpn";
active_format = "^icon_vpn";
inactive_format = "";
}
{ {
block = "custom"; block = "custom";
interval = 5; interval = 5;
@@ -168,7 +167,7 @@ in {
{ {
block = "net"; block = "net";
device = wirelessInterface; device = wirelessInterface;
format = "{ssid} {signal_strength}"; format = "$icon $ssid $signal_strength";
} }
{ {
block = "battery"; block = "battery";
@@ -176,17 +175,14 @@ in {
} }
{ {
block = "sound"; block = "sound";
on_click = "pavucontrol";
} }
{ {
block = "disk_space"; block = "disk_space";
format = "{icon} {available}"; format = "$icon $available";
} }
{ {
block = "memory"; block = "memory";
display_type = "memory"; format = "$icon $mem_used.eng(prefix:G)";
format_mem = "{mem_used;G}";
clickable = false;
} }
{block = "load";} {block = "load";}
{ {

2
systems/ful/configuration.nix
View File

@@ -93,5 +93,5 @@ in {
environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3]; environment.systemPackages = [pkgs.vim pkgs.git pkgs.tmux pkgs.python3];
# since 22.05 timeout fails? # since 22.05 timeout fails?
systemd.services.systemd-networkd-wait-online.enable = false; # systemd.services.systemd-networkd-wait-online.enable = false;
} }

2
systems/makanek/gitea.nix
View File

@@ -4,9 +4,9 @@ let
in { in {
services.gitea = { services.gitea = {
enable = true; enable = true;
rootUrl = domain;
appName = "code.kmein.de"; appName = "code.kmein.de";
settings = { settings = {
server.ROOT_URL = domain;
server.SSH_PORT = sshPort; server.SSH_PORT = sshPort;
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
}; };

1
systems/makanek/hardware-configuration.nix
View File

@@ -16,7 +16,6 @@
extraModulePackages = []; extraModulePackages = [];
loader.grub = { loader.grub = {
enable = true; enable = true;
version = 2;
devices = ["/dev/sda"]; devices = ["/dev/sda"];
configurationLimit = 3; configurationLimit = 3;
}; };

2
systems/makanek/nextcloud.nix
View File

@@ -23,7 +23,7 @@ in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud25; package = pkgs.nextcloud26;
https = true; https = true;
enableBrokenCiphersForSSE = false; enableBrokenCiphersForSSE = false;

2
systems/zaatar/configuration.nix
View File

@@ -81,7 +81,7 @@ in {
]; ];
# since 22.05 timeout fails? # since 22.05 timeout fails?
systemd.services.systemd-networkd-wait-online.enable = false; # systemd.services.systemd-networkd-wait-online.enable = false;
networking = { networking = {
hostName = "zaatar"; hostName = "zaatar";

2
systems/zaatar/moodle-dl-meinhark.nix
View File

@@ -7,7 +7,7 @@
moodle-dl-package = pkgs.moodle-dl.overrideAttrs (old: moodle-dl-package = pkgs.moodle-dl.overrideAttrs (old:
old old
// { // {
patches = [../../packages/moodle-dl/telegram-format.patch]; # patches = [../../packages/moodle-dl/telegram-format.patch]; TODO?
}); });
in { in {
age.secrets = { age.secrets = {