maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Minor fixes

Browse source
This commit is contained in:
Malte Brandy 2020-10-01 03:02:10 +02:00
parent 3935998865
commit 31b1ea3763
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
home-manager/roles/laptop.nix
View file

@ -27,14 +27,14 @@ in {
bins = [ activateMode pkgs.git ];
} ''
params = ["${configPath}/home-manager/target.nix", "-A", "apollo", "-o", "/home/maralorn/.modes"]
privatePath = "${configPath}/private"
canaryPath = privatePath <> "/submodule-is-checked-out"
main = do
say "Building ~/.modes for apollo"
nixPath <- myNixPath "${configPath}"
privateDeinit :: Either SomeException () <- try $ git "submodule" "deinit" "${configPath}"
when (isRight privateDeinit) $ do
nix_build nixPath (params ++ remoteBuildParams)
git "submodule" "update" "--init" "${configPath}"
bracket (rm canaryPath) (\() -> git "-C" privatePath "restore" canaryPath) $ \() ->
nix_build nixPath (params ++ remoteBuildParams)
nix_build nixPath params
activate_mode
'';

6
home-manager/roles/mail.nix
View file

@ -4,7 +4,7 @@ let
name = "Malte Brandy";
mail = "malte.brandy@maralorn.de";
alternates = pkgs.privateValue [] "mail/alternates";
lists = pkgs.privateValue { sortList = []; stupidLists = []; notifications = []; } "mail/filters";
lists = pkgs.privateValue { sortLists = []; stupidLists = []; notifications = []; } "mail/filters";
maildir = config.accounts.email.maildirBasePath;
# mhdr -h List-ID -d Maildir/hera/Archiv/unsortiert | sort | sed 's/^.*<\(.*\)>$/\1/' | uniq | xargs -I '{}' sh -c "notmuch count List:{} | sed 's/$/: {}/'" | sort
# To find candidates
@ -86,7 +86,7 @@ let
main = do
setEnv "MBLAZE_PAGER" "cat"
setEnv "NOTMUCH_CONFIG" "${config.home.sessionVariables.NOTMUCH_CONFIG}"
setEnv "NOTMUCH_CONFIG" "${config.home.sessionVariables.NOTMUCH_CONFIG or ""}"
reScan
(listIDs,tos) <- concurrently (mhdr "-h" "List-ID" "-d" "${unsorted}" |> capture) (mhdr "-h" "To" "-d" "${unsorted}" "-A" |> capture)
let listFilters = mapMaybe filtersFromListIDs . sortNub . mapMaybe (parseMaybe listId) . lines . decodeUtf8 $ listIDs
@ -165,7 +165,7 @@ in {
programs.msmtp.enable = true;
programs.mbsync.enable = true;
programs.notmuch = {
enable = true;
enable = config.accounts.email.accounts != {};
hooks.postInsert = ''
${pkgs.notmuch}/bin/notmuch tag +deleted -- "folder:/Trash/ (not tag:deleted)"
${pkgs.notmuch}/bin/notmuch tag -deleted -- "(not folder:/Trash/) tag:deleted"

7
lib/update-system.nix
View file

@ -5,13 +5,14 @@ in {
name = "update-system";
bins = [ nixos-rebuild pkgs.git ];
} ''
privatePath = "${configPath}/private"
canaryPath = privatePath <> "/submodule-is-checked-out"
main = do
paths <- myNixPath "${configPath}"
args <- getArgs
privateDeinit :: Either SomeException () <- try $ git "-C" "${configPath}" "submodule" "deinit" "private"
when (isRight privateDeinit) $ do
bracket (rm canaryPath) (\() -> git "-C" privatePath "restore" canaryPath) $ \() ->
nixos_rebuild (paths ++ ["build"] ++ remoteBuildParams ++ fmap toString args)
git "-C" "${configPath}" "submodule" "update" "--init" "private"
nixos_rebuild (paths ++ ["switch"] ++ fmap toString args)
'';
}

2
private

@ -1 +1 @@
Subproject commit 5c213f10c5db7e8f11a36d660902ac7183ce177f
Subproject commit 846e2f77048ed9d79269af80cff3c0999e73433d