Merge pull request 'add cleanup action' (#77) from feature/pr-cleanup into main

Reviewed-on: #77

.github/workflows/cleanup-pr-action.yml

@@ -0,0 +1,13 @@
+name: delete branch on close pr
+on: 
+  pull_request:
+    types: [closed]
+  
+jobs:
+  delete-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: delete branch
+        uses: SvanBoxel/delete-merged-branch@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_FOR_PRS  }}

docs/sample-setup.sh

@@ -121,7 +121,7 @@ fi
 DOTS="/mnt/root/dotfiles"
 GC="git -C $DOTS"
 sudo mkdir -p "$DOTS" || echo "directory $DOTS already exists"
-sudo $GC clone https://github.com/RAD-Development/nix-dotfiles.git .
+sudo $GC clone https://nayeonie.com/ahuston-0/nix-dotfiles.git .
 sudo $GC checkout "$FEATUREBRANCH"
 
 # Create ssh keys
@@ -179,4 +179,4 @@ Host github.com
         IdentityFile /root/.ssh/id_ed25519_ghdeploy
 EOF
 printf "%s" "$SSHCONFIG" | sudo tee /root/.ssh/config
-sudo "$GC" remote set-url origin 'git@github.com:RAD-Development/nix-dotfiles.git'
+sudo "$GC" remote set-url origin 'ssh://gitea@nayeonie.com:2222/ahuston-0/nix-dotfiles.git'

flake.nix

@@ -19,6 +19,7 @@
     ];
     trusted-users = [ "root" ];
     allow-import-from-derivation = true;
+    fallback = true;
   };
 
   inputs = {
@@ -153,7 +154,7 @@
         }
       );
       inherit (lib.adev.systems) genSystems getImages;
-      inherit (self) outputs; # for hydra and packages
+      inherit (self) outputs; # for hydra
     in
     rec {
       inherit lib; # for allowing use of custom functions in nix repl
@@ -168,7 +169,10 @@
         qcow = getImages nixosConfigurations "qcow";
       };
 
-      packages = import ./pkgs { pkgs = nixpkgs.legacyPackages.x86_64-linux; };
+      packages.x86_64-linux.lego-latest =
+        nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/lego-latest/default.nix
+          { };
+
       checks = import ./checks.nix { inherit inputs forEachSystem formatter; };
       devShells = import ./shell.nix { inherit inputs forEachSystem checks; };
 

lib/systems.nix

@@ -128,7 +128,6 @@ rec {
   # configPath: path to the folder containing hardware.nix & configuration.nix
   # hostname: hostname of the server
   # inputs: flake inputs to be used
-  # outputs: flake outputs to be used, primarily for accessing custom packages
   # src: base path of the repo
   # users: list of users to be added
   # home: enables home-manager on this machine (requires all users to have home-manager)
@@ -150,7 +149,7 @@ rec {
       configPath,
       hostname,
       inputs,
-      outputs ? { },
+      outputs,
       src,
       users,
       home ? true,
@@ -192,7 +191,6 @@ rec {
   #
   # args:
   # inputs: flake-inputs to be distributed to each system config
-  # outputs: flake-outputs to be distributed to each system config
   # src: the base path to the repo
   # path: the path to read the systems from, should be a directory containing one directory per machine, each having at least the following
   #   - default.nix (with the extra params for constructSystem in it, see systems/palatine-hill/default.nix for an example)
@@ -221,7 +219,7 @@ rec {
                 ;
               hostname = name;
             }
-            // import configPath { inherit inputs outputs; }
+            // import configPath { inherit inputs; }
           );
         }
       ) (lib.adev.lsdir path)

modules/nix.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, ... }:
-  lib,
-  pkgs,
-  outputs,
-  ...
-}:
 {
   nix = {
     package = pkgs.nixVersions.latest;
@@ -51,11 +46,4 @@
       dates = [ "01:00" ];
     };
   };
-
-  nixpkgs.overlays = [
-    (_: _: {
-      # bring all packages into a namespace called rad-pkgs
-      rad-pkgs = lib.genAttrs (lib.attrNames outputs.packages) (pkg: outputs.packages.${pkg});
-    })
-  ];
 }

pkgs/default.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-let
-  rad-maintainers = import ./maintainers.nix;
-in
-{
-
-  ftb-app = pkgs.callPackage ./ftb-app { inherit rad-maintainers; };
-  lego-latest = pkgs.callPackage ./lego-latest { inherit rad-maintainers; };
-}

pkgs/ftb-app/default.nix

