feat(i3): add weechat scratchpad window

feat: do not depend on github for ssh keys bc insecure
fix(stardict): move huzheng dictionary files to cyberlocker
2026-03-22 12:51:08 +01:00 · 2024-03-24 12:40:01 +01:00 · 2024-03-24 12:11:40 +01:00 · 2024-03-24 12:04:14 +01:00
6 changed files with 55 additions and 43 deletions
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -213,8 +213,9 @@ in {
        "${modifier}+Shift+z" = "floating toggle";

        "${modifier}+Shift+s" = "move scratchpad";
-        "${modifier}+s" = ''[class="^(?i)(?!obsidian).*"] scratchpad show'';
+        "${modifier}+s" = ''[class="^(?i)(?!obsidian)(?!irc).*"] scratchpad show'';
        "${modifier}+o" = ''[class="obsidian"] scratchpad show'';
+        "${modifier}+i" = ''[class="irc"] scratchpad show'';

        "${modifier}+c" = "split h";
        "${modifier}+e" = "layout toggle split";
@@ -304,6 +305,11 @@ in {
        exec "${pkgs.obsidian}/bin/obsidian"
        for_window [class="obsidian"] , move scratchpad

+        exec "${pkgs.writers.writeDash "irc" ''
+          exec ${pkgs.alacritty}/bin/alacritty --class irc -e ssh weechat@makanek -t tmux attach-session -t IM
+        ''}"
+        for_window [class="irc"] , move scratchpad
+
        assign [class="wtf"] ${infoWorkspace}
        exec ${dashboard}/bin/dashboard
      '';
--- a/configs/ssh.nix
+++ b/configs/ssh.nix
@@ -2,7 +2,7 @@
  inherit (import ../lib) sshPort kieran;
  externalNetwork = import ../lib/external-network.nix;
 in {
-  users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
+  users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys;

  programs.ssh.startAgent = true;

@@ -28,15 +28,15 @@ in {
  };

  # environment.extraInit = ''
-    # if [[ -z "$SSH_AUTH_SOCK" ]]; then
-    #   export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
-    # fi
+  # if [[ -z "$SSH_AUTH_SOCK" ]]; then
+  #   export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)"
+  # fi
  # '';

  # environment.interactiveShellInit = ''
-    # GPG_TTY="$(tty)"
-    # export GPG_TTY
-    # ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
+  # GPG_TTY="$(tty)"
+  # export GPG_TTY
+  # ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
  # '';

  home-manager.users.me.programs.ssh = {
--- a/configs/sshd.nix
+++ b/configs/sshd.nix
@@ -17,5 +17,5 @@ in {
    };
  };

-  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs;
+  users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys;
 }
--- a/configs/stardict.nix
+++ b/configs/stardict.nix
@@ -4,6 +4,7 @@
  inputs,
  ...
 }: let
+  locker = x: "https://c.krebsco.de/${x}";
  dictionaries = {
    lojban = {
      jbo-deu = pkgs.fetchzip {
@@ -29,7 +30,7 @@
        sha256 = "1kmbdjqinrcxkc6jdyyrq5rl2wzhnrychyynnh91yhrjwjxlh44k";
      };
      Woodhouse = pkgs.fetchzip {
-        url = "https://c.krebsco.de/Woodhouse.zip";
+        url = locker "Woodhouse.zip";
        sha256 = "1dvnc2679yb048q2f3hr2h34acvhan0n3iir6h9ajlrdzz48mlkq";
        stripRoot = false;
      };
@@ -68,39 +69,39 @@
        sha256 = "1bjja3n3layfd08xa1r0a6375dxh5zi6hlv7chkhgnx800cx7hxn";
      };
      Roget = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
-        sha256 = "1szyny9497bpyyccf9l5kr3bnw0wvl4cnsd0n1zscxpyzlsrqqbz";
+        url = locker "stardict-Roget_s_II_The_New_Thesaurus_3th_Ed-2.4.2.tar.bz2";
+        hash = "sha256-f2GcNf3+dqZ/sKBpywjdHHC7Rp6FJseY93edRJK3/us=";
      };
      JargonFile = pkgs.fetchzip {
-        url = "http://download.huzheng.org/dict.org/stardict-dictd-jargon-2.4.2.tar.bz2";
-        sha256 = "096phar9qpmm0fnaqv5nz8x9lpxwnfj78g4vjfcfyd7kqp7iqla4";
+        url = locker "stardict-dictd-jargon-2.4.2.tar.bz2";
+        hash = "sha256-RFEcz8XzNO+Yk5s8dKSzvF+aOvq2bKysA7VenLKC1yQ=";
      };
      Oxford-Collocations = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
