Compare commits

...

6 commits

6 changed files with 81 additions and 19 deletions

View file

@ -149,6 +149,7 @@
cabal-install cabal-install
ghcid ghcid
nixfmt-rfc-style nixfmt-rfc-style
nil
hpack hpack
hlint hlint
]; ];

View file

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
imports = [ imports = [
@ -17,6 +22,7 @@
./services/network-manager ./services/network-manager
./services/syncthing ./services/syncthing
./services/git-sync ./services/git-sync
./modules/email.nix
]; ];
home = { home = {
@ -27,8 +33,11 @@
keyboard.layout = "us"; keyboard.layout = "us";
keyboard.variant = "dvorak"; keyboard.variant = "dvorak";
keyboard.options = keyboard.options = [
[ "terminate:ctrl_alt_bksp" "caps:escape" "compose:ralt" ]; "terminate:ctrl_alt_bksp"
"caps:escape"
"compose:ralt"
];
packages = with pkgs; [ packages = with pkgs; [
# social # social
@ -41,7 +50,8 @@
# gaming support # gaming support
lutris lutris
winePackages.stagingFull bottles
wine64Packages.stagingFull
# reading # reading
calibre calibre
@ -66,23 +76,27 @@
enable = true; enable = true;
package = pkgs.firefox.override { package = pkgs.firefox.override {
cfg = { cfg = {
nativeMessagingHosts.packages = nativeMessagingHosts.packages = [
[ pkgs.browserpass pkgs.tridactyl-native ]; pkgs.browserpass
pkgs.tridactyl-native
];
enableGnomeExtensions = true; enableGnomeExtensions = true;
}; };
}; };
}; };
mpv.enable = true; mpv.enable = true;
zsh = let zsh =
auth-socket-env = '' let
export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf -L agent-ssh-socket)" auth-socket-env = ''
''; export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf -L agent-ssh-socket)"
in { '';
enable = true; in
loginExtra = auth-socket-env; {
initExtra = auth-socket-env; enable = true;
}; loginExtra = auth-socket-env;
initExtra = auth-socket-env;
};
}; };
services.gpg-agent = { services.gpg-agent = {

View file

@ -0,0 +1,39 @@
{
config,
lib,
pkgs,
...
}:
{
programs.mbsync.enable = true;
programs.msmtp.enable = true;
programs.notmuch = {
enable = true;
hooks.preNew = "mbsync --all";
};
accounts.email = {
accounts.failco = {
address = "me@failco.de";
gpg = {
key = "F2132F0C63730C6BC42BCC2A41A6D13FECA21280";
signByDefault = true;
};
imap.host = "thrall.failco.de";
mbsync = {
enable = true;
create = "maildir";
};
msmtp.enable = true;
notmuch.enable = true;
primary = true;
realName = "Alexander Kobjolke";
passwordCommand = "gopass --nosync show -o eMail/failco.de/me@failco.de";
smtp = {
host = "thrall.failco.de";
};
userName = "me@failco.de";
};
};
}

View file

@ -177,8 +177,8 @@
;;zig ; C, but simpler ;;zig ; C, but simpler
:email :email
(mu4e +org +gmail) ;; (mu4e +org +gmail)
;;notmuch (notmuch +org +afew)
;;(wanderlust +gmail) ;;(wanderlust +gmail)
:app :app

View file

@ -1,5 +1,12 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
programs.jq = { enable = true; }; programs.jq = {
enable = true;
};
} }

View file

@ -100,6 +100,7 @@ myConfig =
[ namedScratchpadManageHook scratchpads [ namedScratchpadManageHook scratchpads
, isDialog --> doFloat , isDialog --> doFloat
, isFullscreen --> doFullFloat , isFullscreen --> doFullFloat
, className =? "steam_proton" --> doFloat
, manageHook def , manageHook def
] ]
} }