Commit after not doing it for weeks

flake.lock

@@ -569,6 +569,22 @@
       }
     },
     "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_6": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -584,7 +600,7 @@
         "type": "github"
       }
     },
-    "flake-compat_6": {
+    "flake-compat_7": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -600,7 +616,7 @@
         "type": "github"
       }
     },
-    "flake-compat_7": {
+    "flake-compat_8": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -788,7 +804,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -806,7 +822,7 @@
     },
     "flake-utils_7": {
       "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -824,7 +840,7 @@
     },
     "flake-utils_8": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -1396,6 +1412,29 @@
         "type": "github"
       }
     },
+    "nixos-dns": {
+      "inputs": {
+        "flake-compat": "flake-compat_5",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_4",
+        "treefmt-nix": "treefmt-nix_2"
+      },
+      "locked": {
+        "lastModified": 1715321534,
+        "narHash": "sha256-cDTRRrLj08k867/lajKXkCg9HTNWuoYGfgr8wyAVaTY=",
+        "owner": "Janik-Haag",
+        "repo": "nixos-dns",
+        "rev": "c4f734d771038db15700a61a8703d0da5f993b3a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Janik-Haag",
+        "repo": "nixos-dns",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1711352745,
@@ -1776,7 +1815,7 @@
     },
     "pre-commit-hooks_2": {
       "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_6",
         "flake-utils": "flake-utils_6",
         "gitignore": "gitignore_2",
         "nixpkgs": "nixpkgs_12",
@@ -1798,7 +1837,7 @@
     },
     "pre-commit-hooks_3": {
       "inputs": {
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_7",
         "flake-utils": "flake-utils_7",
         "gitignore": "gitignore_3",
         "nixpkgs": "nixpkgs_13",
@@ -1929,6 +1968,7 @@
         "miros": "miros",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nix-index-database": "nix-index-database",
+        "nixos-dns": "nixos-dns",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_8",
         "nixpkgs-unstable": "nixpkgs-unstable",
@@ -2157,7 +2197,7 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat_7",
+        "flake-compat": "flake-compat_8",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_4",
         "nixpkgs": "nixpkgs_14"
@@ -2280,9 +2320,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "id": "systems",
-        "repo": "default",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "systems_5": {
@@ -2315,6 +2354,21 @@
         "type": "github"
       }
     },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "template-haskell-reload": {
       "flake": false,
       "locked": {
@@ -2354,6 +2408,27 @@
         "type": "github"
       }
     },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos-dns",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714058656,
+        "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "validity": {
       "flake": false,
       "locked": {

flake.nix

@@ -33,6 +33,9 @@
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     korora.url = "github:adisbladis/korora";
+
+    nixos-dns.url = "github:Janik-Haag/nixos-dns";
+    nixos-dns.inputs.nixpkgs.follows = "nixpkgs";
     # }}}
     # {{{ Standalone software
     # {{{ Nightly versions of things
@@ -79,9 +82,6 @@
 
   outputs = { self, nixpkgs, home-manager, ... }@inputs:
     let
-      # Main username
-      pilot = "adrielus";
-
       # {{{ Common helpers
       inherit (self) outputs;
       forAllSystems = nixpkgs.lib.genAttrs [
@@ -101,10 +101,17 @@
     {
       # {{{ Packages
       # Accessible through 'nix build', 'nix shell', etc
-      packages = forAllSystems (system:
+      packages = forAllSystems
-        let pkgs = nixpkgs.legacyPackages.${system};
+        (system:
-        in import ./pkgs { inherit pkgs; }
+          let
-      );
+            pkgs = nixpkgs.legacyPackages.${system};
+            upkgs = inputs.nixpkgs-unstable.legacyPackages.${system};
+          in
+          import ./pkgs { inherit pkgs upkgs; } // {
+            octodns = upkgs.octodns.withProviders
+              (ps: [ (import ./pkgs { inherit pkgs upkgs; }).octodns-cloudflare ]);
+          }
+        );
       # }}}
       # {{{ Bootstrapping and other pinned devshells
       # Accessible through 'nix develop'
@@ -170,33 +177,6 @@
 
         };
       # }}}
-      # {{{ Home manager
-      # Standalone home-manager configuration entrypoint
-      # Available through 'home-manager --flake .#...
-      homeConfigurations =
-        let
-          mkHomeConfig = { system, hostname }:
-            home-manager.lib.homeManagerConfiguration {
-              pkgs = nixpkgs.legacyPackages.${system};
-              extraSpecialArgs = specialArgs system // { inherit hostname; };
-              modules = [ ./home/${hostname}.nix ];
-            };
-        in
-        {
-          "${pilot}@tethys" = mkHomeConfig {
-            system = "x86_64-linux";
-            hostname = "tethys";
-          };
-          "guest@euporie" = mkHomeConfig {
-            system = "x86_64-linux";
-            hostname = "euporie";
-          };
-          "${pilot}@lapetus" = mkHomeConfig {
-            system = "x86_64-linux";
-            hostname = "lapetus";
-          };
-        };
-      # }}}
     };
 
   # {{{ Caching and whatnot

home/features/cli/default.nix

@@ -13,6 +13,7 @@
   ];
 
   programs.bash.enable = true;
+  stylix.targets.yazi.enable = true;
 
   home.packages = with pkgs; [
     # {{{ System information 
@@ -42,12 +43,12 @@
 
   home.shellAliases = {
     # {{{ Storage
-    # -h = humans readable units
+    # -h: humans readable units
     df = "df -h";
     du = "du -h";
 
-    # short for `du here`
+    # duh: short for `du here`
-    # -d = depth
+    # -d: depth
     duh = "du -hd 1";
     # }}}
   };

home/features/cli/fish/default.nix

@@ -17,6 +17,8 @@ let
     "\\e\\[13\\;2u" = "commandline -a ' | $PAGER' && commandline -f execute";
     # C-g to open lazygit
     "\\cg" = "lazygit";
+    # C-S-f to open mini.files
+    "\\e\\[70\\;5u" = ''nvim +":lua require('mini.files').open()"'';
   };
 
   mkKeybind = key: value:

home/features/cli/productivity/smos/default.nix

@@ -39,20 +39,15 @@ in
   };
   # }}}
   # {{{ Add desktop entry
