cleanup passwords

flake.lock

@@ -1,21 +1,5 @@
 {
   "nodes": {
-    "adamcstephens_stop-export": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710028874,
-        "narHash": "sha256-D15vE/boUSGSig3EMx1dCeu7N7S92wiRMJKZ1h9mBjM=",
-        "ref": "refs/heads/main",
-        "rev": "3404021b7caf7dea1ce9c8d4ece36dc26575bc47",
-        "revCount": 17,
-        "type": "git",
-        "url": "https://codeberg.org/adamcstephens/stop-export.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codeberg.org/adamcstephens/stop-export.git"
-      }
-    },
     "aphorme_launcher": {
       "flake": false,
       "locked": {
@@ -49,23 +33,6 @@
         "url": "https://git.codelinaro.org/clo/ath-firmware/ath11k-firmware.git"
       }
     },
-    "brainwart_x13s-nixos": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1705565623,
-        "narHash": "sha256-sisr/dFIz8p3/Y7mz+arWxjeiBmUTQkMqkF9j3c2dWE=",
-        "owner": "BrainWart",
-        "repo": "x13s-nixos",
-        "rev": "29002122d86a1009ba70e7a4ca3063e5404c77a2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "BrainWart",
-        "ref": "flake",
-        "repo": "x13s-nixos",
-        "type": "github"
-      }
-    },
     "colmena": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -131,22 +98,6 @@
         "type": "github"
       }
     },
-    "dotfiles": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1541334338,
-        "narHash": "sha256-9QAq7bjITpaO8A8qD8IVoa+89Bg13CEwxf771d9S/Ag=",
-        "owner": "steveeJ",
-        "repo": "dotfiles",
-        "rev": "9a8484f7094edc1b533bad3be71c511ba8ff45eb",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "steveeJ",
-        "repo": "dotfiles",
-        "type": "gitlab"
-      }
-    },
     "espanso": {
       "flake": false,
       "locked": {
@@ -412,33 +363,16 @@
         "type": "github"
       }
     },
