Move files out of home to xdg folders
Thanks to xdg-ninja for analysing my home folder.
This commit is contained in:
parent
f2bcb12135
commit
0a5c2ca8ff
4
home.nix
4
home.nix
|
@ -36,7 +36,7 @@
|
||||||
file = import ./home/files.nix { };
|
file = import ./home/files.nix { };
|
||||||
|
|
||||||
} // import ./home/home.nix {
|
} // import ./home/home.nix {
|
||||||
inherit pkgs;
|
inherit config pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
targets.genericLinux.enable = true;
|
targets.genericLinux.enable = true;
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
};
|
};
|
||||||
gtk = import ./home/gtk.nix {
|
gtk = import ./home/gtk.nix {
|
||||||
inherit pkgs;
|
inherit config pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
services = import ./home/services.nix {
|
services = import ./home/services.nix {
|
||||||
|
|
|
@ -5,5 +5,4 @@ _:
|
||||||
".profile".source = ./files/profile;
|
".profile".source = ./files/profile;
|
||||||
".myclirc".source = ./files/myclirc;
|
".myclirc".source = ./files/myclirc;
|
||||||
".agignore".source = ./files/agignore;
|
".agignore".source = ./files/agignore;
|
||||||
".docker/config.json".source = ./files/docker/config.json;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
/home/daniels/.3T
|
|
||||||
/home/daniels/.audacity-data
|
|
||||||
/home/daniels/.cache
|
/home/daniels/.cache
|
||||||
/home/daniels/.config
|
/home/daniels/.config
|
||||||
/home/daniels/.dbus
|
/home/daniels/.dbus
|
||||||
/home/daniels/.dvdcss
|
|
||||||
/home/daniels/.gvfs
|
/home/daniels/.gvfs
|
||||||
/home/daniels/.icons
|
/home/daniels/.icons
|
||||||
/home/daniels/.java
|
/home/daniels/.java
|
||||||
|
@ -13,11 +10,9 @@
|
||||||
/home/daniels/.node
|
/home/daniels/.node
|
||||||
/home/daniels/.npm
|
/home/daniels/.npm
|
||||||
/home/daniels/.rnd
|
/home/daniels/.rnd
|
||||||
/home/daniels/.vimundo
|
|
||||||
/home/daniels/Applications/Games/
|
/home/daniels/Applications/Games/
|
||||||
/home/daniels/Downloads/
|
/home/daniels/Downloads/
|
||||||
/home/daniels/Music/
|
/home/daniels/Music/
|
||||||
/home/daniels/Pictures/
|
/home/daniels/Pictures/
|
||||||
/home/daniels/Projects/
|
/home/daniels/Projects/
|
||||||
/home/daniels/Videos/
|
/home/daniels/Videos/
|
||||||
/home/daniels/snap/
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ multi_line = False
|
||||||
destructive_warning = True
|
destructive_warning = True
|
||||||
|
|
||||||
# log_file location.
|
# log_file location.
|
||||||
; log_file = ~/.mycli.log
|
log_file = $XDG_DATA_DIRS/mycli.log
|
||||||
|
|
||||||
# Default log level. Possible values: "CRITICAL", "ERROR", "WARNING", "INFO"
|
# Default log level. Possible values: "CRITICAL", "ERROR", "WARNING", "INFO"
|
||||||
# and "DEBUG".
|
# and "DEBUG".
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs }:
|
{ config, pkgs }:
|
||||||
|
|
||||||
# Possible alternatives:
|
# Possible alternatives:
|
||||||
# https://github.com/FedoraQt/adwaita-qt
|
# https://github.com/FedoraQt/adwaita-qt
|
||||||
|
@ -24,6 +24,8 @@
|
||||||
size = 14;
|
size = 14;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
|
||||||
|
|
||||||
gtk3.extraConfig = {
|
gtk3.extraConfig = {
|
||||||
gtk-application-prefer-dark-theme = 1;
|
gtk-application-prefer-dark-theme = 1;
|
||||||
gtk-enable-animations = 0;
|
gtk-enable-animations = 0;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs }:
|
{ config, pkgs }:
|
||||||
|
|
||||||
let
|
let
|
||||||
enLocale = "en_US.utf8";
|
enLocale = "en_US.utf8";
|
||||||
|
@ -48,13 +48,33 @@ in {
|
||||||
EDITOR = "nvim";
|
EDITOR = "nvim";
|
||||||
SHELL = "zsh";
|
SHELL = "zsh";
|
||||||
|
|
||||||
TYPO3_CONTEXT = "Development/dsiepmann";
|
# Configure look up paths to not clutter home folder but follow XDG
|
||||||
TYPO3_ADDITIONAL_CONFIGURATION = "/home/daniels/.local/share/typo3-configuration/AdditionalConfiguration.inc.php";
|
|
||||||
|
XAUTHORITY = "${config.xdg.stateHome}/Xauthority";
|
||||||
|
ERRFILE = "${config.xdg.cacheHome}/X11/xsession-errors";
|
||||||
|
|
||||||
|
MYSQL_HISTFILE = "${config.xdg.dataHome}/mysql_history";
|
||||||
|
LESSHISTFILE = "${config.xdg.cacheHome}/less/history";
|
||||||
|
|
||||||
|
BUNDLE_USER_CONFIG = "${config.xdg.configHome}/bundle";
|
||||||
|
BUNDLE_USER_CACHE = "${config.xdg.cacheHome}/bundle";
|
||||||
|
BUNDLE_USER_PLUGIN = "${config.xdg.dataHome}/bundle";
|
||||||
|
|
||||||
|
ICEAUTHORITY = "${config.xdg.cacheHome}/ICEauthority";
|
||||||
|
DVDCSS_CACHE = "${config.xdg.dataHome}/dvdcss";
|
||||||
|
DOCKER_CONFIG = "${config.xdg.configHome}/docker";
|
||||||
|
|
||||||
|
# Program specific vars
|
||||||
|
|
||||||
LSCOLORS = "HxGxDxDxbxDxDxababcxcx";
|
LSCOLORS = "HxGxDxDxbxDxDxababcxcx";
|
||||||
LS_COLORS = "di=1;37:ln=1;36:so=1;33:pi=1;33:ex=31:bd=1;33:cd=1;33:su=30;41:sg=30;41:tw=32:ow=32";
|
LS_COLORS = "di=1;37:ln=1;36:so=1;33:pi=1;33:ex=31:bd=1;33:cd=1;33:su=30;41:sg=30;41:tw=32:ow=32";
|
||||||
GREP_COLOR = "0;30;44";
|
GREP_COLOR = "0;30;44";
|
||||||
PHAN_COLOR_SCHEME = "code";
|
PHAN_COLOR_SCHEME = "code";
|
||||||
|
|
||||||
|
# Custom vars
|
||||||
|
|
||||||
|
TYPO3_CONTEXT = "Development/dsiepmann";
|
||||||
|
TYPO3_ADDITIONAL_CONFIGURATION = "${config.xdg.dataHome}/typo3-configuration/AdditionalConfiguration.inc.php";
|
||||||
};
|
};
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
|
|
|
@ -38,6 +38,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
gpg = import ./programs/gpg.nix {
|
gpg = import ./programs/gpg.nix {
|
||||||
|
inherit config;
|
||||||
};
|
};
|
||||||
|
|
||||||
ssh = import ./programs/ssh.nix {
|
ssh = import ./programs/ssh.nix {
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
_:
|
{ config }:
|
||||||
|
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
homedir = "${config.xdg.dataHome}/gnupg";
|
||||||
|
|
||||||
publicKeys = [
|
publicKeys = [
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
1
home/programs/neovim/configuration/plugin/shada.vim
Normal file
1
home/programs/neovim/configuration/plugin/shada.vim
Normal file
|
@ -0,0 +1 @@
|
||||||
|
set shadafile=~/.local/share/vim/shadafile
|
|
@ -1,5 +1,5 @@
|
||||||
" Use undo file (Persist history through restart)
|
" Use undo file (Persist history through restart)
|
||||||
set undofile
|
set undofile
|
||||||
" Directory to use for undo files
|
" Directory to use for undo files
|
||||||
set undodir=~/.vimundo
|
set undodir=~/.local/share/vim/undo
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
dotDir = ".config/zsh";
|
||||||
|
|
||||||
autocd = true;
|
autocd = true;
|
||||||
enableSyntaxHighlighting = true;
|
enableSyntaxHighlighting = true;
|
||||||
|
|
||||||
|
@ -21,6 +23,7 @@
|
||||||
ignoreSpace = true;
|
ignoreSpace = true;
|
||||||
extended = true;
|
extended = true;
|
||||||
share = false;
|
share = false;
|
||||||
|
path = "${config.xdg.dataHome}/zsh/zsh_history";
|
||||||
};
|
};
|
||||||
|
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
tmpfiles.rules = [
|
tmpfiles.rules = [
|
||||||
"L ${config.home.homeDirectory}/.themes - - - - ${config.home.profileDirectory}/share/themes"
|
"L ${config.xdg.dataHome}/themes - - - - ${config.home.profileDirectory}/share/themes"
|
||||||
"L ${config.home.homeDirectory}/.icons/${config.gtk.iconTheme.name} - - - - ${config.home.profileDirectory}/share/icons/${config.gtk.iconTheme.name}"
|
"L ${config.xdg.dataHome}/icons/${config.gtk.iconTheme.name} - - - - ${config.home.profileDirectory}/share/icons/${config.gtk.iconTheme.name}"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,6 +81,8 @@
|
||||||
|
|
||||||
"nvim/syntax/php.vim".source = ./files/nvim/syntax/php.vim;
|
"nvim/syntax/php.vim".source = ./files/nvim/syntax/php.vim;
|
||||||
|
|
||||||
|
"docker/config.json".source = ./files/docker/config.json;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dataFile = {
|
dataFile = {
|
||||||
|
|
Loading…
Reference in a new issue