From 944c66fb1ea1b12cdaff25e005cd9d4f62c9ffb1 Mon Sep 17 00:00:00 2001 From: Scotte Zinn Date: Mon, 25 Nov 2024 02:10:40 -0500 Subject: [PATCH] Updates --- homes/_modules/security/one-password.nix | 2 +- hosts/odin/default.nix | 2 +- modules/nvim/ui/noice.nix | 54 ++++++++++++------------ pkgs/_sources/generated.nix | 6 ++- pkgs/talosctl.nix | 2 +- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/homes/_modules/security/one-password.nix b/homes/_modules/security/one-password.nix index 14c87c3a..9309a9c8 100644 --- a/homes/_modules/security/one-password.nix +++ b/homes/_modules/security/one-password.nix @@ -13,7 +13,7 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ - _1password + _1password-cli ]; }; } diff --git a/hosts/odin/default.nix b/hosts/odin/default.nix index e80e6f85..f124def7 100644 --- a/hosts/odin/default.nix +++ b/hosts/odin/default.nix @@ -21,7 +21,7 @@ # "homebrew/services" # to use `brew services`` ]; brews = [ - "postgresql@16" + "postgresql@17" ]; casks = [ "1password" diff --git a/modules/nvim/ui/noice.nix b/modules/nvim/ui/noice.nix index 51db89d5..31239e05 100644 --- a/modules/nvim/ui/noice.nix +++ b/modules/nvim/ui/noice.nix @@ -1,35 +1,37 @@ { plugins.noice = { enable = true; - notify = { - enabled = false; - }; - messages = { - enabled = true; # Adds a padding-bottom to neovim statusline when set to false for some reason - }; - lsp = { - message = { - enabled = true; + settings = { + format = { + filter = { + pattern = [":%s*%%s*s:%s*" ":%s*%%s*s!%s*" ":%s*%%s*s/%s*" "%s*s:%s*" ":%s*s!%s*" ":%s*s/%s*"]; + icon = ""; + lang = "regex"; + }; + replace = { + pattern = [":%s*%%s*s:%w*:%s*" ":%s*%%s*s!%w*!%s*" ":%s*%%s*s/%w*/%s*" "%s*s:%w*:%s*" ":%s*s!%w*!%s*" ":%s*s/%w*/%s*"]; + icon = "󱞪"; + lang = "regex"; + }; }; - progress = { - enabled = false; - view = "mini"; + lsp = { + message = { + enabled = true; + }; + progress = { + enabled = false; + view = "mini"; + }; }; - }; - popupmenu = { - enabled = true; - backend = "nui"; - }; - format = { - filter = { - pattern = [":%s*%%s*s:%s*" ":%s*%%s*s!%s*" ":%s*%%s*s/%s*" "%s*s:%s*" ":%s*s!%s*" ":%s*s/%s*"]; - icon = ""; - lang = "regex"; + messages = { + enabled = true; # Adds a padding-bottom to neovim statusline when set to false for some reason + }; + popupmenu = { + enabled = true; + backend = "nui"; }; - replace = { - pattern = [":%s*%%s*s:%w*:%s*" ":%s*%%s*s!%w*!%s*" ":%s*%%s*s/%w*/%s*" "%s*s:%w*:%s*" ":%s*s!%w*!%s*" ":%s*s/%w*/%s*"]; - icon = "󱞪"; - lang = "regex"; + notify = { + enabled = false; }; }; }; diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 0e7824c9..cc7bb4fa 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -1,6 +1,10 @@ # This file was generated by nvfetcher, please do not modify it manually. -{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { + fetchgit, + fetchurl, + fetchFromGitHub, + dockerTools, +}: { talosctl = { pname = "talosctl"; version = "v1.8.3"; diff --git a/pkgs/talosctl.nix b/pkgs/talosctl.nix index 5134eb3f..21c088aa 100644 --- a/pkgs/talosctl.nix +++ b/pkgs/talosctl.nix @@ -12,7 +12,7 @@ in version = lib.strings.removePrefix "v" packageData.version; # vendorHash = lib.fakeHash; - vendorHash = "sha256-pWG8DbZ9N57p2Q9w/IzETcvwaSfzaUvJgcz7Th/Oi9c="; + vendorHash = "sha256-/Xt/WZ+5ptxsiUkm6mplilB9gqv3mz+j7tyNikzJtkA="; ldflags = ["-s" "-w"];