dsalkjdsalkjdsa

hardware/gpu/rocm.nix

@@ -42,7 +42,7 @@
       in [ "L+    /opt/rocm   -    -    -     -    ${rocmEnv}" ];
 
       nixpkgs.overlays = [
-        (prev: final: {
+        (final: prev: {
           blender = prev.blender-hip;
         })
       ];

hosts/default.nix

@@ -92,7 +92,7 @@ let
       sopp        = mk "pbsds.net" "x86_64-linux"  input-views.inputs-edge "25.05" [ ts1 au ];
       bjarte      = mk "pbsds.net" "x86_64-linux"  input-views.inputs-edge "25.05" [ ts1    ];
       bolle       = mk "pbsds.net" "x86_64-linux"  input-views.inputs-edge "25.05" [ ts2 au tse ];
-      eple        = mk "pbsds.net" "x86_64-linux"  input-views.inputs-2505 "25.05" [ ts1 au tse dns64 ];
+      eple        = mk "pbsds.net" "x86_64-linux"  input-views.inputs-2511 "25.05" [ ts1 au tse ];
       garp        = mk "pbsds.net" "x86_64-linux"  input-views.inputs-2511 "25.05" [ ts1 au ];
       # hasselknippe= mk "pbsds.net" "aarch64-linux" input-views.inputs-2505 "24.05" [ ts1 ];
 

hosts/nixos/bolle/configuration.nix

@@ -28,10 +28,10 @@
 
     ../../../profiles/shell.nix
 
-    ../../../profiles/domeneshop-dyndns.nix
+    # ../../../profiles/domeneshop-dyndns.nix
     ../../../profiles/known-hosts
   ];
-  services.domeneshop-updater.targets = [ config.networking.fqdn ];
+  # services.domeneshop-updater.targets = [ config.networking.fqdn ];
 
   # Networking
   networking.networkmanager.enable = true;

hosts/nixos/eple/configuration.nix

@@ -32,10 +32,10 @@
 
     ../../../profiles/shell.nix
 
-    ../../../profiles/domeneshop-dyndns.nix
+    # ../../../profiles/domeneshop-dyndns.nix
     ../../../profiles/known-hosts
   ];
-  services.domeneshop-updater.targets = [ config.networking.fqdn ];
+  # services.domeneshop-updater.targets = [ config.networking.fqdn ];
 
   networking.hostId = "43c43ded"; # needed for zfs: head -c 8 /etc/machine-id
 

overlays/pbsdspkgs.nix

@@ -1,32 +1,32 @@
-final: prev: # TODO: not prev: final: ?
+prev: final:
 let
-  inherit (final) lib;
+  inherit (prev) lib;
 
   # TODO: get faketty to work, ${expect}/bin/unbuffer is bad
   mkNomWrapper =
     pkg:
-    final.writeScriptBin (pkg.meta.mainProgram or (lib.getName pkg)) ''
+    prev.writeScriptBin (pkg.meta.mainProgram or (lib.getName pkg)) ''
       if test -t 1 && test -z "''${NIX_NO_NOM-}"; then
-        exec ${lib.getExe pkg} -L "$@" |& ${lib.getExe final.nix-output-monitor}
+        exec ${lib.getExe pkg} -L "$@" |& ${lib.getExe prev.nix-output-monitor}
       else
         exec ${lib.getExe pkg} -L "$@"
       fi
     '';
 in
 {
-  pbsds = lib.makeScope final.newScope (pbsds: {
-    nom-nixos-rebuild = mkNomWrapper final.nixos-rebuild;
-    nom-nixos-rebuild-ng = mkNomWrapper final.nixos-rebuild-ng;
-    nom-home-manager = mkNomWrapper final.home-manager;
-    nom-system-manager = mkNomWrapper final.system-manager;
+  pbsds = lib.makeScope prev.newScope (pbsds: {
+    nom-nixos-rebuild = mkNomWrapper prev.nixos-rebuild;
+    nom-nixos-rebuild-ng = mkNomWrapper prev.nixos-rebuild-ng;
+    nom-home-manager = mkNomWrapper prev.home-manager;
+    nom-system-manager = mkNomWrapper prev.system-manager;
 
     # TODO: make these automatic, maybe use by-name?
-    v4l2-play = final.callPackage ./../pkgs/v4l2-play { };
-    device-mon = final.callPackage ./../pkgs/device-mon { };
-    zluda-run = final.callPackage ./../pkgs/zluda-run.nix { };
+    v4l2-play = prev.callPackage ./../pkgs/v4l2-play { };
+    device-mon = prev.callPackage ./../pkgs/device-mon { };
+    zluda-run = prev.callPackage ./../pkgs/zluda-run.nix { };
 
     # TODO: move to separate flake, maintain with CI
-    #pdoc-docs  = (final.callPackage ./../pkgs/pdocs.nix {}).pdocs;
-    #pdoc3-docs = (final.callPackage ./../pkgs/pdocs.nix {}).pdocs3;
+    #pdoc-docs  = (prev.callPackage ./../pkgs/pdocs.nix {}).pdocs;
+    #pdoc3-docs = (prev.callPackage ./../pkgs/pdocs.nix {}).pdocs3;
   });
 }

profiles/base/lix.nix

@@ -15,10 +15,17 @@
       };
 
       # pkgs/tools/package-management/lix/default.nix
+      # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/package-management/lix/default.nix
 
       nix-direnv = prev.nix-direnv.override {
         nix = prev.lix;
       };
+
+      nix-update = prev.nix-update.override {
+        nix = prev.lix;
+        inherit (prev) nixpkgs-review;
+      };
+
     })
   ];
 }

