more modular system
This commit is contained in:
parent
9a5cb97ade
commit
4a70e04625
12
flake.nix
12
flake.nix
@ -33,7 +33,6 @@
|
||||
./sys/laptop
|
||||
./modules/dnscrypt
|
||||
hosts.nixosModule
|
||||
# ./modules/gaming
|
||||
];
|
||||
};
|
||||
};
|
||||
@ -41,12 +40,23 @@
|
||||
ivand = home-manager.lib.homeManagerConfiguration {
|
||||
modules = [
|
||||
./home/ivand
|
||||
./modules/programs
|
||||
./modules/packages
|
||||
];
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [ my-overlay ];
|
||||
};
|
||||
};
|
||||
vid = home-manager.lib.homeManagerConfiguration {
|
||||
modules = [
|
||||
./home/vid
|
||||
./modules/programs
|
||||
];
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ pkgs, lib, ... }: {
|
||||
|
||||
imports = [ ./programs ./packages ];
|
||||
|
||||
programs.home-manager = { enable = true; };
|
||||
|
||||
home = {
|
||||
@ -40,6 +38,11 @@
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
nv.enable = true;
|
||||
shell.enable = true;
|
||||
};
|
||||
|
||||
xdg.configFile = {
|
||||
"user-dirs.dirs" = {
|
||||
text = ''
|
||||
|
@ -1,44 +0,0 @@
|
||||
{ pkgs, lib, ... }: {
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
enableAutosuggestions = true;
|
||||
loginExtra = ''
|
||||
[ "$(tty)" = "/dev/tty1" ] && exec sway --unsupported-gpu
|
||||
'';
|
||||
sessionVariables = {
|
||||
PASSWORD_STORE_DIR = "$HOME/.password-store";
|
||||
};
|
||||
shellAliases = {
|
||||
cal = "cal $(date +%Y)";
|
||||
ssh = "TERM=xterm-256color ssh";
|
||||
GG = "git add . && git commit -m 'GG' && git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
gad = "git add . && git diff --cached";
|
||||
gac = "ga && gc";
|
||||
gach = "gac -C HEAD";
|
||||
ga = "git add .";
|
||||
gc = "git commit";
|
||||
dev = "nix develop --command $SHELL";
|
||||
la = "ls -alh";
|
||||
torrent = "transmission-remote";
|
||||
};
|
||||
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"
|
||||
'';
|
||||
};
|
||||
}
|
15
home/vid/default.nix
Normal file
15
home/vid/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ pkgs, lib, ... }: {
|
||||
home = {
|
||||
username = "vid";
|
||||
homeDirectory = "/home/vid";
|
||||
stateVersion = "23.11";
|
||||
sessionPath = [
|
||||
"$HOME/.local/bin"
|
||||
];
|
||||
};
|
||||
programs = {
|
||||
nv.enable = true;
|
||||
shell.enable = true;
|
||||
};
|
||||
}
|
||||
|
@ -2,7 +2,6 @@
|
||||
imports = [ ./neovim ./neomutt ./sway ./tmux.nix ./zsh.nix ./lf ];
|
||||
|
||||
programs = {
|
||||
nv.enable = true;
|
||||
thunderbird = {
|
||||
enable = true;
|
||||
profiles = { ivan = { isDefault = true; }; };
|
54
modules/programs/zsh.nix
Normal file
54
modules/programs/zsh.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
let
|
||||
cfg = config.programs.nv;
|
||||
in
|
||||
{
|
||||
|
||||
options.programs.shell = {
|
||||
enable = lib.mkEnableOption "shell";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
enableAutosuggestions = true;
|
||||
loginExtra = ''
|
||||
[ "$(tty)" = "/dev/tty1" ] && exec sway --unsupported-gpu
|
||||
'';
|
||||
sessionVariables = {
|
||||
PASSWORD_STORE_DIR = "$HOME/.password-store";
|
||||
};
|
||||
shellAliases = {
|
||||
cal = "cal $(date +%Y)";
|
||||
ssh = "TERM=xterm-256color ssh";
|
||||
GG = "git add . && git commit -m 'GG' && git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
gad = "git add . && git diff --cached";
|
||||
gac = "ga && gc";
|
||||
gach = "gac -C HEAD";
|
||||
ga = "git add .";
|
||||
gc = "git commit";
|
||||
dev = "nix develop --command $SHELL";
|
||||
la = "ls -alh";
|
||||
torrent = "transmission-remote";
|
||||
};
|
||||
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