diff options
Diffstat (limited to 'home/common/modules')
-rw-r--r-- | home/common/modules/git.nix | 6 | ||||
-rw-r--r-- | home/common/modules/mimeapps.nix | 3 | ||||
-rw-r--r-- | home/common/modules/shell.nix | 3 | ||||
-rw-r--r-- | home/common/modules/ssh.nix | 6 | ||||
-rw-r--r-- | home/common/modules/tmux.nix | 6 | ||||
-rw-r--r-- | home/common/modules/xdg_ninja.nix | 9 | ||||
-rw-r--r-- | home/common/modules/xdgdirs.nix | 6 |
7 files changed, 24 insertions, 15 deletions
diff --git a/home/common/modules/git.nix b/home/common/modules/git.nix index 1f10da7..3f8a98e 100644 --- a/home/common/modules/git.nix +++ b/home/common/modules/git.nix @@ -1,7 +1,9 @@ -{ config, ... }: let +{ config, ... }: +let userName = config.global.userdata.nameFq; userEmail = config.global.userdata.email; -in { +in +{ programs.git = { enable = true; inherit userName; diff --git a/home/common/modules/mimeapps.nix b/home/common/modules/mimeapps.nix index 04e3bd9..8c128cf 100644 --- a/home/common/modules/mimeapps.nix +++ b/home/common/modules/mimeapps.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ xdg.mimeApps = { enable = true; diff --git a/home/common/modules/shell.nix b/home/common/modules/shell.nix index c1b31fd..02f188a 100644 --- a/home/common/modules/shell.nix +++ b/home/common/modules/shell.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ programs.bash.enable = true; home = { diff --git a/home/common/modules/ssh.nix b/home/common/modules/ssh.nix index 5c54f44..31df169 100644 --- a/home/common/modules/ssh.nix +++ b/home/common/modules/ssh.nix @@ -1,6 +1,8 @@ -{ config, ... }: let +{ config, ... }: +let domain = config.global.userdata.domain; -in { +in +{ programs.ssh = { enable = true; compression = true; diff --git a/home/common/modules/tmux.nix b/home/common/modules/tmux.nix index 20fecd5..6705f38 100644 --- a/home/common/modules/tmux.nix +++ b/home/common/modules/tmux.nix @@ -1,8 +1,8 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, ... }: +{ home.packages = with pkgs; [ tmux ]; - home.sessionVariables.TMUX_TMPDIR = - ''''${XDG_RUNTIME_DIR:-"/run/user/$(id -u)"}''; + home.sessionVariables.TMUX_TMPDIR = ''''${XDG_RUNTIME_DIR:-"/run/user/$(id -u)"}''; programs.bash.initExtra = lib.mkOrder 2000 '' if [ -z "$TMUX" ] && { [ -n "$WAYLAND_DISPLAY" ] || [ -n "$SSH_TTY" ]; }; then diff --git a/home/common/modules/xdg_ninja.nix b/home/common/modules/xdg_ninja.nix index 614454b..6bd4196 100644 --- a/home/common/modules/xdg_ninja.nix +++ b/home/common/modules/xdg_ninja.nix @@ -1,12 +1,13 @@ -{ config, lib, ... }: let +{ config, lib, ... }: +let bashHistory = config.xdg.stateHome + "/bash/history"; -in { +in +{ home.activation.init = lib.hm.dag.entryAfter [ "writeBoundary" ] '' run --silence mkdir -p ${builtins.dirOf bashHistory} ''; - gtk.gtk2.configLocation = - config.xdg.configHome + "/gtk-2.0/gtkrc"; + gtk.gtk2.configLocation = config.xdg.configHome + "/gtk-2.0/gtkrc"; home.sessionVariables = { HISTFILE = bashHistory; diff --git a/home/common/modules/xdgdirs.nix b/home/common/modules/xdgdirs.nix index 3073a10..a2dce4f 100644 --- a/home/common/modules/xdgdirs.nix +++ b/home/common/modules/xdgdirs.nix @@ -1,9 +1,11 @@ -{ config, ... }: let +{ config, ... }: +let home = config.home.homeDirectory; etc = home + "/etc"; dl = home + "/dl"; -in { +in +{ xdg = { enable = true; |