diff options
Diffstat (limited to 'modules/home.legacy/conf')
-rw-r--r-- | modules/home.legacy/conf/default.nix | 3 | ||||
-rw-r--r-- | modules/home.legacy/conf/direnv/default.nix | 6 | ||||
-rw-r--r-- | modules/home.legacy/conf/firefox/config/bookmarks/default.nix | 22 | ||||
-rw-r--r-- | modules/home.legacy/conf/firefox/config/extensions/extensions.json | 6 | ||||
-rw-r--r-- | modules/home.legacy/conf/firefox/config/prefs/override.js | 2 | ||||
-rw-r--r-- | modules/home.legacy/conf/firefox/config/search/engines/default.nix | 6 | ||||
-rw-r--r-- | modules/home.legacy/conf/mail/default.nix | 38 | ||||
-rw-r--r-- | modules/home.legacy/conf/mbsync/default.nix | 17 | ||||
-rw-r--r-- | modules/home.legacy/conf/mpv/default.nix | 10 | ||||
-rw-r--r-- | modules/home.legacy/conf/swaylock/GTDcanonical.png | bin | 34659 -> 0 bytes | |||
-rw-r--r-- | modules/home.legacy/conf/swaylock/commands.jpg | bin | 629695 -> 0 bytes | |||
-rw-r--r-- | modules/home.legacy/conf/swaylock/default.nix | 10 | ||||
-rw-r--r-- | modules/home.legacy/conf/swaylock/duwon-lee-tempano-port.jpg | bin | 671125 -> 0 bytes | |||
-rw-r--r-- | modules/home.legacy/conf/swaylock/gnu.png | bin | 327518 -> 0 bytes |
14 files changed, 57 insertions, 63 deletions
diff --git a/modules/home.legacy/conf/default.nix b/modules/home.legacy/conf/default.nix index 328f4dab..e1cab572 100644 --- a/modules/home.legacy/conf/default.nix +++ b/modules/home.legacy/conf/default.nix @@ -4,7 +4,6 @@ ./beets ./btop ./dconf - ./direnv ./firefox ./gammastep ./gpg @@ -17,7 +16,6 @@ ./mail ./mako ./mbsync - ./mpv ./mumble ./neomutt ./nix-index @@ -29,7 +27,6 @@ ./ssh ./starship ./swayidle - ./swaylock ./taskwarrior ./timewarrior ./tridactyl diff --git a/modules/home.legacy/conf/direnv/default.nix b/modules/home.legacy/conf/direnv/default.nix deleted file mode 100644 index 3a7b8add..00000000 --- a/modules/home.legacy/conf/direnv/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - programs.direnv = { - enable = true; - nix-direnv.enable = true; - }; -} diff --git a/modules/home.legacy/conf/firefox/config/bookmarks/default.nix b/modules/home.legacy/conf/firefox/config/bookmarks/default.nix index c612bf4d..41936819 100644 --- a/modules/home.legacy/conf/firefox/config/bookmarks/default.nix +++ b/modules/home.legacy/conf/firefox/config/bookmarks/default.nix @@ -3,27 +3,7 @@ pkgs, ... }: let - bookmarks = [ - { - name = "Feed - Piped"; - url = "https://piped.video/feed"; - } - - { - name = "DeepL Translate"; - url = "https://www.deepl.com/translator"; - } - - { - name = "Nix lib"; - url = "https://teu5us.github.io/nix-lib.html"; - } - - { - name = "Nixpkgs manual"; - url = "https://ryantm.github.io/nixpkgs/"; - } - ]; + bookmarks = []; mkBookmarksFile = (import ./lib.nix) {inherit lib pkgs;}; bookmarks_file = mkBookmarksFile bookmarks; diff --git a/modules/home.legacy/conf/firefox/config/extensions/extensions.json b/modules/home.legacy/conf/firefox/config/extensions/extensions.json index 0c318236..54b28c78 100644 --- a/modules/home.legacy/conf/firefox/config/extensions/extensions.json +++ b/modules/home.legacy/conf/firefox/config/extensions/extensions.json @@ -3,9 +3,9 @@ "addonId": "addon@darkreader.org", "default_area": "navbar", "pname": "darkreader", - "sha256": "sha256:02c67ce2b3cd96719b5e369b9207ef11ed6c3a79eccb454d1e6ec3e005004e72", - "url": "https://addons.mozilla.org/firefox/downloads/file/4405074/darkreader-4.9.99.xpi", - "version": "4.9.99" + "sha256": "sha256:f565b2263a71626a0310380915b7aef90be8cc6fe16ea43ac1a0846efedc2e4c", + "url": "https://addons.mozilla.org/firefox/downloads/file/4439735/darkreader-4.9.103.xpi", + "version": "4.9.103" }, "keepassxc-browser": { "addonId": "keepassxc-browser@keepassxc.org", diff --git a/modules/home.legacy/conf/firefox/config/prefs/override.js b/modules/home.legacy/conf/firefox/config/prefs/override.js index bf874b33..cf74cf3b 100644 --- a/modules/home.legacy/conf/firefox/config/prefs/override.js +++ b/modules/home.legacy/conf/firefox/config/prefs/override.js @@ -168,7 +168,7 @@ user_pref("browser.urlbar.placeholderName", "Brave"); // Set the tabs and bookmarks user_pref("browser.tabs.inTitlebar", 1); -user_pref("browser.toolbars.bookmarks.visibility", "always"); +user_pref("browser.toolbars.bookmarks.visibility", "never"); user_pref("browser.places.importBookmarksHTML", true); // Theme diff --git a/modules/home.legacy/conf/firefox/config/search/engines/default.nix b/modules/home.legacy/conf/firefox/config/search/engines/default.nix index a47c77df..7e7880ca 100644 --- a/modules/home.legacy/conf/firefox/config/search/engines/default.nix +++ b/modules/home.legacy/conf/firefox/config/search/engines/default.nix @@ -13,6 +13,12 @@ definedAliases = ["@np"]; }; + "Nix functions" = { + urls = [{template = "https://noogle.dev/q?term={searchTerms}";}]; + icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = ["@ng"]; + }; + "NixOS Options" = { urls = [{template = "https://search.nixos.org/options?type=options&query={searchTerms}";}]; icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; diff --git a/modules/home.legacy/conf/mail/default.nix b/modules/home.legacy/conf/mail/default.nix index 0ecbe40a..46526173 100644 --- a/modules/home.legacy/conf/mail/default.nix +++ b/modules/home.legacy/conf/mail/default.nix @@ -1,15 +1,53 @@ { config, pkgs, + lib, ... }: let benedikt = import ./accounts/benedikt.nix {inherit pkgs;}; soispha = import ./accounts/soispha.nix {inherit pkgs;}; accounts = {inherit soispha benedikt;}; + + mkHelper = { + userName, + passwordCommand, + ... + }: + builtins.toString (pkgs.writeShellScript "git-credential-keepassxc-libsecret" + # bash + '' + [ "$1" = "get" ] || { + exit 1 + } + output="$(cat)" + if echo "$output" | grep "username=${userName}" -q; then + if password="$(${passwordCommand})"; then + printf "%s\npassword=%s\n\n" "$output" "$password" + else + # The password command failed (for whatever reason) + exit 1 + fi + else + # Not our business. + exit 1 + fi + ''); + accountCredentials = + # TODO: This will result in only one of them being defined, as we duplicate the + # attribute key <2025-02-03> + lib.mapAttrs' (_: value: { + name = "credential.smtp://${value.smtp.host}:${builtins.toString value.smtp.port}"; + value = { + "helper" = mkHelper value; + }; + }) + accounts; in { accounts.email = { maildirBasePath = "${config.xdg.dataHome}/maildir"; inherit accounts; }; + + programs.git.extraConfig = accountCredentials; } diff --git a/modules/home.legacy/conf/mbsync/default.nix b/modules/home.legacy/conf/mbsync/default.nix index ac9808c9..8418d92d 100644 --- a/modules/home.legacy/conf/mbsync/default.nix +++ b/modules/home.legacy/conf/mbsync/default.nix @@ -1,17 +1,16 @@ -{ - config, - lib, - ... -}: { - # TODO: I have no clue if both are needed, but it looks neat, right? +{lib, ...}: { + # This configures the program in itself (i.e., sets-up a config file, etc.) programs.mbsync = { enable = true; }; + + # This starts a systemd service to periodically sync mail services.mbsync = { enable = true; - # TODO: enable after isync 1.5 drops - #configFile = "${config.xdg.configHome}/mbsync/mbsync.conf"; }; - # Disable the timer, and only activate it on neomutt start + + # Disable the timer, and only activate the service when neomutt starts + # Otherwise, the password command would prompt me to unlock the keepassxc database every + # time. systemd.user.timers.mbsync = lib.mkForce {}; } diff --git a/modules/home.legacy/conf/mpv/default.nix b/modules/home.legacy/conf/mpv/default.nix deleted file mode 100644 index 6b252a38..00000000 --- a/modules/home.legacy/conf/mpv/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{...}: { - programs.mpv = { - enable = true; - bindings = { - q = "quit 0"; - "Ctrl+c" = "quit 1"; - "Shift+q" = "quit-watch-later 1"; - }; - }; -} diff --git a/modules/home.legacy/conf/swaylock/GTDcanonical.png b/modules/home.legacy/conf/swaylock/GTDcanonical.png deleted file mode 100644 index ef41d79d..00000000 --- a/modules/home.legacy/conf/swaylock/GTDcanonical.png +++ /dev/null Binary files differdiff --git a/modules/home.legacy/conf/swaylock/commands.jpg b/modules/home.legacy/conf/swaylock/commands.jpg deleted file mode 100644 index 54016503..00000000 --- a/modules/home.legacy/conf/swaylock/commands.jpg +++ /dev/null Binary files differdiff --git a/modules/home.legacy/conf/swaylock/default.nix b/modules/home.legacy/conf/swaylock/default.nix deleted file mode 100644 index d662cb78..00000000 --- a/modules/home.legacy/conf/swaylock/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{...}: { - programs.swaylock = { - enable = true; - settings = { - image = "${./duwon-lee-tempano-port.jpg}"; - scaling = "center"; - color = "000000"; - }; - }; -} diff --git a/modules/home.legacy/conf/swaylock/duwon-lee-tempano-port.jpg b/modules/home.legacy/conf/swaylock/duwon-lee-tempano-port.jpg deleted file mode 100644 index d72f32d1..00000000 --- a/modules/home.legacy/conf/swaylock/duwon-lee-tempano-port.jpg +++ /dev/null Binary files differdiff --git a/modules/home.legacy/conf/swaylock/gnu.png b/modules/home.legacy/conf/swaylock/gnu.png deleted file mode 100644 index d07dee3e..00000000 --- a/modules/home.legacy/conf/swaylock/gnu.png +++ /dev/null Binary files differ |