summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/editor/vim.nix3
-rw-r--r--makefu/2configs/gui/base.nix2
-rw-r--r--makefu/2configs/home-manager/cli.nix9
-rw-r--r--makefu/2configs/home-manager/zsh.nix9
-rw-r--r--makefu/2configs/minimal.nix2
5 files changed, 11 insertions, 14 deletions
diff --git a/makefu/2configs/editor/vim.nix b/makefu/2configs/editor/vim.nix
index 52ccd0ddd..3954dc0f3 100644
--- a/makefu/2configs/editor/vim.nix
+++ b/makefu/2configs/editor/vim.nix
@@ -22,7 +22,8 @@ in {
vimrcConfig.vam.knownPlugins = pkgs.vimPlugins // customPlugins;
vimrcConfig.vam.pluginDictionaries = [
{ names = [ "undotree"
- "YouCompleteMe" "UltiSnips"
+ "YouCompleteMe"
+ #"UltiSnips"
"vim-better-whitespace" ]; }
# vim-nix handles indentation better but does not perform sanity
{ names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }
diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 8aee1bdc3..9c1d560a0 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -30,7 +30,7 @@ in
awesome.noArgb = true;
awesome.luaModules = [ pkgs.luaPackages.vicious ];
};
- displayManager.defaultSession = lib.mkDefault "awesome";
+ displayManager.defaultSession = lib.mkDefault "none+awesome";
displayManager.lightdm = { enable = true; autoLogin.enable = true; autoLogin.user = mainUser; };
desktopManager.xterm.enable = false;
};
diff --git a/makefu/2configs/home-manager/cli.nix b/makefu/2configs/home-manager/cli.nix
index 6b5d26111..5d5673b81 100644
--- a/makefu/2configs/home-manager/cli.nix
+++ b/makefu/2configs/home-manager/cli.nix
@@ -1,15 +1,6 @@
{pkgs, ... }: {
imports = [ ./zsh.nix ];
home-manager.users.makefu = {
- services.gpg-agent = {
- enable = true;
- defaultCacheTtl = 900;
- maxCacheTtl = 7200;
- defaultCacheTtlSsh = 3600;
- maxCacheTtlSsh = 86400;
- enableSshSupport = true;
- enableScDaemon = true;
- };
programs.direnv = {
stdlib = ''
use_nix() {
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 1f4ceea6c..f972e98b4 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -1,5 +1,12 @@
{ pkgs, ... }:
{
+ programs = {
+ ssh.startAgent = false;
+ gnupg.agent = {
+ enable = true;
+ enableSSHSupport = true;
+ };
+ };
imports = [
{ #direnv
home-manager.users.makefu.home.packages = [ pkgs.direnv pkgs.nur.repos.kalbasit.nixify ];
@@ -54,8 +61,6 @@
setopt HIST_IGNORE_SPACE
setopt HIST_FIND_NO_DUPS
- unset SSH_AGENT_PID
- export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
compdef _pass brain
zstyle ':completion::complete:brain::' prefix "$HOME/brain"
compdef _pass secrets
diff --git a/makefu/2configs/minimal.nix b/makefu/2configs/minimal.nix
index ad4c128ec..78a9dcfa6 100644
--- a/makefu/2configs/minimal.nix
+++ b/makefu/2configs/minimal.nix
@@ -69,9 +69,9 @@
# the only locale you will ever need
i18n = {
- consoleKeyMap = "us";
defaultLocale = "en_US.UTF-8";
};
+ console.keyMap = "us";
# suppress chrome autit event messages
security.audit.rules = [ "-a task,never" ];