@@ -1,112 +0,0 @@
-{
-  alsa-lib,
-  at-spi2-atk,
-  cairo,
-  cups,
-  dbus,
-  dpkg,
-  expat,
-  fetchurl,
-  gtk3,
-  gdk-pixbuf,
-  jre,
-  lib,
-  libdrm,
-  libgbm,
-  libxkbcommon,
-  makeWrapper,
-  mesa,
-  nspr,
-  nss,
-  pango,
-  rad-maintainers,
-  stdenv,
-  xorg,
-  ...
-}:
-# source_aarch64=("https://piston.feed-the-beast.com/app/ftb-app-${pkgver}-arm64.deb")
-# sha256sums_aarch64=(ad1197556a187693cbc488142562a0c17144e33056f1c914950c2f1496a4c532)
-stdenv.mkDerivation rec {
-  pname = "ftb-app";
-  version = "1.27.3";
-
-  src = fetchurl {
-    url = "https://piston.feed-the-beast.com/app/ftb-app-linux-${version}-amd64.deb";
-    sha256 = "031a73g58vj35h33pmp3swjrjlg09ismdx46810sp7ihrpvs0ad6";
-  };
-
-  nativeBuildInputs = [
-    dpkg
-    makeWrapper
-  ];
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    dpkg -x $src ./ftb-app
-
-    runHook postUnpack
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out"
-    cp -r ftb-app/* "$out"
-
-    # Flatten /usr and manually merge lib/ and usr/lib/, since mv refuses to.
-    mv "$out"'/opt/FTB Electron App' "$out/bin"
-    mv "$out/usr/"* "$out/"
-    rmdir "$out/usr"
-    rmdir "$out/opt"
-
-    for f in "$out/share/applications/"*.desktop; do
-       substituteInPlace "$f" \
-           --replace-fail '/opt/FTB Electron App/ftb-app' "$out/bin/ftb-app"
-    done
-
-    # prevent self-upgrade with dpkg
-    rm "$out/bin/resources/package-type"
-
-    chmod +x "$out/bin/ftb-app"
-
-    libs="${nss}/lib/libnss3.so ${nss}/lib/libnssutil3.so ${nss}/lib/libsmime3.so "
-    libs+="${nspr}/lib/libnspr4.so ${dbus.lib}/lib/libdbus-1.so.3 "
-    libs+="${at-spi2-atk}/lib/libatk-1.0.so.0 ${cups.lib}/lib/libcups.so.2 "
-    libs+="${at-spi2-atk}/lib/libatk-bridge-2.0.so.0 "
-    libs+="${libdrm}/lib/libdrm.so.2 ${gtk3}/lib/libgtk-3.so.0 "
-    libs+="${pango.out}/lib/libpango-1.0.so.0 ${cairo}/lib/libcairo.so.2 "
-    libs+="${xorg.libX11}/lib/libX11.so.6 ${xorg.libXext}/lib/libXext.so.6 "
-    libs+="${xorg.libXcomposite}/lib/libXcomposite.so.1 "
-    libs+="${xorg.libXdamage}/lib/libXdamage.so.1 "
-    libs+="${xorg.libXfixes}/lib/libXfixes.so.3 ${expat}/lib/libexpat.so.1 "
-    libs+="${xorg.libXrandr}/lib/libXrandr.so.2  "
-    libs+="${xorg.libxcb}/lib/libxcb.so.1 ${alsa-lib}/lib/libasound.so.2 "
-    libs+="${libxkbcommon}/lib/libxkbcommon.so.0 "
-    libs+="${at-spi2-atk}/lib/libatspi.so.0 ${xorg.libXtst}/lib/libXtst.so.6 "
-    libs+="${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 ${libgbm}/lib/libgbm.so.1"
-
-    echo "$libs"
-
-
-    for p in "$out/bin/ftb-app"; do
-        wrapProgram "$p" \
-            --set LD_PRELOAD "$libs" \
-            --set NIX_REDIRECTS "/usr/share=$out/share:"'/opt/FTB Electron Application'"=$out/bin" \
-            --set JAVA_HOME "${jre.home}"
-            # --prefix PATH : "{lib.makeBinPath [ gzip gnutar ]}"
-    done
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "A new Modpack launcher for FTB and Curse modpacks.";
-    homepage = "https://feed-the-beast.com/app";
-    license = with licenses; [ lgpl21Only ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with rad-maintainers; [ ahuston-0 ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "ftb-app";
-  };
-}

pkgs/lego-latest/default.nix

@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
-  rad-maintainers,
 }:
 
 buildGoModule rec {
@@ -32,7 +31,7 @@ buildGoModule rec {
     description = "Let's Encrypt client and ACME library written in Go";
     license = licenses.mit;
     homepage = "https://go-acme.github.io/lego/";
-    maintainers = teams.acme.members ++ [ rad-maintainers.ahuston-0 ];
+    maintainers = teams.acme.members;
     mainProgram = "lego";
   };
 

pkgs/maintainers.nix

@@ -1,77 +0,0 @@
-/*
-  Borrowed this from nixpkgs :)
-  List of NixOS maintainers.
-   ```nix
-   handle = {
-     # Required
-     name = "Your name";
-
-     # Optional, but at least one of email, matrix or githubId must be given
-     email = "address@example.org";
-     matrix = "@user:example.org";
-     github = "GithubUsername";
-     githubId = your-github-id;
-
-     keys = [{
-       fingerprint = "AAAA BBBB CCCC DDDD EEEE  FFFF 0000 1111 2222 3333";
-     }];
-   };
-   ```
-
-   where
-
-   - `handle` is the handle you are going to use in nixpkgs expressions,
-   - `name` is a name that people would know and recognize you by,
-   - `email` is your maintainer email address,
-   - `matrix` is your Matrix user ID,
-   - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
-   - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
-   - `keys` is a list of your PGP/GPG key fingerprints.
-
-   Specifying a GitHub account ensures that you automatically:
-   - get invited to the @NixOS/nixpkgs-maintainers team ;
-   - once you are part of the @NixOS org, OfBorg will request you review
-     pull requests that modify a package for which you are a maintainer.
-
-   `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
-
-   If `github` begins with a numeral, `handle` should be prefixed with an underscore.
-   ```nix
-   _1example = {
-     github = "1example";
-   };
-   ```
-
-   Add PGP/GPG keys only if you actually use them to sign commits and/or mail.
-
-   To get the required PGP/GPG values for a key run
-   ```shell
-   gpg --fingerprint <email> | head -n 2
-   ```
-
-   !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth.
-
-   More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible.
-
-   When editing this file:
-    * keep the list alphabetically sorted, check with:
-        nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix
-    * test the validity of the format with:
-        nix-build lib/tests/maintainers.nix
-
-   See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
-
-   When adding a new maintainer, be aware of the current commit conventions
-   documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions)
-   file located in the root of the Nixpkgs repo.
-*/
-
-{
-  ahuston-0 = {
-    name = "ahuston-0";
-    email = "aliceghuston@gmail.com";
-    github = "ahuston-0";
-    githubId = 43225907;
-    keys = [ { fingerprint = "F638 32C3 080D 6E1A C77E  ECF8 0B42 45FF E305 BC82"; } ];
-  };
-}

systems/artemision/desktop.nix

@@ -30,10 +30,6 @@
   };
   # Optional, hint electron apps to use wayland:
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
-  xdg.portal = {
-    enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-  };
 
   services = {
     xserver = {

systems/artemision/programs.nix

@@ -72,7 +72,6 @@
     protontricks
     proxychains
     qrencode
-    rad-pkgs.ftb-app
     redshift
     restic
     ripgrep

systems/palatine-hill/acme.nix

@@ -31,7 +31,7 @@
       openssl
     ]
     ++ [
-      outputs.packages.lego-latest
+      outputs.packages.x86_64-linux.lego-latest
     ]
   );
 

