From 74b9dc142aa76519a944e066279619c0bd16b5ed Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Fri, 21 Feb 2025 22:54:39 -0500 Subject: [PATCH] make home profile for server 2 --- common/users/homeModules/kde.nix | 1 + common/users/homeModules/nvim.light.nix | 19 ++++++++++ common/users/homeModules/nvim.nix | 3 +- common/users/homeModules/utils.nix | 47 +++++++++++++------------ common/users/homeModules/zsh.nix | 1 - common/users/meyer-server/home.nix | 7 +++- 6 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 common/users/homeModules/nvim.light.nix diff --git a/common/users/homeModules/kde.nix b/common/users/homeModules/kde.nix index 426a2c0..ab09396 100644 --- a/common/users/homeModules/kde.nix +++ b/common/users/homeModules/kde.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { home = { packages = with pkgs; [ + filelight ksshaskpass xsel libsForQt5.kinit diff --git a/common/users/homeModules/nvim.light.nix b/common/users/homeModules/nvim.light.nix new file mode 100644 index 0000000..ecbf754 --- /dev/null +++ b/common/users/homeModules/nvim.light.nix @@ -0,0 +1,19 @@ + +{pkgs, config, ...}: { + home = { + packages = with pkgs; [ + neovim + ]; + file = { + nvim = { + recursive = true; + source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/dotfiles/light.config"; + target = "./.config/nvim"; + }; + }; + sessionVariables = { + EDITOR = "nvim"; + MANPAGER = "nvim +Man!"; + }; + }; +} diff --git a/common/users/homeModules/nvim.nix b/common/users/homeModules/nvim.nix index e3e6f5a..cdf77f9 100644 --- a/common/users/homeModules/nvim.nix +++ b/common/users/homeModules/nvim.nix @@ -13,7 +13,6 @@ sessionVariables = { EDITOR = "nvim"; MANPAGER = "nvim +Man!"; - MANWIDTH = "999"; }; }; -} \ No newline at end of file +} diff --git a/common/users/homeModules/utils.nix b/common/users/homeModules/utils.nix index c18749a..c34f483 100644 --- a/common/users/homeModules/utils.nix +++ b/common/users/homeModules/utils.nix @@ -1,25 +1,26 @@ -{pkgs, lib, ...}: { - home = { - packages = with pkgs; [ - unixtools.xxd - filelight - p7zip - dig - bat - usbutils - tree - sops - fzf - jq - unzip - unrar - ]; - sessionVariables = { - BAT_THEME = "Dracula"; - SSH_ASKPASS_REQUIRE = "prefer"; - }; - sessionPath = [ - "$HOME/.local/bin" - ]; +{ pkgs, lib, ... }: +{ + home = { + packages = with pkgs; [ + # CLI ONLY + unixtools.xxd + p7zip + dig + bat + usbutils + tree + sops + fzf + jq + unzip + unrar + ]; + sessionVariables = { + BAT_THEME = "Dracula"; + SSH_ASKPASS_REQUIRE = "prefer"; }; + sessionPath = [ + "$HOME/.local/bin" + ]; + }; } diff --git a/common/users/homeModules/zsh.nix b/common/users/homeModules/zsh.nix index fed2c22..945ebab 100644 --- a/common/users/homeModules/zsh.nix +++ b/common/users/homeModules/zsh.nix @@ -1,6 +1,5 @@ { lib, pkgs, ... }: let - # TODO: make these modular _ = [ "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme" diff --git a/common/users/meyer-server/home.nix b/common/users/meyer-server/home.nix index 95984ad..22b5b88 100644 --- a/common/users/meyer-server/home.nix +++ b/common/users/meyer-server/home.nix @@ -1,4 +1,3 @@ - { ... }: @@ -7,6 +6,12 @@ nixpkgs.config.allowUnfreePredicate = (pkg: true); imports = [ + ../homeModules/nvim.light.nix + ../homeModules/git.nix + ../homeModules/zsh.nix + ../homeModules/sops.nix + ../homeModules/utils.nix + ../homeModules/media/cli.nix ]; # Home Manager needs a bit of information about you and the paths it should