diff --git a/flake.lock b/flake.lock index 263389f..1007cd7 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1661323822, - "narHash": "sha256-1UGGcQ00uSo5cPTwL7C3S1zkcScbpF0WzspvnceWkbQ=", + "lastModified": 1663328500, + "narHash": "sha256-7n+J/exp8ky4dmk02y5a9R7CGmJvHpzrHMzfEkMtSWA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d81e6295ca530603478114f4977402d51299ad8", + "rev": "5427f3d1f0ea4357cd4af0bffee7248d640c6ffc", "type": "github" }, "original": { @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1661329936, - "narHash": "sha256-dafFjAcJPo0SdegK3E+SnTI8CNMgV/bBm/6CeDf82f8=", + "lastModified": 1663492236, + "narHash": "sha256-KzgrcFVhv/Ca7m83SaijE0W+tLHzjoypHZm9gHGS+cY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ef0e7f41cdf8fae1d2390c4df246c90a364ed8d9", + "rev": "de4d41ee9fd12a60236c1f35cead7c511dac08eb", "type": "github" }, "original": { @@ -186,11 +186,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1661239211, - "narHash": "sha256-pNJzBlSNpWEiFJZnLF2oETYq8cGWx1DJPW33aMtG6n8=", + "lastModified": 1663494472, + "narHash": "sha256-fSowlaoXXWcAM8m9wA6u+eTJJtvruYHMA+Lb/tFi/qM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e804cd8a27f835a402b22e086e36e797716ef8b", + "rev": "f677051b8dc0b5e2a9348941c99eea8c4b0ff28f", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "utils_3": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { diff --git a/home/gui/environments/gnome/default.nix b/home/gui/environments/gnome/default.nix index c10503e..1f31515 100644 --- a/home/gui/environments/gnome/default.nix +++ b/home/gui/environments/gnome/default.nix @@ -7,9 +7,7 @@ in { dconf.enable = true; dconf.settings = { - "org/gnome/mutter" = { - dynamic-workspaces = false; - }; + "org/gnome/mutter" = { dynamic-workspaces = false; }; "org/gnome/desktop/interface" = { # Clock at Top Bar diff --git a/hosts/hetzner-vm/hetzner-vm.nix b/hosts/hetzner-vm/hetzner-vm.nix index 3540342..2e51203 100644 --- a/hosts/hetzner-vm/hetzner-vm.nix +++ b/hosts/hetzner-vm/hetzner-vm.nix @@ -18,7 +18,7 @@ hosts.hetzner-vm.services.storage-sftp hosts.hetzner-vm.services.mail hosts.hetzner-vm.services.gitlab-static-sites - #hosts.hetzner-vm.services.misskey + hosts.hetzner-vm.services.lappy-dev (modulesPath + "/profiles/qemu-guest.nix") diff --git a/hosts/hetzner-vm/services/lappy-dev.nix b/hosts/hetzner-vm/services/lappy-dev.nix new file mode 100644 index 0000000..631ff0f --- /dev/null +++ b/hosts/hetzner-vm/services/lappy-dev.nix @@ -0,0 +1,7 @@ +{ ... }: { + services.nginx.virtualHosts."lappy-dev.owo.monster" = { + forceSSL = true; + enableACME = true; + locations = { "/".proxyPass = "http://lappy.tailscale-internal.genderfucked.monster:8088"; }; + }; +} diff --git a/hosts/hetzner-vm/services/misskey.nix b/hosts/hetzner-vm/services/misskey.nix deleted file mode 100644 index bc33a71..0000000 --- a/hosts/hetzner-vm/services/misskey.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ pkgs, ... }: -let - misskeyDomain = "social.owo.monster"; - misskeyPort = 3020; - redisPort = 3019; -in { - users.users."misskey" = { - isNormalUser = true; - createHome = true; - extraGroups = [ "docker" ]; - }; - home-manager.users."misskey".home.packages = with pkgs; [ - git - docker-compose - ]; - - virtualisation.docker.enable = true; - - # make .config/default.yml a symlink to /etc/misskey.yml - environment.etc."misskey.yml".text = pkgs.lib.generators.toYAML { } { - url = "https://${misskeyDomain}/"; - port = misskeyPort; - - db = { - host = "localhost"; - port = "5432"; - db = "misskey"; - user = "misskey"; - pass = "a"; - }; - - redis = { - host = "127.0.0.1"; - port = redisPort; - }; - }; - - services.nginx.virtualHosts."${misskeyDomain}" = { - forceSSL = true; - enableACME = true; - locations = { - "/" = { - proxyPass = "http://127.0.0.1:${toString misskeyPort}"; - proxyWebsockets = true; - }; - }; - }; - - services.postgresql = { - enable = true; - ensureUsers = [{ - name = "misskey"; - ensurePermissions."DATABASE misskey" = "ALL PRIVILEGES"; - }]; - ensureDatabases = [ "misskey" ]; - }; - - services.redis.servers."misskey" = { - enable = true; - port = redisPort; - }; -} diff --git a/profiles/connectivity/ios/default.nix b/profiles/connectivity/ios/default.nix index 5ed343a..4b9f539 100644 --- a/profiles/connectivity/ios/default.nix +++ b/profiles/connectivity/ios/default.nix @@ -1 +1,7 @@ -_: { services.usbmuxd.enable = true; } +{ pkgs, ... }: { + services.usbmuxd.enable = true; + environment.systemPackages = with pkgs; [ + libimobiledevice + ifuse # optional, to mount using 'ifuse' + ]; +} diff --git a/scripts/rebuild.sh b/scripts/rebuild.sh index 44fed58..06763d0 100755 --- a/scripts/rebuild.sh +++ b/scripts/rebuild.sh @@ -14,4 +14,5 @@ FIRST_ARG="${1:-switch}" shift +sudo cpupower frequency-set -g performance nixos-rebuild --flake "path:${REPO_ROOT}#$(hostname)" ${FIRST_ARG} $@