users/alice/home.nix

@@ -76,7 +76,6 @@
       nix-prefetch
       nix-tree
       nh
-      nix-prefetch-scripts
 
       # doom emacs dependencies
       fd
@@ -92,6 +91,7 @@
       nodePackages.prettier
       treefmt
 
+      gocryptfs
     ];
   };
 

users/alice/secrets.yaml

@@ -9,11 +9,8 @@ alice:
     attic-nix-cache-writer: ENC[AES256_GCM,data:vxSeys7EJDyatZFpeyxeDzaKGqDtm3atpVly6+BPHUFTrlLaVl86roGZjpBB9wwOMuP007qJNva0HQcTONbSyNw/snUU5JpaFWLT87Eu81V8gdulzHwm61caQ4A/e1ylKkdtwalNymBSyWi9b+SOWXTgralrg9L3OHw+nVuZaAi8QXF2ImLoZ2vXl7MGNXParflV2KK2uqfRatDZMbSSFipT0tQpkNTBTA6l8woILK3BKrHdYq+D8n4EmRowSuMWuN1uknyctb4+Ap3AeBITvyJjKejocQ9qK9plP6CChiC4Z1mmt/HOrfXYXiJO+Va64rOYRywMga8=,iv:bAx7iR24dpIOudkiFOc/xmIG73rcaMDdhWjiBO4BsBM=,tag:gtTyldhdRV97YJREG5lPjA==,type:str]
     attic-nix-cache-admin: ENC[AES256_GCM,data:OP02nJTo0cx8M9cR+P7cpI1gEXCKqXWehlaL+dYGwGSUnQ6iSC25vpdZ5SSnjyhiBZe+VnYld+b5PO+OOt7NMGxVvQ0zcuvrG7qfhEpIfGrbx9S9cEV2eAMchG/Hua609MUTbFYKvpwWw6tFZD2dYYQv2gXI7mYSeN0Tw4i2x1f/+cKDtV+ak+UHRgEe/f5OdE8v5I6dRXUQGVOBSRAQkfYDFuI2JUz4oNJsz66YkdMtgudhqWi4mekODD3v2Gcg/zAv1PogaHaIH1BHNvLQ/DsNVcvLsnTb6inM3cTCyPpHcx+VwPO7g9kYNV8xcCRkAIvX6aFzRVT0tJcEXFWStMnKS8nr8HoKFQ==,iv:ftmN3jK5qa6SwrSyhhL3PZls2hTG6xGa0LW7ycdkYxQ=,tag:TQCELzJQjsMfAJseZ7tB4w==,type:str]
     gitea-actions-token: ENC[AES256_GCM,data:QTEPMAh1RWWJ/O3yhkQkEBTdVL8XhIRGCDbiM0lLjfILKF4SpSJ2sA==,iv:mBaaB1JHb2KVc9n2pdeX4pSMvb7q5z3joMT7rR5Whgs=,tag:ef+58SI4AUeqUsk3RVDsRQ==,type:str]
