diff --git a/flake.lock b/flake.lock index 7a14c69..0f21b43 100644 --- a/flake.lock +++ b/flake.lock @@ -385,11 +385,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738638143, - "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", + "lastModified": 1738471961, + "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", + "rev": "537286c3c59b40311e5418a180b38034661d2536", "type": "github" }, "original": { @@ -401,11 +401,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738574474, - "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", + "lastModified": 1738435198, + "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", + "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -701,11 +701,11 @@ ] }, "locked": { - "lastModified": 1738536830, - "narHash": "sha256-3QbNcI9qJ0tKv00w0r2Amqf9pylHVolcTyEi30WZxY8=", + "lastModified": 1738526440, + "narHash": "sha256-pveA7FOO6Y4pTnVIyx3xLUHUpq9JW9FqEj8E0t+YIjQ=", "ref": "main", - "rev": "6fd169aab3ce461fef6a1a4dcbb2ef643e12d9e6", - "revCount": 5, + "rev": "b1c65c444b21d1c8ddbefcfa339ac7861358d323", + "revCount": 4, "type": "git", "url": "https://codeberg.org/0xa/website.git" }, diff --git a/hosts/cloud/proxy/git.nix b/hosts/cloud/proxy/git.nix index ac53f4c..49be270 100644 --- a/hosts/cloud/proxy/git.nix +++ b/hosts/cloud/proxy/git.nix @@ -2,9 +2,7 @@ { # ssh config for forgejo # need ip forward for nat - boot.kernel.sysctl = { - "net.ipv4.ip_forward" = 1; - }; + boot.kernel.sysctl = { "net.ipv4.ip_forward" = 1; }; networking.firewall = { # open port explicitly @@ -20,20 +18,19 @@ ''; }; # host sshd: only listen on oxapentane.com and mgmt vpn - services.openssh.listenAddresses = - map - (a: { - addr = a; - port = 22; - }) - [ - # enp1s0 - "188.245.196.27" - "2a01:4f8:c17:7f8a::1" - # wg-0xa-mgmt - "10.89.87.1" - "fd31:185d:722e::1" - ]; + services.openssh.listenAddresses = map (a : + { + addr = a; + port = 22; + }) [ + # enp1s0 + "188.245.196.27" + "2a01:4f8:c17:7f8a::1" + # wg-0xa-mgmt + "10.89.87.1" + "fd31:185d:722e::1" + ]; + services.nginx.upstreams.forgejo = { servers = { diff --git a/hosts/forgejo/forgejo.nix b/hosts/forgejo/forgejo.nix index 965354f..d099efb 100644 --- a/hosts/forgejo/forgejo.nix +++ b/hosts/forgejo/forgejo.nix @@ -1,9 +1,4 @@ -{ - config, - pkgs, - lib, - ... -}: +{ config, pkgs, lib, ... }: { services.forgejo = { enable = true; @@ -32,8 +27,8 @@ SSH_LISTEN_PORT = 2222; }; repository = { - DEFAULT_REPO_UNITS = "repo.code,repo.releases,repo.issues,repo.pulls"; - ENABLE_PUSH_CREATE_USER = true; + DEFAULT_REPO_UNITS="repo.code,repo.releases,repo.issues,repo.pulls"; + ENABLE_PUSH_CREATE_USER=true; }; service = { REGISTER_EMAIL_CONFIRM = false; @@ -48,23 +43,21 @@ }; # expose forgejo cli - environment.systemPackages = - let - cfg = config.services.forgejo; - forgejo-cli = pkgs.writeScriptBin "forgejo-cli" '' - #!${pkgs.runtimeShell} - cd ${cfg.stateDir} - sudo=exec - if [[ "$USER" != forgejo ]]; then - sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} -g ${cfg.group} --preserve-env=GITEA_WORK_DIR --preserve-env=GITEA_CUSTOM' - fi - # Note that these variable names will change - export GITEA_WORK_DIR=${cfg.stateDir} - export GITEA_CUSTOM=${cfg.customDir} - $sudo ${lib.getExe cfg.package} "$@" - ''; - in - [ - forgejo-cli - ]; + environment.systemPackages = let + cfg = config.services.forgejo; + forgejo-cli = pkgs.writeScriptBin "forgejo-cli" '' + #!${pkgs.runtimeShell} + cd ${cfg.stateDir} + sudo=exec + if [[ "$USER" != forgejo ]]; then + sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} -g ${cfg.group} --preserve-env=GITEA_WORK_DIR --preserve-env=GITEA_CUSTOM' + fi + # Note that these variable names will change + export GITEA_WORK_DIR=${cfg.stateDir} + export GITEA_CUSTOM=${cfg.customDir} + $sudo ${lib.getExe cfg.package} "$@" + ''; in [ + forgejo-cli + ]; } + diff --git a/modules/tlp.nix b/modules/tlp.nix index 5606ab2..0265110 100644 --- a/modules/tlp.nix +++ b/modules/tlp.nix @@ -9,6 +9,7 @@ USB_BLACKLIST = "1d50:604b 1d50:6089 1d50:cc15 1fc9:000c"; CPU_SCALING_GOVERNOR_ON_AC = "performance"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + WIFI_PWR_ON_BAT = "off"; }; }; }