summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--home/ebisu/fortune/development/default.nix2
-rw-r--r--home/ebisu/fortune/development/nix/default.nix (renamed from home/ebisu/fortune/development/nix.nix)2
-rw-r--r--home/ebisu/fortune/development/nix/direnv.nix7
-rw-r--r--home/ebisu/fortune/rice/gtk.nix13
-rw-r--r--home/ebisu/fortune/system/xdg.nix28
5 files changed, 47 insertions, 5 deletions
diff --git a/home/ebisu/fortune/development/default.nix b/home/ebisu/fortune/development/default.nix
index 435f127..1fdf89f 100644
--- a/home/ebisu/fortune/development/default.nix
+++ b/home/ebisu/fortune/development/default.nix
@@ -1,9 +1,9 @@
{
imports = [
./languages
+ ./nix
./tools
./database.nix
./infrastructure.nix
- ./nix.nix
];
}
diff --git a/home/ebisu/fortune/development/nix.nix b/home/ebisu/fortune/development/nix/default.nix
index 5fa5d17..1dd7ab1 100644
--- a/home/ebisu/fortune/development/nix.nix
+++ b/home/ebisu/fortune/development/nix/default.nix
@@ -5,7 +5,7 @@
...
}:
{
- programs.direnv.enable = true;
+ imports = [ ./direnv.nix ];
services.lorri.enable = true;
home.packages = with pkgs; [
diff --git a/home/ebisu/fortune/development/nix/direnv.nix b/home/ebisu/fortune/development/nix/direnv.nix
new file mode 100644
index 0000000..9f73981
--- /dev/null
+++ b/home/ebisu/fortune/development/nix/direnv.nix
@@ -0,0 +1,7 @@
+{
+ programs.direnv = {
+ enable = true;
+ silent = true;
+ nix-direnv.enable = true;
+ };
+}
diff --git a/home/ebisu/fortune/rice/gtk.nix b/home/ebisu/fortune/rice/gtk.nix
index 933fc54..a3b5c5f 100644
--- a/home/ebisu/fortune/rice/gtk.nix
+++ b/home/ebisu/fortune/rice/gtk.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
{
gtk = {
enable = true;
@@ -30,6 +30,17 @@
gtk-application-prefer-dark-theme=1
'';
};
+
+ gtk2 = {
+ configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+
+ extraConfig = ''
+ gtk-xft-antialias=1
+ gtk-xft-hinting=1
+ gtk-xft-hintstyle="hintslight"
+ gtk-xft-rgba="rgb"
+ '';
+ };
};
home.sessionVariables.GTK_THEME = "WhiteSur-Dark";
diff --git a/home/ebisu/fortune/system/xdg.nix b/home/ebisu/fortune/system/xdg.nix
index dde487b..7a0bf32 100644
--- a/home/ebisu/fortune/system/xdg.nix
+++ b/home/ebisu/fortune/system/xdg.nix
@@ -1,9 +1,33 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
{
home.packages = with pkgs; [
xdg-utils
xdg-ninja
];
- xdg.enable = true;
+ xdg = {
+ enable = true;
+ cacheHome = "${config.home.homeDirectory}/.cache";
+ configHome = "${config.home.homeDirectory}/.config";
+ dataHome = "${config.home.homeDirectory}/.local/share";
+ stateHome = "${config.home.homeDirectory}/.local/state";
+
+ userDirs = {
+ enable = pkgs.stdenv.isLinux;
+ createDirectories = true;
+ download = "${config.home.homeDirectory}/Downloads";
+ desktop = "${config.home.homeDirectory}/Desktop";
+ documents = "${config.home.homeDirectory}/Documents";
+ publicShare = null; # "${config.home.homeDirectory}/Public";
+ templates = null; # "${config.home.homeDirectory}/Templates";
+ music = "${config.home.homeDirectory}/Music";
+ pictures = "${config.home.homeDirectory}/Pictures";
+ videos = "${config.home.homeDirectory}/Videos";
+
+ extraConfig = {
+ XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
+ XDG_MAIL_DIR = "${config.home.homeDirectory}/Mail";
+ };
+ };
+ };
}