frajul-auto-upgrade: restore flake.lock if update failed

homes/julian/features/neovim/default.nix

@@ -49,7 +49,7 @@
         key = "<leader><space>";
       }
       {
-        action = "<cmd>Telescope file_browser<cr>";
+        action = "<cmd>Telescope file_browser path=%:p:h<cr>";
         key = "<leader>.";
       }
       {
@@ -140,18 +140,21 @@
       };
 
       lsp = {
-        enable = true;
+        enable = true; # includes lsp-config, default settings for the lsps
         servers = {
           rust_analyzer = {
             enable = true;
             installCargo = true;
             installRustc = true;
           };
-          nixd.enable = true;
-          pyright.enable = true;
-          dockerls.enable = true;
-          lua_ls.enable = true;
-          clangd.enable = true;
+          nixd.enable = true; # nix
+          pyright.enable = true; # python
+          dockerls.enable = true; # docker
+          lua_ls.enable = true; # lua
+          clangd.enable = true; # c, c++
+          dartls.enable = true; # dart, flutter
+          digestif.enable = true; # latex
+          tinymist.enable = true; # typst
         };
       };
     };

homes/julian/features/suites/cli/default.nix

@@ -40,6 +40,7 @@
     wireguard-tools # wg-quick
     xorg.xkill
     zip
+    dig
 
     ## My scripts
     frajul.edit-config

hosts/aspi/default.nix

@@ -4,6 +4,7 @@
 
     ../common/global
     ../common/users/julian
+    ../common/users/yukari
     ../common/optional/binarycaches.nix
 
     ../common/optional/remote-builder.nix
@@ -38,6 +39,8 @@
     };
   };
 
+  services.desktopManager.plasma6.enable = true;
+
   services.blueman.enable = true;
   services.upower.enable = true;
 

hosts/builder/default.nix

@@ -41,6 +41,9 @@
     trusted-users = ["nix"];
     max-jobs = "auto";
     cores = 0;
+
+    # Ensure we can still build when missing-server is not accessible
+    fallback = true;
   };
 
   system.autoUpgrade = {

hosts/common/users/julian/default.nix

@@ -17,6 +17,8 @@ in {
       "networkmanager"
       "wheel"
       "audio"
+      "realtime"
+      "rtkit"
       "network"
       "video"
       "podman"

hosts/common/users/yukari/default.nix

@@ -0,0 +1,100 @@
+{
+  pkgs,
+  config,
+  lib,
+  outputs,
+  ...
+}: let
+  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in {
+  users.mutableUsers = false;
+  users.users.yukari = {
+    description = "Yukari";
+    group = "yukari";
+    isNormalUser = true;
+    shell = pkgs.fish;
+    extraGroups = ifTheyExist [
+      "networkmanager"
+      "audio"
+      "network"
+      "video"
+      "podman"
+      "docker"
+      "git"
+      "gamemode"
+    ];
+
+    createHome = true;
+    hashedPassword = "$y$j9T$rGuTL0rfiy7ht8L58BGCw0$fN.KwHjYlIitFEPHndKvV06ezgeWzP3/58o1kkviZwB";
+    packages = [pkgs.home-manager];
+  };
+  users.groups.yukari = {};
+
+  home-manager.users.yukari = {
+    imports =
+      [
+        ../../../../homes/julian/features/fonts
+        ../../../../homes/julian/features/suites/cli
+      ]
+      ++ (builtins.attrValues outputs.homeManagerModules);
+
+    home = {
+      username = lib.mkDefault "yukari";
+      homeDirectory = lib.mkDefault "/home/${config.home.username}";
+      stateVersion = lib.mkDefault "23.11";
+
+      sessionPath = ["$HOME/.local/bin"];
+
+      packages = with pkgs; [
+        arandr
+        calibre # ebook manager and viewer
+        # digikam
+        discord
+        discord-ptb # in case discord updates take their time
+        # dvdisaster
+        # element-desktop
+        # rocketchat-desktop
+        thunderbird
+        tdesktop # telegram
+        # schildichat-desktop # not updated regularly
+        nheko
+        evince # Simple pdf reader, good for focusing on document content
+        firefox
+        vivaldi
+        # geogebra
+        cheese
+        handbrake
+        # kitty # Terminal, already available as feature
+        libnotify
+        libreoffice
+        mate.engrampa
+        nomacs # Image viewer
+        kdePackages.okular # Pdf reader with many features, good for commenting documents
+        pavucontrol
+        pdfsam-basic # Split, merge, etc for pdfs
+        qalculate-gtk # Nice gui calculator
+        qpdfview
+        # qutebrowser
+        # realvnc-vnc-viewer
+        rpi-imager # make isos
+        # rustdesk
+        tor-browser
+        unstable.path-of-building # Path of Building
+        # frajul.pob-dev-version # Path of Building
+        vlc
+        wineWowPackages.stable # 32-bit and 64-bit wine
+        winetricks
+        xclip # x11 clipboard access from terminal
+        xfce.mousepad # simple text editor
+        xournalpp # Edit pdf files
+        zoom-us # Video conferencing
+        zotero # Manage papers and other sources
+        pdfpc # Present slides in pdf form
+      ];
+    };
+    programs = {
+      home-manager.enable = true;
+      git.enable = true;
+    };
+  };
+}

modules/nixos/frajul-auto-upgrade.nix

@@ -64,10 +64,14 @@ in {
           exit 1
         fi
 
+        echo $$ > "$LOCK_FILE"
+        trap 'rm -f "$LOCK_FILE"' EXIT
+
         if /run/current-system/sw/bin/nix flake update --flake "${cfg.flakePath}" && /run/current-system/sw/bin/nixos-rebuild switch --flake "${cfg.flakePath}"; then
             echo "success" > "$LAST_STATUS_FILE"
         else
             echo "failure" > "$LAST_STATUS_FILE"
+            git -C "${cfg.flakePath}" restore flake.lock
         fi
 
         # Write full timestamp