+        url = locker "stardict-Oxford_Collocations_Dictionary_2nd_Ed-2.4.2.tar.bz2";
        sha256 = "1zkfs0zxkcn21z2lhcabrs77v4ma9hpv7qm119hpyi1d8ajcw07q";
      };
      Langenscheidt-Deu-En = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
+        url = locker "stardict-Handw_rterbuch_Deutsch_Englisc-2.4.2.tar.bz2";
        sha256 = "12q9i5azq7ylyrpb6jqbaf1rxalc3kzcwjvbinvb0yabdxb80y30";
      };
      Langenscheidt-En-Deu = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
+        url = locker "stardict-Handw_rterbuch_Englisch_Deutsc-2.4.2.tar.bz2";
        sha256 = "087b05h155j5ldshfgx91pz81h6ijq2zaqjirg7ma8ig3l96zb59";
      };
      Duden_Das_Fremdworterbuch = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
+        url = locker "stardict-Duden_Das_Fremdworterbuch-2.4.2.tar.bz2";
        sha256 = "1zrcay54ccl031s6dvjwsah5slhanmjab87d81rxlcy8fx0xd8wq";
      };
      Duden_De_De = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Duden_De_De-2.4.2.tar.bz2";
+        url = locker "stardict-Duden_De_De-2.4.2.tar.bz2";
        sha256 = "1fhay04w5aaj83axfmla2ql34nb60gb05dgv0k94ig7p8x4yxxlf";
      };
      ConciseOED = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
+        url = locker "stardict-Concise_Oxford_English_Dictionary-2.4.2.tar.bz2";
        sha256 = "19kpcxbhqzpmhi94mp48nalgmsh6s7rsx1gb4kwkhirp2pbjcyl7";
      };
      Duden_Synonym = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/german/stardict-Duden_Synonym-2.4.2.tar.bz2";
+        url = locker "stardict-Duden_Synonym-2.4.2.tar.bz2";
        sha256 = "0cx086zvb86bmz7i8vnsch4cj4fb0cp165g4hig4982zakj6f2jd";
      };
    };
@@ -140,32 +141,38 @@
    };
    oed = {
      OED1 = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
+        url = locker "stardict-Oxford_English_Dictionary_2nd_Ed._P1-2.4.2.tar.bz2";
        sha256 = "0i5vv1rv44yfwyf9bfbdrb9brzhhpvz2jnh39fv8hh107nkv2vcf";
      };
      OED2 = pkgs.fetchzip {
-        url = "http://download.huzheng.org/bigdict/stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
+        url = locker "stardict-Oxford_English_Dictionary_2nd_Ed._P2-2.4.2.tar.bz2";
        sha256 = "1pk234pbq4pk55d8sjk0pp9j5sajm82f8804kf2xm2x5p387q1rg";
      };
    };