-  home.packages =
+  # Start smos with a custom class so our WM can move it to the correct workspace
-    # Start smos with a custom class so our WM can move it to the correct workspace
+  xdg.desktopEntries.smostui = {
-    let smosgui = pkgs.writeShellScriptBin "smosgui" ''
+    name = "Smos TUI";
-      wezterm start --class "org.wezfurlong.wezterm.smos" --cwd ${workflowDir} smos
-    '';
-    in
-    [ smosgui ];
-
-  xdg.desktopEntries.smosgui = {
-    name = "Smos GUI";
     type = "Application";
-    exec = "smosgui";
     terminal = false;
     icon = ../../../../../common/icons/smos.svg;
+    exec = builtins.toString (pkgs.writeShellScript "smostui" ''
+      wezterm start --class "org.wezfurlong.wezterm.smos" --cwd ${workflowDir} smos
+    '');
   };
   # }}}
 }

home/features/desktop/discord/themes.nix

@@ -2,19 +2,19 @@
 lib.fix (self: {
   "Catppuccin Mocha" = fetchurl {
     url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
-    sha256 = "1agw88vg2dh948365mx8x7hzvghvscdpqhm70icg2x6bs5zszg9l";
+    sha256 = "01j5xhzpy3a68qlrzchzclj7mnxj106bwxq2vyvxw7fd2n3zn96b";
   };
   "Catppuccin Frappe" = fetchurl {
     url = "https://catppuccin.github.io/discord/dist/catppuccin-frappe.theme.css";
-    sha256 = "0rrz71n05jb0fd2jymis43i325y87qwrb5s6rryh8gd8anbk8h6y";
+    sha256 = "037jr133zw04sslkl1hdspkqqb40c3a7hcs72lzjlimaqhnxd044";
   };
   "Catppuccin Latte" = fetchurl {
     url = "https://catppuccin.github.io/discord/dist/catppuccin-latte.theme.css";
-    sha256 = "HixxRdOTU7RynNseRWAWd4VzqYoX52n2nWlt9DX5MS8=";
+    sha256 = "1bijp2ysm7ifah6xqz95ag4hi7k7r0s9c8jz0s5a4b00k59qd6qc";
   };
   "Catppuccin Macchiato" = fetchurl {
     url = "https://catppuccin.github.io/discord/dist/catppuccin-macchiato.theme.css";
-    sha256 = "1dgq1sdy07m0ra3ysn1g29y2ba37cna3sxy2vv125f2pjmdx0vci";
+    sha256 = "1ggw9iyn7d7z0sv784kgmxbf94xvwn2cnkd8g08xzy5c17gky6ln";
   };
   default.dark = self."Catppuccin Macchiato";
   default.light = self."Catppuccin Latte";

home/features/desktop/obsidian.nix

@@ -1,19 +1,17 @@
 { config, pkgs, ... }: {
-  home.packages =
+  home.packages = [ pkgs.obsidian ];
-    let
-      vaultDir = "${config.xdg.userDirs.extraConfig.XDG_PROJECTS_DIR}/stellar-sanctum";
-      # Start nvim with a custom class so our WM can move it to the correct workspace
-      obsidiantui = pkgs.writeShellScriptBin "obsidiantui" ''
-        wezterm start --class "org.wezfurlong.wezterm.obsidian" --cwd ${vaultDir} nvim
-      '';
-    in
-    [ obsidiantui pkgs.obsidian ];
 
+  # Start nvim with a custom class so our WM can move it to the correct workspace
   xdg.desktopEntries.obsidiantui = {
     name = "Obsidian TUI";
     type = "Application";
-    exec = "obsidiantui";
-    terminal = false;
     icon = "obsidian";
+    terminal = false;
+    exec =
+      let vaultDir = "${config.xdg.userDirs.extraConfig.XDG_PROJECTS_DIR}/stellar-sanctum";
+      in
+      builtins.toString (pkgs.writeShellScript "obsidiantui" ''
+        wezterm start --class "org.wezfurlong.wezterm.obsidian" --cwd ${vaultDir} nvim
+      '');
   };
 }

home/features/neovim/config/lua/my/abbreviations/unicode.lua

@@ -80,7 +80,7 @@ M.unicode = {
   -- }}}
   -- {{{ Common relations
   { "sim", "∼" }, -- similarity
-  { "simeq", "≃" },
+  { "simeq", "≃" }, -- isomorphism
   { "cong", "≅" }, -- congruence
 
   { "iin", "∈" }, -- [I]ncluded [i][n]

home/features/neovim/config/lua/my/plugins/whichkey.lua

@@ -2,7 +2,8 @@ local runtime = require("my.tempest")
 
 local M = {
   "folke/which-key.nvim",
-  event = "VeryLazy",
+  -- event = "VeryLazy",
+  lazy = true,
   cond = runtime.blacklist("vscode"),
 }
 

home/features/neovim/config/lua/my/starter.lua

@@ -13,6 +13,10 @@ M.setup = function(config)
   local augroup = vim.api.nvim_create_augroup("M", {})
 
   local on_vimenter = function()
+    if vim.o.filetype ~= "" then
+      return
+    end
+
     if vim.fn.argc() > 0 then
       return
     end

home/features/neovim/config/spell/en.utf-8.add

@@ -0,0 +1 @@
+Context/!

home/features/neovim/default.nix

@@ -1406,6 +1406,28 @@ let
           event = "VeryLazy";
         };
         # }}}
+        # {{{ djot support
+        djot =
+          let djot = pkgs.fetchFromGitHub {
+            owner = "jgm";
+            repo = "djot";
+            rev = "2fec440ab7a75a06a1e18c29a00de64ec7c94b9d";
+            sha256 = "1xy2x1qbmv1kjxdpj2pjm03d9l7qrl0wx96gn5m0lkfxkg766i7z";
+          };
+          in
+          {
+            dir = "${djot}/editors/vim";
+            cond = blacklist "vscode";
+            ft = "djot";
+
+            config.autocmds = {
+              event = "FileType";
+              group = "UserDjotSettings";
+              pattern = "djot";
+              action.vim.opt.commentstring = ''{\% %s \%}'';
+            };
+          };
+        # }}}
         # }}}
         # {{{ external
         # These plugins integrate neovim with external services

home/lapetus.nix

@@ -1,6 +1,3 @@
 {
   imports = [ ./global.nix ];
-
-  # Arbitrary extra packages
-  home.packages = [ ];
 }

hosts/nixos/common/global/default.nix

@@ -7,6 +7,7 @@ let
     inputs.disko.nixosModules.default
     inputs.stylix.nixosModules.stylix
     inputs.sops-nix.nixosModules.sops
+    inputs.nixos-dns.nixosModules.dns
     # }}}
     # {{{ global configuration
     ./cli/fish.nix

hosts/nixos/common/optional/desktop/steam.nix

@@ -5,10 +5,4 @@
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
   };
-
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "steam"
-    "steam-original"
-    "steam-runtime"
-  ];
 }

