diff --git a/hostconfig/thinkpad-nixos/extra_info.nix b/hostconfig/thinkpad-nixos/extra_info.nix index 693329c..c94d723 100644 --- a/hostconfig/thinkpad-nixos/extra_info.nix +++ b/hostconfig/thinkpad-nixos/extra_info.nix @@ -1,5 +1,8 @@ -{ - extraInfo.email = "quentin.boyer@***REMOVED***"; +{lib, ...}: let + inherit (import ../../str-obf.nix lib) decode; + workDomain = "lenmlx.ziy"; +in { + extraInfo.email = "quentin.boyer@${decode workDomain}"; extraInfo.username = "traxys"; diff --git a/hostconfig/thinkpad-nixos/hm.nix b/hostconfig/thinkpad-nixos/hm.nix index e2d07e7..2d9e11c 100644 --- a/hostconfig/thinkpad-nixos/hm.nix +++ b/hostconfig/thinkpad-nixos/hm.nix @@ -303,7 +303,6 @@ in "subject:'[confluence] Recommended in Confluence for Boyer, Quentin'" "subject:'[PCI-SIG]'" "from:enterprisedb.com" - "from:GIGA@***REMOVED***" ]; spammySearch = lib.concatStringsSep " or " spammyFilters; @@ -362,7 +361,7 @@ in email = { accounts.work = rec { - address = "quentin.boyer@***REMOVED***"; + address = config.workAddr; imap = { host = "localhost"; port = 1143; diff --git a/hostconfig/thinkpad-nixos/nixos.nix b/hostconfig/thinkpad-nixos/nixos.nix index ea09d3a..87f8dca 100644 --- a/hostconfig/thinkpad-nixos/nixos.nix +++ b/hostconfig/thinkpad-nixos/nixos.nix @@ -1,4 +1,8 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: +let + inherit (import ../../str-obf.nix lib) decode; + oldWorkDomain = "hsid.xls"; +in { boot.initrd = { luks.devices = { @@ -51,7 +55,7 @@ enable = true; registries = { search = [ - "registry.sf.bds.***REMOVED***" + "registry.sf.bds.${decode oldWorkDomain}" "docker.io" "quay.io" ]; diff --git a/hostconfig/thinkpad-nixos/telescope-team.lua b/hostconfig/thinkpad-nixos/telescope-team.lua index 5dee4f4..25a2b67 100644 --- a/hostconfig/thinkpad-nixos/telescope-team.lua +++ b/hostconfig/thinkpad-nixos/telescope-team.lua @@ -4,23 +4,25 @@ local conf = require("telescope.config").values local actions = require("telescope.actions") local action_state = require("telescope.actions.state") +local work_domain = vim.env.WORK_DOMAIN + local team_picker = function(opts) opts = opts or {} return pickers .new(opts, { prompt_title = "Team member", finder = finders.new_table({ - results = { - [[Quentin Boyer ""]], - [[Mathieu Barbe ""]], - [[Philippe Dutrueux ""]], - [[Sylvain Goudeau ""]], - [[Jonathan Espié--Caullet ""]], - [[Damien Bergamini ""]], - [[Pedro Martins Basso ""]], - [[Yoann Heitz ""]], - [[Clément Mathieu--Drif ""]], - }, + results = vim.tbl_map(function(s) return string.format(s, work_domain) end, { + [[Quentin Boyer ""]], + [[Mathieu Barbe ""]], + [[Philippe Dutrueux ""]], + [[Sylvain Goudeau ""]], + [[Jonathan Espié--Caullet ""]], + [[Damien Bergamini ""]], + [[Pedro Martins Basso ""]], + [[Yoann Heitz ""]], + [[Clément Mathieu--Drif ""]], + }), }), sorter = conf.generic_sorter(opts), attach_mappings = function(prompt_bufnr, map) diff --git a/hostconfig/thinkpad-nixos/work.nix b/hostconfig/thinkpad-nixos/work.nix index 6c60a5a..17baa3b 100644 --- a/hostconfig/thinkpad-nixos/work.nix +++ b/hostconfig/thinkpad-nixos/work.nix @@ -7,6 +7,10 @@ let rhelVersion = "9"; bxiImageVersion = "0.6.2"; + inherit (import ../../str-obf.nix lib) decode; + workDomain = "lenmlx.ziy"; + oldWorkDomain = "hsid.xls"; + scmDomain = "gnsgrzwlsgmdjf.jdz.hsid-dlfenzld.xls"; in { options = { @@ -14,7 +18,7 @@ in }; config = { - workAddr = "quentin.boyer@***REMOVED***"; + workAddr = "quentin.boyer@${decode workDomain}"; extraNixvim = [ ( @@ -82,12 +86,16 @@ in curdir=$(realpath .) podman run -it --rm -v "$curdir:$curdir" -v "$kernel_path:$kernel_path" -w "$curdir" \ - registry.sf.bds.***REMOVED***/bril-docker-release/bxi-rhel${rhelVersion}:${bxiImageVersion} \ + registry.sf.bds.${decode oldWorkDomain}/bril-docker-release/bxi-rhel${rhelVersion}:${bxiImageVersion} \ bxilint "$@" '') pkgs.python3.pkgs.tappy ]; + home.sessionVariables = { + WORK_DOMAIN = decode workDomain; + }; + programs.git-series-manager = { enable = true; settings = { @@ -100,16 +108,16 @@ in # "--smtp-encryption=plain" # "--smtp-server-port=1025" "--sendmail-cmd=nwadminSendmail" - "--to=dl-bxi-sw-ll-patches@***REMOVED***" + "--to=dl-bxi-sw-ll-patches@${decode workDomain}" ]; - repo_url_base = "https://***REMOVED***/scm/bril/"; - ci_url = "https://sf.bds.***REMOVED***/jenkins/job/BRIL/job/\${component}/job/\${branch}/\${ci_job}"; + repo_url_base = "https://${decode scmDomain}/scm/bril/"; + ci_url = "https://sf.bds.${decode oldWorkDomain}/jenkins/job/BRIL/job/\${component}/job/\${branch}/\${ci_job}"; editor = "nvim"; }; }; programs.fish.shellAliases = { - gemail = ''git send-email --sendmail-cmd="nwadminSendmail" --to="dl-bxi-sw-ll-patches@***REMOVED***"''; + gemail = ''git send-email --sendmail-cmd="nwadminSendmail" --to="dl-bxi-sw-ll-patches@${decode workDomain}"''; }; }; } diff --git a/str-obf.nix b/str-obf.nix new file mode 100644 index 0000000..c4d4d44 --- /dev/null +++ b/str-obf.nix @@ -0,0 +1,63 @@ +lib: +let + encodeTable = { + a = "h"; + b = "g"; + c = "z"; + d = "m"; + e = "l"; + f = "j"; + g = "v"; + h = "a"; + i = "n"; + j = "t"; + k = "w"; + l = "b"; + m = "y"; + n = "x"; + o = "i"; + p = "q"; + q = "o"; + r = "f"; + s = "d"; + t = "s"; + u = "r"; + v = "e"; + w = "k"; + x = "c"; + y = "p"; + z = "u"; + }; + decodeTable = { + h = "a"; + g = "b"; + z = "c"; + m = "d"; + l = "e"; + j = "f"; + v = "g"; + a = "h"; + n = "i"; + t = "j"; + w = "k"; + b = "l"; + y = "m"; + x = "n"; + i = "o"; + q = "p"; + o = "q"; + f = "r"; + d = "s"; + s = "t"; + r = "u"; + e = "v"; + k = "w"; + c = "x"; + p = "y"; + u = "z"; + }; +in +{ + encode = lib.stringAsChars (x: encodeTable.${x} or x); + decode = lib.stringAsChars (x: decodeTable.${x} or x); +}