-    coptic.dictionary = inputs.coptic-dictionary.packages.x86_64-linux.coptic-stardict;
+    coptic = {
+      dictionary = inputs.coptic-dictionary.packages.x86_64-linux.coptic-stardict;
+      Crum = pkgs.fetchzip {
+        url = locker "stardict-Coptic-English_all_dialects-2.4.2.tar.bz2";
+        sha256 = "1fi281mb9yzv40wjsdapi8fzpa7x2yscz582lv2qnss9g8zzzzr9";
+      };
+    };
    russian = {
      LingvoGermanRussian = pkgs.fetchzip {
-        url = "http://download.huzheng.org/lingvo/stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
+        url = locker "stardict-GR-LingvoUniversal-2.4.2.tar.bz2";
        sha256 = "0p353gs2z4vj70hqsdhffjaaw3a4zlmcs46flipmf35lm5wmaj0g";
      };
      LingvoRussianGerman = pkgs.fetchzip {
-        url = "http://download.huzheng.org/lingvo/stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
+        url = locker "stardict-RG-LingvoUniversal-2.4.2.tar.bz2";
        sha256 = "03f9wdmkgpjifpms7dyh10ma29wf3ka1j3zlp1av0cybhdldk2a8";
      };
    };
    turkish = {
      BabylonTurkishEnglish = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
+        url = locker "stardict-babylon-Babylon_Turkish_English-2.4.2.tar.bz2";
        sha256 = "1zpzgk3w0536gww31bj58cmn3imnkndyjwbcr7bay8ibq2kzv44z";
      };
      BabylonEnglishTurkish = pkgs.fetchzip {
-        url = "http://download.huzheng.org/babylon/bidirectional/stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
+        url = locker "stardict-babylon-Babylon_English_Turkish-2.4.2.tar.bz2";
        sha256 = "0myx31xzb7nrn5m657h0bwdgm5xp93ccwp6lcpbxgjxdjm3q0hc5";
      };
    };
@@ -307,15 +314,14 @@ in {
  #   // dictionaries.turkish));

  environment.systemPackages = [
-    # pkgs.goldendict
-    # (makeStardict "lsj" dictionaries.classics)
-    # (makeStardict "sa" dictionaries.sanskrit)
-    # (makeStardict "oed" dictionaries.oed)
-    # (makeStardict "sd-russian" dictionaries.russian)
-    # (makeStardict "sd" dictionaries.englishGerman)
-    # (makeStardict "jbo" dictionaries.lojban)
-    # (makeStardict "cop" dictionaries.coptic)
-    # (makeStardict "sd-turkish" dictionaries.turkish)
+    (makeStardict "lsj" dictionaries.classics)
+    (makeStardict "sa" dictionaries.sanskrit)
+    (makeStardict "oed" dictionaries.oed)
+    (makeStardict "sd-russian" dictionaries.russian)
+    (makeStardict "sd" dictionaries.englishGerman)
+    (makeStardict "jbo" dictionaries.lojban)
+    (makeStardict "cop" dictionaries.coptic)
+    (makeStardict "sd-turkish" dictionaries.turkish)
  ];
 }
 /*
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -67,11 +67,11 @@
    github = "kmein";
    email = "kmein@posteo.de";
    name = "Kierán Meinhardt";
-    sshKeys = pkgs:
-      pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
-        url = "https://github.com/kmein.keys";
-        hash = "sha256-kabB1yNEToMw1Lcf4WYx4IfuuLzHOPvABTQku5CE60A=";
-      }));
+    sshKeys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk" # kabsa
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiQEc8rTr7C7xVLYV7tQ99BDDBLrJsy5hslxtCEatkB" # manakish
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByreBjBEMJKjgpKLd5XZHIUUwIhNafVqN6OUOQpJa3y" # fatteh
+    ];
  };

  syncthing.devices = {
--- a/systems/makanek/weechat.nix
+++ b/systems/makanek/weechat.nix
@@ -193,7 +193,7 @@ in {
  users.extraUsers.weechat = {
    useDefaultShell = true;
    openssh.authorizedKeys.keys =
-      kieran.sshKeys pkgs
+      kieran.sshKeys
      ++ [
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@heym"
      ];
Author	SHA1	Message	Date
Kierán Meinhardt	d9be7c5eeb	feat(i3): add weechat scratchpad window	2024-03-24 12:40:01 +01:00
Kierán Meinhardt	aecf6b8616	feat: do not depend on github for ssh keys bc insecure	2024-03-24 12:11:40 +01:00
Kierán Meinhardt	83ca7976ce	fix(stardict): move huzheng dictionary files to cyberlocker	2024-03-24 12:04:14 +01:00