hosts/nixos/lapetus/secrets.example.yaml

@@ -7,7 +7,11 @@ grafana_discord_webhook: https://discord.com/api/webhooks/...
 invidious_hmac_key: ...
 # contents of `credentials.json` file generated by `cloudflared tunnel create`
 cloudflare_tunnel_credentials: |
-    ...
+  {
+    "AccountTag": "...",
+    "TunnelSecret": "...",
+    "TunnelID": "..."
+  }
 microbin_env: |
     MICROBIN_ADMIN_PASSWORD=...
     MICROBIN_UPLOAD_PASSWORD=...

hosts/nixos/lapetus/services/commafeed.nix

@@ -9,7 +9,6 @@ in
 
   virtualisation.oci-containers.containers.commafeed = {
     image = "athou/commafeed:latest";
-    autoStart = true;
 
     ports = [ "${toString port}:8082" ]; # server:docker
     volumes = [ "${dataDir}:/commafeed/data" ]; # server:docker

hosts/nixos/lapetus/services/forgejo.nix

@@ -11,7 +11,7 @@ in
     group = cfg.group;
   };
 
-  satellite.cloudflared.targets.${host}.port = port;
+  satellite.cloudflared.at.${host}.port = port;
 
   services.forgejo = {
     enable = true;

hosts/nixos/lapetus/services/guacamole/default.nix

@@ -12,9 +12,7 @@
       "/var/lib/guacamole:/config"
     ];
 
