diff --git a/sam/configuration.nix b/sam/configuration.nix index a450fa3..ab0e14d 100644 --- a/sam/configuration.nix +++ b/sam/configuration.nix @@ -62,7 +62,9 @@ }; security.sudo.wheelNeedsPassword = false; + users.groups.users.gid = 100; users.users.chandler = { + uid = 1000; isNormalUser = true; description = "Chandler Swift"; extraGroups = [ "networkmanager" "wheel" "docker"]; @@ -83,7 +85,7 @@ # azure-cli.extensions.fleet # azure-cli.extensions.interactive # azure-cli.extensions.log-analytics - # azure-cli.extensions.resource-graph + azure-cli.extensions.resource-graph # azure-cli.extensions.serial-console # azure-cli.extensions.ssh ]) @@ -102,6 +104,9 @@ jujutsu killall kubectl + # From https://github.com/NixOS/nixpkgs/pull/370555 + # I don't expect this to be backported, so this should be removed with 25.11 + (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/a5ea75e611fb5bf6898d7d72401f6cb2aacf30f0.tar.gz") {}).openconnect pv ripgrep unzip @@ -139,6 +144,7 @@ lfs.enable = true; # TODO: delta or diff-so-fancy or difftastic extraConfig = { + help.autoCorrect = "prompt"; init.defaultBranch = "main"; diff.wsErrorHighlight = "all"; pull.ff = "only"; diff --git a/sam/hardware-configuration.nix b/sam/hardware-configuration.nix index eb44286..6330286 100644 --- a/sam/hardware-configuration.nix +++ b/sam/hardware-configuration.nix @@ -24,6 +24,31 @@ options = [ "fmask=0077" "dmask=0077" ]; }; + fileSystems."/mnt/utm" = { + device = "share"; + fsType = "9p"; + options = [ + "trans=virtio" + "version=9p2000.L" + "rw" + "_netdev" + "nofail" + "auto" + ]; + }; + + fileSystems."/home/chandler/shared_with_host" = { + device = "/mnt/utm"; + fsType = "fuse.bindfs"; + options = [ + "map=502/${builtins.toString config.users.users.chandler.uid}:@20/@${builtins.toString config.users.groups.users.gid}" + "x-systemd.requires=/mnt/utm" + "_netdev" + "nofail" + "auto" + ]; + }; + swapDevices = [ { device = "/dev/disk/by-uuid/6c923fd7-5b0a-4dd5-b1ce-6cd4ea144275"; } ];