TODO.md

@@ -1,13 +1,9 @@
 - [ ] Update the README.md
 - [ ] switch ssh keys to ECC (fuck RSA)
+- [ ] forgejo not post-quantum (fix that)
 
+- [X] migrate forge.dobutterfliescry.net -> tearforge.net
+- [X] rename forgejo user to git
 - [ ] setup my own VPN
 - [ ] connect matcha to my VPN
 - [ ] use matcha to build stuff instead of using my laptop
-
-- [X] update bat config
-- [ ] switch to zsh? or maybe elvish?
-- [ ] switch to neovim
-- [ ] switch to mangowc
-
-- [ ] fix my fuck ass emojis

groups/cryos/default.nix

@@ -1,7 +1,6 @@
-{...}: {
+{lib, ...}: {
   imports = [
     ./programs.nix
-    ./keybinds.nix
   ];
 
   boot.loader = {

groups/cryos/keybinds.nix

@@ -1,19 +0,0 @@
-{...}: {
-  services.keyd = {
-    enable = true;
-    keyboards.default = {
-      ids = ["*"];
-      settings = {
-        main = {
-          capslock = "meta";
-
-          # NOTE: unsure whether or not i like oneshot...
-          # shift = "oneshot(shift)";
-          # control = "oneshot(control)";
-          # leftalt = "oneshot(alt)";
-          # rightalt = "oneshot(rightalt)";
-        };
-      };
-    };
-  };
-}

groups/cryos/programs.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  upkgs,
-  ...
-}: {
   environment.systemPackages = with pkgs; [
     # Shell
     bash
@@ -49,7 +45,6 @@
     nix-prefetch-git
     nix-index
     nix-unit
-    upkgs.nix-search-tv
 
     # Python
     python312 # I use 3.12 since it's in a pretty stable state now

homes/me/default.nix

@@ -26,15 +26,11 @@
 
   home = {
     shellAliases = {
-      # nix
       nd = "nix develop";
-      ntv = "nix-search-tv";
       rebuild = "nh os switch ~/flake";
       trybuild = "nh os test ~/flake";
-
+      brip = "batgrep"; # bat + ripgrep
-      # shell utilities
+      man = "batman"; # bat + man
-      rgf = "rg --files | rg";
-      watch = "viddy";
     };
 
     pointerCursor = {
@@ -47,13 +43,14 @@
 
     packages = with pkgs; [
       # for services.gnome-keyring
-      gcr # provides org.gnome.keyring.SystemPrompter
+      pkgs.gcr # provides org.gnome.keyring.SystemPrompter
       seahorse # gui
-
       krita
+
       tor-browser
 
       fuzzel
+
       speedtest-cli
     ];
   };

homes/modules/bat.nix

@@ -1,109 +1,24 @@
-let
+{
-  # Module Meta Configuration
-  setShellAliases = true;
-  supportBash = true;
-  supportZsh = true;
-  supportFish = true;
-in
-  {
-    osConfig,
   config,
   pkgs,
-    lib,
-    username,
   ...
-  }: let
+}: {
-    inherit
+  # like `/bin/cat` but with syntax highlighting
-      (builtins)
+  # TODO: change the pager (maybe use Github:sachaos/viddy instead)
-      elemAt
-      ;
-
-    inherit
-      (lib)
-      flip
-      mkIf
-      optional
-      splitString
-      ;
-
-    cfg = config.programs.bat;
-
-    # NOTE: `<derivation>.pname` can be used instead of `<derivation>.meta.mainProgram`
-    # NOTE: but then `pkgs.bash` would return `"bash-interactive"` which is annoying...
-    shellPkg = osConfig.users.users.${username}.shell;
-    shell = shellPkg.meta.mainProgram;
-
-    pager =
-      cfg.config.pager
-      |> splitString " "
-      |> flip elemAt 0;
-  in {
   programs.bat = {
     enable = true;
     config = {
-        # WARNING: pager must be set for this module to function
-        # NOTE: not sure whether to use ov/moor/viddy as my pager?
       pager = "less -FR";
-        # theme = "Dracula";
+      theme = "Dracula";
     };
   };
 
-    home = {
+  # other commands that make normal utils prettier
-      shellAliases = mkIf setShellAliases {
+  home.packages = with pkgs.bat-extras; [
-        bat = "prettybat";
-        cat = "prettybat";
-        diff = "batdiff";
-        brg = "batgrep";
-        man = "batman";
-        # watch = "batwatch"; # NOTE: using viddy instead atm
-      };
-
-      sessionVariables = {
-        PAGER = pager;
-
-        # REF: https://github.com/eth-p/bat-extras/blob/master/doc/batpipe.md
-        BATPIPE_ENABLE_COLOR = "true";
-        BATPIPE_INSIDE_LESS = "true";
-        BATPIPE_TERM_WIDTH = "-"; # hyphone -> auto detect
-      };
-
-      packages = with pkgs.bat-extras;
-        [
     batdiff
     batgrep
     batman
-          batpipe
     batwatch
     prettybat
-        ]
+  ];
-        ++ (with pkgs; [
+}
-          bat
-          entr # required by pkgs.bat-extras.batwatch
-          ripgrep # required by pkgs.bat-extras.batgrep
-          delta # required by pkgs.bat-extras.batdiff
-        ])
-        ++ optional (pkgs?${pager}) pkgs.${pager};
-    };
-
-    # Configure the user's shell to source batpipe
-    # WARNING: only currently supports bash, zsh, & fish
-    programs = {
-      bash = mkIf (supportBash || shell == "bash") {
-        initExtra = ''
-          eval "$(batpipe)"
-        '';
-      };
-
-      zsh = mkIf (supportZsh || shell == "zsh") {
-        initContent = ''
-          eval "$(batpipe)"
-        '';
-      };
-
-      fish = mkIf (supportFish || shell == "fish") {
-        interactiveShellInit = ''
-          eval (batpipe)
-        '';
-      };
-    };
-  }

homes/modules/fish.nix

@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   pkgs,
   ...
@@ -59,13 +60,14 @@
           curl -sL "https://www.gitignore.io/api/$type"
         end
 
-        end
+        # ripgrep on files
-
+        function rgf
-        function decompile
+          rg --files | rg $args
-          objdump --disassemble --demangle --debugging --debugging-tags $argv | bat --language asm
         end
 
         set -g fish_greeting (rand_greet)
+
+
       '';
 
       shellAliases = {