From 082de10236a7857dfa8cf4574c21de33b3314d21 Mon Sep 17 00:00:00 2001 From: notohh Date: Mon, 17 Jun 2024 04:49:13 -0400 Subject: [PATCH] flake.lock: update nushell: update config wezterm: add fallback font ame: remove chatterino tsuki: add lutris forgejo: update mailer pwd attic: increase retention period passgen: bump version --- flake.lock | 38 +++++++++++------------ home/profiles/ame/default.nix | 1 - home/profiles/tsuki/default.nix | 2 +- home/programs/terminal/nushell/config.nu | 3 +- home/programs/terminal/wezterm/config.lua | 2 +- hosts/sakura/services/forgejo.nix | 4 ++- hosts/sora/services/attic.nix | 2 +- pkgs/passgen/default.nix | 4 +-- 8 files changed, 29 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 6fe06f2..53ff0a5 100644 --- a/flake.lock +++ b/flake.lock @@ -755,11 +755,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -849,11 +849,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718480796, - "narHash": "sha256-BMLFzvIn5Qdrfc1zyIXWTMA5FHx+R9JNDJ7dkwbvdzk=", + "lastModified": 1718566457, + "narHash": "sha256-FtgnoGecYVBnGelxdcgavpogPVn+zi/5p4JFJM+9VJk=", "ref": "refs/heads/main", - "rev": "1f5fd7e64a1c0e8d1815bdd6d168193bf9c28d6d", - "revCount": 4839, + "rev": "b15be9c77de593581007de53b2bbca97d121900a", + "revCount": 4851, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1239,11 +1239,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718459188, - "narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=", + "lastModified": 1718548414, + "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29", + "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06", "type": "github" }, "original": { @@ -1679,11 +1679,11 @@ }, "nur": { "locked": { - "lastModified": 1718519969, - "narHash": "sha256-CverpMOBGhwwoZSQUiDQWH09kok3eXwbrRKktbVssvc=", + "lastModified": 1718606072, + "narHash": "sha256-+BKOI7p2YoNwNQgfdIldS0hmihEjBBLWPOek624sgeg=", "owner": "nix-community", "repo": "NUR", - "rev": "14d2879054f9411da2f421b6ff034983947c14dc", + "rev": "6af362f6660ce325faacb9e180e3c2e8d2af3fdd", "type": "github" }, "original": { @@ -1931,11 +1931,11 @@ "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1718457106, - "narHash": "sha256-sVpsAuvXaSRHhcCw8XbVKlZe8GqB5jpGj4oyZaHAI/Y=", + "lastModified": 1718546905, + "narHash": "sha256-FmtNOW6Ng11TTgsXkQLqBcIE0j2SmlydHXu/DnWlS4k=", "owner": "danth", "repo": "stylix", - "rev": "a7fbda1fd965cc22e62463896a4af0342cb00e6a", + "rev": "80e8e1e2f613bdc8749461899f0959312eb4a54e", "type": "github" }, "original": { @@ -2302,11 +2302,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1718282288, - "narHash": "sha256-Bytnc38TKqrunthOxMAiQkIw2Yg6caYGqrdJU2W8sWA=", + "lastModified": 1718523431, + "narHash": "sha256-VnWkpSzD8AQ4BulYIt9xpVEjubMcMkvgnt1+w2bIEOs=", "owner": "sxyazi", "repo": "yazi", - "rev": "794694e2d6b2c53e5187204c7a386c947527cdf1", + "rev": "2a35d30f384d06d34c0675e57c72fabedc4f8c40", "type": "github" }, "original": { diff --git a/home/profiles/ame/default.nix b/home/profiles/ame/default.nix index c1ab245..bcb8514 100644 --- a/home/profiles/ame/default.nix +++ b/home/profiles/ame/default.nix @@ -29,7 +29,6 @@ wl-clipboard swww hyprpicker - (libsForQt5.callPackage ../../../pkgs/chatterino7 {}) ]; programs.ssh = { enable = true; diff --git a/home/profiles/tsuki/default.nix b/home/profiles/tsuki/default.nix index c77727c..b9d25c1 100644 --- a/home/profiles/tsuki/default.nix +++ b/home/profiles/tsuki/default.nix @@ -46,7 +46,7 @@ wine bottles prismlauncher - heroic + lutris r2modman inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin diff --git a/home/programs/terminal/nushell/config.nu b/home/programs/terminal/nushell/config.nu index 4e22684..b2f018f 100755 --- a/home/programs/terminal/nushell/config.nu +++ b/home/programs/terminal/nushell/config.nu @@ -35,6 +35,7 @@ alias send = croc --relay "100.104.42.96:9009" send alias receive = croc --relay "100.104.42.96:9009" alias ps = procs alias tail = tspin +alias spotify = spotify_player nitch $env.config = { @@ -81,7 +82,7 @@ $env.config = { # buffer_editor: "emacs" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL use_ansi_coloring: true edit_mode: vi # emacs, vi - shell_integration: true # enables terminal markers and a workaround to arrow keys stop working issue + shell_integration: {} # enables terminal markers and a workaround to arrow keys stop working issue show_banner: false # true or false to enable or disable the banner render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt. hooks: { diff --git a/home/programs/terminal/wezterm/config.lua b/home/programs/terminal/wezterm/config.lua index 077d2fb..00b276e 100644 --- a/home/programs/terminal/wezterm/config.lua +++ b/home/programs/terminal/wezterm/config.lua @@ -11,7 +11,7 @@ local config = { color_scheme = "Tokyo Night", enable_wayland = true, - font = wezterm.font("Comic Code Ligatures"), + font = wezterm.font_with_fallback({ "Comic Code Ligatures", "JetBrainsMono NF Medium" }), font_size = 12.0, window_background_opacity = 0.6, text_background_opacity = 1.0, diff --git a/hosts/sakura/services/forgejo.nix b/hosts/sakura/services/forgejo.nix index 4db9869..58ab667 100644 --- a/hosts/sakura/services/forgejo.nix +++ b/hosts/sakura/services/forgejo.nix @@ -13,6 +13,9 @@ in { enable = true; stateDir = "/var/lib/forgejo"; lfs.enable = true; + secrets = { + mailer.PASSWD = config.sops.secrets.smtp2go-pwd.path; + }; settings = { service.DISABLE_REGISTRATION = true; DEFAULT.APP_NAME = "forgejo"; @@ -77,7 +80,6 @@ in { USER = "forgejo-mailer"; }; }; - mailerPasswordFile = config.sops.secrets.smtp2go-pwd.path; }; services.fail2ban.jails.forgejo = { settings = { diff --git a/hosts/sora/services/attic.nix b/hosts/sora/services/attic.nix index bcc655c..73d3967 100644 --- a/hosts/sora/services/attic.nix +++ b/hosts/sora/services/attic.nix @@ -30,7 +30,7 @@ }; garbage-collection = { interval = "12 hours"; - default-retention-period = "8 weeks"; + default-retention-period = "12 weeks"; }; compression = { type = "zstd"; diff --git a/pkgs/passgen/default.nix b/pkgs/passgen/default.nix index 00415c4..521aae2 100644 --- a/pkgs/passgen/default.nix +++ b/pkgs/passgen/default.nix @@ -10,8 +10,8 @@ rustPlatform.buildRustPackage { domain = "git.flake.sh"; owner = "notohh"; repo = "passgen"; - rev = "fa2181af70b5efa0376a5f6ffa937073b2201339"; - sha256 = "sha256-E77mzceKBaXOjW/C/aHfUltt1Wb7RAzvJzhlgmbxkoE="; + rev = "4a01bd5faae893682e7011632bdda8f12c96ef49"; + sha256 = "sha256-+a1B1Z/N7OsGTVmIBp/JJZYdvTerClHo7y1Bn419dlg="; }; cargoSha256 = "sha256-A8W7Qz+8cy6sPjLBC5a4Brz+cCyGPeNM1f7oZ6pmfe0=";