From 4fbb9a38c0fe206cedbf3be6da3e1c3d195372c5 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sun, 20 Apr 2025 14:25:49 +0000 Subject: [PATCH] Updated some things --- dot_config/flake/flake.nix | 1 + .../flake/machines/mal/configuration.nix | 4 ++++ .../mal/encrypted_private_secrets.sh.age | 22 +++++++++---------- .../machines/mal/hardware-configuration.nix | 12 ++++++++++ dot_config/flake/machines/mal/home.nix | 2 ++ 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index aff6425..1b1cbe9 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -69,6 +69,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; + # home-manager.backupFileExtension = "bak"; home-manager.extraSpecialArgs = {inherit inputs outputs;}; home-manager.users.tyler = import ./machines/mal/home.nix; } diff --git a/dot_config/flake/machines/mal/configuration.nix b/dot_config/flake/machines/mal/configuration.nix index a9c5180..5443845 100644 --- a/dot_config/flake/machines/mal/configuration.nix +++ b/dot_config/flake/machines/mal/configuration.nix @@ -110,6 +110,8 @@ in { git chezmoi + screen + pinentry-curses ]; @@ -161,6 +163,8 @@ in { # Enable the OpenSSH daemon. services.openssh.enable = true; + services.qemuGuest.enable = true; + # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/dot_config/flake/machines/mal/encrypted_private_secrets.sh.age b/dot_config/flake/machines/mal/encrypted_private_secrets.sh.age index 432dc22..dbd9321 100644 --- a/dot_config/flake/machines/mal/encrypted_private_secrets.sh.age +++ b/dot_config/flake/machines/mal/encrypted_private_secrets.sh.age @@ -1,13 +1,13 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwQW1XRFcwWUlUR0dDUkdl -WXFiamhsc0FGU3R6NDhMTTRjYllRTlR4MGxrCnpjbzQzSXJ2VU9oWGFiTTNlMGZY -Y3ZQSUdpUVh4bWFCZVAxNTR2V2VWd28KLS0tIFlHck11dEVyVFdxcVdsY2tVT1hs -Q1pWNWtZOGhZTTJBSGd2VlZmeTNBZTQK9bx0M1AecvHhyWDvwkh0ngY7Wvzx3XvY -LLG4avljxdm80KmwdWyNQquCI9iYrwwVp+vM/O4kPHul1gBGNXw3BlsihaLrqzGO -0NtiXEf8t/HNwFxaLCYO1SbcOkId44iXFDUnNlzf+Xvx+XPVM2l0KehZz38OCcIu -8Q0MVdADp3VOIaUtIqn0JUVPQlJUPnsJTmDpIZ8wvRHn4+9n4goPacVZuxUy/EQ2 -XtDRqbdP2grheQR6i5ICqu4uhpPMlPbde5BpkDTm8Zk53wonrZyYkqRxeupFkkeb -5VO+fo7r6s3HN2xI5vSAA0/PLFswd2KBQdSWmck6gvLJtikeDr6eyBEAcCIeDpPD -fFQ+ejr3xMGUmwwR/kR4OIHuHlAS02Ja1VIOuDp7Nd95eI85wbuxJ3F4Gc56eg9h -CbScScf4iLc= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaMDR2TEdZOVFzTXZMMVlR +Uk1lMWlhQUVEdGJWYkhQYU4wVW0xcmdRSnp3CjJUaXBRWDhNSENSMi93cHBJSHN1 +M3VGMHk1RUdUTjBhUWM3UjRSekIzNHMKLS0tIDZhNFBvaXo2VVZMejRrMjZ0Z0pQ +UGNiN1hrQWFHZWoxZHhReFdFY1Q3WjAKGVUAMYVdOhQe44Cmj/c9KPheLGzeZSVY +d6p+7grXl43P2Q5apmZSmubW1Vu4WI4jbzDxTImbgvki+OUFAsmmZNMMqAMZ8SX1 +3QrHHnVvKFyKQ27UzCoKwXOXmce+QEMdzmkV6fgVfqGsCeRRpkslrDLgwOS4HkSU +WZumhWN/mbgneKxxwjL+JiuRD3WKnFUB7RXIT/upaKkw0XGFOSCYe1EEHnFNgDCc +LmY9fAMrPVoN2sasHuKheCdTz2OFq4IyXlNEEWMTRsNd7Y4ZI7iKBcytT80qrIIl +keQIwBvrtmcoFoFvhWs8LYg2IIxccVn1hEkEoHMrJxmr/AuoTO3RAj6sgMgd9YTY +rNK8644gMNtKYCQDiSMjMHTT8SqmHxsjLu2EKbUH3QaWpJIJNQNbmYfjDRqaIUsD +Owrubb1nNGuZkbR/JMyB -----END AGE ENCRYPTED FILE----- diff --git a/dot_config/flake/machines/mal/hardware-configuration.nix b/dot_config/flake/machines/mal/hardware-configuration.nix index 36e5ad2..91c2f89 100644 --- a/dot_config/flake/machines/mal/hardware-configuration.nix +++ b/dot_config/flake/machines/mal/hardware-configuration.nix @@ -33,6 +33,18 @@ fsType = "9p"; }; + fileSystems."/nix" = { + depends = [ + "/mnt/user" + ]; + + device = "/mnt/user/nix-store"; + fsType = "none"; + options = [ + "bind" + ]; + }; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/dot_config/flake/machines/mal/home.nix b/dot_config/flake/machines/mal/home.nix index 5e603fd..107ccb8 100644 --- a/dot_config/flake/machines/mal/home.nix +++ b/dot_config/flake/machines/mal/home.nix @@ -7,5 +7,7 @@ home = { username = "tyler"; homeDirectory = "/home/tyler"; + + stateVersion = "23.11"; }; }