+    gitea-pr-token: ENC[AES256_GCM,data:ybTya4X2wd65pNFSGbQkg73lu66GNtSba4yf8J6tT8XkuOtfvtBS4g==,iv:39mJiAlw4kud4l06jOpxOCRumChE/5q8IBNsPHG1rMc=,tag:MEvHD2b9E3fVHLlz7haNyw==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
         - recipient: age1qw5k8h72k3fjg5gmlxx8q8gwlc2k6n6u08d8hdzpm2pk9r0fnfxsmw33nh
           enc: |
@@ -42,8 +39,8 @@ sops:
             ZERFTlFyNjhOb3VCaW43ZXFHT1Vxc0UK7YV+BU7dCEOZxpqkQA394eDsnthvorj6
             7bqrCdeU+6DU7DmFs6++BrNO2tx8vvOa1im+ZGrM/gZAJdv/7R2d6Q==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-03-26T15:28:13Z"
+    lastmodified: "2025-04-02T04:59:28Z"
-    mac: ENC[AES256_GCM,data:BfEahKHAcnLc/PSagENBIVwxufJrjpMSC6U4hkkxNwcEJYDNAlrF0w00aiexLeX+UfVGIw19+SrNL5zuecEf+GaYzYNy9RE3c66KUM2B/cpuBuzkiwLaBCTfcWr7k8dW11BGFCmugRSG4w6wXKG5B/LyEKB6Vcvp0JRbCYSqZSY=,iv:97UzvdvQCtTLaLDrg6VEwiofHtSPGtaxuPLHfTAyIFA=,tag:r4r45OaV9ZRDzd56RGLFZw==,type:str]
+    mac: ENC[AES256_GCM,data:lzOiHCCAm9rlzD04UbrPi6UZ3TM12jffqHKVaI0jdAEsRgFSdtz9AE4HiDS7FHv8daKVgBMgPgmQiRvEXvnouFjgKBYvoMRSav+Zogo1lR3KEnkPsOg+BRz07GsU4wQDyU4Df7cCCVLeLxUBT/AX7no8u4TOOwKjsyYmJbbJjd0=,iv:8mJ43fMFHltVQ4fQe2lQRK9eSb2/7TzUBaIr1tKOjYM=,tag:hGBkAvZ+Glg8PkNqzB+KCw==,type:str]
     pgp:
         - created_at: "2024-09-05T06:10:22Z"
           enc: |-
@@ -58,4 +55,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330
     unencrypted_suffix: _unencrypted
-    version: 3.9.4
+    version: 3.10.0