From f0b807891bd11ef59b3f3878b50c3f2a689f2af2 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Mon, 9 Sep 2024 19:07:54 -0400 Subject: [PATCH] update --- hosts/dell/home.nix | 2 -- hosts/desktop/home.nix | 2 -- hosts/macbook/home.nix | 1 - hosts/thinkpad/home.nix | 2 -- modules/home-manager/bat/default.nix | 9 --------- modules/home-manager/eza/default.nix | 12 ------------ .../home-manager/neovim/nvim/after/ftplugin/c.lua | 4 ++++ modules/home-manager/zsh/default.nix | 1 - 8 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 modules/home-manager/bat/default.nix delete mode 100644 modules/home-manager/eza/default.nix create mode 100644 modules/home-manager/neovim/nvim/after/ftplugin/c.lua diff --git a/hosts/dell/home.nix b/hosts/dell/home.nix index bae1f40..4f50f11 100644 --- a/hosts/dell/home.nix +++ b/hosts/dell/home.nix @@ -11,8 +11,6 @@ ../../modules/home-manager/tmux ../../modules/home-manager/taskwarrior ../../modules/home-manager/zoxide - ../../modules/home-manager/eza - ../../modules/home-manager/bat ../../modules/home-manager/irssi ]; home.username = "mthomson"; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 9e59e20..7a5a1be 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -11,8 +11,6 @@ ../../modules/home-manager/tmux ../../modules/home-manager/taskwarrior ../../modules/home-manager/zoxide - ../../modules/home-manager/eza - ../../modules/home-manager/bat ../../modules/home-manager/irssi ../../modules/home-manager/syncthing ../../modules/home-manager/email diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 1bfe6bd..a8915b8 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -9,7 +9,6 @@ ../../modules/home-manager/zsh ../../modules/home-manager/tmux ../../modules/home-manager/zoxide - ../../modules/home-manager/eza ../../modules/home-manager/bat ../../modules/home-manager/irssi ../../modules/home-manager/email ../../modules/home-manager/password-store diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix index bfa06f7..3f06c50 100644 --- a/hosts/thinkpad/home.nix +++ b/hosts/thinkpad/home.nix @@ -12,8 +12,6 @@ ../../modules/home-manager/taskwarrior ../../modules/home-manager/zoxide ../../modules/home-manager/zathura - ../../modules/home-manager/eza - ../../modules/home-manager/bat ../../modules/home-manager/syncthing ../../modules/home-manager/email ]; diff --git a/modules/home-manager/bat/default.nix b/modules/home-manager/bat/default.nix deleted file mode 100644 index 1332e90..0000000 --- a/modules/home-manager/bat/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, config, ... }: - -{ - programs = { - bat = { - enable = true; - }; - }; -} diff --git a/modules/home-manager/eza/default.nix b/modules/home-manager/eza/default.nix deleted file mode 100644 index 3fe1b69..0000000 --- a/modules/home-manager/eza/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, config, ... }: - -{ - programs = { - eza = { - enable = true; - enableZshIntegration = true; - git = true; - icons = false; - }; - }; -} diff --git a/modules/home-manager/neovim/nvim/after/ftplugin/c.lua b/modules/home-manager/neovim/nvim/after/ftplugin/c.lua new file mode 100644 index 0000000..294b53a --- /dev/null +++ b/modules/home-manager/neovim/nvim/after/ftplugin/c.lua @@ -0,0 +1,4 @@ +vim.opt.tabstop = 8 +vim.opt.softtabstop = 8 +vim.opt.shiftwidth = 8 +vim.opt.noexpandtab = true diff --git a/modules/home-manager/zsh/default.nix b/modules/home-manager/zsh/default.nix index 61fd323..c67956f 100644 --- a/modules/home-manager/zsh/default.nix +++ b/modules/home-manager/zsh/default.nix @@ -18,7 +18,6 @@ shellAliases = { cd = "z"; cdi = "zi"; - cat = "bat"; }; initExtra = '' . "/etc/profiles/per-user/$USER/etc/profile.d/hm-session-vars.sh"