summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chaski/configuration.nix4
-rw-r--r--chaski/services/tracktrain.nix9
-rw-r--r--common/common.nix2
-rw-r--r--common/headless.nix2
-rw-r--r--flake.lock88
-rw-r--r--flake.nix6
-rw-r--r--flora/configuration.nix12
-rw-r--r--flora/services/cgit.nix1
-rw-r--r--flora/services/pleroma.nix1
-rw-r--r--home/packages-minimal.nix2
-rw-r--r--home/packages.nix2
11 files changed, 52 insertions, 77 deletions
diff --git a/chaski/configuration.nix b/chaski/configuration.nix
index 88d617b..6e14e95 100644
--- a/chaski/configuration.nix
+++ b/chaski/configuration.nix
@@ -8,9 +8,7 @@
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
- # note: dns records deleted
- # ./services/jitsi.nix
- ./services/uplcg.nix
+ # ./services/uplcg.nix
./services/woitb.nix
./services/geolocation.nix
./services/tracktrain.nix
diff --git a/chaski/services/tracktrain.nix b/chaski/services/tracktrain.nix
index 6f9acb9..3841a42 100644
--- a/chaski/services/tracktrain.nix
+++ b/chaski/services/tracktrain.nix
@@ -23,7 +23,14 @@
script = ''
cd /tmp
wget "https://ilztalbahn.eu/wp-content/uploads/2020/07/gtfs.zip"
- ${import inputs.tracktrain {nixpkgs = pkgs;}}/bin/haskell-gtfs
+ ${((import inputs.tracktrain {nixpkgs = pkgs;}))
+ # have to remove version constraints because some aren't in 22.05
+ .overrideAttrs (old: { patchPhase = ''
+ sed -i "s/base.*/base/g" *.cabal
+ sed -i "s/^>=.*//g" *.cabal
+ sed -i "s/>=.*//g" *.cabal
+ ''; })
+ }/bin/haskell-gtfs
'';
startAt = "daily";
};
diff --git a/common/common.nix b/common/common.nix
index 947ad9e..e1dd6f7 100644
--- a/common/common.nix
+++ b/common/common.nix
@@ -9,7 +9,7 @@
time.timeZone = "Europe/Amsterdam";
environment.systemPackages = with pkgs; [
- wget vim htop-vim dnsutils inetutils iftop manpages
+ wget vim htop-vim dnsutils inetutils iftop man-pages gitMinimal
];
# Select internationalisation properties.
diff --git a/common/headless.nix b/common/headless.nix
index 6c4127e..d3a7c22 100644
--- a/common/headless.nix
+++ b/common/headless.nix
@@ -25,7 +25,7 @@
security.acme = {
acceptTerms = true;
- email = "stuebinm@disroot.org";
+ defaults.email = "stuebinm@disroot.org";
};
}
diff --git a/flake.lock b/flake.lock
index cf1b57f..6f89a73 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,11 +49,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1648475189,
- "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
+ "lastModified": 1653594315,
+ "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=",
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
+ "rev": "184349d8149436748986d1bdba087e4149e9c160",
"type": "github"
},
"original": {
@@ -114,16 +114,16 @@
]
},
"locked": {
- "lastModified": 1648834319,
- "narHash": "sha256-i5Aj4Aw64D/A0X6XW5LxSS4XBnYj7gMz+kN4dpsbdk8=",
+ "lastModified": 1654113405,
+ "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "0bdbdea2e26c984b096f4f7d10e3c88536a980b0",
+ "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-21.11",
+ "ref": "release-22.05",
"repo": "home-manager",
"type": "github"
}
@@ -135,11 +135,11 @@
]
},
"locked": {
- "lastModified": 1648544490,
- "narHash": "sha256-EoBDcccV70tfz2LAs5lK0BjC7en5mzUVlgLsd5E6DW4=",
+ "lastModified": 1655042882,
+ "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
"owner": "nix-community",
"repo": "naersk",
- "rev": "e30ef9a5ce9b3de8bb438f15829c50f9525ca730",
+ "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
"type": "github"
},
"original": {
@@ -150,57 +150,27 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1649079908,
- "narHash": "sha256-EfiX+YBbhvJz/wuZzY+K6Rhbunbu6oK4ms7Qa4THpMI=",
+ "lastModified": 1655200170,
+ "narHash": "sha256-/yzkX+10sJhYNIcTtZ5ObS+nh/HrJp01XLaubzbRDcU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fcc07c40a30567772b349d163a32e10324c02aaa",
+ "rev": "9ff91ce2e4c5d70551d4c8fd8830931c6c6b26b8",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "release-21.11",
+ "ref": "release-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs-21_05": {
- "locked": {
- "lastModified": 1625692408,
- "narHash": "sha256-e9L3TLLDVIJpMnHtiNHJE62oOh6emRtSZ244bgYJUZs=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "c06613c25df3fe1dd26243847a3c105cf6770627",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "nixos-21.05",
- "type": "indirect"
- }
- },
- "nixpkgs-21_11": {
- "locked": {
- "lastModified": 1638371214,
- "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "a640d8394f34714578f3e6335fc767d0755d78f9",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "nixos-21.11",
- "type": "indirect"
- }
- },
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1648219316,
- "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
+ "lastModified": 1655183247,
+ "narHash": "sha256-RQwSjdHA3MY/UpKpuT+Nv5HfFj8yCQHwKLd287j9jbE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
+ "rev": "3c2068d6c90cab895afad0f8249fcf968aea4bca",
"type": "github"
},
"original": {
@@ -212,11 +182,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1626852498,
- "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
+ "lastModified": 1642635915,
+ "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70",
+ "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f",
"type": "github"
},
"original": {
@@ -280,21 +250,19 @@
"inputs": {
"blobs": "blobs",
"nixpkgs": "nixpkgs_2",
- "nixpkgs-21_05": "nixpkgs-21_05",
- "nixpkgs-21_11": "nixpkgs-21_11",
"utils": "utils_2"
},
"locked": {
- "lastModified": 1638911354,
- "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=",
+ "lastModified": 1653423337,
+ "narHash": "sha256-TLNyDhwhQWimt5QWzFf/3B7lKk5isdICNRTwiCAhiB0=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
- "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303",
+ "rev": "15cf252a0dfffb2420a60fbd6be3467c11026142",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
- "ref": "nixos-21.11",
+ "ref": "master",
"repo": "nixos-mailserver",
"type": "gitlab"
}
@@ -302,11 +270,11 @@
"tracktrain": {
"flake": false,
"locked": {
- "lastModified": 1641709913,
- "narHash": "sha256-n3c6wOmlKL7X7ALLAnQYGyGNlVUrDVpUFY2tBQRV4Vs=",
+ "lastModified": 1654892572,
+ "narHash": "sha256-BJXYM+CM4rPfeR1/loJKNe2/U08DzRkRNEQFDfxGE3g=",
"ref": "main",
- "rev": "2784c11ea13cad29d0407bcb64fde7cef5e9c360",
- "revCount": 5,
+ "rev": "c37d12f82eea235295c50014acd41c094b426f14",
+ "revCount": 6,
"type": "git",
"url": "https://stuebinm.eu/git/tracktrain"
},
diff --git a/flake.nix b/flake.nix
index 0a7fe56..8719fea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,16 +3,16 @@
description = "testing nix flakes for server deployment";
inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/release-21.11";
+ nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
- home-manager.url = "github:nix-community/home-manager/release-21.11";
+ home-manager.url = "github:nix-community/home-manager/release-22.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
naersk.url = "github:nix-community/naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs";
deploy-rs.url = "github:serokell/deploy-rs";
deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
- simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11";
+ simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
# simple-nixos-mailserver.follows = "nixpkgs";
uplcg.url = "git+https://stuebinm.eu/git/uplcg?ref=main";
diff --git a/flora/configuration.nix b/flora/configuration.nix
index 51fee59..07d1049 100644
--- a/flora/configuration.nix
+++ b/flora/configuration.nix
@@ -54,9 +54,11 @@
services.logrotate = {
enable = true;
- paths.nginx = {
- path = "/var/log/nginx";
- frequency = "weekly";
+ # the nginx module does stuff here, which apparently no one tells anyone about
+ settings.nginx = {
+ rotate = 2;
+ nocompress = true;
+ compress = false;
};
};
@@ -67,9 +69,7 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
- system = {
- stateVersion = "20.09"; # Did you read the comment?
- };
+ system.stateVersion = "20.09"; # Did you read the comment?
}
diff --git a/flora/services/cgit.nix b/flora/services/cgit.nix
index cc05d5c..f18fd69 100644
--- a/flora/services/cgit.nix
+++ b/flora/services/cgit.nix
@@ -18,6 +18,7 @@
};
config = {pkgs, config, ...}: {
+ system.stateVersion = "20.09";
services.lighttpd.enable = true;
services.lighttpd.extraConfig = ''server.use-ipv6 = "enable"'';
services.lighttpd.cgit = {
diff --git a/flora/services/pleroma.nix b/flora/services/pleroma.nix
index 21e4228..12f4511 100644
--- a/flora/services/pleroma.nix
+++ b/flora/services/pleroma.nix
@@ -24,6 +24,7 @@ in
# pleroma has a cli tool for configuration
environment.systemPackages = [ pkgs.dnsutils ];
+ system.stateVersion = "20.09";
services.pleroma = {
enable = true;
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index 8544f12..7c47af9 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -22,7 +22,7 @@ in
lynx
pandoc
# extra documentation, data, resources that aren't programs
- manpages nerdfonts
+ nerdfonts
# general cli utils
tree dnsutils inetutils pijul bat age libsecret gping bottom dogdns
cifs-utils jekyll fzf ripgrep fd bandwhich exa dive
diff --git a/home/packages.nix b/home/packages.nix
index 63abb12..39c0b90 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -19,7 +19,7 @@ in
gimp-with-plugins inkscape krita meshlab pavucontrol moc
gst_all_1.gstreamer
# LaTeX & documents
- texlive.combined.scheme-full xournal pandoc zathura
+ texlive.combined.scheme-full xournal pandoc zathura pdfpc
# general cli utils
extras.almanac libnotify grim slurp wl-clipboard
# graphical utils
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:50:43 +0000