Cleanup nix config

This commit is contained in:
elkowar 2020-08-09 20:32:27 +02:00
parent 1a1ef26924
commit 77c32b7c9d
7 changed files with 150 additions and 90 deletions

View file

@ -1,10 +1,4 @@
{ {
"optOut": false, "optOut": false,
"lastUpdateCheck": 1596968361979, "lastUpdateCheck": 1596968361979
"update": {
"latest": "6.14.7",
"current": "6.14.6",
"type": "patch",
"name": "npm"
}
} }

View file

@ -1 +1 @@
/nix/store/ajbv3kkxfjvs37gy8a3fibsbv8qhynla-home-manager-files/.config/htop/htoprc /nix/store/khgb01ah9qx65314m2i6klylm5brkvnj-home-manager-files/.config/htop/htoprc

View file

@ -132,11 +132,9 @@ in
''; '';
initExtra = '' initExtra = ''
#export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=2" +"set statusline=\ %t"' export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=2" +"set statusline=\ %t"'
export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=0"' export MANPAGER='nvim +Man! +"set nocul" +"set noshowcmd" +"set noruler" +"set noshowmode" +"set laststatus=0"'
setopt nobeep setopt nobeep
setopt HIST_IGNORE_ALL_DUPS setopt HIST_IGNORE_ALL_DUPS

View file

@ -26,87 +26,12 @@ in
); );
}; };
profiles = {
base.enable = true;
home.packages = with pkgs; [ desktop.enable = true;
elkowar_local.bashtop
elkowar_local.liquidctl
direnv
rnix-lsp
nix-prefetch-git
gtop
simplescreenrecorder
bat
websocat
niv
exa
gromit-mpx
zsh-completions
cool-retro-term
ghc
mdcat
github-cli
#hyper-haskell
];
gtk = import ./config/gtk.nix { inherit pkgs; inherit myConf; };
programs = {
home-manager.enable = true;
alacritty = import ./config/alacritty.nix { inherit pkgs; inherit myConf; }; # <- https://github.com/guibou/nixGL
zsh = import ./config/zsh.nix { inherit pkgs; inherit myConf; };
tmux = import ./config/tmux.nix { inherit pkgs; inherit myConf; };
feh = import ./config/feh.nix;
rofi = import ./config/rofi { inherit pkgs; inherit myConf; };
htop.enable = true;
mpv = {
enable = true;
bindings = {
WHEEL_UP = "add volume 5";
WHEEL_DOWN = "add volume -5";
WHEEL_LEFT = "seek -3";
WHEEL_RIGHT = "seek 3";
h = "seek -3";
l = "seek 3";
};
};
fzf = {
enable = true;
enableFishIntegration = true;
enableZshIntegration = true;
defaultCommand = "rg --files";
fileWidgetCommand = "fd --type f";
changeDirWidgetCommand = "rg --files --null | xargs -0 dirname | sort -u";
};
direnv = {
enable = true;
enableFishIntegration = true;
enableZshIntegration = true;
enableNixDirenvIntegration = true;
};
};
services = {
mpd = {
enable = true;
musicDirectory = "/home/leon/Downloads/music";
};
udiskie.enable = true;
}; };
home.sessionVariables = {
LOCALE_ARCHIVE_2_11 = "${pkgs.glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE = "/usr/bin/locale";
};
home.username = "leon";
home.homeDirectory = "/home/leon";
home.stateVersion = "20.09"; imports = [ ./profiles/base.nix ./profiles/desktop.nix ];
} }

View file

@ -0,0 +1,75 @@
{ config, lib, pkgs, ... }:
let
cfg = config.profiles.base;
elkowar_local = import ../local/default.nix {};
myConf = import ../myConfig.nix;
in
{
options.profiles.base = {
enable = lib.mkEnableOption "Basic profile enabled";
#useZsh = lib.mkEnableOption
};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
direnv
rnix-lsp
nix-prefetch-git
gtop
bat
websocat
niv
exa
zsh-completions
trash-cli
mdcat
github-cli
haskellPackages.nix-tree
ripgrep
fd
jq
(import (fetchTarball https://github.com/lf-/nix-doc/archive/main.tar.gz) {})
];
programs = {
home-manager.enable = true;
htop.enable = true;
zsh = import ../config/zsh.nix { inherit pkgs; inherit myConf; };
tmux = import ../config/tmux.nix { inherit pkgs; inherit myConf; };
fzf = {
enable = true;
enableFishIntegration = true;
enableZshIntegration = true;
defaultCommand = "rg --files";
fileWidgetCommand = "fd --type f";
changeDirWidgetCommand = "rg --files --null | xargs -0 dirname | sort -u";
};
direnv = {
enable = true;
enableFishIntegration = true;
enableZshIntegration = true;
enableNixDirenvIntegration = true;
};
};
home = {
sessionVariables = rec {
LOCALE_ARCHIVE_2_11 = "${pkgs.glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE = "/usr/bin/locale";
EDITOR = "nvim";
VISUAL = "nvim";
GIT_EDITOR = EDITOR;
};
username = "leon";
homeDirectory = "/home/leon";
stateVersion = "20.09";
};
};
}

View file

@ -0,0 +1,55 @@
{ config, lib, pkgs, ... }:
let
cfg = config.profiles.desktop;
elkowar_local = import ../local/default.nix {};
myConf = import ../myConfig.nix;
in
{
options.profiles.desktop = {
enable = lib.mkEnableOption "Desktop configuration enabled";
};
config = lib.mkIf cfg.enable {
gtk = import ../config/gtk.nix { inherit pkgs; inherit myConf; };
home.packages = with pkgs; [
elkowar_local.bashtop
elkowar_local.liquidctl
cool-retro-term
simplescreenrecorder
gromit-mpx
#hyper-haskell
];
programs = {
alacritty = import ../config/alacritty.nix { inherit pkgs; inherit myConf; }; # <- https://github.com/guibou/nixGL
feh = import ../config/feh.nix;
rofi = import ../config/rofi { inherit pkgs; inherit myConf; };
mpv = {
enable = true;
bindings = {
WHEEL_UP = "add volume 5";
WHEEL_DOWN = "add volume -5";
WHEEL_LEFT = "seek -3";
WHEEL_RIGHT = "seek 3";
h = "seek -3";
l = "seek 3";
};
};
};
services = {
mpd = {
enable = true;
musicDirectory = "/home/leon/Downloads/music";
};
udiskie.enable = true;
};
};
}

View file

@ -0,0 +1,13 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.locate;
in
{
options.term = {
enable = mkOption {
type = types.bool;
default = false;
};
};
}