wurzel/fruitbasket
10
1
Fork 1
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity

upgrade quitte to 24.11

Browse source
This commit is contained in:
Rouven Seifert 2024-12-13 19:51:28 +01:00
parent 7d7d60c189
commit e3dd58a1f9
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
9 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
flake.lock generated
View file

@ -3,9 +3,7 @@
"course-management": { "course-management": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs"
],
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
@ -179,11 +177,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732519917, "lastModified": 1733629314,
"narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -201,11 +199,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732688645, "lastModified": 1733968549,
"narHash": "sha256-SQBVnfTAhVmNs5mKjoe942GykhAh9RQbcqScK9XlsWM=", "narHash": "sha256-r18fyuignDxOTgmgSRAvR2XRvdwoZOtPxqgRBuafqFQ=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "6adec7f87f6c1d455f89f57bd697740bd6dc88fa", "rev": "8f4795cc29b2a1e62e0d1856d9f7dcf219829748",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -216,21 +214,37 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732632634, "lastModified": 1730531603,
"narHash": "sha256-+G7n/ZD635aN0sEXQLynU7pWMd3PKDM7yBIXvYmjABQ=", "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6f6076c37180ea3a916f84928cf3a714c5207a30", "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1733808091,
"narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1682134069, "lastModified": 1682134069,
"narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
@ -296,7 +310,7 @@
"kpp": "kpp", "kpp": "kpp",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"print-interface": "print-interface", "print-interface": "print-interface",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"vscode-server": "vscode-server" "vscode-server": "vscode-server"
@ -309,11 +323,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732575825, "lastModified": 1733965552,
"narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,7 +435,7 @@
"vscode-server": { "vscode-server": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1729422940, "lastModified": 1729422940,

4
flake.nix
View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
@ -17,7 +17,7 @@
course-management = { course-management = {
url = "github:fsr/course-management"; url = "github:fsr/course-management";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-minecraft.url = "github:Infinidoge/nix-minecraft"; nix-minecraft.url = "github:Infinidoge/nix-minecraft";
nix-minecraft.inputs.nixpkgs.follows = "nixpkgs"; nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";

4
hosts/quitte/network.nix
View file

@ -38,10 +38,10 @@
]; ];
routes = [ routes = [
{ {
routeConfig.Gateway = "141.30.30.193"; Gateway = "141.30.30.193";
} }
{ {
routeConfig.Gateway = "fe80::7a24:59ff:fe5e:6e2f"; Gateway = "fe80::7a24:59ff:fe5e:6e2f";
} }
]; ];
networkConfig = { networkConfig = {

1
hosts/tomate/configuration.nix
View file

@ -106,7 +106,6 @@
}; };
# Enable sound with pipewire. # Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {

2
hosts/tomate/network.nix
View file

@ -27,7 +27,7 @@
address = [ "141.30.86.196/26" ]; address = [ "141.30.86.196/26" ];
routes = [ routes = [
{ {
routeConfig.Gateway = "141.30.86.193"; Gateway = "141.30.86.193";
} }
]; ];
networkConfig = { networkConfig = {

1
modules/core/base.nix
View file

@ -73,6 +73,7 @@
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
# basic shell & editor # basic shell & editor
programs.vim.enable = true;
programs.vim.defaultEditor = true; programs.vim.defaultEditor = true;
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:

4
modules/keycloak/default.nix
View file

@ -12,7 +12,9 @@ in
http-port = 8086; http-port = 8086;
https-port = 19000; https-port = 19000;
hostname = domain; hostname = domain;
proxy = "edge"; proxy-headers = "xforwarded";
http-enabled = true;
hostname-strict-https = false;
}; };
# The module requires a password for the DB and works best with its own DB config # The module requires a password for the DB and works best with its own DB config
# Does an automatic Postgresql configuration # Does an automatic Postgresql configuration

7
modules/minecraft/default.nix
View file

@ -12,13 +12,6 @@
jvmOpts = "-Xmx8192M -Xms8192M"; jvmOpts = "-Xmx8192M -Xms8192M";
}; };
}; };
services.bluemap = {
enable = true;
host = "map.mc.ifsr.de";
eula = true;
onCalendar = "hourly";
defaultWorld = "/srv/minecraft/ifsr/world";
};
services.nginx.virtualHosts."map.mc.ifsr.de".extraConfig = '' services.nginx.virtualHosts."map.mc.ifsr.de".extraConfig = ''
allow 141.30.0.0/16; allow 141.30.0.0/16;
allow 141.76.0.0/16; allow 141.76.0.0/16;

2
modules/nextcloud.nix
View file

@ -15,7 +15,7 @@ in
nextcloud = { nextcloud = {
enable = true; enable = true;
configureRedis = true; configureRedis = true;
package = pkgs.nextcloud29; package = pkgs.nextcloud30;
hostName = domain; hostName = domain;
https = true; # Use https for all urls https = true; # Use https for all urls
phpExtraExtensions = all: [ phpExtraExtensions = all: [