chore: Move environment variables to correct place
This commit is contained in:
parent
2c453b5831
commit
07249cf3d3
|
|
@ -6,53 +6,30 @@ let
|
|||
else
|
||||
"${pkgs.sudo}/bin/sudo";
|
||||
in {
|
||||
environment = {
|
||||
sessionVariables = { # home decluttering
|
||||
ANDROID_HOME = "\${XDG_DATA_HOME}/android";
|
||||
ANDROID_USER_HOME = "\${XDG_DATA_HOME}/android";
|
||||
CUDA_CACHE_PATH = "\${XDG_CACHE_HOME}/nv";
|
||||
GNUPGHOME = "\${XDG_DATA_HOME}/gnupg";
|
||||
GRADLE_USER_HOME = "\${XDG_DATA_HOME}/gradle";
|
||||
GTK2_RC_FILES = "\${XDG_CONFIG_HOME}/gtk-3.0/gtkrc";
|
||||
HISTFILE = "\${XDG_STATE_HOME}/bash/history";
|
||||
IONIC_CONFIG_DIRECTORY = "\${XDG_CONFIG_HOME}/ionic";
|
||||
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot=\${XDG_CONFIG_HOME}/java";
|
||||
MYSQL_HISTFILE = "\${XDG_DATA_HOME}/mysql_history";
|
||||
NODE_REPL_HISTORY = "\${XDG_DATA_HOME}/node_repl_history";
|
||||
PSQL_HISTORY = "\${XDG_DATA_HOME}/psql_history";
|
||||
XCOMPOSECACHE = "\${XDG_CACHE_HOME}/X11/xcompose";
|
||||
XDG_CACHE_HOME = "$HOME/.cache";
|
||||
XDG_CONFIG_HOME = "$HOME/.config";
|
||||
XDG_DATA_HOME = "$HOME/.local/share";
|
||||
XDG_STATE_HOME = "$HOME/.local/state";
|
||||
} // { # other
|
||||
HISTCONTROL = "ignorespace";
|
||||
};
|
||||
systemPackages = with pkgs;
|
||||
[ # development
|
||||
gnumake
|
||||
postgresql
|
||||
strace
|
||||
valgrind
|
||||
] ++ [ # utilities
|
||||
acpi
|
||||
cloak
|
||||
man-pages
|
||||
mdcat
|
||||
unzip
|
||||
wget
|
||||
] ++ [ # applications
|
||||
pulsemixer
|
||||
R
|
||||
] ++ [ # other
|
||||
cifs-utils
|
||||
ffmpeg
|
||||
libcxx
|
||||
libinput
|
||||
ntfs3g
|
||||
openal
|
||||
];
|
||||
};
|
||||
environment.systemPackages = with pkgs;
|
||||
[ # development
|
||||
gnumake
|
||||
postgresql
|
||||
strace
|
||||
valgrind
|
||||
] ++ [ # utilities
|
||||
acpi
|
||||
cloak
|
||||
man-pages
|
||||
mdcat
|
||||
unzip
|
||||
wget
|
||||
] ++ [ # applications
|
||||
pulsemixer
|
||||
R
|
||||
] ++ [ # other
|
||||
cifs-utils
|
||||
ffmpeg
|
||||
libcxx
|
||||
libinput
|
||||
ntfs3g
|
||||
openal
|
||||
];
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
users.${config.lwad.definitions.username} = {
|
||||
|
|
@ -90,11 +67,7 @@ in {
|
|||
fi
|
||||
}
|
||||
'';
|
||||
sessionVariables = {
|
||||
BOOKMARKS_FILE = "\${HOME}/Documents/bookmarks";
|
||||
PROJECT_MANAGER_PATH = "\${HOME}/Documents/projects";
|
||||
NVIM_UNDODIR = "\${HOME}/Documents/.undo/";
|
||||
};
|
||||
sessionVariables.BOOKMARKS_FILE = "\${HOME}/Documents/bookmarks";
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -49,6 +49,11 @@ with lib; {
|
|||
type = types.listOf types.str;
|
||||
};
|
||||
};
|
||||
undodir = mkOption {
|
||||
default = "\${HOME}/Documents/.undo/";
|
||||
description = "Directory to store undo files in.";
|
||||
type = types.str;
|
||||
};
|
||||
undotree.enable = mkEnableOption "undotree";
|
||||
zenmode.enable = mkEnableOption "zenmode";
|
||||
};
|
||||
|
|
@ -82,6 +87,7 @@ with lib; {
|
|||
])
|
||||
(optional cfg.telescope.enable ripgrep)
|
||||
];
|
||||
sessionVariables.NVIM_UNDODIR = mkIf cfg.enable cfg.undodir;
|
||||
# This clangd binary must be used instead of the one in pkgs.libclang.
|
||||
variables.PATH = mkIf (builtins.elem "clangd" cfg.lsp.servers)
|
||||
"${pkgs.clang-tools}/bin:$PATH";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,30 @@ with lib; {
|
|||
doc.enable = false;
|
||||
nixos.enable = false;
|
||||
};
|
||||
environment.defaultPackages = lib.mkForce [ ];
|
||||
environment = {
|
||||
defaultPackages = lib.mkForce [ ];
|
||||
sessionVariables = { # home decluttering
|
||||
ANDROID_HOME = "\${XDG_DATA_HOME}/android";
|
||||
ANDROID_USER_HOME = "\${XDG_DATA_HOME}/android";
|
||||
CUDA_CACHE_PATH = "\${XDG_CACHE_HOME}/nv";
|
||||
GNUPGHOME = "\${XDG_DATA_HOME}/gnupg";
|
||||
GRADLE_USER_HOME = "\${XDG_DATA_HOME}/gradle";
|
||||
GTK2_RC_FILES = "\${XDG_CONFIG_HOME}/gtk-3.0/gtkrc";
|
||||
HISTFILE = "\${XDG_STATE_HOME}/bash/history";
|
||||
IONIC_CONFIG_DIRECTORY = "\${XDG_CONFIG_HOME}/ionic";
|
||||
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot=\${XDG_CONFIG_HOME}/java";
|
||||
MYSQL_HISTFILE = "\${XDG_DATA_HOME}/mysql_history";
|
||||
NODE_REPL_HISTORY = "\${XDG_DATA_HOME}/node_repl_history";
|
||||
PSQL_HISTORY = "\${XDG_DATA_HOME}/psql_history";
|
||||
XCOMPOSECACHE = "\${XDG_CACHE_HOME}/X11/xcompose";
|
||||
XDG_CACHE_HOME = "$HOME/.cache";
|
||||
XDG_CONFIG_HOME = "$HOME/.config";
|
||||
XDG_DATA_HOME = "$HOME/.local/share";
|
||||
XDG_STATE_HOME = "$HOME/.local/state";
|
||||
} // { # other
|
||||
HISTCONTROL = "ignorespace";
|
||||
};
|
||||
};
|
||||
hardware.i2c.enable = true;
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,20 @@
|
|||
|
||||
let project-manager = inputs.project-manager.packages.x86_64-linux.default;
|
||||
in with lib; {
|
||||
options.lwad.utilities.terminal.enable = mkEnableOption "terminal utilities";
|
||||
config = let cfg = config.lwad.utilities.terminal.enable;
|
||||
in mkIf cfg {
|
||||
environment.systemPackages = [ project-manager ];
|
||||
options.lwad.utilities.terminal = {
|
||||
enable = mkEnableOption "terminal utilities";
|
||||
projectsFile = mkOption {
|
||||
default = "\${HOME}/Documents/projects";
|
||||
description = "File to store projects list in.";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
config = let cfg = config.lwad.utilities.terminal;
|
||||
in mkIf cfg.enable {
|
||||
environment = {
|
||||
systemPackages = [ project-manager ];
|
||||
sessionVariables.PROJECT_MANAGER_PATH = cfg.projectsFile;
|
||||
};
|
||||
programs = {
|
||||
bash = {
|
||||
shellAliases.p = "${project-manager}/bin/project-manager";
|
||||
|
|
|
|||
Loading…
Reference in New Issue