From fdd799bf06c5d40cb8a3e8292ee76bff265765f9 Mon Sep 17 00:00:00 2001 From: Simon Parri Date: Fri, 6 Jun 2025 11:52:35 -0500 Subject: hosts: Rename muspell to carrot --- flake.nix | 4 ++-- hosts/carrot/default.nix | 59 +++++++++++++++++++++++++++++++++++++++++++++++ hosts/default.nix | 2 +- hosts/muspell/default.nix | 59 ----------------------------------------------- 4 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 hosts/carrot/default.nix delete mode 100644 hosts/muspell/default.nix diff --git a/flake.nix b/flake.nix index 8f75eb6..b165f35 100644 --- a/flake.nix +++ b/flake.nix @@ -18,9 +18,9 @@ import ./hosts { inherit inputs; }; - muspell-img = + carrot-img = self.nixosConfigurations. - muspell.config.mobile. + carrot.config.mobile. outputs.u-boot.disk-image; ades-live-iso = self.nixosConfigurations. diff --git a/hosts/carrot/default.nix b/hosts/carrot/default.nix new file mode 100644 index 0000000..cea43df --- /dev/null +++ b/hosts/carrot/default.nix @@ -0,0 +1,59 @@ +{ inputs, lib, pkgs, ... }: + +let inherit (inputs) mobile-nixos; +in +{ + imports = [ + (import "${mobile-nixos}/lib/configuration.nix" { + device = "pine64-pinephone"; + }) + ]; + + this.locales.default = "us"; + + time.timeZone = "America/Chicago"; + + this.pc.enable = true; + + this.users.enabled = ["simon"]; + + this.sets = { + cli.tools.full = true; + de.utils = true; + media.tools = true; + net.tools.minimal = true; + script.utils = true; + sound.tools = true; + sys.tools = true; + www.browser = true; + }; + + services.xserver = { + enable = true; + desktopManager.plasma5.mobile.enable = true; + displayManager.lightdm = { + enable = true; + # Workaround for autologin only working at first launch. + # A logout or session crashing will show the login screen otherwise. + extraSeatDefaults = '' + session-cleanup-script=${pkgs.procps}/bin/pkill -P1 -fx ${pkgs.lightdm}/sbin/lightdm + ''; + }; + }; + + hardware.bluetooth.enable = true; + powerManagement.enable = true; + services.libinput.enable = true; + services.displayManager.defaultSession = "plasma-mobile"; + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "simon"; + + # Ensures any rndis config from stage-1 is not clobbered by NetworkManager + networking.networkmanager.unmanaged = [ "rndis0" "usb0" ]; + + # Setup USB gadget networking in initrd... + mobile.boot.stage-1.networking.enable = true; + + nixpkgs.hostPlatform = "aarch64-linux"; + system.stateVersion = "24.11"; +} diff --git a/hosts/default.nix b/hosts/default.nix index 6435c09..e689405 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -42,7 +42,7 @@ hosts { "tomato" ]; "aarch64-linux" = [ - "muspell" + "carrot" ]; } // hostsImport ./ades diff --git a/hosts/muspell/default.nix b/hosts/muspell/default.nix deleted file mode 100644 index cea43df..0000000 --- a/hosts/muspell/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ inputs, lib, pkgs, ... }: - -let inherit (inputs) mobile-nixos; -in -{ - imports = [ - (import "${mobile-nixos}/lib/configuration.nix" { - device = "pine64-pinephone"; - }) - ]; - - this.locales.default = "us"; - - time.timeZone = "America/Chicago"; - - this.pc.enable = true; - - this.users.enabled = ["simon"]; - - this.sets = { - cli.tools.full = true; - de.utils = true; - media.tools = true; - net.tools.minimal = true; - script.utils = true; - sound.tools = true; - sys.tools = true; - www.browser = true; - }; - - services.xserver = { - enable = true; - desktopManager.plasma5.mobile.enable = true; - displayManager.lightdm = { - enable = true; - # Workaround for autologin only working at first launch. - # A logout or session crashing will show the login screen otherwise. - extraSeatDefaults = '' - session-cleanup-script=${pkgs.procps}/bin/pkill -P1 -fx ${pkgs.lightdm}/sbin/lightdm - ''; - }; - }; - - hardware.bluetooth.enable = true; - powerManagement.enable = true; - services.libinput.enable = true; - services.displayManager.defaultSession = "plasma-mobile"; - services.displayManager.autoLogin.enable = true; - services.displayManager.autoLogin.user = "simon"; - - # Ensures any rndis config from stage-1 is not clobbered by NetworkManager - networking.networkmanager.unmanaged = [ "rndis0" "usb0" ]; - - # Setup USB gadget networking in initrd... - mobile.boot.stage-1.networking.enable = true; - - nixpkgs.hostPlatform = "aarch64-linux"; - system.stateVersion = "24.11"; -} -- cgit v1.2.3