From f671e4bcf54bc97b82984da578628c23843d83f6 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Fri, 30 May 2025 00:39:47 -0400 Subject: [PATCH 1/3] add minio backend for gitea Signed-off-by: ahuston-0 --- .github/workflows/flake-update.yml | 26 +++++++++++++------------- systems/palatine-hill/gitea.nix | 16 ++++++++++++++++ systems/palatine-hill/secrets.yaml | 11 ++++------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 84bcbf7..007ad57 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -61,25 +61,25 @@ jobs: with: path: pr_body.template contents: | - - The following Nix Flake inputs were updated: + - The following Nix Flake inputs were updated: - Flake input changes: + Flake input changes: - ```shell - ${{ env.UPDATE_LOG }} - ``` + ```shell + ${{ env.UPDATE_LOG }} + ``` - Flake evaluation diff: + Flake evaluation diff: - ```shell - nix-diff-placeholder - ``` + ```shell + nix-diff-placeholder + ``` - Auto-generated by [update.yml][1] with the help of - [create-pull-request][2]. + Auto-generated by [update.yml][1] with the help of + [create-pull-request][2]. - [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml - [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request + [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml + [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request - name: Generate PR body uses: pedrolamas/handlebars-action@v2.4.0 # v2.4.0 with: diff --git a/systems/palatine-hill/gitea.nix b/systems/palatine-hill/gitea.nix index a0728bb..9cffbaf 100644 --- a/systems/palatine-hill/gitea.nix +++ b/systems/palatine-hill/gitea.nix @@ -27,6 +27,12 @@ in SSH_PORT = 2222; SSH_LISTEN_PORT = 2223; START_SSH_SERVER = true; + PUBLIC_URL_DETECTION = "auto"; + }; + repository = { + ENABLE_PUSH_CREATE_USER = true; + DEFAULT_MERGE_STYLE = "rebase-merge"; + }; service = { DISABLE_REGISTRATION = true; @@ -45,6 +51,15 @@ in host = "192.168.76.2"; port = "8088"; }; + "storage.minio" = { + STORAGE_TYPE = "minio"; + MINIO_ENDPOINT = "minio.nayeonie.com"; + MINIO_BUCKET = "gitea"; + MINIO_LOCATION = "us-east-1"; + MINIO_USE_SSL = true; + MINIO_INSECURE_SKIP_VERIFY = false; + MINIO_BUCKET_LOOKUP_TYPE = "auto"; + }; }; stateDir = base_path; lfs.enable = true; @@ -60,5 +75,6 @@ in sops.secrets = { "gitea/dbpass".owner = "gitea"; + "gitea/minio".owner = "gitea"; }; } diff --git a/systems/palatine-hill/secrets.yaml b/systems/palatine-hill/secrets.yaml index 31f68bc..c1afa14 100644 --- a/systems/palatine-hill/secrets.yaml +++ b/systems/palatine-hill/secrets.yaml @@ -10,6 +10,7 @@ postgres: init: ENC[AES256_GCM,data:trwA30EswHEPa6V2GuHsGgU4NK/j/UQveldwHng0Ilwyqh9aZCgF3axP48MmcciBssux8DZ4O5U=,iv:VC+tpG5yuiBE7pjZ85lYCwHG/bTePxeXQDz2zyLyLYA=,tag:5+jwWTv5T5YWwQpR58QfOA==,type:str] gitea: dbpass: ENC[AES256_GCM,data:8jECcEJ8JnK7fztTckzLrQ==,iv:yQMp5VrierOKXwiop0NUA7Qbn2eH5iUCVlKppZwKLIQ=,tag:rI9WT7zLIaFxVcTu3ufW4g==,type:str] + minio: ENC[AES256_GCM,data:LxY6AD+CZ9VQEl5FrG6o0XiOiizLcwiLiyH1WJD8mMCPWhDjGzt+k+YPOm1BpWzTZF8+2EoxR9oKFJu9mzTibl2Ieits0/RNwh1VdQALXw3FwfRym7CFS+Z5S8H9kGMoXWRrr+I5,iv:g/wq0r2HKfX2AwirT4hm/H1Ms/mtbf4ZuFLISikRyoI=,tag:he99s/WpKoN+lHR8r4K30w==,type:str] upsmon: password: ENC[AES256_GCM,data:52Rxsh7KUq+aYjQORBC+Yq5B,iv:F05g/a5bv7DQ+eLlMqsNeRHLxzl7AyXU1zAlmFevQ6o=,tag:xkGDD3hDF+u5fUbP33OrlA==,type:str] minio: @@ -30,10 +31,6 @@ server-validation: typhon: hashedPassword: ENC[AES256_GCM,data:gMyY8gxUn3HzycQRu2cminqRFWghqWcjzZzTxAQZ5PJqn604iSwDiVdr7icHB7drJfCAfsE7L4oKRJgxaIAE32043oOkb2T7DDH8y2jxMzqmZCfbvrfMI4wdfRTHGqzxb6X/aZ5ai2rr1Q==,iv:4EsTo/lQld0o9iktDX9gobMlPUCitx1i9wn8EL16sIs=,tag:FgVDRHk2glDwpC/mprrPqQ==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age1qw5k8h72k3fjg5gmlxx8q8gwlc2k6n6u08d8hdzpm2pk9r0fnfxsmw33nh enc: | @@ -44,8 +41,8 @@ sops: cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-26T05:47:58Z" - mac: ENC[AES256_GCM,data:ZP9HglMmn9FDv6/vtQAxz/qP76QniPqM6bzMQVvVU/OhDmjuneGKZY7d1Es7LC9o5qmJ+T3Dh3/bkmuRdgdnd2TO6iuvM++DEPxwnoHis+0lbMxv5a6ibzvoXXm2CrL4HPETqLKbLahGJRmDNgnkCEWxAs16zrqe5kgDpD53R5c=,iv:DcCXNGyb41ToV9uSnrnrl0dWiw2pvykM8z86Yk814P4=,tag:T9PFl48qABwBSy7vIhSmLA==,type:str] + lastmodified: "2025-05-30T04:36:41Z" + mac: ENC[AES256_GCM,data:fEsUt5g0/7j8IVgtXQ0thV93dxe6SGCglqeHdnaXFOjKcCUEFWUmi98M8X92hR9AJzscRK6wqzijd/AQBzl+GL2QtDYsn8qx9Nr0DBd6Gh1vi25eh5LtADm09COSae1THWuFLP7L1Qamyt+XzlBa7Xnrzfuzzp0s2/cZoxZiueU=,iv:VYzh833cMQwGmkB6QunRys0Eluz+0KGj8Y43B9icE9w=,tag:EWJSizBMTFZ0TZhncYe2Sw==,type:str] pgp: - created_at: "2024-11-28T18:56:39Z" enc: |- @@ -60,4 +57,4 @@ sops: -----END PGP MESSAGE----- fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330 unencrypted_suffix: _unencrypted - version: 3.9.4 + version: 3.10.2 From 4fcd627fac6dada9d4dc6c38c5fdb04183e4f931 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sat, 31 May 2025 16:18:12 -0400 Subject: [PATCH 2/3] make changes for evaluation warnings Signed-off-by: ahuston-0 --- modules/locale.nix | 2 +- systems/artemision/configuration.nix | 5 ----- systems/artemision/desktop.nix | 17 ++--------------- systems/palatine-hill/samba.nix | 3 +-- users/alice/home/zsh.nix | 24 ++++++++++++++++++++++-- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/modules/locale.nix b/modules/locale.nix index 275417d..3fe44b9 100644 --- a/modules/locale.nix +++ b/modules/locale.nix @@ -5,7 +5,7 @@ i18n = { defaultLocale = lib.mkDefault "en_US.utf8"; - supportedLocales = lib.mkDefault [ "en_US.UTF-8/UTF-8" ]; + extraLocales = lib.mkDefault [ "en_US.UTF-8/UTF-8" ]; extraLocaleSettings = lib.mkDefault { LC_ADDRESS = "en_US.UTF-8"; LC_IDENTIFICATION = "en_US.UTF-8"; diff --git a/systems/artemision/configuration.nix b/systems/artemision/configuration.nix index 9bf71c9..72dcc48 100644 --- a/systems/artemision/configuration.nix +++ b/systems/artemision/configuration.nix @@ -37,11 +37,6 @@ default = true; }; - i18n = { - defaultLocale = "en_US.utf8"; - supportedLocales = [ "en_US.UTF-8/UTF-8" ]; - }; - sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; services = { diff --git a/systems/artemision/desktop.nix b/systems/artemision/desktop.nix index 207b75f..97cfe56 100644 --- a/systems/artemision/desktop.nix +++ b/systems/artemision/desktop.nix @@ -32,22 +32,9 @@ environment.sessionVariables.NIXOS_OZONE_WL = "1"; services = { - xserver = { + displayManager.gdm = { enable = true; - displayManager.session = [ - { - manage = "desktop"; - name = "hyprland"; - start = '' - bash ${./hypr/wrappedhl} & - waitPID=$! - ''; - } - ]; - displayManager.gdm = { - enable = true; - wayland = true; - }; + wayland = true; }; dbus = { diff --git a/systems/palatine-hill/samba.nix b/systems/palatine-hill/samba.nix index 339e2ef..abe9dc8 100644 --- a/systems/palatine-hill/samba.nix +++ b/systems/palatine-hill/samba.nix @@ -2,14 +2,13 @@ { services.samba = { enable = true; - securityType = "user"; openFirewall = true; settings = { global = { + security = "user"; "workgroup" = "WORKGROUP"; "server string" = "palatine-hill"; "netbios name" = "palatine-hill"; - "security" = "user"; #"use sendfile" = "yes"; #"max protocol" = "smb2"; # note: localhost is the ipv6 localhost ::1 diff --git a/users/alice/home/zsh.nix b/users/alice/home/zsh.nix index ecb3192..a2d3c73 100644 --- a/users/alice/home/zsh.nix +++ b/users/alice/home/zsh.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, ... }: { programs.zsh = { @@ -22,7 +22,27 @@ "z" ]; }; - initExtra = '' + /* + To specify the order, use lib.mkOrder. + + Common order values: + + 500 (mkBefore): Early initialization (replaces initExtraFirst) + + 550: Before completion initialization (replaces initExtraBeforeCompInit) + + 1000 (default): General configuration (replaces initExtra) + + 1500 (mkAfter): Last to run configuration + + To specify both content in Early initialization and General configuration, use lib.mkMerge. + + e.g. + + initContent = let zshConfigEarlyInit = lib.mkOrder 500 “do something”; zshConfig = lib.mkOrder 1000 “do something”; in lib.mkMerge [ zshConfigEarlyInit zshConfig ]; + */ + + initContent = lib.mkOrder 1000 '' # functions function mount-data { if [[ -f /home/alice/backup/.noconnection ]]; then From 7e989cab31da2d9881191e4c35fac7a04cc37559 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 1 Jun 2025 01:40:17 -0400 Subject: [PATCH 3/3] change the name of the hearth --- flake.nix | 1 - systems/palatine-hill/gitea.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 72660e5..1b71661 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,6 @@ url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; }; }; diff --git a/systems/palatine-hill/gitea.nix b/systems/palatine-hill/gitea.nix index 9cffbaf..a521ad7 100644 --- a/systems/palatine-hill/gitea.nix +++ b/systems/palatine-hill/gitea.nix @@ -10,7 +10,7 @@ in { services.gitea = { enable = true; - appName = "The Hearth"; + appName = "Nayeonie's Trove"; database = { type = "postgres"; passwordFile = config.sops.secrets."gitea/dbpass".path;