-    environment = {
+    environment.TZ = config.time.timeZone;
-      TZ = config.time.timeZone;
-    };
   };
 
   # Allow ssh-ing using the provided key

hosts/nixos/lapetus/services/jellyfin.nix

@@ -5,17 +5,15 @@
 
   # {{{ Storage 
   environment.persistence."/persist/state".directories = [{
+    inherit (config.services.jellyfin) user group;
     directory = "/var/lib/jellyfin";
     mode = "u=rwx,g=r,o=r";
-    user = config.services.jellyfin.user;
-    group = config.services.jellyfin.group;
   }];
 
   environment.persistence."/persist/local/cache".directories = [{
+    inherit (config.services.jellyfin) user group;
     directory = "/var/cache/jellyfin";
     mode = "u=rwx,g=,o=";
-    user = config.services.jellyfin.user;
-    group = config.services.jellyfin.group;
   }];
   # }}}
 }

hosts/nixos/lapetus/services/jupyter.nix

@@ -71,7 +71,7 @@ in
   };
   # }}}
   # {{{ Networking & storage
-  satellite.cloudflared.targets."jupyter.moonythm.dev".port = config.services.jupyterhub.port;
+  satellite.cloudflared.at."jupyter.moonythm.dev".port = config.services.jupyterhub.port;
 
   environment.persistence."/persist/state".directories = [
     "/var/lib/${config.services.jupyterhub.stateDirectory}"

hosts/nixos/lapetus/services/microbin.nix

@@ -5,7 +5,7 @@ let
 in
 {
   sops.secrets.microbin_env.sopsFile = ../secrets.yaml;
-  satellite.cloudflared.targets.${host}.port = port;
+  satellite.cloudflared.at.${host}.port = port;
 
   services.microbin = {
     enable = true;

hosts/nixos/lapetus/services/qbittorrent.nix

@@ -25,8 +25,9 @@ in
 
     environment = {
       WEBUI_PORT = toString port;
-      PGID = "100";
       PUID = "1000";
+      PGID = config.users.groups.users.gid;
+      TZ = config.time.timeZone;
     };
   };
   # }}}

hosts/nixos/tethys/default.nix

@@ -43,6 +43,7 @@
   programs.firejail.enable = true;
   programs.extra-container.enable = true;
   virtualisation.docker.enable = true;
+  virtualisation.waydroid.enable = true;
   # virtualisation.spiceUSBRedirection.enable = true; # This was required for the vm usb passthrough tomfoolery
   # }}}
   # {{{ Ad-hoc stylix targets
@@ -56,7 +57,7 @@
       blacklisted = [
         # "twitter.com"
         # "www.reddit.com"
-        # "minesweeper.online" 
+        "minesweeper.online"
       ];
       blacklist = lib.concatStringsSep "\n" (lib.forEach blacklisted (host: "127.0.0.1 ${host}"));
     in

modules/nixos/cloudflared.nix

@@ -5,10 +5,10 @@ in
   options.satellite.cloudflared = {
     tunnel = lib.mkOption {
       type = lib.types.str;
-      description = "Cloudflare tunnel id to use for the `satellite.cloudflared.targets` helper";
+      description = "Cloudflare tunnel id to use for the `satellite.cloudflared.at` helper";
     };
 
-    targets = lib.mkOption {
+    at = lib.mkOption {
       description = "List of hosts to set up ingress rules for";
       default = { };
       type = lib.types.attrsOf (lib.types.submodule ({ name, ... }: {
@@ -33,5 +33,5 @@ in
       name = host;
       value = "http://localhost:${toString port}";
     })
-    cfg.targets;
+    cfg.at;
 }

pkgs/default.nix

@@ -1,12 +1,15 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
 
-{ pkgs ? (import ../nixpkgs.nix) { } }:
+{ pkgs ? (import ../nixpkgs.nix) { }, upkgs ? pkgs }:
 let plymouthThemes = pkgs.callPackage (import ./plymouth-themes.nix) { }; in
 {
   # example = pkgs.callPackage (import ./example.nix) {};
   vimclip = pkgs.callPackage (import ./vimclip.nix) { };
   homer = pkgs.callPackage (import ./homer.nix) { };
 
+  # REASON: octodns not in nixpkgs 23.11
+  octodns-cloudflare = upkgs.python3Packages.callPackage (import ./octodns-cloudflare.nix) { };
+
   plymouthThemeCutsAlt = plymouthThemes.cuts_alt;
 }