profiles/vpn-pbsds/tailscale.nix

@@ -1,10 +1,14 @@
-{ config, pkgs, lib, ...}:
+{ config, lib, ...}:
 
 # THIS IS NOT USED
 # see tailscale-{inner,outer}.nix instead
 
 let
   cfg = config.services.tailscale;
+  ifPbsds = lib.mkIf (
+      config.services.desktopManager.gnome.enable
+      && (config.users.users ? "pbsds" && config.users.users."pbsds".enable)
+  );
 in
 
 lib.mkIf (!config.virtualisation.isVmVariant)
@@ -15,25 +19,8 @@ lib.mkIf (!config.virtualisation.isVmVariant)
   networking.firewall.trustedInterfaces = [ cfg.interfaceName ];
   networking.firewall.allowedUDPPorts = [ cfg.port ];
 
-  /** /
-  systemd.services."tailscale-autoconnect" = lib.mkIf cfg.enable {
-    serviceConfig.Type = "oneshot";
-    after = [ "network-pre.target" "tailscale.service" ];
-    wants = [ "network-pre.target" "tailscale.service" ];
-    wantedBy = [ "tailscale.service" ];
-    script = ''
-      sleep 60 # Wait for tailscaled to settle
-
-      status="$(${lib.getExe cfg.package} status -json | ${lib.getExe pkgs.jq} -r .BackendState)"
-      if [ $status = "Running" ]; then
-        exit 0 # already authenticated
-      fi
-
-      #${lib.getExe cfg.package} up -authkey tskey-examplekeyhere
-    '';
-  };
-  /**/
-
+  services.tailscale.extraSetFlags = ifPbsds [ "--operator=pbsds" ];
+  services.tailscale.extraUpFlags  = ifPbsds [ "--operator=pbsds" ];
 
   # remote sudo nixos-rebuild switch --flake . -L
   # remote-quick sudo tailscale up --login-server 'https://head.pbsds.net'

users/pbsds/home/profiles/desktop/gnome/dconf-gnome-behaviour.nix

@@ -31,6 +31,14 @@ with lib.hm.gvariant;
       ];
     };
 
+    "org/gnome/mutter" = {
+      attach-modal-dialogs = false;
+      center-new-windows = true;
+      check-alive-timeout = mkUint32 30000;
+      dynamic-workspaces = true;
+      workspaces-only-on-primary = true;
+    };
+
     "org/freedesktop/tracker/miner/files" = {
       index-recursive-directories = [ ];
       index-single-directories = [ ];

users/pbsds/home/profiles/desktop/gnome/dconf-gnome-theme.nix

@@ -50,11 +50,6 @@ with lib.hm.gvariant;
       show-extensions-notice = false;
     };
 
-    "org/gnome/mutter" = {
-      dynamic-workspaces = true;
-      workspaces-only-on-primary = true;
-    };
-
     "org/gnome/desktop/calendar" = {
       show-weekdate = true;
     };

users/pbsds/home/profiles/desktop/gnome/dconf-pull.sh

@@ -35,6 +35,7 @@ dump1() {
 
 {
   dump "org/gnome/desktop/search-providers"
+  dump1 "org/gnome/mutter"
   dump "org/freedesktop/tracker/miner/files"
 } | dconf2nix > dconf-gnome-behaviour.nix
 
@@ -44,7 +45,7 @@ dump1() {
   dump "org/gnome/desktop/wm/preferences"
   dump "org/gnome/shell/overrides"
   dump "org/gnome/tweaks"
-  dump1 "org/gnome/mutter"
+  # dump1 "org/gnome/mutter"
   dump "org/gnome/desktop/calendar"
   dump "org/gnome/desktop/privacy"
 } | dconf2nix | sd --string-mode \