Scimitar config stable

.gitignore

@@ -17,3 +17,5 @@ devenv.local.nix
 result
 
 *.qcow2
+
+.env

config/atuin/home.nix

@@ -9,7 +9,7 @@
       ctrl_n_shortcuts = true;
       dialect = "uk";
       filter_mode = "host";
-      filter_mode_shell_up_key_binding = "directory";
+      filter_mode_shell_up_key_binding = "session";
       style = "compact";
       inline_height = 5;
       show_help = false;

config/bat/home.nix

@@ -8,13 +8,6 @@
       style = "plain";
     };
 
-    extraPackages = builtins.attrValues {
-      inherit (pkgs.bat-extras)
-        batdiff
-        batman
-        batgrep
-        batwatch
-        ;
-    };
+    extraPackages = builtins.attrValues { inherit (pkgs.bat-extras) batman batgrep batwatch; };
   };
 }

config/chromium/chromium-macos.nix

@@ -15,7 +15,7 @@
   cpio,
 }:
 let
-  version = "127.0.6533.88-1.1";
+  version = "127.0.6533.119-1.1";
 in
 stdenv.mkDerivation rec {
   name = "chromium";
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
     }-macos-signed.dmg";
     hash =
       if stdenv.isAarch64 then
-        "sha256-4YoFYTZrG1UexMgU2QOQ9V+c4mEmqyUHaUZdAfVezkY="
+        "sha256-2mENjHOQ/cN1So+7XhlOAx/Q0hkm3x/4KcadPK3rcCM="
       else
-        "sha256-px45f0tXBo/gUzXdpb7i7ZtELHLgjhMFDsYw9XhuxOQ=";
+        "sha256-BlSdADfbe4PSSYIZa2mJRHItlB3ltY7DB4D7YrRZ/Qo=";
   };
 
   nativeBuildInputs = [

config/chromium/update.js

@@ -0,0 +1,41 @@
+const repo = 'claudiodekker/ungoogled-chromium-macos'
+
+const request = await fetch(`https://api.github.com/repos/${repo}/releases/latest`, {
+  headers: {
+    accept: ' application/vnd.github+json',
+    'X-GitHub-Api-Version': '2022-11-28'
+  }
+})
+
+if (!request.ok) {
+  console.error(`Failed to fetch the latest release metadata for github:${repo}`)
+  Deno.exit(1)
+}
+
+const releaseMetadata = await request.json()
+
+const version = releaseMetadata.name;
+
+console.log(`Latest release: ${version}`)
+
+for (const asset of releaseMetadata.assets) {
+  console.log(`Asset: ${asset.name}`)
+
+  const sha256Hash = await $("nix-prefetch-url", asset.browser_download_url)
+  const sriHash = await $("nix-hash", "--type", "sha256", "--to-sri", sha256Hash.trim())
+
+  console.log(`  SRI: ${sriHash}`)
+  console.log(`  SHA256: ${sha256Hash}`)
+}
+
+async function $(name, ...args) {
+  const command = new Deno.Command(name, { args })
+
+  const { code, stdout, stderr } = await command.output();
+
+  if (code !== 0) {
+    console.log(`${name}: exited ${code} with ${new TextDecoder().decode(stderr)}`)
+  }
+
+  return new TextDecoder().decode(stdout);
+}

config/default.nix

@@ -54,7 +54,6 @@ let
         inputs,
         self,
         pkgs,
-        pkgs-unstable,
         ...
       }:
       let
@@ -77,8 +76,13 @@ let
           };
 
           home-manager = {
+            backupFileExtension = "backup";
+
             sharedModules = [
-              { home.stateVersion = stateVersion; }
+              {
+                home.stateVersion = stateVersion;
+                nix.package = lib.mkForce pkgs.nixVersions.latest;
+              }
             ] ++ (with builtins; attrValues (removeAttrs homeModules cfg.disabledHmConfigs));
             # Use the system-level nixpkgs instead of Home Manager's
             useGlobalPkgs = true;
@@ -87,11 +91,7 @@ let
             # using multiple profiles for one user
             useUserPackages = true;
 
-            # Initialise home-manager users to system users.
-            # users = builtins.trace (builtins.attrNames config.users.users) {};
-
-            backupFileExtension = "backup";
-            extraSpecialArgs.pkgs-unstable = pkgs-unstable;
+            extraSpecialArgs.pkgs = pkgs;
           };
         };
       }