-    "linux_x13s": {
+    "logseq_0_10_9_aarch64_appimage": {
       "flake": false,
       "locked": {
-        "lastModified": 1706261399,
+        "narHash": "sha256-b/zzQ3hNfaSUAJmhKuZaYTY0LX7Jwch182vbNrWBh6w=",
-        "narHash": "sha256-NJSN4j2VbFIPerb/bFqmaYbcHjxF3u6lijuXpC0USYo=",
-        "owner": "jhovold",
-        "repo": "linux",
-        "rev": "b929f8eed9ad1f156cae932dea741bc4383e6367",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jhovold",
-        "ref": "wip/sc8280xp-v6.7",
-        "repo": "linux",
-        "type": "github"
-      }
-    },
-    "logseq_0_10_5_aarch64_appimage": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-5uHRJpNcAzVRqyF5eR2sY0u/Q9rHXWh/g36/sehmSys=",
         "type": "file",
-        "url": "https://www.stefanjunker.de/downloads/Logseq-0.10.5.AppImage"
+        "url": "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage"
       },
       "original": {
         "type": "file",
-        "url": "https://www.stefanjunker.de/downloads/Logseq-0.10.5.AppImage"
+        "url": "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage"
       }
     },
     "nix-eval-jobs": {
@@ -837,24 +771,20 @@
     },
     "root": {
       "inputs": {
-        "adamcstephens_stop-export": "adamcstephens_stop-export",
         "aphorme_launcher": "aphorme_launcher",
         "ath11k-firmware": "ath11k-firmware",
-        "brainwart_x13s-nixos": "brainwart_x13s-nixos",
         "colmena": "colmena",
         "crane": "crane",
         "disko": [
           "nixos-anywhere",
           "disko"
         ],
-        "dotfiles": "dotfiles",
         "espanso": "espanso",
         "fenix": "fenix",
         "flake-parts": "flake-parts",
         "get-flake": "get-flake",
         "jay": "jay",
-        "linux_x13s": "linux_x13s",
+        "logseq_0_10_9_aarch64_appimage": "logseq_0_10_9_aarch64_appimage",
-        "logseq_0_10_5_aarch64_appimage": "logseq_0_10_5_aarch64_appimage",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixos-anywhere": "nixos-anywhere",
         "nixpkgs": [

flake.nix

@@ -1,10 +1,11 @@
 # flake.nix
 {
   inputs = {
-    dotfiles = {
+    # TODO: where has this been used?
-      url = "gitlab:steveeJ/dotfiles";
+    # dotfiles = {
-      flake = false;
+    #   url = "git+https://forgejo.www.stefanjunker.de/steveej/dotfiles.git";
-    };
+    #   flake = false;
+    # };
 
     # flake and infra basics
     nixpkgs-2211.url = "github:nixos/nixpkgs/nixos-22.11";
@@ -90,29 +91,9 @@
       flake = false;
     };
 
-    ### inputs for thinkpad x13s
+    logseq_0_10_9_aarch64_appimage = {
-    # see https://github.com/jhovold/linux/wiki/X13s for status updates
-    linux_x13s.url = "github:jhovold/linux/wip/sc8280xp-v6.7";
-    linux_x13s.flake = false;
-
-    brainwart_x13s-nixos = {
-      url = "github:BrainWart/x13s-nixos/flake";
       flake = false;
-    };
+      url = "https://www.stefanjunker.de/downloads/Logseq-0.10.9.AppImage";
-
-    adamcstephens_stop-export = {
-      flake = false;
-      url = "git+https://codeberg.org/adamcstephens/stop-export.git";
-    };
-
-    # alsa-ucm-conf = {
-    #   flake = false;
-    #   url = "github:alsa-project/alsa-ucm-conf/master";
-    # };
-
-    logseq_0_10_5_aarch64_appimage = {
-      flake = false;
-      url = "https://www.stefanjunker.de/downloads/Logseq-0.10.5.AppImage";
     };
 
     espanso = {
@@ -349,7 +330,7 @@
           logseq =
             pkgs.callPackage ./nix/pkgs/logseq
             (lib.attrsets.optionalAttrs pkgs.stdenv.isAarch64 {
-              overrideSrc = self.inputs.logseq_0_10_5_aarch64_appimage;
+              overrideSrc = self.inputs.logseq_0_10_9_aarch64_appimage;
             });
 
           rperf = craneLib.buildPackage {

nix/home-manager/configuration/graphical-fullblown.nix

@@ -39,7 +39,15 @@ in {
   home.sessionVariables.GOPATH = "$HOME/src/go";
   home.sessionVariables.PATH = pkgs.lib.concatStringsSep ":" ["$HOME/.local/bin" "$PATH"];
 
+  nixpkgs.config.allowInsecurePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "electron-28.3.3"
+      "electron-27.3.11"
+    ];
+
   nixpkgs.config.permittedInsecurePackages = [
+    "electron-28.3.3"
+    "electron-27.3.11"
   ];
 
   home.packages =
@@ -101,15 +109,14 @@ in {
       aspellDicts.de
       # skypeforlinux
       # pkgsUnstable.jitsi-meet-electron
-      thunderbird
+      thunderbird-115
+      # betterbird
 
       # FIXME: depends on insecure openssl 1.1.1t
       # kotatogram-desktop
       pkgsUnstable.tdesktop
       # TODO: remove or reuse this depending on whether waydroid signal works
-      # pkgsUnstable.signal-desktop
+      pkgsUnstable.signal-desktop
-
-      thunderbird
 
       # gnome.cheese
 

nix/home-manager/profiles/common.nix

@@ -15,7 +15,6 @@
     allowUnfree = true;
 
     permittedInsecurePackages = [
-      "nix-2.15.3"
     ];
   };
 

nix/home-manager/profiles/sway-desktop.nix

@@ -97,6 +97,17 @@ in {
     pkgs.fuzzel
   ];
 
+  # TODO: configure kanshi to always set the 5K resolution
+  # DP-1 "Philips Consumer Electronics Company PHL 499P9 AU02419010010 (DP-1 via DP)"
+  #   Make: Philips Consumer Electronics Company
+  #   Model: PHL 499P9
+  #   Serial: AU02419010010
+  #   Physical size: 1190x340 mm
+  #   Enabled: yes
+  #   Modes:
+  #     3840x1080 px, 59.967999 Hz (preferred)
+  #     5120x1440 px, 59.977001 Hz (current)
+
   wayland.windowManager.sway = {
     enable = true;
     systemd.enable = true;

nix/home-manager/programs/redshift.nix

@@ -7,15 +7,22 @@
 in {
   services.gammastep = {
     enable = true;
+    provider = "manual";
+    enableVerboseLogging = true;
     inherit (passwords.location.stefan) longitude latitude;
     temperature = {
-      day = 6700;
+      # day = 6700;
+      day = 3000;
       night = 3000;
     };
     tray = true;
     settings = {
+      general = {
+        adjustment-method = "wayland";
+      };
       gammastep = {
-        brightness-day = 1.0;
+        # brightness-day = 1.0;
+        brightness-day = 0.5;
         brightness-night = 0.5;
       };
     };

nix/home-manager/programs/vscode/default.nix

@@ -18,7 +18,8 @@ in {
         #   sha256 = "1qc1qsahfx1nvznq4adplx63w5d94xhafngv76vnqjjbzhv991v2";
         # })
       ]
-      ++ (with pkgsVscodium.vscode-extensions; [
+      ++ (with pkgsVscodium.vscode-extensions;
+        [
           eamodio.gitlens
           mkhl.direnv
           tomoki1207.pdf
@@ -31,6 +32,8 @@ in {
           ms-vscode.theme-tomorrowkit
           nonylene.dark-molokai-theme
 
+          ms-python.vscode-pylance
+
           # TODO: these are not in nixpkgs
 
           # fredwangwang.vscode-hcl-format
@@ -40,7 +43,8 @@ in {
 
           # TODO: not compatible with vscodium
           # ms-vscode-remote.remote-ssh
-      ] ++ (let
+        ]
+        ++ (let
           extensions = repoFlake.inputs.nix-vscode-extensions.extensions.${pkgs.system};
         in (with extensions.vscode-marketplace; [
           tamasfe.even-better-toml

nix/os/devices/router0-dmz0/configuration.nix

@@ -188,8 +188,8 @@ in {
     # TODO: configure packet_priority for VLANs (see https://wiki.nftables.org/wiki-nftables/index.php/Configuring_chains#Base_chain_priority, https://wiki.nftables.org/wiki-nftables/index.php/Setting_packet_metainformation#packet_priority)
     nftables = {
       enable = true;
-      stopRuleset = "";
 
+      stopRuleset = "";
       chains = {
         prerouting = {
           "exposeHost" = {
@@ -206,6 +206,9 @@ in {
 
       firewall = {
         enable = true;
+        snippets.nnf-common.enable = true;
+        # included in the above
+        # snippets.nnf-conntrack.enable = true;
         zones =
           {
             lan.interfaces = [(mkInterfaceName {vlanid = 0;})];
@@ -559,7 +562,49 @@ in {
           vlanRange
         )
       );
-    networks =
+    networks = let
+      commonWanOptions = {
+        networkConfig = {
+          # start a DHCP Client for IPv4/6 Addressing/Routing
+          DHCP = true;
+          DNSOverTLS = true;
+          DNSSEC = true;
+          IPForward = true;
+
+          # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
+          IPv6AcceptRA = true;
+          IPv6PrivacyExtensions = false;
+          DHCPPrefixDelegation = true;
+        };
+        dhcpV4Config = {
+          UseDNS = false;
+          UseDomains = false;
+          UseHostname = false;
+        };
+        dhcpV6Config = {
+          UseDNS = false;
+          UseDomains = false;
+          UseHostname = false;
+          PrefixDelegationHint = "::/56";
+          UseDelegatedPrefix = true;
+          WithoutRA = "solicit";
+        };
+        ipv6AcceptRAConfig = {
+          UseDNS = false;
+          UseDomains = false;
+        };
+
+        # TODO: enable these somehow
+        # extraConfig = ''
+        #   [IPv6AcceptRA]
+        #   # FIXME: supported in nixos-24.11
+        #   DHCPv6Client=solicit
+
+        #   # FIXME: not supported at all yet
+        #   UsePREF64=true
+        # '';
+      };
+    in
       {
         # places options here that should always exist
         "lo" = {
@@ -619,20 +664,16 @@ in {
           ];
         };
         # use lan0 as secondary WAN interface
-        "10-lan0-wan" = {
+        "10-lan0-wan" = lib.attrsets.recursiveUpdate commonWanOptions {
           matchConfig.Name = "lan0";
-          networkConfig = {
+          # make routing on this interface a dependency for network-online.target
-            # start a DHCP Client for IPv4/6 Addressing/Routing
+          # linkConfig.RequiredForOnline = "routable";
-            DHCP = true;
-            # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
-            IPv6AcceptRA = true;
-            DNSOverTLS = true;
-            DNSSEC = true;
-            IPv6PrivacyExtensions = false;
-            IPForward = true;
-          };
           linkConfig.RequiredForOnline = "no";
 
+          dhcpV4Config = {
+            RouteMetric = 2000;
+          };
+
           # similar to
           # ip route add default via 172.16.0.1 table 101
           routes = [
@@ -644,22 +685,16 @@ in {
             }
           ];
         };
-        "10-wan" = {
+        "10-wan" = lib.attrsets.recursiveUpdate commonWanOptions {
           matchConfig.Name = "wan";
-          networkConfig = {
-            # start a DHCP Client for IPv4/6 Addressing/Routing
-            DHCP = true;
-            # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
-            IPv6AcceptRA = true;
-            DNSOverTLS = true;
-            DNSSEC = true;
-            IPv6PrivacyExtensions = false;
-            IPForward = true;
-          };
           # make routing on this interface a dependency for network-online.target
           # linkConfig.RequiredForOnline = "routable";
           linkConfig.RequiredForOnline = "no";
 
+          dhcpV4Config = {
+            RouteMetric = 1000;
+          };
+
           # similar to
           # ip route add default via 192.168.0.1 table 100
           routes = [
@@ -835,6 +870,19 @@ in {
             ];
             networkConfig = {
               ConfigureWithoutCarrier = true;
+
+              # the client shouldn't be allowed to send us RAs, that would be weird.
+              IPv6AcceptRA = false;
+
+              DHCPPrefixDelegation = true;
+              IPv6SendRA = true;
+            };
+
+            dhcpPrefixDelegationConfig = {
+              UplinkInterface = "wan";
+              Assign = true;
+              SubnetId = vlanid;
+              Announce = true;
             };
 
             linkConfig.RequiredForOnline = "no";
@@ -873,19 +921,19 @@ in {
             ];
           };
 
-          "50-${mkInterfaceName {inherit vlanid;}}" = {
+          # "50-${mkInterfaceName {inherit vlanid;}}" = {
-            matchConfig.Name = "${mkInterfaceName {inherit vlanid;}}";
+          #   matchConfig.Name = "${mkInterfaceName {inherit vlanid;}}";
-            address = [
+          #   address = [
-              (mkVlanIpv4HostAddr {
+          #     (mkVlanIpv4HostAddr {
-                inherit vlanid;
+          #       inherit vlanid;
-                host = 1;
+          #       host = 1;
-              })
+          #     })
-            ];
+          #   ];
-            networkConfig = {
+          #   networkConfig = {
-              ConfigureWithoutCarrier = true;
+          #     ConfigureWithoutCarrier = true;
-            };
+          #   };
-            linkConfig.RequiredForOnline = "no";
+          #   linkConfig.RequiredForOnline = "no";
-          };
+          # };
         })
         (
           builtins.map
@@ -1099,6 +1147,9 @@ in {
       local-ttl = 0;
       dhcp-ttl = 0;
 
+      # v6 config
+      enable-ra = true;
+
       dhcp-range = let
         mkDhcpRange = {
           tag,
@@ -1117,6 +1168,9 @@ in {
               cidr = false;
             })
             "12h"
+            # "slaac"
+            # "ra-stateless"
+            # "ra-names"
           ];
       in
         builtins.map

nix/os/devices/router0-dmz0/flake.lock

@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723080788,
+        "lastModified": 1728109432,
-        "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=",
+        "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed",
+        "rev": "48ebb577855fb2398653f033b3b2208a9249203d",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
+        "lastModified": 1726989464,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
     "hostapd": {
       "flake": false,
       "locked": {
-        "lastModified": 1723046327,
+        "lastModified": 1727905939,
-        "narHash": "sha256-803SwotTiTX3eXZ70sTi51oGufgDsLDvUPiJrsECXVo=",
+        "narHash": "sha256-LZHwXN8lBcDpKQVB3GcYI0SVzj6WXd2E0GDqhQh503w=",
         "ref": "refs/heads/main",
-        "rev": "c6faa8936604a5a24b36600ab893725350d894bd",
+        "rev": "d84323d05ef30cdcf343884ac34420caf72145bd",
-        "revCount": 19755,
+        "revCount": 19910,
         "type": "git",
         "url": "git://w1.fi/hostap.git?branch=main"
       },
@@ -137,11 +137,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722869614,
+        "lastModified": 1728067476,
-        "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
+        "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "883180e6550c1723395a3a342f830bfc5c371f6b",
+        "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1722813957,
+        "lastModified": 1728018373,
-        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
         "type": "github"
       },
       "original": {
@@ -206,11 +206,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723077922,
+        "lastModified": 1728127082,
-        "narHash": "sha256-FY5UMtlBCcbMxk+ykmZzYYtm7l/uUKwiMNYbFgqG5yg=",
+        "narHash": "sha256-MDU/aVPcR5Fk+x1B+SAsyYG47k5cvFvGTrqZIev2Jck=",
         "owner": "numtide",
         "repo": "srvos",
-        "rev": "f389064525b8330f20106231762f52854490654e",
+        "rev": "7aaa72eb804248436ea20c084a7891a383e23b02",
         "type": "github"
       },
       "original": {

nix/os/devices/steveej-x13s/configuration.nix

@@ -13,6 +13,7 @@
   nixpkgs.overlays = [
     (final: previous: {
       # inherit (nodeFlake.inputs.nixpkgs-systemd256.legacyPackages.${system}) systemd systemdMinimal;
+      # inherit (nodeFlake.inputs.nixpkgs-unstable.legacyPackages.${system}) libcamera libcamera-qcam;
     })
   ];
 
@@ -25,6 +26,15 @@
 
   services.illum.enable = true;
 
+  # printint and autodiscovery of printers
+  services.printing.enable = true;
+  services.printing.drivers = [pkgs.hplip];
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+
   systemd.services.bluetooth-x13s-mac = lib.mkForce {
     enable = true;
     path = [
@@ -95,10 +105,9 @@
       sops.secrets.builder-private-key = {};
       nix.distributedBuilds = true;
       nix.buildMachines = [
-        # test these with: sudo nix store ping --store 'ssh-ng://nix-remote-builder@sj-bm-hostkey0.dev.infra.holochain.org?ssh-key=/run/secrets/builder-private-key'
+        # test these with: sudo nix store ping --store 'ssh-ng://nix-remote-builder@<fqdn>?ssh-key=/run/secrets/builder-private-key'
-
         {
-          hostName = "sj-bm-hostkey0.dev.infra.holochain.org";
+          hostName = "buildbot-nix-0.infra.holochain.org";
           sshUser = "nix-remote-builder";
           sshKey = config.sops.secrets.builder-private-key.path;
           protocol = "ssh-ng";
@@ -110,7 +119,7 @@
             "big-parallel"
             "kvm"
           ];
-          maxJobs = 0;
+          maxJobs = 16;
         }
 
         {
@@ -126,7 +135,7 @@
             "big-parallel"
             "kvm"
           ];
-          maxJobs = 32;
+          maxJobs = 0;
         }
       ];
     }
@@ -195,7 +204,7 @@
     ];
 
     # TODO: currently unsupported
-    services.gammastep.enable = lib.mkForce false;
+    services.gammastep.enable = true;
   };
 
   boot = {

nix/os/devices/steveej-x13s/disko.nix

@@ -4,6 +4,7 @@
       x13s-nvme = {
         type = "disk";
         device = "/dev/disk/by-id/nvme-KBG5AZNT1T02_LA_KIOXIA_52QC84BEEJS6";
+        # device = "/dev/disk/by-id/nvme-Corsair_MP600_CORE_MINI_A7SIB33902BQLN";
         content = {
           type = "gpt";
           partitions = {

nix/os/devices/steveej-x13s/flake.lock

@@ -165,16 +165,16 @@
     "linux-jhovold": {
       "flake": false,
       "locked": {
-        "lastModified": 1725261528,
+        "lastModified": 1728631036,
-        "narHash": "sha256-p2rP8fErEnrlrkl2l4ZfnWOG2U/ohAC9blx+sTpU4+I=",
+        "narHash": "sha256-1LnClVjY6WS+IR9eqPFA7gzXm0cio3mY23NXj9cKHHs=",
         "owner": "jhovold",
         "repo": "linux",
-        "rev": "2997053728cd0675469399212061423e63b48c1f",
+        "rev": "6a97bc22fa36010400b91e6d5979741c391112c3",
         "type": "github"
       },
       "original": {
         "owner": "jhovold",
-        "ref": "wip/sc8280xp-6.11-rc6",
+        "ref": "wip/sc8280xp-6.12-rc2",
         "repo": "linux",
         "type": "github"
       }
@@ -185,7 +185,9 @@
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1725529869,
@@ -242,29 +244,29 @@
       "inputs": {
         "flake-parts": "flake-parts_2",
         "linux-jhovold": "linux-jhovold",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1725606185,
+        "lastModified": 1728680044,
-        "narHash": "sha256-ur40KNuaj90nv3tmNhozvNvhLWxFzyodtkYi/JOBZLE=",
+        "narHash": "sha256-kDqUDwEEv1KPOObmdnO3zb5mFthFDHoPgzVDpmRIq44=",
         "ref": "refs/heads/remaintain",
-        "rev": "759bf531bb9ffa1a45cabb01c6ee1bdb23b9b49b",
+        "rev": "f691c125485b6764ebef0b9f148613d79de95525",
-        "revCount": 101,
+        "revCount": 109,
         "type": "git",
-        "url": "file:///home/steveej/src/others/nixos-x13s"
+        "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain"
       },
       "original": {
         "type": "git",
-        "url": "file:///home/steveej/src/others/nixos-x13s"
+        "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716509168,
+        "lastModified": 1725432240,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
         "type": "github"
       },
       "original": {
@@ -288,37 +290,21 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1725634671,
+        "lastModified": 1728621521,
-        "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
+        "narHash": "sha256-Fk8C/cywdAP//XjK1/CF2VMIRoQjhosCor71p84ff+c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+        "rev": "7045aa75c71e90ae3bbb486d35414b08add9c424",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-unstable-small",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1725432240,
-        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1725826545,
         "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=",
@@ -342,7 +328,7 @@
         "mycelium": "mycelium",
         "nix-snapshotter": "nix-snapshotter",
         "nixos-x13s": "nixos-x13s",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },

nix/os/devices/steveej-x13s/flake.nix

@@ -1,9 +1,10 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    # nixpkgs.follows = "nixpkgs-unstable";
 
     # required for home-manager modules
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
 
     get-flake.url = "github:ursi/get-flake";
 
@@ -15,8 +16,13 @@
     };
 
     nixos-x13s.url =
-      # "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain"
+      "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain"
-      "/home/steveej/src/others/nixos-x13s"
+      # 6.11.0
+      # "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain&rev=6b9efe77ca80653354981c720af3c4241ac71490"
+      # 6.12.0-rc6
+      # "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain&rev=bd580ee9c35fcb8a720122d5bb2f903f1b7395ee"
+      # "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?branch=remaintain&rev=1286d20be2321a1a2d27f5d09257ebaf54ce0630"
+      #"/home/steveej/src/others/nixos-x13s"
       #
       ;
 
@@ -25,6 +31,7 @@
     # nixos-x13s.inputs.nixpkgs.follows = "nixpkgs";
 
     mycelium.url = "github:threefoldtech/mycelium";
+    mycelium.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-snapshotter = {
       url = "github:yu-re-ka/nix-snapshotter";
@@ -42,14 +49,6 @@
     nativeSystem = "aarch64-linux";
     nodeName = "steveej-x13s";
 
-    pkgs = nixpkgs.legacyPackages.${nativeSystem};
-    pkgsCross = import self.inputs.nixpkgs {
-      system = "x86_64-linux";
-      crossSystem = {
-        config = "aarch64-unknown-linux-gnu";
-      };
-    };
-
     repoFlake = get-flake ../../../..;
 
     mkNixosConfiguration = {extraModules ? [], ...} @ attrs:

nix/os/snippets/mycelium.nix

@@ -4,8 +4,11 @@
   nodeName,
   config,
   system,
+  lib,
   ...
-}: {
+}: let
+  cfg.autostart = false;
+in {
   imports = [
   ];
 
@@ -27,4 +30,6 @@
     extraArgs = [
     ];
   };
+
+  systemd.services.mycelium.wantedBy = lib.mkIf (!cfg.autostart) (lib.mkForce []);
 }

nix/os/snippets/nix-settings-holo-chain.nix

@@ -3,7 +3,7 @@
     substituters = [
       "https://holochain-ci.cachix.org"
       "https://holochain-ci-internal.cachix.org"
-      "https://cache.holo.host/"
+      # "https://cache.holo.host/"
     ];
 
     trusted-public-keys = [

nix/os/snippets/sway-desktop.nix

@@ -74,10 +74,10 @@ in {
     extraPortals = [
       # repoFlake.inputs.nixpkgs-wayland.packages.${pkgs.system}.xdg-desktop-portal-wlr
 
-      # pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal-gtk
-      (pkgs.xdg-desktop-portal-gtk.override (_: {
+      # (pkgs.xdg-desktop-portal-gtk.override (_: {
-        buildPortalsInGnome = false;
+      #   buildPortalsInGnome = false;
-      }))
+      # }))
     ];
   };
 

nix/pkgs/logseq/Containerfile

@@ -4,7 +4,8 @@
 #       build-docker.yml and change the release channel from :latest to :testing
 
 # Builder image
-FROM clojure:temurin-11-tools-deps-1.11.1.1208-bullseye-slim as builder
+# FROM clojure:temurin-11-tools-deps-1.11.1.1208-bullseye-slim as builder
+FROM clojure:temurin-11-tools-deps-bullseye-slim as builder
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -20,15 +21,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # install NodeJS & yarn
 RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | \
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && apt-get update && apt-get install -y nodejs yarn
-    tee /etc/apt/trusted.gpg.d/yarn.gpg && \
-    echo "deb https://dl.yarnpkg.com/debian/ stable main" | \
-    tee /etc/apt/sources.list.d/yarn.list && \
-    apt-get update && apt-get install -y nodejs yarn
 
 WORKDIR /data
 
-ENV VERSION=0.10.5
+ENV VERSION=0.10.9
 
 # build Logseq static resources
 RUN git clone -b ${VERSION} https://github.com/logseq/logseq.git .

nix/pkgs/logseq/README.md

@@ -2,10 +2,19 @@
 
 this is pseudocode that serves as a reminder
 
-1. podman build -f Containerfile
+1. podman build -f Containerfile -t logseq
+2. CONTAINER_ID=$(podman container create logseq)
 2. podman unshare
 3. podman mount $CONTAINER_ID
-4. upload the AppImaeg
+4. copy and upload the AppImage. e.g.
+    ```
+    cp /home/steveej/.local/share/containers/storage/overlay/f932ca9f11ea2bfd6b221118eb54775a623bc519bfe38188afcbad51dda2777f/merged/Logseq-0.10.9.AppImage .
+    exit
+    scp Logseq-0.10.9.AppImage root@www.stefanjunker.de:/var/lib/container-volumes/webserver/var-www/stefanjunker.de/htdocs/caddy/downloads/
+    ```
+5. podman unshare
+6. podman unmount
+
 
 # resources
 

nix/pkgs/logseq/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: let
   inherit (finalAttrs) pname version src appimageContents;
 in {
   pname = "logseq";
-  version = "0.10.5";
+  version = "0.10.9";
 
   src =
     if overrideSrc != null