mkboot: stop pretending the arm installer is host specific
- run `rdate` when we are on arm64 - install neovim packges that exist now
This commit is contained in:
parent
4815673dcd
commit
a0b0e4b0a8
@ -1,8 +1,8 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
case $1 in
|
case $1 in
|
||||||
weather)
|
arm|arm64)
|
||||||
nix build .#nixosConfigurations.weatherInstall.config.system.build.sdImage
|
nix build .#nixosConfigurations.arm64Install.config.system.build.sdImage
|
||||||
;;
|
;;
|
||||||
haas)
|
haas)
|
||||||
nix build .#nixosConfigurations.hassInstall.config.system.build.isoImage
|
nix build .#nixosConfigurations.hassInstall.config.system.build.isoImage
|
||||||
@ -14,6 +14,6 @@ reform)
|
|||||||
nix build .#nixosConfigurations.reformInstall.config.system.build.sdImage
|
nix build .#nixosConfigurations.reformInstall.config.system.build.sdImage
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Usage: boot [iso|weather|hass|reform]"
|
echo "Usage: boot [iso|arm64|arm|hass|reform]"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -123,9 +123,11 @@ let
|
|||||||
nvim-treesitter.withAllGrammars
|
nvim-treesitter.withAllGrammars
|
||||||
rust-vim
|
rust-vim
|
||||||
telescope-fzf-native-nvim
|
telescope-fzf-native-nvim
|
||||||
|
telescope-manix
|
||||||
telescope-nvim
|
telescope-nvim
|
||||||
vimagit
|
vimagit
|
||||||
vim-gitgutter
|
vim-gitgutter
|
||||||
|
vim-go
|
||||||
vim-hindent
|
vim-hindent
|
||||||
vim-lua
|
vim-lua
|
||||||
vim-markdown
|
vim-markdown
|
||||||
@ -142,7 +144,7 @@ let
|
|||||||
myVimPackages = if pkgs.system == "aarch64-linux" then
|
myVimPackages = if pkgs.system == "aarch64-linux" then
|
||||||
baseVimPackages
|
baseVimPackages
|
||||||
else
|
else
|
||||||
baseVimPackages ++ [ vimPlugins.vim-go vimPlugins.telescope-manix ];
|
baseVimPackages ++ [ ];
|
||||||
in {
|
in {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
elmPackages.elm
|
elmPackages.elm
|
||||||
|
@ -180,7 +180,7 @@
|
|||||||
#router =
|
#router =
|
||||||
# buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "router";
|
# buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "router";
|
||||||
|
|
||||||
weatherInstall = stable.lib.nixosSystem {
|
arm64Install = stable.lib.nixosSystem {
|
||||||
system = "aarch64-linux";
|
system = "aarch64-linux";
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
|
@ -107,6 +107,17 @@ in {
|
|||||||
|
|
||||||
time.timeZone = "US/Mountain";
|
time.timeZone = "US/Mountain";
|
||||||
|
|
||||||
|
systemd.services."setdate" = if pkgs.system == "aarch64-linux" then {
|
||||||
|
description = "Set date on boot";
|
||||||
|
wantedBy = [ "network-online.target" ];
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
script = ''
|
||||||
|
. /etc/profile;
|
||||||
|
${pkgs.outils}/bin/rdate pool.ntp.org
|
||||||
|
'';
|
||||||
|
serviceConfig.Type = "oneshot";
|
||||||
|
} else {};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
ssh = {
|
ssh = {
|
||||||
|
Loading…
Reference in New Issue
Block a user