Merge branch 'master' of git.uninsane.org:shelvacu/nix-stuff

2025-03-28 16:11:56 -07:00
parent 050a855701 152d6e5301
commit eb853dbdd9
3 changed files with 55 additions and 60 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -552,11 +552,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741379162,
-        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
        "type": "github"
      },
      "original": {
@@ -656,11 +656,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742234739,
-        "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
+        "lastModified": 1742655702,
+        "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
+        "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
        "type": "github"
      },
      "original": {
@@ -677,11 +677,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742508854,
-        "narHash": "sha256-vQQTIl4+slrcu7ftVKNBql9ngBdY0dcYGujdT7zIVp0=",
+        "lastModified": 1742996658,
+        "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "da0181819479ddc034a3db9a77ed21ea3bcc0668",
+        "rev": "693840c01b9bef9e54100239cef937e53d4661bf",
        "type": "github"
      },
      "original": {
@@ -1122,11 +1122,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1742376361,
-        "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=",
+        "lastModified": 1742806253,
+        "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9",
+        "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
        "type": "github"
      },
      "original": {
@@ -1137,11 +1137,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1742477035,
-        "narHash": "sha256-Cd/SF29YrLJOp6c5m0Kfg14tO1bVzj9n3xZQCrLRrWs=",
+        "lastModified": 1743036386,
+        "narHash": "sha256-W1Qap/jwnpvWPXC+cUp0PlaZsJO05sfQfzffRrYW7YY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "005fba1c2b781d37edb2858194ff52f0a90733fd",
+        "rev": "1751c9cb80247edc5fed79b90211a92c56bf91e6",
        "type": "github"
      },
      "original": {
@@ -1248,11 +1248,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1742450798,
-        "narHash": "sha256-lfOAAaX68Ed7R6Iy2nbFAkGj6B8kHBp3nqZhgZjxR5c=",
+        "lastModified": 1743039536,
+        "narHash": "sha256-O3GFPU0Uyv80LKVMMukVqrfxSzWKkBwQIHN2UnRSCZk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b64ec1944ea40d9f3920f938e17ed39a9978c6c7",
+        "rev": "0ab4a506520ea9247e673e9849ecf84c72f88be2",
        "type": "github"
      },
      "original": {
@@ -1278,11 +1278,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1742045620,
-        "narHash": "sha256-zXkJRY/87TPX1vxlrF4941/GRHD3L+CFfe0/95dWT9o=",
+        "lastModified": 1743045122,
+        "narHash": "sha256-ySz2mfQTFJmdwHCVbMgQRzrcIHgamKwdiwcV+PzDXZI=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "b73beb7bb8c5ec5e559bb5222af9994e7ee4bdbd",
+        "rev": "3363fe9cc6574282a8e22e447c319e761c8019e7",
        "type": "github"
      },
      "original": {
@@ -1301,11 +1301,11 @@
        "nuschtosSearch": "nuschtosSearch_2"
      },
      "locked": {
-        "lastModified": 1742488644,
-        "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=",
+        "lastModified": 1742991302,
+        "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13",
+        "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622",
        "type": "github"
      },
      "original": {
@@ -1362,11 +1362,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741886583,
-        "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=",
+        "lastModified": 1742659553,
+        "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467",
+        "rev": "508752835128a3977985a4d5225ff241f7756181",
        "type": "github"
      },
      "original": {
@@ -1385,11 +1385,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1741886583,
-        "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=",
+        "lastModified": 1742659553,
+        "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467",
+        "rev": "508752835128a3977985a4d5225ff241f7756181",
        "type": "github"
      },
      "original": {
@@ -1801,11 +1801,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742406979,
-        "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
+        "lastModified": 1742700801,
+        "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
+        "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
        "type": "github"
      },
      "original": {
@@ -1904,11 +1904,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739829690,
-        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
+        "lastModified": 1742982148,
+        "narHash": "sha256-aRA6LSxjlbMI6MmMzi/M5WH/ynd8pK+vACD9za3MKLQ=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
+        "rev": "61c88349bf6dff49fa52d7dfc39b21026c2a8881",
        "type": "github"
      },
      "original": {
@@ -1924,11 +1924,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742370146,
-        "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
+        "lastModified": 1742982148,
+        "narHash": "sha256-aRA6LSxjlbMI6MmMzi/M5WH/ynd8pK+vACD9za3MKLQ=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
+        "rev": "61c88349bf6dff49fa52d7dfc39b21026c2a8881",
        "type": "github"
      },
      "original": {
--- a/nix-on-droid/default.nix
+++ b/nix-on-droid/default.nix
@@ -28,10 +28,9 @@
  # Set your time zone
  time.timeZone = "America/Los_Angeles";

-  vacu.packages.yt-dlp.enable = true;
-  vacu.packages.radicle-node.enable = true;
-
-  #specific to the particular install; avoids impurity
-  #user.gid = 10287;
-  #user.uid = 10287;
+  vacu.packages = [
+    "yt-dlp"
+    "radicle-node"
+    "ncurses" #want this everywhere for clear/reset commands, but its included by default in nixos so only need ta specify here
+  ];
 }
--- a/triple-dezert/proxied/services/vacustore.nix
+++ b/triple-dezert/proxied/services/vacustore.nix
@@ -71,14 +71,9 @@
              notes
              tasks
              contacts
+              gpoddersync
+              richdocuments
              ;
-            gpoddersync = pkgs.fetchNextcloudApp {
-              appName = "gpoddersync";
-              url = "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.11.0/gpoddersync.tar.gz";
-              hash = "sha256-U4YzTec7mvslXk6LC5/YlIRzrbOhABHK3ZZ1zYR3JYU=";
-              appVersion = "3.9.0";
-              license = "gpl3";
-            };
          };

          phpOptions."opcache.interned_strings_buffer" = "32";
@@ -98,18 +93,19 @@
            trusted_proxies = [ outer_config.containers.vacustore.hostAddress ];
            allow_user_to_change_display_name = false;
            lost_password_link = "disabled";
-            oidc_login_provider_url = "https://id.shelvacu.com/oauth2/openid/vacustore/";
-            oidc_login_client_id = "vacustore";
-            # client_secret can't go here...
-            # oidc_login_auto_redirect = true;
-            oidc_login_button_text = "Yo Do Da Login Thangg";
-            oidc_login_scope = "email profile";
-            oidc_login_disable_registration = false;
-            oidc_login_code_challenge_method = "S256";
          };

          secretFile = "/etc/nc-secrets.json";
        };
+
+        services.collabora-online = {
+          enable = true;
+          settings = {
+            logging.level = "trace";
+            ssl.enable = false;
+            ssl.termination = false;
+          };
+        };
      };
  };
 }