feat(nix): add jj-cz to devshell

flake.lock

@@ -35,11 +35,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780375472,
+        "lastModified": 1781930126,
-        "narHash": "sha256-Q8RAJoYlakA6B2I5DVcuxzNbhCNU1nnIjqQZYP1KGrM=",
+        "narHash": "sha256-AopjjM6497f3Usb6IAZgensjtzGlYGGpJLw7DRtP67I=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "d1c8c8fc09738d1b40576e97c274b4a11a2e0ac7",
+        "rev": "b00dabaa9351d1383dfba162f5b3575b49a126e1",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1780839367,
+        "lastModified": 1782013769,
-        "narHash": "sha256-KAENT4Od2wwWtJzWFtR/qKzqoR673r91KLcyv4pPcNQ=",
+        "narHash": "sha256-3j6GU+y8RSyRAibriCePKqqU4UPf6qjabUD9cfjehcM=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "3bc2bd2a5c5c886f75363211d838b749ab95137e",
+        "rev": "74e4970ab530b3d1a5cddb8424fcf0ee96443bd9",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779822991,
+        "lastModified": 1781648708,
-        "narHash": "sha256-r6e4eHEyQJEDhT6gkW3B9+OgB0pZebw2+du4bvN3vww=",
+        "narHash": "sha256-i9ggnF31Uq3tpdp6ZMe7YAOxjTfkB7S4WjSBfXV0uMk=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "6e75faa62349a59f4df328a4939ba8626d89ee1a",
+        "rev": "d33d11321f823f58a9109298ef886044f63b02ce",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780679734,
+        "lastModified": 1781989573,
-        "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=",
+        "narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b2b7db486e06e098711dc291bb25db82850e1d16",
+        "rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f",
         "type": "github"
       },
       "original": {
@@ -230,11 +230,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1780841807,
+        "lastModified": 1781867614,
-        "narHash": "sha256-7N3iYAUmNjt0wgfpb1ZMVP5xRcXSrihQqOxZPM5N0Tc=",
+        "narHash": "sha256-GHy8hEZtToo7FLxEZm0x/pn/fjg1w9sx7ZP9hRd1fcM=",
         "ref": "develop",
-        "rev": "0e6b559d002cc7a9bcb758384623de0e8e034bbe",
+        "rev": "d2c48605aac4ca9580d8a34aad4c65371c5a7cc1",
-        "revCount": 45,
+        "revCount": 52,
         "type": "git",
         "url": "https://labs.phundrak.com/phundrak/jj-cz"
       },
@@ -247,17 +247,17 @@
     "m3shapes": {
       "flake": false,
       "locked": {
-        "lastModified": 1777812556,
+        "lastModified": 1781017666,
-        "narHash": "sha256-E5nqOucRQBWKuT31AMekmfgMywRdHgSbU86R7t4BKKA=",
+        "narHash": "sha256-kfHyzZaPHgqZML48OA+5JwBOsLdQJ2ci/aGPShvUB4Y=",
         "owner": "soramanew",
         "repo": "m3shapes",
-        "rev": "356825d31f16052a782735cce264331cba0cb71b",
+        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
         "type": "github"
       },
       "original": {
         "owner": "soramanew",
         "repo": "m3shapes",
-        "rev": "356825d31f16052a782735cce264331cba0cb71b",
+        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
         "type": "github"
       }
     },