config/defaults/darwin.nix

@@ -69,28 +69,10 @@ in
           "show-recents" = false;
         };
         "com.apple.WindowManager" = {
-          GloballyEnabled = true;
+          GloballyEnabled = false;
           GloballyEnabledEver = true;
         };
-        "com.apple.TextEdit" = {
-          "RichText" = false;
-          "SmartQuotes" = false;
-        };
       };
     };
-
-    home-manager.sharedModules = [
-      (
-        { lib, ... }:
-        {
-          home.activation.setDarwinDefaults = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-            if [ -e /usr/bin/killall ]; then
-              verboseEcho "Restarting Dock"
-              /usr/bin/killall Dock
-            fi
-          '';
-        }
-      )
-    ];
   };
 }

config/helix/home.nix

@@ -8,6 +8,7 @@
   config = {
     programs.helix = {
       enable = true;
+      defaultEditor = true;
 
       settings = (lib.importTOML ./config.toml);
 

config/nix/darwin.nix

@@ -23,18 +23,21 @@
       "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
     ];
     settings.extra-substituters = [ "https://devenv.cachix.org" ];
+    settings.extra-platforms = [
+      "aarch64-linux"
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
 
     gc.automatic = true;
 
     linux-builder = {
       enable = true;
-      ephemeral = true;
-      maxJobs = 4;
       config = {
         virtualisation = {
           darwin-builder = {
-            diskSize = 40 * 1024;
-            memorySize = 8 * 1024;
+            diskSize = 80 * 1024;
+            memorySize = 32 * 1024;
           };
           cores = 6;
         };

config/nushell/home.nix

@@ -2,14 +2,12 @@
   lib,
   config,
   pkgs,
-  pkgs-unstable,
   ...
 }:
 {
   config = {
     programs.nushell = {
       enable = true;
-      package = pkgs-unstable.nushell;
 
       envFile.text = (builtins.readFile ./env.nu);
       configFile.text = (builtins.readFile ./config.nu);

config/ssh/home.nix

@@ -1,10 +1,27 @@
-{ ... }:
 {
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+{
+  options = {
+    programs.ssh.enable1PasswordAgent = lib.mkOption {
+      description = "Enable 1Password agent";
+      type = lib.types.bool;
+      default = false;
+    };
+  };
+
   config.programs.ssh = {
     enable = true;
 
     forwardAgent = true;
     hashKnownHosts = true;
     addKeysToAgent = "yes";
+
+    extraConfig = lib.mkIf (
+      pkgs.stdenv.isDarwin && config.programs.ssh.enable1PasswordAgent
+    ) "IdentityAgent \"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";
   };
 }

config/tools/home.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  pkgs-unstable,
   ...
 }:
 let
@@ -11,7 +10,7 @@ let
   pkgSet = enable: packages: if enable then packages else { };
   defaultPackages =
     {
-      inherit (pkgs-unstable)
+      inherit (pkgs)
         lsd
         tree
         ripgrep

config/vscode/home.nix

@@ -1,9 +1,14 @@
-{ lib, pkgs-unstable, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 {
   config.programs.vscode = {
     enable = true;
 
-    package = pkgs-unstable.vscodium;
+    package = pkgs.vscodium;
 
     enableUpdateCheck = false;
     enableExtensionUpdateCheck = false;
@@ -12,7 +17,7 @@
     userSettings = (lib.importJSON ./settings.json);
     keybindings = (lib.importJSON ./keybindings.json);
 
-    extensions = with pkgs-unstable.vscode-extensions; [
+    extensions = with pkgs.vscode-extensions; [
       zhuangtongfa.material-theme
       mkhl.direnv
       editorconfig.editorconfig
@@ -23,4 +28,10 @@
       tamasfe.even-better-toml
     ];
   };
+
+  config.home.packages = [
+    (pkgs.writeShellScriptBin "code" ''
+      ${config.programs.vscode.package}/Applications/VSCodium.app/Contents/MacOS/Electron $@
+    '')
+  ];
 }

config/zoxide/home.nix

@@ -1,7 +1,5 @@
-{ ... }:
 {
-  config.programs.zoxide = {
+  programs.zoxide = {
     enable = true;
-    options = [ "--cmd cd" ];
   };
 }