From 285659e558eed5208caa6f41803dd738a42f6904 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Fri, 25 Apr 2025 22:04:23 -0400 Subject: [PATCH 1/8] Add dislocker to swarm --- nixos/machines/swarm/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix index 29c80e9..dd40578 100644 --- a/nixos/machines/swarm/configuration.nix +++ b/nixos/machines/swarm/configuration.nix @@ -150,6 +150,7 @@ # System tools gparted f2fs-tools + dislocker ]; virtualisation.podman = {enable = true;}; From 88812199204a61931c295774494f161e5c1b7d69 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Fri, 25 Apr 2025 22:32:54 -0400 Subject: [PATCH 2/8] Use git dislocker --- nixos/machines/swarm/configuration.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix index dd40578..5de17b6 100644 --- a/nixos/machines/swarm/configuration.nix +++ b/nixos/machines/swarm/configuration.nix @@ -150,7 +150,15 @@ # System tools gparted f2fs-tools - dislocker + (dislocker.overrideAttrs (prev: { + src = fetchFromGitHub { + owner = "aorimn"; + repo = "dislocker"; + rev = "3e7aea196eaa176c38296a9bc75c0201df0a3679"; + sha256 = "sha256-jKk+okSQJ54R17EiUk9NnjLxGi6RrwFrGFVi8ekckww="; + }; + patches = []; + })) ]; virtualisation.podman = {enable = true;}; From 3b6cb441f51f89393c350cd0c66c81a3a0d9d4a7 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Sat, 26 Apr 2025 01:32:19 -0400 Subject: [PATCH 3/8] Silence ssh-add --- home-manager/modules/programs/ssh-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/modules/programs/ssh-agent.nix b/home-manager/modules/programs/ssh-agent.nix index 2911ad7..c4954e2 100644 --- a/home-manager/modules/programs/ssh-agent.nix +++ b/home-manager/modules/programs/ssh-agent.nix @@ -11,6 +11,6 @@ # Setup fish init programs.fish.shellInit = '' set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent - ssh-add + ssh-add >/dev/null 2>&1 ''; } From cfb97d506fca47239b8c495fd19882a6fed0244a Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Sat, 26 Apr 2025 18:37:32 -0400 Subject: [PATCH 4/8] Flatpack on swarm --- nixos/machines/swarm/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix index 5de17b6..b836e84 100644 --- a/nixos/machines/swarm/configuration.nix +++ b/nixos/machines/swarm/configuration.nix @@ -163,6 +163,9 @@ virtualisation.podman = {enable = true;}; + # Basically only for fusion 360 + services.flatpak.enable = true; + # Enable sway programs.sway = { enable = true; From 5dce76ffc2c89b5934597a12e1e5168e36d812a1 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Sat, 26 Apr 2025 19:45:31 -0400 Subject: [PATCH 5/8] fusion --- nixos/machines/swarm/configuration.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix index b836e84..78d5a37 100644 --- a/nixos/machines/swarm/configuration.nix +++ b/nixos/machines/swarm/configuration.nix @@ -159,13 +159,12 @@ }; patches = []; })) + # Test driving + freecad-wayland ]; virtualisation.podman = {enable = true;}; - # Basically only for fusion 360 - services.flatpak.enable = true; - # Enable sway programs.sway = { enable = true; From be78cbcedcd707a3910f6af436a09be4e0d02fef Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Mon, 19 May 2025 00:03:03 -0400 Subject: [PATCH 6/8] Have grub remember which OS we booted last --- nixos/machines/swarm/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix index 78d5a37..82bf524 100644 --- a/nixos/machines/swarm/configuration.nix +++ b/nixos/machines/swarm/configuration.nix @@ -54,6 +54,7 @@ device = "nodev"; efiSupport = true; useOSProber = true; + default = "saved"; }; efi.canTouchEfiVariables = true; }; From 5c04b0be5d23394695dc526ed7713690ff1b27a7 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Mon, 19 May 2025 00:20:04 -0400 Subject: [PATCH 7/8] Set grub display resolution --- nixos/machines/swarm/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix index 82bf524..6b109da 100644 --- a/nixos/machines/swarm/configuration.nix +++ b/nixos/machines/swarm/configuration.nix @@ -55,6 +55,7 @@ efiSupport = true; useOSProber = true; default = "saved"; + gfxmodeEfi = "1600x1200"; }; efi.canTouchEfiVariables = true; }; From a31490012195fb6009d2088fb40c54b015d4366c Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Sat, 14 Jun 2025 20:11:15 -0400 Subject: [PATCH 8/8] Add dig to basic utilties --- nixos/modules/base.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/base.nix b/nixos/modules/base.nix index a8da9b8..5871267 100644 --- a/nixos/modules/base.nix +++ b/nixos/modules/base.nix @@ -14,14 +14,19 @@ ]; environment.systemPackages = with pkgs; [ + # Basic text editing and git neovim git + # Basic terminal and cli utilities tmux + just + # Basic nix utilities alejandra nix-index + # Basic networking utilities curl wget - just + dig ]; system.stateVersion = "24.11";