From d95167fc620f1a6cb52109f0be2ae2faed7934e4 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Feb 2024 06:49:43 -0700 Subject: [PATCH 1/7] flake: add nixos-hardware for jaal --- flake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index aed801c..0cfecfa 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,10 @@ url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list where available }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - outputs = { self, nixpkgs, disko, home-manager, ... }@inputs: { + outputs = { self, nixpkgs, disko, home-manager, nixos-hardware ... }@inputs: { nixosConfigurations = { "nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -98,6 +99,7 @@ home-manager.useUserPackages = true; home-manager.users.aaronh = import ./home.nix; } + nixos-hardware.nixosModules.pine64-pinebook-pro ]; }; From bd7a5eeb21b22388ff58df88511f897cbb11152c Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Feb 2024 07:20:24 -0700 Subject: [PATCH 2/7] work on getting jaal to install and boot --- home.nix | 1 - hosts/aarch64/jaal/pinebook-pro.nix | 78 +---------------------------- 2 files changed, 1 insertion(+), 78 deletions(-) diff --git a/home.nix b/home.nix index 081d0ee..9ada90a 100644 --- a/home.nix +++ b/home.nix @@ -22,7 +22,6 @@ home.packages = with pkgs; [ # GUI - discord libreoffice-fresh signal-desktop system76-keyboard-configurator diff --git a/hosts/aarch64/jaal/pinebook-pro.nix b/hosts/aarch64/jaal/pinebook-pro.nix index a078a47..62526ca 100644 --- a/hosts/aarch64/jaal/pinebook-pro.nix +++ b/hosts/aarch64/jaal/pinebook-pro.nix @@ -8,7 +8,6 @@ # ./programs.nix ]; - boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ "console=tty0" ]; boot.loader = { @@ -25,13 +24,6 @@ }; }; - boot.initrd.luks.devices = { - root = { - device = "/dev/sda"; - preLVM = true; - }; - }; - boot.initrd.kernelModules = [ # Rockchip modules "rockchip_rga" @@ -63,74 +55,6 @@ "rtc_rk808" ]; - nix.settings.auto-optimise-store = true; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - - networking = { - hostName = "jaal"; - networkmanager.enable = true; - }; - - # Set your time zone. - time.timeZone = "America/Denver"; - - environment.systemPackages = - with pkgs; - [ - firefox - git - git-lfs - neofetch - unzip - wget - ]; - - # Define user accounts - users.users.aaronh = { - description = "Aaron Honeycutt"; - home = "/home/aaronh"; - extraGroups = [ "wheel" "networkmanager" "adm"]; - isNormalUser = true; - hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx."; - - packages = with pkgs; [ - fish - ]; - - shell = pkgs.fish; - }; - - # Enable Pipewire - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - # Turn off PulseAudio - hardware.pulseaudio.enable = false; - - # Enable Bluetooth - hardware.bluetooth.enable = true; - - # Enable the OpenSSH daemon - services.openssh.enable = true; - - # Enable CUPS - services.printing.enable = true; - - # Allow Unfree - nixpkgs.config.allowUnfree = true; - - # System - system.stateVersion = "23.11"; - system.autoUpgrade.enable = true; + networking.hostName = "jaal"; } From e99c7951fb236767ca01eacd0fe41b64a9938c53 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Feb 2024 07:21:05 -0700 Subject: [PATCH 3/7] fix: swap garrus for jaal for jaal build --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 0cfecfa..484f53b 100644 --- a/flake.nix +++ b/flake.nix @@ -90,7 +90,7 @@ disko.nixosModules.disko ./disko-config.nix ./gnome.nix - ./garrus.nix + ./jaal.nix ./configuration.nix ./hardware-configuration.nix home-manager.nixosModules.home-manager From 6d4ee6127d6d8bf96e842a6a33a9d9f5a7365a95 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Feb 2024 07:33:16 -0700 Subject: [PATCH 4/7] home: remove tuba --- home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home.nix b/home.nix index 9ada90a..34182c5 100644 --- a/home.nix +++ b/home.nix @@ -25,7 +25,6 @@ libreoffice-fresh signal-desktop system76-keyboard-configurator - tuba #youtube-music # CLI From 11cc50393795cf1a2f489f0ae078ea5362dd2624 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Feb 2024 07:48:55 -0700 Subject: [PATCH 5/7] flake: fix missing comma --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 484f53b..f98043f 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; - outputs = { self, nixpkgs, disko, home-manager, nixos-hardware ... }@inputs: { + outputs = { self, nixpkgs, disko, home-manager, nixos-hardware, ... }@inputs: { nixosConfigurations = { "nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; From 8603ae447da4848bb251d85198c64f0f1a9f6b07 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Feb 2024 08:31:38 -0700 Subject: [PATCH 6/7] fix: clean up jaal file --- hosts/aarch64/jaal/pinebook-pro.nix | 47 ----------------------------- 1 file changed, 47 deletions(-) diff --git a/hosts/aarch64/jaal/pinebook-pro.nix b/hosts/aarch64/jaal/pinebook-pro.nix index 62526ca..2e7640e 100644 --- a/hosts/aarch64/jaal/pinebook-pro.nix +++ b/hosts/aarch64/jaal/pinebook-pro.nix @@ -3,58 +3,11 @@ { imports = [ -# ./hardware-configuration.nix -# ./programs.nix ]; boot.kernelParams = [ "console=tty0" ]; - boot.loader = { - efi = { - canTouchEfiVariables = false; - }; - - grub = { - enable = true; - efiInstallAsRemovable = true; - efiSupport = true; - version = 2; - device = "nodev"; - }; - }; - - boot.initrd.kernelModules = [ - # Rockchip modules - "rockchip_rga" - "rockchip_saradc" - "rockchip_thermal" - "rockchipdrm" - - # GPU/Display modules - "analogix_dp" - "cec" - "drm" - "drm_kms_helper" - "dw_hdmi" - "dw_mipi_dsi" - "gpu_sched" - "panel_edp" - "panel_simple" - "panfrost" - "pwm_bl" - - # USB / Type-C related modules - "fusb302" - "tcpm" - "typec" - - # Misc. modules - "cw2015_battery" - "gpio_charger" - "rtc_rk808" - ]; - networking.hostName = "jaal"; } From 2f1f7c7a0116c55d040c262653c43614881a6a4e Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 9 Feb 2024 08:33:26 -0700 Subject: [PATCH 7/7] jaal: rename the configuration file --- hosts/aarch64/jaal/{pinebook-pro.nix => configuration.nix} | 0 hosts/aarch64/jaal/pbp.nix | 7 ------- 2 files changed, 7 deletions(-) rename hosts/aarch64/jaal/{pinebook-pro.nix => configuration.nix} (100%) delete mode 100644 hosts/aarch64/jaal/pbp.nix diff --git a/hosts/aarch64/jaal/pinebook-pro.nix b/hosts/aarch64/jaal/configuration.nix similarity index 100% rename from hosts/aarch64/jaal/pinebook-pro.nix rename to hosts/aarch64/jaal/configuration.nix diff --git a/hosts/aarch64/jaal/pbp.nix b/hosts/aarch64/jaal/pbp.nix deleted file mode 100644 index d4f4b62..0000000 --- a/hosts/aarch64/jaal/pbp.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Name your host machine - networking.hostName = "jaal"; - -}