added 'roles', sets of installed programs.

This commit is contained in:
Gabe Venberg 2024-05-09 13:11:22 -05:00
parent f180fc20f1
commit 43a47321e4
7 changed files with 50 additions and 22 deletions

View file

@ -87,7 +87,7 @@ inputs.nixpkgs.lib.nixosSystem {
}; };
}; };
imports = [ imports = [
../../modules/home-manager/terminal ../../roles/terminal.nix
../../modules/home-manager/nvim ../../modules/home-manager/nvim
../../modules/home-manager/common.nix ../../modules/home-manager/common.nix
../../modules/home-manager/email.nix ../../modules/home-manager/email.nix

View file

@ -34,7 +34,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
home.username = "gabe"; home.username = "gabe";
home.homeDirectory = /home/gabe; home.homeDirectory = /home/gabe;
imports = [ imports = [
../modules/home-manager/terminal ../roles/terminal.nix
../modules/home-manager/nvim ../modules/home-manager/nvim
../modules/home-manager/common.nix ../modules/home-manager/common.nix
../modules/home-manager/syncthing.nix ../modules/home-manager/syncthing.nix

View file

@ -37,7 +37,7 @@ inputs.home-manager.lib.homeManagerConfiguration {
home.username = "gabe"; home.username = "gabe";
home.homeDirectory = /home/gabe; home.homeDirectory = /home/gabe;
imports = [ imports = [
../modules/home-manager/terminal ../roles/terminal.nix
../modules/home-manager/nvim ../modules/home-manager/nvim
../modules/home-manager/common.nix ../modules/home-manager/common.nix
../modules/home-manager/syncthing.nix ../modules/home-manager/syncthing.nix

View file

@ -88,7 +88,7 @@ inputs.nixpkgs.lib.nixosSystem {
}; };
}; };
imports = [ imports = [
../../modules/home-manager/terminal ../../roles/terminal.nix
../../modules/home-manager/nvim ../../modules/home-manager/nvim
../../modules/home-manager/common.nix ../../modules/home-manager/common.nix
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim

View file

@ -30,7 +30,7 @@
#select first item when you press tab the first time. #select first item when you press tab the first time.
setopt MENU_COMPLETE setopt MENU_COMPLETE
'' ''
(lib.mkif (!config.programs.starship.enable) '' (lib.mkIf (!config.programs.starship.enable) ''
autoload -U promptinit autoload -U promptinit
promptinit promptinit
autoload -U colors autoload -U colors

View file

@ -4,14 +4,18 @@
lib, lib,
... ...
}: { }: {
imports = [
../modules/home-manager/terminal/zsh.nix
../modules/home-manager/terminal/git.nix
../modules/home-manager/terminal/zellij
../modules/home-manager/terminal/ssh-agent.nix
../modules/home-manager/terminal/direnv.nix
];
home.packages = with pkgs; [ home.packages = with pkgs; [
sshfs sshfs
just just
fd fd
sd sd
tre-command
diskonaut
hyperfine
curl curl
]; ];
@ -37,25 +41,11 @@
sshmnt = "sshfs -o idmap=user,compression=no,reconnect,follow_symlinks,dir_cache=yes,ServerAliveInterval=15"; sshmnt = "sshfs -o idmap=user,compression=no,reconnect,follow_symlinks,dir_cache=yes,ServerAliveInterval=15";
}; };
imports = [
./nushell
./zsh.nix
./git.nix
./starship.nix
./voice.nix
./zellij
./tiny-irc.nix
./ssh-agent.nix
./direnv
];
programs = { programs = {
yazi.enable = true; yazi.enable = true;
zoxide.enable = true;
fzf.enable = true; fzf.enable = true;
ripgrep.enable = true; ripgrep.enable = true;
bat.enable = true; bat.enable = true;
tealdeer.enable = true;
btop.enable = true; btop.enable = true;
man.enable = true; man.enable = true;
}; };

38
roles/terminal.nix Normal file
View file

@ -0,0 +1,38 @@
{
config,
pkgs,
lib,
...
}: {
imports = [
./minimal-terminal.nix
../modules/home-manager/terminal/nushell
../modules/home-manager/terminal/starship.nix
../modules/home-manager/terminal/voice.nix
../modules/home-manager/terminal/tiny-irc.nix
];
home.packages = with pkgs; [
tre-command
diskonaut
hyperfine
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
home.file = {
};
home.sessionVariables = {
PIPENV_VENV_IN_PROJECT = 1;
POETRY_VIRTUALENVS_IN_PROJECT = 1;
};
home.shellAliases = {
# doc2pdf = "loffice --convert-to-pdf --headless *.docx";
};
programs = {
zoxide.enable = true;
tealdeer.enable = true;
};
}