diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index c28c548b..bfde4edb 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -43,7 +43,7 @@ } _prompt_auto_width () { - if [[ $COLUMNS -lt 100 ]]; then + if [[ "$TERM" == "linux" || $COLUMNS -lt 100 ]]; then export STARSHIP_CONFIG=''${XDG_CONFIG_HOME:-$HOME/.config}/starship-minimal.toml else unset STARSHIP_CONFIG diff --git a/hosts/glyph/default.nix b/hosts/glyph/default.nix index f5a29752..b4091541 100644 --- a/hosts/glyph/default.nix +++ b/hosts/glyph/default.nix @@ -1,4 +1,4 @@ -{...}: { +{config, ...}: { imports = [ ./hardware.nix ./services @@ -54,5 +54,9 @@ # Beets library database (beets configured in home-manager) rc.backup.paths = ["/home/mu/.config/beets/library.db"]; + age.secrets.user-password.file = ./secrets/user-password.age; + + users.users.mu.hashedPasswordFile = config.age.secrets.user-password.path; + system.stateVersion = "24.05"; } diff --git a/hosts/glyph/hardware.nix b/hosts/glyph/hardware.nix index dc7ce697..dd406984 100644 --- a/hosts/glyph/hardware.nix +++ b/hosts/glyph/hardware.nix @@ -11,7 +11,7 @@ boot.initrd.availableKernelModules = ["vmd" "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod"]; boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; + boot.kernelModules = ["kvm-intel" "i915"]; boot.extraModulePackages = []; fileSystems."/" = { diff --git a/hosts/glyph/secrets/user-password.age b/hosts/glyph/secrets/user-password.age new file mode 100644 index 00000000..2f50f7ee --- /dev/null +++ b/hosts/glyph/secrets/user-password.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 rSr+rA VY2dvp9g6IgtOiJ4dW/TvMOIwJBSlw+0ZIRG8Ag3N3U +KE02vkB09orCWVf48P4a6cU4Clmlqr46xh+NG1oQT5Y +-> ssh-ed25519 3EWhnQ 0KLn5lqM207eDkxOnJz3oUd5JxDhW5NALuL5djhVoxg +VlWK1Nfpruxkq6jFBM1Mbegn7hR58TmavrFHFk1go3g +--- kPA0luugj4TiRFPNQoz3C5A74PfQer4LjVvAib9t9ms +2rN1D#4pIA GQ +ØdeӁXz=i܇$Ja׉=́6HP6g+0\Ǻ+fw \ No newline at end of file diff --git a/lib/secrets/glyph.nix b/lib/secrets/glyph.nix index f72fe182..5611c515 100644 --- a/lib/secrets/glyph.nix +++ b/lib/secrets/glyph.nix @@ -11,4 +11,5 @@ in { "hosts/glyph/secrets/grafana-mcp-token.age".publicKeys = keys; "hosts/glyph/secrets/graphite-auth-token.age".publicKeys = keys; "hosts/glyph/secrets/attic-credentials.age".publicKeys = keys; + "hosts/glyph/secrets/user-password.age".publicKeys = keys; }