diff --git a/flake.lock b/flake.lock index 04f7018..549f598 100644 --- a/flake.lock +++ b/flake.lock @@ -220,20 +220,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", + "lastModified": 1685189510, + "narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", + "rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -340,11 +339,11 @@ ] }, "locked": { - "lastModified": 1683530131, - "narHash": "sha256-R0RSqj6JdZfru2x/cM19KJMHsU52OjtyxI5cccd+uFc=", + "lastModified": 1685000237, + "narHash": "sha256-pm+2xP9g9sh6wapk1ulg7/1DdENkTNDB7Kx+6lwGs/k=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "10079333313ff62446e6f2b0e7c5231c7431d269", + "rev": "05bef004794f352ea12475a89f3f55b4102c0728", "type": "github" }, "original": { @@ -355,11 +354,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1684169666, - "narHash": "sha256-N5jrykeSxLVgvm3Dd3hZ38/XwM/jU+dltqlXgrGlYxk=", + "lastModified": 1684899633, + "narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "71ce85372a614d418d5e303dd5702a79d1545c04", + "rev": "4cc688ee711159b9bcb5a367be44007934e1a49d", "type": "github" }, "original": { @@ -418,16 +417,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1684398685, - "narHash": "sha256-TRE62m91iZ5ArVMgA+uj22Yda8JoQuuhc9uwZ+NoX+0=", + "lastModified": 1685094109, + "narHash": "sha256-u+awry81RAVV+fJBCZt+GKWsISSLJKUNbVwKccHeaPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "628d4bb6e9f4f0c30cfd9b23d3c1cdcec9d3cb5c", + "rev": "551a52bfdd02e7b75be5faf9b42f864112d88654", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -569,21 +568,6 @@ "repo": "default", "type": "github" } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 068d8bf..e56834b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "dadada's nix flake"; inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; + nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; flake-utils.url = github:numtide/flake-utils; home-manager = { - url = github:nix-community/home-manager/release-22.11; + url = github:nix-community/home-manager/release-23.05; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = github:NixOS/nixos-hardware/master; diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index 744e08b..832491f 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -110,7 +110,6 @@ with pkgs; [ reptyr ripgrep ripgrep - rust-analyzer rustup saleae-logic-2 sd # search and displace like sed but with better syntax diff --git a/nixos/agares/configuration.nix b/nixos/agares/configuration.nix index 67b6c90..f49b083 100644 --- a/nixos/agares/configuration.nix +++ b/nixos/agares/configuration.nix @@ -26,7 +26,6 @@ # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; boot.kernelParams = [ diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 935e888..ee3485b 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -59,7 +59,6 @@ in dadada = { #headphones.enable = true; steam.enable = true; - kanboard.enable = true; #fido2 = { # credential = "04ea2813a116f634e90f9728dbbb45f1c0f93b7811941a5a14fb75e711794df0c26552dae2262619c1da2be7562ec9dd94888c71a9326fea70dfe16214b5ea8ec01473070000"; # enablePam = true; @@ -151,7 +150,6 @@ in virtualisation.podman = { enable = true; dockerCompat = true; - defaultNetwork.dnsname.enable = true; }; users.users = { diff --git a/nixos/ifrit/configuration.nix b/nixos/ifrit/configuration.nix index 9f1665a..5927c60 100644 --- a/nixos/ifrit/configuration.nix +++ b/nixos/ifrit/configuration.nix @@ -26,7 +26,6 @@ in # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; # weird issues with crappy plastic router diff --git a/nixos/modules/admin.nix b/nixos/modules/admin.nix index 87d9573..8a6818e 100644 --- a/nixos/modules/admin.nix +++ b/nixos/modules/admin.nix @@ -77,7 +77,7 @@ in programs.zsh.enable = mkDefault true; services.sshd.enable = true; - services.openssh.passwordAuthentication = false; + services.openssh.settings.PasswordAuthentication = false; security.sudo.wheelNeedsPassword = false; services.openssh.openFirewall = true; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 0d63712..9b8864e 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -9,7 +9,6 @@ gitea = import ./gitea.nix; headphones = import ./headphones.nix; homepage = import ./homepage.nix; - kanboard = import ./kanboard; miniflux = import ./miniflux.nix; networking = import ./networking.nix; inputs = import ./inputs.nix; diff --git a/nixos/modules/gitea.nix b/nixos/modules/gitea.nix index bc4c6a0..f566024 100644 --- a/nixos/modules/gitea.nix +++ b/nixos/modules/gitea.nix @@ -14,20 +14,24 @@ in services.gitea = { enable = true; appName = "dadada Gitea"; - rootUrl = "https://git.dadada.li/"; - log.level = "Error"; - domain = config.networking.domain; - cookieSecure = true; - enableUnixSocket = true; database = { type = "postgres"; }; - disableRegistration = true; + settings = { + service = { + DISABLE_REGISTRATION = true; + }; + sessions = { + COOKIE_SECURE = true; + }; server = { + ROOT_URL = "https://git.dadada.li/"; + PROTOCOL = "http+unix"; LANDING_PAGE = "explore"; OFFLINE_MODE = true; DISABLE_SSH = false; + DOMAIN = "git.dadada.li"; }; picture = { DISABLE_GRAVATAR = true; @@ -41,6 +45,7 @@ in }; log = { DISABLE_ROUTER_LOG = true; + LEVEL = "Error"; }; cache = { ENABLE = true; diff --git a/nixos/modules/kanboard/default.nix b/nixos/modules/kanboard/default.nix deleted file mode 100644 index e972977..0000000 --- a/nixos/modules/kanboard/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -# Source https://github.com/NixOS/nixpkgs/issues/113384 -{ config -, lib -, pkgs -, ... -}: -let - cfg = config.dadada.kanboard; -in -{ - options = { - dadada.kanboard.enable = lib.mkEnableOption "Enable Kanboard"; - }; - - config = lib.mkIf cfg.enable { - services.phpfpm.pools.kanboard = { - user = "kanboard"; - group = "kanboard"; - settings = { - "listen.group" = "nginx"; - "pm" = "static"; - "pm.max_children" = 4; - }; - }; - users.users.kanboard.isSystemUser = true; - users.users.kanboard.group = "kanboard"; - users.groups.kanboard.members = [ "kanboard" ]; - - systemd.tmpfiles.rules = [ - "d /var/lib/kanboard/data 0750 kanboard nginx - -" - ]; - - services.nginx = { - enable = true; - virtualHosts."kanboard.dadada.li" = { - root = pkgs.buildEnv { - name = "kanboard-configured"; - paths = [ - (pkgs.runCommand "kanboard-over" { meta.priority = 0; } '' - mkdir -p $out - for f in index.php jsonrpc.php ; do - echo " $out/$f - tail -n+2 ${pkgs.kanboard}/share/kanboard/$f \ - | sed 's^__DIR__^"${pkgs.kanboard}/share/kanboard"^' >> $out/$f - done - ln -s /var/lib/kanboard $out/data - ln -s ${./kanboard-config.php} $out/config.php - '') - { - outPath = "${pkgs.kanboard}/share/kanboard"; - meta.priority = 10; - } - ]; - }; - locations = { - "/".index = "index.php"; - "~ \\.php$" = { - tryFiles = "$uri =404"; - extraConfig = '' - fastcgi_pass unix:${config.services.phpfpm.pools.kanboard.socket}; - ''; - }; - }; - }; - }; - }; -} diff --git a/nixos/modules/kanboard/kanboard-config.php b/nixos/modules/kanboard/kanboard-config.php deleted file mode 100644 index 8a65351..0000000 --- a/nixos/modules/kanboard/kanboard-config.php +++ /dev/null @@ -1,279 +0,0 @@ -