@@ -268,11 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780816331,
+        "lastModified": 1782030356,
-        "narHash": "sha256-0BYqs8yKWkOz2Q7+SP18N5E5gmDKSo6LSxIVIa0wWes=",
+        "narHash": "sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "1a2ea89c917781e88508d9fd2b507f2d2a0e173c",
+        "rev": "3017088b49efd404f78e3b104f553b97e4af786b",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780243769,
+        "lastModified": 1781577229,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
         "type": "github"
       },
       "original": {
@@ -299,11 +299,11 @@
     },
     "nixpkgsStable": {
       "locked": {
-        "lastModified": 1780511130,
+        "lastModified": 1781509190,
-        "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=",
+        "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "535f3e6942cb1cead3929c604320d3db54b542b9",
+        "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4",
         "type": "github"
       },
       "original": {
@@ -342,11 +342,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780303737,
+        "lastModified": 1781847791,
-        "narHash": "sha256-7HgdJBG4BgAPDyHKKxWtxj7nziqsQo6zQCXtwy+L9fs=",
+        "narHash": "sha256-Mo2YtNEGlcySnbq0YuP3nUKMAQCMAfE+TcCffo5vzD8=",
         "ref": "refs/heads/master",
-        "rev": "b66495fcc5022681b56b61f928c7acbe910e722c",
+        "rev": "68c2c85c33845385f7ab8147b32f1450b1e468e0",
-        "revCount": 821,
+        "revCount": 824,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -466,11 +466,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780547341,
+        "lastModified": 1781943681,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1780422259,
+        "lastModified": 1782031037,
-        "narHash": "sha256-dWGk4SEdI189kQW5cE4Uo1Mc+P+kQEdgMcyMgTtmQOA=",
+        "narHash": "sha256-a7oWSyS7SN81UOqVt481yIEMDsMpaJ7GNdV6Eaz5Yqg=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "8414bbf2fcc7bc0a22c675e498e3c7365c1aec0a",
+        "rev": "9cb27462cfd20edac174353f1e95bc03aa888863",
         "type": "github"
       },
       "original": {
@@ -507,11 +507,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780545143,
+        "lastModified": 1781754174,
-        "narHash": "sha256-y9aFcK8A3pctkW9G9LdppzPDsuBa3VzToADnacjir/A=",
+        "narHash": "sha256-Q5hp6+DYj23gMAvhLXBYNan9EwY9C+oxyU+M1TJDwgo=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "bc0ca7b0f7c8ca9dc55166438fec4dc2dd74f8a4",
+        "rev": "18ae1c654f60fb8dafb40c48fe25eb09f1aaddb2",
         "type": "github"
       },
       "original": {
@@ -587,11 +587,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780637620,
+        "lastModified": 1781847955,
-        "narHash": "sha256-ngPdHinPyF0AMxRr32qt+TZCv0sagmooBW14u6DfjSU=",
+        "narHash": "sha256-1OSYOGuJp/NoODmSHjsz+6TB/kSilJ+BsFihjY7TTnc=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "8c62bc6a72ac5a5b8d1b41b2b88dfed9d9932c48",
+        "rev": "4bca251cd556677f7b765ff324d1638ae215be13",
         "type": "github"
       },
       "original": {

flake.nix

@@ -104,6 +104,7 @@
             pkgs.nh
             pkgs.jujutsu
             pkgs.git
+            inputs.jj-cz.packages.${system}.default
           ];
         };
 
@@ -186,7 +187,7 @@
                 srvos.nixosModules.server
                 srvos.nixosModules.hardware-hetzner-cloud
                 srvos.nixosModules.mixins-terminfo
-                ./hosts/naromk3/configuration.nix
+                ./hosts/naromk3
               ];
             };
             pinetab2 = pinetabConfig "x86_64-linux" ./hosts/pinetab2/gnome.nix;

hosts/naromk3/default.nix

@@ -24,8 +24,11 @@
       firewall = {
         openPorts = [
           22  # Gitea SSH
+          25  # SMTP
           80  # HTTP
           443 # HTTPS
+          465 # SMTPS
+          993 # IMAPS
         ];
       };
     };

users/modules/desktop/hyprland.nix

@@ -106,10 +106,7 @@ in {
             "workspaces, 1, 6, default"
           ];
         };
