Minor changes
This commit is contained in:
parent
ff72e7ca4a
commit
d475f895a0
1
home.nix
1
home.nix
@ -15,7 +15,6 @@ in
|
|||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
fortune
|
fortune
|
||||||
(customPackages.repo-to-text)
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ in
|
|||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
xkb.layout = "us";
|
xkb.layout = "us";
|
||||||
videoDrives = [ "displaylink" "modesetting" ];
|
videoDrivers = [ "displaylink" "modesetting" ];
|
||||||
desktopManager.plasma6 = {
|
desktopManager.plasma6 = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraSessionCommands = ''
|
extraSessionCommands = ''
|
||||||
|
@ -1,12 +1,6 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# Matrix/Mautrix bridges
|
|
||||||
element-desktop-wayland
|
|
||||||
mautrix-whatsapp
|
|
||||||
mautrix-signal
|
|
||||||
mautrix-telegram
|
|
||||||
|
|
||||||
# Signal
|
# Signal
|
||||||
signal-cli
|
signal-cli
|
||||||
signal-export
|
signal-export
|
||||||
|
@ -1,35 +1,29 @@
|
|||||||
|
# users/jeirmeister/programs/development/env/common/paths.nix
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
# XDG Base Directories
|
|
||||||
XDG_CACHE_HOME = "$HOME/.cache";
|
|
||||||
XDG_CONFIG_HOME = "$HOME/.config";
|
|
||||||
XDG_DATA_HOME = "$HOME/.local/share";
|
|
||||||
XDG_STATE_HOME = "$HOME/.local/state";
|
|
||||||
XDG_RUNTIME_DIR = "/run/user/${toString config.home.uid}";
|
|
||||||
|
|
||||||
# Tool-specific paths
|
# Tool-specific paths
|
||||||
DEVELOPMENT_TOOLS_HOME = "$XDG_DATA_HOME/dev-tools";
|
DEVELOPMENT_TOOLS_HOME = "${config.xdg.dataHome}/dev-tools";
|
||||||
VIRTUALENV_HOME = "$XDG_DATA_HOME/virtualenvs";
|
VIRTUALENV_HOME = "${config.xdg.dataHome}/virtualenvs";
|
||||||
NODE_PACKAGES_DIR = "$XDG_DATA_HOME/node-packages";
|
NODE_PACKAGES_DIR = "${config.xdg.dataHome}/node-packages";
|
||||||
CARGO_HOME = "$XDG_DATA_HOME/cargo";
|
CARGO_HOME = "${config.xdg.dataHome}/cargo";
|
||||||
GO_PATH = "$XDG_DATA_HOME/go";
|
GO_PATH = "${config.xdg.dataHome}/go";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Ensure directories exist
|
# Ensure directories exist
|
||||||
home.file = {
|
home.file = {
|
||||||
"${config.home.sessionVariables.DEVELOPMENT_TOOLS_HOME}/.keep".text = "";
|
"${config.xdg.dataHome}/dev-tools/.keep".text = "";
|
||||||
"${config.home.sessionVariables.VIRTUALENV_HOME}/.keep".text = "";
|
"${config.xdg.dataHome}/virtualenvs/.keep".text = "";
|
||||||
"${config.home.sessionVariables.NODE_PACKAGES_DIR}/.keep".text = "";
|
"${config.xdg.dataHome}/node-packages/.keep".text = "";
|
||||||
# Add standard cache directories
|
# Add standard cache directories
|
||||||
"${config.home.sessionVariables.XDG_CACHE_HOME}/yarn/.keep".text = "";
|
"${config.xdg.cacheHome}/yarn/.keep".text = "";
|
||||||
"${config.home.sessionVariables.XDG_CACHE_HOME}/pnpm/.keep".text = "";
|
"${config.xdg.cacheHome}/pnpm/.keep".text = "";
|
||||||
|
|
||||||
# Add standard data directories
|
# Add standard data directories
|
||||||
"${config.home.sessionVariables.XDG_DATA_HOME}/node/.keep".text = "";
|
"${config.xdg.dataHome}/node/.keep".text = "";
|
||||||
"${config.home.sessionVariables.XDG_DATA_HOME}/python/.keep".text = "";
|
"${config.xdg.dataHome}/python/.keep".text = "";
|
||||||
"${config.home.sessionVariables.XDG_DATA_HOME}/cargo/.keep".text = "";
|
"${config.xdg.dataHome}/cargo/.keep".text = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Add to env/common/paths.nix
|
# Add to env/common/paths.nix
|
||||||
@ -42,16 +36,8 @@
|
|||||||
|
|
||||||
assertions = [
|
assertions = [
|
||||||
{
|
{
|
||||||
assertion = config.home.sessionVariables.XDG_CACHE_HOME != "";
|
assertion = config.xdg.enable;
|
||||||
message = "XDG_CACHE_HOME must be set";
|
message = "XDG Base Directory support must be enabled";
|
||||||
}
|
|
||||||
{
|
|
||||||
assertion = config.home.sessionVariables.XDG_DATA_HOME != "";
|
|
||||||
message = "XDG_DATA_HOME must be set";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
assertion = config.home.sessionVariables.XDG_CONFIG_HOME != "";
|
|
||||||
message = "XDG_CONFIG_HOME must be set";
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
@ -1,5 +1,10 @@
|
|||||||
{ pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
let
|
||||||
repo-to-text = pkgs.callPackage ./repo-to-text.nix {};
|
repo-to-text = pkgs.callPackage ./repo-to-text.nix {};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
home.packages = [
|
||||||
|
repo-to-text
|
||||||
|
];
|
||||||
}
|
}
|
@ -8,10 +8,6 @@
|
|||||||
cargo-tarpaulin
|
cargo-tarpaulin
|
||||||
];
|
];
|
||||||
|
|
||||||
home.sessionVariables = {
|
|
||||||
CARGO_HOME = "${config.home.sessionVariables.CARGO_HOME}";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file.".cargo/config.toml".text = ''
|
home.file.".cargo/config.toml".text = ''
|
||||||
[build]
|
[build]
|
||||||
target-dir = "target"
|
target-dir = "target"
|
||||||
|
Loading…
Reference in New Issue
Block a user