From 004b723cd4f73bb16dd8ce21ef839ab4e3dcb2ff Mon Sep 17 00:00:00 2001 From: fleaz Date: Mon, 15 Jul 2024 23:07:21 +0200 Subject: [PATCH 1/3] switch from nixpkgs-fmt to nixfmt-classic --- home-manager/default.nix | 2 -- home-manager/modules/neovim.nix | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index f5becdd..0413ae9 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -105,8 +105,6 @@ in pwgen magic-wormhole - nixpkgs-fmt - # kubernetes stuff kubectl krew diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix index e2d03f4..2ffdd6c 100644 --- a/home-manager/modules/neovim.nix +++ b/home-manager/modules/neovim.nix @@ -5,7 +5,7 @@ withPython3 = true; extraPackages = with pkgs; [ nil - nixpkgs-fmt + nixfmt-classic gopls pyright (python3.withPackages (ps: with ps; [ @@ -182,7 +182,7 @@ ['nil'] = { testSetting = 42, formatting = { - command = { "nixpkgs-fmt" }, + command = { "nixfmt-classic" }, }, }, }, From bf613c29b14d0cd957127ab606d6ab5cc5f4c89c Mon Sep 17 00:00:00 2001 From: fleaz Date: Thu, 18 Jul 2024 23:26:27 +0200 Subject: [PATCH 2/3] home/zsh: Drop ncal alias --- home-manager/modules/zsh.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix index 8dae7b2..7c8562a 100644 --- a/home-manager/modules/zsh.nix +++ b/home-manager/modules/zsh.nix @@ -18,7 +18,6 @@ "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.cccda.de buzzer"; "beep" = "paplay /usr/share/sounds/freedesktop/stereo/complete.oga"; # play "ding" for long running jobs "dig" = "dig +short"; - "cal" = "ncal -b"; }; initExtra = '' autoload -U colors && colors From 9f2e1afc34144118f84193528baadb3dd84b6731 Mon Sep 17 00:00:00 2001 From: fleaz Date: Thu, 18 Jul 2024 23:27:21 +0200 Subject: [PATCH 3/3] home/neovim: Use nixfmt-rfc-style instead of classic --- home-manager/modules/neovim.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix index 2ffdd6c..82a85ef 100644 --- a/home-manager/modules/neovim.nix +++ b/home-manager/modules/neovim.nix @@ -5,7 +5,7 @@ withPython3 = true; extraPackages = with pkgs; [ nil - nixfmt-classic + nixfmt-rfc-style gopls pyright (python3.withPackages (ps: with ps; [ @@ -182,7 +182,7 @@ ['nil'] = { testSetting = 42, formatting = { - command = { "nixfmt-classic" }, + command = { "nixfmt-rfc-style" }, }, }, },