cleanup
This commit is contained in:
parent
8bfa3f9bba
commit
898826b7d3
@ -1,7 +1,32 @@
|
||||
{ system, pkgs, home-manager, modules, nid, ... }:
|
||||
let
|
||||
ivand-programs = with modules.home.programs; [ nvim zsh tmux git chromium firefox kitty lf obs-studio sway swaylock browserpass bottom gpg comma nushell waybar tealdeer pueue ];
|
||||
ivand-packages = with modules.home.packages; [ dev essential media ];
|
||||
ivand-programs = with modules.home.programs; [
|
||||
nvim
|
||||
zsh
|
||||
tmux
|
||||
git
|
||||
chromium
|
||||
firefox
|
||||
kitty
|
||||
lf
|
||||
obs-studio
|
||||
sway
|
||||
swaylock
|
||||
browserpass
|
||||
bottom
|
||||
gpg
|
||||
comma
|
||||
nushell
|
||||
waybar
|
||||
tealdeer
|
||||
pueue
|
||||
starship
|
||||
];
|
||||
ivand-packages = with modules.home.packages; [
|
||||
dev
|
||||
essential
|
||||
media
|
||||
];
|
||||
in
|
||||
{
|
||||
ivand = home-manager.lib.homeManagerConfiguration {
|
||||
|
@ -15,6 +15,7 @@
|
||||
nushell = import ./nushell;
|
||||
obs-studio = import ./obs-studio { inherit pkgs; };
|
||||
pueue = import ./pueue;
|
||||
starship = import ./starship;
|
||||
sway = import ./sway { inherit pkgs; };
|
||||
swaylock = import ./swaylock;
|
||||
tealdeer = import ./tealdeer;
|
||||
|
@ -1,9 +1,8 @@
|
||||
{
|
||||
programs = {
|
||||
nushell = {
|
||||
enable = true;
|
||||
environmentVariables = {
|
||||
config = ''{
|
||||
programs.nushell = {
|
||||
enable = true;
|
||||
environmentVariables = {
|
||||
config = ''{
|
||||
show_banner: false,
|
||||
completions: {
|
||||
quick: true
|
||||
@ -12,30 +11,25 @@
|
||||
}
|
||||
}
|
||||
'';
|
||||
PASSWORD_STORE_DIR = "($env.HOME | path join .password-store)";
|
||||
PATH = "($env.PATH | split row (char esep) | append ($env.HOME | path join .local bin))";
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
shellAliases = {
|
||||
gcal = ''
|
||||
bash -c "cal $(date +%Y)"
|
||||
'';
|
||||
la = "ls -al";
|
||||
ssh = "TERM=xterm-256color ssh";
|
||||
dev = "nix develop --command $env.SHELL";
|
||||
torrent = "transmission-remote";
|
||||
vi = "nvim";
|
||||
sc = "systemctl";
|
||||
};
|
||||
loginFile.text = ''
|
||||
if (tty) == "/dev/tty1" {
|
||||
sway
|
||||
}
|
||||
PASSWORD_STORE_DIR = "($env.HOME | path join .password-store)";
|
||||
PATH = "($env.PATH | split row (char esep) | append ($env.HOME | path join .local bin))";
|
||||
EDITOR = "nvim";
|
||||
};
|
||||
shellAliases = {
|
||||
gcal = ''
|
||||
bash -c "cal $(date +%Y)"
|
||||
'';
|
||||
la = "ls -al";
|
||||
ssh = "TERM=xterm-256color ssh";
|
||||
dev = "nix develop --command $env.SHELL";
|
||||
torrent = "transmission-remote";
|
||||
vi = "nvim";
|
||||
sc = "systemctl";
|
||||
};
|
||||
starship = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
loginFile.text = ''
|
||||
if (tty) == "/dev/tty1" {
|
||||
sway
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
12
modules/home/programs/starship/default.nix
Normal file
12
modules/home/programs/starship/default.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
sudo = {
|
||||
disabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -31,20 +31,5 @@
|
||||
history = {
|
||||
expireDuplicatesFirst = true;
|
||||
};
|
||||
plugins = [
|
||||
{
|
||||
name = "zsh-powerlevel10k";
|
||||
src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k";
|
||||
file = "powerlevel10k.zsh-theme";
|
||||
}
|
||||
{
|
||||
name = "zsh-nix-shell";
|
||||
file = "nix-shell.plugin.zsh";
|
||||
src = "${pkgs.zsh-nix-shell}/share/zsh-nix-shell";
|
||||
}
|
||||
];
|
||||
initExtra = ''
|
||||
source "$HOME/.p10k.zsh"
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user