Compare commits

..

No commits in common. "8149576db5dea0982674dd43660ecd0cbc8f51f0" and "b691c64fbe71413c4f6004d805cd53d5bd88d777" have entirely different histories.

5 changed files with 10 additions and 42 deletions

View File

@ -11,7 +11,6 @@
"flakes" "flakes"
]; ];
auto-optimise-store = true; auto-optimise-store = true;
use-xdg-base-directories = true;
trusted-users = [ "@wheel" ]; trusted-users = [ "@wheel" ];
}; };
gc = { gc = {

View File

@ -1,18 +1,8 @@
{ pkgs, ... }: { ... }:
{ {
nix = { nix = {
package = pkgs.nix;
gc = { gc = {
automatic = true; automatic = true;
}; };
settings = {
experimental-features = [
"nix-command"
"flakes"
];
auto-optimise-store = true;
use-xdg-base-directories = true;
trusted-users = [ "@wheel" ];
};
}; };
} }

View File

@ -1,20 +0,0 @@
{ pkgs, ... }:
{
home.packages = [ pkgs.thunderbird ];
xdg = {
desktopEntries.thunderbird = {
name = "thunderbird";
exec = "${pkgs.thunderbird}/bin/thunderbird";
};
mimeApps = {
associations.added = {
"x-scheme-handler/mailto" = [ "thunderbird.desktop " ];
"text/calendar" = [ "thunderbird.desktop " ];
};
defaultApplications = {
"x-scheme-handler/mailto" = [ "thunderbird.desktop " ];
"text/calendar" = [ "thunderbird.desktop " ];
};
};
};
}

View File

@ -0,0 +1,4 @@
extra-experimental-features = flakes nix-command
max-jobs = auto
substituters = https://cache.nixos.org https://cache.nixos.org/ https://nix-community.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=

View File

@ -90,6 +90,7 @@ in
gh gh
ffmpeg ffmpeg
man man
thunderbird
jq jq
tectonic tectonic
fzf fzf
@ -154,20 +155,14 @@ in
CARGO_HOME = "${config.xdg.dataHome}/cargo"; CARGO_HOME = "${config.xdg.dataHome}/cargo";
OMNISHARPHOME = "${config.xdg.configHome}/omnisharp"; OMNISHARPHOME = "${config.xdg.configHome}/omnisharp";
NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
TERMINFO_DIRS = "${config.home.profileDirectory}/share/terminfo"; TERMINFO_DIRS = "${config.home.homeDirectory}/.nix-profile/share/terminfo";
WSLENV = "TERMINFO_DIRS"; WSLENV = "TERMINFO_DIRS";
LD_LIBRARY_PATH = lib.strings.makeLibraryPath [ LD_LIBRARY_PATH = lib.strings.makeLibraryPath [
"${config.home.profileDirectory}" "${config.home.homeDirectory}/.nix-profile/"
"${pkgs.sqlite.out}" "${pkgs.sqlite.out}"
]; ];
PKG_CONFIG_PATH = "${config.home.profileDirectory}/lib/pkgconfig"; PKG_CONFIG_PATH = "${config.home.homeDirectory}/.nix-profile/lib/pkgconfig";
GTK_PATH = "${pkgs.gtk-engine-murrine}/lib/gtk-2.0"; GTK_PATH = "${pkgs.gtk-engine-murrine}/lib/gtk-2.0";
ANDROID_USER_HOME = "${config.xdg.dataHome}/android";
ANSIBLE_HOME = "${config.xdg.dataHome}/ansible";
CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv";
DOCKER_CONFIG = "${config.xdg.configHome}/docker";
GRADLE_USER_HOME = "${config.xdg.dataHome}/gradle";
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot='${config.xdg.configHome}/java'";
}; };
sessionPath = [ "${config.xdg.dataHome}/bin" ]; sessionPath = [ "${config.xdg.dataHome}/bin" ];
}; };
@ -175,7 +170,7 @@ in
xdg = { xdg = {
enable = true; enable = true;
mime.enable = true; mime.enable = true;
systemDirs.data = [ "${config.home.profileDirectory}/share/" ]; systemDirs.data = [ "${config.home.homeDirectory}/.nix-profile/share/" ];
mimeApps = { mimeApps = {
enable = true; enable = true;
associations.added = { associations.added = {