summaryrefslogtreecommitdiff
path: root/profiles/core
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/core')
-rw-r--r--profiles/core/home.nix16
-rw-r--r--profiles/core/syncthing.nix2
2 files changed, 8 insertions, 10 deletions
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 3788da7..9434fc5 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -5,8 +5,9 @@
pkgs,
...
}: with lib; {
- programs.tmux = let
- cfg = ''
+ programs.tmux = {
+ enable = true;
+ extraConfig = ''
set-option -g default-shell ${config.ivi.shell}/bin/zsh
set -g status off
set -s set-clipboard on
@@ -38,13 +39,7 @@
bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
bind-key -T copy-mode-vi : command-prompt
'';
- in {
- enable = true;
- } // (if machine.isDarwin then {
- tmuxConfig = cfg;
- } else {
- extraConfig = cfg;
- });
+ };
hm = {
fonts.fontconfig.enable = true;
@@ -119,6 +114,8 @@
'';
};
+ programs.alacritty.enable = true;
+
programs = {
zsh = {
enable = true;
@@ -306,6 +303,7 @@
enableSshSupport = false;
defaultCacheTtl = 34550000;
maxCacheTtl = 34550000;
+ pinentryPackage = pkgs.pinentry-gtk2;
# pinentryFlavor = "gtk2";
};
};
diff --git a/profiles/core/syncthing.nix b/profiles/core/syncthing.nix
index e076d8d..b736379 100644
--- a/profiles/core/syncthing.nix
+++ b/profiles/core/syncthing.nix
@@ -6,7 +6,7 @@ in {
];
services.syncthing = {
- enable = true;
+ enable = mkDefault true;
user = ivi.username;
inherit group;
dataDir = config.ivi.home;