-        dwindle = {
+        dwindle.preserve_split = true;
-          pseudotile = true;
-          preserve_split = true;
-        };
         exec-once =
           [
             "pactl load-module module-switch-on-connect"

users/modules/dev/ai/opencode.nix

@@ -10,25 +10,7 @@ with lib; let
   cfg = config.home.dev.ai.opencode;
   defaultPackageCli = inputs.opencode.packages.${system}.opencode;
   defaultPackageDesktop = inputs.opencode.packages.${system}.desktop;
-  corsString = cors:
-    {
-      null = "";
-      string = v: trim v;
-      path = v: trim (readFile v);
-    }
-    .${
-      if cors == null
-      then "null"
-      else typeOf cors
-    };
   corsList = domains: lists.remove "" (lists.forEach (strings.splitString "," domains) trim);
-  corsDomains = domains:
-    lists.flatten (
-      lists.forEach (lists.remove "" (lists.forEach (strings.splitString "," domains) trim)) (domain: [
-        "--cors"
-        domain
-      ])
-    );
 in {
   options.home.dev.ai.opencode = {
     enable = mkEnableOption "Enables OpenCode";
@@ -87,9 +69,7 @@ in {
     inherit (cfg) enable tui;
     enableMcpIntegration = true;
     extraPackages = with pkgs; [uv];
-    settings = let
+    settings =
-      cors = corsString cfg.web.cors;
-    in
       {
         server = mkIf cfg.web.mdns.enable {
           mdns = true;

users/modules/media/default.nix

@@ -12,6 +12,7 @@ in {
     ./mpd-mpris.nix
     ./mpv.nix
     ./ncmpcpp.nix
+    ./streamlink.nix
   ];
 
   options.home.media.fullDesktop = mkEnableOption "Enables everything";
@@ -20,5 +21,6 @@ in {
     mpd.enable = mkDefault (cfg.fullDesktop or cfg.mpd-mpris.enable);
     mpv.enable = mkDefault cfg.fullDesktop;
     ncmpcpp.enable = mkDefault config.home.media.mpd.enable;
+    streamlink.enable = mkDefault config.home.media.mpv.enable;
   };
 }

users/modules/media/streamlink.nix

@@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.home.media.streamlink;
+in {
+  options.home.media.streamlink.enable = mkEnableOption "Enable Streamlink";
+  config.programs.streamlink = mkIf cfg.enable {
+    enable = true;
+    settings = {
+      player = "${pkgs.mpv}/bin/mpv";
+    };
+  };
+}

users/phundrak/ai.nix

@@ -30,6 +30,8 @@
         };
         permission = {
           "*" = "ask";
+          glob = "allow";
+          grep = "allow";
           read = {
             "*" = "allow";
             "*.env" = "deny";

users/phundrak/firefox.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   config.home.desktop.firefox = {
     enable = true;
     useZen = true;
@@ -13,6 +13,16 @@
         smothscroll = "true";
       };
       extraConfig = ''
+        command openTwitchInMpv js -d@\
+          const url = new URL(document.location.href);\
+          const cleanUrl = url.hostname + url.pathname;\
+          const token = document.cookie.split("; ")\
+                                .find(item => item.startsWith("auth-token="))?.split("=")[1];\
+          const auth = "--twitch-api-header=Authorization=OAuth " + token;\
+          const cmd = `${pkgs.streamlink}/bin/streamlink "''${auth}" "''${cleanUrl}" best`;\
+          tri.native.run(cmd)\
+        @
+
         unbind h
         unbind j
         unbind k
@@ -69,6 +79,7 @@
 
         bind < urlincrement -1
         bind > urlincrement 1
+        bind ypt openTwitchInMpv
         bind ypv js tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${document.location.href}"`)
         bind ypm hint -JF e => tri.native.run(`mpv --ytdl-format="[height >=? 480]" --ontop --fs "''${e.href}"`)
       '';

users/phundrak/packages.nix

@@ -49,6 +49,7 @@ in {
     scrcpy
     syncthing
     watchmate
+    chatterino7
 
     # Games
     atlauncher
@@ -74,6 +75,7 @@ in {
     tectonic # better LaTeX engine
     wakatime-cli
     zeal
+    pandoc
 
     ## LSP servers
     bash-language-server