diff --git a/flake.lock b/flake.lock index 212c7b7..f0ae9dd 100644 --- a/flake.lock +++ b/flake.lock @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1744618730, - "narHash": "sha256-n3gN7aHwVRnnBZI64EDoKyJnWidNYJ0xezhqQtdjH2Q=", + "lastModified": 1744637364, + "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "85dd758c703ffbf9d97f34adcef3a898b54b4014", + "rev": "337541447773985f825512afd0f9821a975186be", "type": "github" }, "original": { @@ -909,11 +909,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744366945, - "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { diff --git a/hosts/emenel-services/configuration.nix b/hosts/emenel-services/configuration.nix index 078d154..32d88a3 100644 --- a/hosts/emenel-services/configuration.nix +++ b/hosts/emenel-services/configuration.nix @@ -101,7 +101,10 @@ package = pkgs.nh; }; - + services.caddy = { + enable = true; + email = "matt@emenel.ca"; + }; diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 536afa4..4436c09 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -76,7 +76,7 @@ vlc discord slack - signal-desktop + signal-desktop-bin libreoffice hyphenDicts.en_US plex-mpv-shim diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index 13e3e7a..b2ff9a8 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -44,7 +44,7 @@ owner = "boydaihungst"; repo = "restore.yazi"; rev = "HEAD"; - sha256 = "sha256-OJJPgpSaUHYz8a9opVLCds+VZsK1B6T+pSRJyVgYNy8="; + sha256 = "sha256-3Z8P25u9bffdjrPjxLRWUQn6MdBS+vyElUBkgV4EUwY="; }; lazygit = pkgs.fetchFromGitHub { owner = "Lil-Dank"; @@ -116,8 +116,8 @@ { on = ["d" "d"]; run = "remove"; desc = "Delete files/folders"; } { on = ["d" "u"]; run = "plugin restore"; desc = "Restore last deleted files/folders"; } - { on = "f"; run = "filter --smart"; desc = "Find file"; } - { on = "F"; run = "find --smart"; desc = "Find file"; } + { on = "F"; run = "filter --smart"; desc = "Find file"; } + { on = "f"; run = "find --smart"; desc = "Find file"; } { on = "z"; run = "plugin zoxide"; } { on = "Z"; run = "plugin fzf"; } diff --git a/modules/home/yazi/init.lua b/modules/home/yazi/init.lua index 07fdd20..a78940b 100644 --- a/modules/home/yazi/init.lua +++ b/modules/home/yazi/init.lua @@ -1,6 +1,18 @@ require("git"):setup() require("dir-rules"):setup() +require("restore"):setup({ + -- Set the position for confirm and overwrite dialogs. + -- don't forget to set height: `h = xx` + -- https://yazi-rs.github.io/docs/plugins/utils/#ya.input + position = { "center", w = 70, h = 40 }, -- Optional + + -- Show confirm dialog before restore. + -- NOTE: even if set this to false, overwrite dialog still pop up + show_confirm = true, -- Optional +}) + + Status:children_add(function() local h = cx.active.current.hovered if h == nil or ya.target_family() ~= "unix" then diff --git a/modules/system/forgejo.nix b/modules/system/forgejo.nix index 10dfbba..3fc8900 100644 --- a/modules/system/forgejo.nix +++ b/modules/system/forgejo.nix @@ -1,5 +1,7 @@ { config, lib, pkgs, ... }: - +let + port = 12345; +in { services = { forgejo = { @@ -7,7 +9,7 @@ lfs.enable = true; settings = { server = { - HTTP_PORT = 12345; + HTTP_PORT = port; }; service.DISABLE_REGISTRATION = true; actions = { @@ -24,6 +26,17 @@ # mailerPasswordFile = config.age.secrets.forgejo-mailer-password.path; }; + # caddy.virtualHosts."gt.emenel.ca" = { + # serverAliases = [ "www.gt.emenel.ca" ]; + # extraConfig = '' + # reverse_proxy http://localhost:${port} { + # header_down X-Real-IP {http.request.remote} + # header_down X-Forwarded-For {http.request.remote} + # } + # ''; + # }; + }; + # gitea-actions-runner = { # package = pkgs.forgejo-actions-runner; # instances.default = { @@ -66,10 +79,10 @@ sops.secrets.forgejo-emenel.owner = "forgejo"; systemd.services.forgejo.preStart = let adminCmd = "${lib.getExe pkgs.forgejo} admin user"; - pwd = config.sops.secrets.forgejoemenel; + pwd = config.sops.secrets.forgejo-emenel; user = "emenel"; # Note, Forgejo doesn't allow creation of an account named "admin" in '' - ${adminCmd} create --admin --email "root@localhost" --username ${user} --password "$(tr -d '\n' < ${pwd.path})" || true + ${adminCmd} create --admin --email "matt@emenel.ca" --username ${user} --password "$(tr -d '\n' < ${pwd.path})" || true ## uncomment this line to change an admin user which was already created # ${adminCmd} change-password --username ${user} --password "$(tr -d '\n' < ${pwd.path})" || true '';