diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 40f3c1e..d936b1a 100755 Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ diff --git a/home-modules/bitwarden.nix b/home-modules/bitwarden.nix index 59f6242..b5414d8 100755 --- a/home-modules/bitwarden.nix +++ b/home-modules/bitwarden.nix @@ -6,28 +6,28 @@ lib.mkIf (host != "NxACE") bitwarden-cli ]; - home.file.".config/Bitwarden CLI/data.json".text = '' - { - "stateVersion": 9, - "global": { - "theme": "system", - "window": {}, - "environmentUrls": { - "base": "https://pw.nx2.site", - "api": null, - "identity": null, - "webVault": null, - "icons": null, - "notifications": null, - "events": null, - "keyConnector": null - }, - "region": "Self-hosted", - "installedVersion": "2023.12.0" - } - } - ''; + # home.file.".config/Bitwarden CLI/data.json".text = '' + # { + # "stateVersion": 9, + # "global": { + # "theme": "system", + # "window": {}, + # "environmentUrls": { + # "base": "https://pw.nx2.site", + # "api": null, + # "identity": null, + # "webVault": null, + # "icons": null, + # "notifications": null, + # "events": null, + # "keyConnector": null + # }, + # "region": "Self-hosted", + # "installedVersion": "2023.12.0" + # } + # } + # ''; - home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session; + # home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session; } diff --git a/home-modules/email.nix b/home-modules/email.nix index 8de4c9e..ee8e666 100755 --- a/home-modules/email.nix +++ b/home-modules/email.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, host, secrets, ... }: +{ pkgs, lib, host, rice, secrets, ... }: lib.mkIf (host != "NxACE") { home.packages = with pkgs; [ @@ -6,30 +6,68 @@ lib.mkIf (host != "NxACE") ]; - programs.thunderbird = { + programs.thunderbird = + let + inherit (lib.generators) toJSON; + extensions = toJSON {} { + "default-theme@mozilla.org" = "5787f490-29b8-436e-a111-640da8590790"; + "google@search.mozilla.org" = "cc340383-7068-4b32-a10f-9f19334bfebc"; + "ddg@search.mozilla.org" = "0c340210-f7ab-48e8-9778-600ed5d00160"; + "amazondotcom@search.mozilla.org" = "881d8fdf-5772-4e33-81ff-faac2d1fa92c"; + "wikipedia@search.mozilla.org" = "7ea3d39d-3eea-430f-9bd7-f902d8124d45"; + "bing@search.mozilla.org" = "f480cce8-68af-4082-908e-f8996153352b"; + "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d"; + "lightningcalendartabs@jlx.84" = "12d48e41-412e-4d09-835a-fa6fb8c180eb"; + }; + in { enable = true; profiles = { default = { isDefault = true; - settings = { + settings = with rice.color; { "calendar.alarms.showmissed" = false; "calendar.alarms.playsound" = false; "calendar.alarms.show" = false; + "extensions.webextensions.uuids" = extensions; + "mail.startup.enabledMailCheckOnce" = true; + "mailnews.mark_message_read.delay" = true; + "mailnews.mark_message_read.delay.interval" = 3; + "mailnews.tags.$label1.color" = red.base; + "mailnews.tags.$label1.tag" = "Important"; + "mailnews.tags.$label2.color" = yellow.base; + "mailnews.tags.$label2.tag" = "Work"; + "mailnews.tags.$label3.color" = green.base; + "mailnews.tags.$label3.tag" = "Personal"; + "mailnews.tags.$label4.color" = cyan.base; + "mailnews.tags.$label4.tag" = "To Do"; + "mailnews.tags.$label5.color" = blue.base; + "mailnews.tags.$label5.tag" = "Later"; + "mailnews.headers.showMessageId" = true; + "mailnews.headers.showOrganization" = true; + "mailnews.headers.showReferences" = true; + "mailnews.headers.showSender" = true; + "mailnews.headers.showUserAgent" = true; }; }; }; }; - accounts.email.accounts = { - "gamil-online" = { + accounts.email.accounts = + let + OAuth2Settings = id: { + "mail.smtpserver.smtp_${id}.authMethod" = 10; + "mail.server.server_${id}.authMethod" = 10; + }; + in { + gmail-online = { address = secrets.email.gmail-online.mail; realName = "Lennart J. Kurzweg"; flavor = "gmail.com"; primary = true; + smtp.tls.useStartTls = true; signature = { text = '' - -- About Me: https://nx2.site/about-me Contact: https://nx2.site/contact GPG: https://nx2.site/gpg @@ -39,16 +77,47 @@ lib.mkIf (host != "NxACE") thunderbird = { enable = true; profiles = [ "default" ]; + # The id given as argument is an automatically generated account identifier. + settings = OAuth2Settings; }; }; - "gamil-business" = { + gmail-business = { address = secrets.email.gmail-business.mail; realName = "Lennart J. Kurzweg"; flavor = "gmail.com"; signature = { text = '' - -- + About Me: https://nx2.site/about-me + Contact: https://nx2.site/contact + GPG: https://nx2.site/gpg + ''; + showSignature = "append"; + }; + thunderbird = { + enable = true; + profiles = [ "default" ]; + # The id given as argument is an automatically generated account identifier. + settings = OAuth2Settings; + }; + }; + + hsmw = { + address = secrets.email.hsmw.mail; + userName = secrets.email.hsmw.mail; + realName = "Lennart J. Kurzweg"; + imap = { + port = 993; + host = "xc.hs-mittweida.de"; + }; + smtp = { + port = 465; + host = "xc.hs-mittweida.de"; + }; + signature = { + text = '' + MatNr: ${secrets.email.hsmw.mnr} + SemGr: ${secrets.email.hsmw.semgr} About Me: https://nx2.site/about-me Contact: https://nx2.site/contact GPG: https://nx2.site/gpg @@ -60,34 +129,6 @@ lib.mkIf (host != "NxACE") profiles = [ "default" ]; }; }; - - # "hsmw" = { - # address = secrets.email.hsmw.mail; - # realName = "Lennart J. Kurzweg"; - # imap = { - # port = 993; - # host = "mail.hs-mittweida.de"; - # }; - # smtp = { - # port = 465; - # host = "mail.hs-mittweida.de"; - # }; - # signature = { - # text = '' - # -- - # MatNr: ${secrets.email.hsmw.mnr} - # SemGr: ${secrets.email.hsmw.semgr} - # About Me: https://nx2.site/about-me - # Contact: https://nx2.site/contact - # GPG: https://nx2.site/gpg - # ''; - # showSignature = "append"; - # }; - # thunderbird = { - # enable = true; - # profiles = [ "default" ]; - # }; - # }; }; } diff --git a/home-modules/fish.nix b/home-modules/fish.nix index e59611d..9cf9d44 100755 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, system, user, allowed, secrets, ... }: +{ config, pkgs, lib, rice, user, allowed, secrets, ... }: lib.mkIf (user != "tv") { home.packages = with pkgs; [ @@ -79,6 +79,7 @@ lib.mkIf (user != "tv") lzd = "lazydocker"; d = "docker"; dcmp = "docker compose"; + nxsent = ''sent -c \${rice.color.foreground} -b \${rice.color.background}''; code = "codium"; # ya = "yazi"; # function diff --git a/home-modules/helix.nix b/home-modules/helix.nix index 654f4ed..e350537 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -91,23 +91,23 @@ "variableother.member" = foreground; "warning" = red.base; + "markup.heading" = accent.base; "markup.bold" = { - "fg" = foreground; + "fg" = tertiary.bright; "modifiers" = [ "bold" ]; }; - "markup.heading" = foreground; "italic" = { - "fg" = foreground; + "fg" = secondary.bright; "modifiers" = [ "italic" ]; }; - "markup.linktext" = foreground; + "markup.linktext" = accent.base; "markup.linkurl" = { - "fg" = foreground; + "fg" = tertiary.dark; "modifiers" = [ "underlined" ]; }; - "markup.list" = foreground; - "markup.quote" = foreground; - "markup.raw" = foreground; + "markup.list" = accent.bright; + "markup.quote" = weird.bright; + "markup.raw" = special.bright; "markup.strikethrough" = { "modifiers" = [ "crossed_out" ]; }; diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index d35ded3..a069fee 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -261,6 +261,7 @@ lib.mkIf (user != "tv") "opacity ${transparency}, code-oss" "opacity ${transparency}, VSCodium" "opacity ${transparency}, Code" + "opacity ${transparency}, sent" "opacity ${transparency}, neovide" "opacity ${transparency}, obsidian" "opacity ${transparency}, zathura" diff --git a/home-modules/mako.nix b/home-modules/mako.nix index f44ebfd..6249999 100755 --- a/home-modules/mako.nix +++ b/home-modules/mako.nix @@ -1,16 +1,20 @@ -{ config, pkgs, rice, lib, user, ... }: +{ pkgs, rice, lib, user, ... }: lib.mkIf (user != "tv") { home.packages = [ pkgs.mako pkgs.libnotify ]; - services.mako = { + services.mako = with rice; { enable = true; - defaultTimeout = 10000; # in ms - backgroundColor = "#${rice.color.background}"; - textColor = "#${rice.color.foreground}"; - borderColor = "#${rice.color.border}"; - font = rice.font.code.name2; + defaultTimeout = 5000; # in ms + backgroundColor = color.background; + textColor = color.foreground; + borderColor = color.border; + borderSize = border-width; + font = font.code.name2; + borderRadius = rounding; + anchor = "bottom-right"; + margin = builtins.toString (gap-size * 2) ; }; } diff --git a/home-modules/programming/c.nix b/home-modules/programming/c.nix new file mode 100644 index 0000000..b14243b --- /dev/null +++ b/home-modules/programming/c.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + home = { + packages = with pkgs; [ + libclang + glibc + # clang-tools + ]; + sessionVariables = { + LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include"; + C_INCLUDE_PATH = "${pkgs.llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include"; + }; + }; +} diff --git a/home-modules/sent.nix b/home-modules/sent.nix new file mode 100644 index 0000000..6281105 --- /dev/null +++ b/home-modules/sent.nix @@ -0,0 +1,35 @@ +{ pkgs, rice, user, ... }: +let + my-sent = pkgs.sent.override { + patches = [ + ./sent.patch + # /home/${user}/.local/share/sent.patch + # (builtins.toFile "/home/${user}/ + ]; + }; +in +{ + home = { + packages = [ + # pkgs.sent + my-sent + ]; + file.".local/share/sent.patch".text = '' + diff --git a/config.def.h b/config.def.h + index 60eb376..64e7f05 100644 + --- a/config.def.h + +++ b/config.def.h + @@ -9,8 +9,8 @@ static char *fontfallbacks[] = { + #define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */ + + static const char *colors[] = { + - "#000000", /* foreground color */ + - "#FFFFFF", /* background color */ + + "${rice.color.foreground}", /* foreground color */ + + "${rice.color.background}", /* background color */ + }; + + static const float linespacing = 1.4; + ''; + }; +} diff --git a/home-modules/sent.patch b/home-modules/sent.patch new file mode 100644 index 0000000..daf6939 --- /dev/null +++ b/home-modules/sent.patch @@ -0,0 +1,71 @@ +From 3a348cc15a97df8e8784b129800293dcfba28f3f Mon Sep 17 00:00:00 2001 +From: Sunur Efe Vural +Date: Wed, 13 Feb 2019 14:28:17 -0500 +Subject: [PATCH] Commandline Options + +A simple patch that adds extra commandline options to sent. +--- + sent.1 | 11 +++++++++++ + sent.c | 11 ++++++++++- + 2 files changed, 21 insertions(+), 1 deletion(-) + +diff --git a/sent.1 b/sent.1 +index fabc614..5d55bf4 100644 +--- a/sent.1 ++++ b/sent.1 +@@ -5,6 +5,9 @@ + .Nd simple plaintext presentation tool + .Sh SYNOPSIS + .Nm ++.Op Fl f Ar font ++.Op Fl c Ar fgcolor ++.Op Fl b Ar bgcolor + .Op Fl v + .Op Ar file + .Sh DESCRIPTION +@@ -21,6 +24,14 @@ few minutes. + .Bl -tag -width Ds + .It Fl v + Print version information to stdout and exit. ++.It Fl f Ar font ++Defines the ++.Ar font ++when sent is run. ++.It Fl c Ar fgcolor ++Defines the foreground color when sent is run. ++.It Fl b Ar bgcolor ++Defines the background color when sent is run. + .El + .Sh USAGE + .Bl -tag -width Ds +diff --git a/sent.c b/sent.c +index c50a572..0b36e32 100644 +--- a/sent.c ++++ b/sent.c +@@ -675,7 +675,7 @@ configure(XEvent *e) + void + usage() + { +- die("usage: %s [file]", argv0); ++ die("usage: %s [-c fgcolor] [-b bgcolor] [-f font] [file]", argv0); + } + + int +@@ -687,6 +687,15 @@ main(int argc, char *argv[]) + case 'v': + fprintf(stderr, "sent-"VERSION"\n"); + return 0; ++ case 'f': ++ fontfallbacks[0] = EARGF(usage()); ++ break; ++ case 'c': ++ colors[0] = EARGF(usage()); ++ break; ++ case 'b': ++ colors[1] = EARGF(usage()); ++ break; + default: + usage(); + } ARGEND +-- +2.20.1 diff --git a/home.nix b/home.nix index ca66919..b177aec 100755 --- a/home.nix +++ b/home.nix @@ -10,6 +10,7 @@ ./home-modules/virt-manager.nix ./home-modules/office.nix ./home-modules/obs.nix + ./home-modules/sent.nix ./home-modules/gestures.nix @@ -48,6 +49,7 @@ ./home-modules/pandoc.nix ./home-modules/programming/python.nix + ./home-modules/programming/c.nix ./home-modules/programming/node.nix ./home-modules/color-pallete.nix