From 9c37ed9dbc11215a757c7d4277a1be66ac2ba533 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 30 Mar 2023 15:21:41 +0000 Subject: [PATCH 01/13] Add for COSMIC build --- unstable.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/unstable.nix b/unstable.nix index caba350..a739384 100644 --- a/unstable.nix +++ b/unstable.nix @@ -10,5 +10,6 @@ in { environment.systemPackages = with pkgs; [ unstable.rustc + unstable.just ]; } From 5f59605deca0f0851c44759fb3ae9da7067548e7 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 30 Mar 2023 15:21:59 +0000 Subject: [PATCH 02/13] Update shell.nix --- shell/COSMIC/shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/COSMIC/shell.nix b/shell/COSMIC/shell.nix index 073e67d..ce61ba5 100644 --- a/shell/COSMIC/shell.nix +++ b/shell/COSMIC/shell.nix @@ -12,7 +12,7 @@ egl-wayland glib gtk4 - just + lld llvm llvmPackages_15.llvm libclang From 46aba856cdbcb26412b7db5cab48aad2fa06c7f1 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Thu, 30 Mar 2023 15:22:52 +0000 Subject: [PATCH 03/13] Update configuration.nix --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 7450753..fc01120 100644 --- a/configuration.nix +++ b/configuration.nix @@ -82,7 +82,6 @@ avahi cargo dmidecode - just libcamera lshw quickemu From ae3519cd49f8b51acd166b90c30f5ba66db2cd74 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 31 Mar 2023 13:21:32 +0000 Subject: [PATCH 04/13] Update shell.nix --- shell/system76-docs/shell.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/system76-docs/shell.nix b/shell/system76-docs/shell.nix index 0b1ed1b..7060e9e 100644 --- a/shell/system76-docs/shell.nix +++ b/shell/system76-docs/shell.nix @@ -1,7 +1,7 @@ { pkgs ? import {} }: pkgs.mkShell { - nativeBuildInputs = [ - pkgs.buildPackages.nodejs-16_x - pkgs.buildPackages.nodePackages.npm + nativeBuildInputs = with pkgs; [ + nodejs-16_x + nodePackages.npm ]; } From 0a8d839956847bbe23a157050803e4e26bb25e0a Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 31 Mar 2023 15:19:30 +0000 Subject: [PATCH 05/13] Update configuration.nix --- configuration.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configuration.nix b/configuration.nix index fc01120..781da63 100644 --- a/configuration.nix +++ b/configuration.nix @@ -19,6 +19,14 @@ systemd-boot.consoleMode = "0"; }; + + boot.initrd.luks.devices = { + root = { + device = "/dev/sda"; + preLVM = true; + }; + }; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; nix.settings.extra-platforms = [ "aarch64-linux" ]; From afa9b1c768c47040b9b070138dd551646e158134 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 31 Mar 2023 15:25:15 +0000 Subject: [PATCH 06/13] Update configuration.nix --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 781da63..8b68e4a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -19,7 +19,6 @@ systemd-boot.consoleMode = "0"; }; - boot.initrd.luks.devices = { root = { device = "/dev/sda"; From 0aad6718755245cdeaf24e043b3d217da87ff4e2 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sat, 1 Apr 2023 23:33:50 +0000 Subject: [PATCH 07/13] Fix Pinebook Pro build issue --- configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 8b68e4a..4a75445 100644 --- a/configuration.nix +++ b/configuration.nix @@ -91,9 +91,6 @@ dmidecode libcamera lshw - quickemu - spice - spice-gtk nix-index toybox unzip From 5e0e4e266d4d7a1b50296d2970bcbf8948293ce0 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Sat, 1 Apr 2023 23:34:42 +0000 Subject: [PATCH 08/13] Update programs.nix --- programs.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs.nix b/programs.nix index f812e80..51dede4 100644 --- a/programs.nix +++ b/programs.nix @@ -16,10 +16,13 @@ # Office google-chrome libreoffice-fresh + vscode # Work virt-manager - vscode + quickemu + spice + spice-gtk # Streaming obs-studio From 98270c00c4f6b8f8f8d250bc3cfddebcf2805493 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 3 Apr 2023 19:37:44 +0000 Subject: [PATCH 09/13] Add new file --- systems/vm.nix | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 systems/vm.nix diff --git a/systems/vm.nix b/systems/vm.nix new file mode 100644 index 0000000..7e62d53 --- /dev/null +++ b/systems/vm.nix @@ -0,0 +1,115 @@ +{ config, pkgs, ... }: + +{ + # Import other configuration modules + # (hardware-configuration.nix is autogenerated upon installation) + # paths in nix expressions are always relative the file which defines them + imports = + [ + ./hardware-configuration.nix +# ./programs.nix + ]; + + # Latest kernel + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelParams = [ "vfio-pci.ids=8086:9b41" "qxl" "bochs_drm"]; + + boot.loader = { + systemd-boot.enable = true; + systemd-boot.consoleMode = "0"; + }; + + boot.initrd.luks.devices = { + root = { + device = "/dev/sda"; + preLVM = true; + }; + }; + + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + + nix.settings.extra-platforms = [ "aarch64-linux" ]; + 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.networkmanager.enable = true; + + # Set your time zone. + time.timeZone = "America/Denver"; + + # Enter keyboard layout + services.xserver.layout = "us"; + + # 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; [ + # Fonts + fira + fira-mono + restic + + neofetch + ]; + }; + + # Allow Unfree + nixpkgs.config.allowUnfree = true; + + # Install some packages + environment.systemPackages = + with pkgs; + [ + avahi + cargo + dmidecode + libcamera + lshw + nix-index + toybox + unzip + wget + xz + ]; + + # Enable/Disable hardware + ## Turn off PulseAudio + hardware.pulseaudio.enable = false; + + # Enable Pipewire + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + # Enable Bluetooth + hardware.bluetooth.enable = true; + + services.printing.enable = true; + services.openssh.enable = true; + + services.avahi = { + enable = true; + nssmdns = true; + openFirewall = true; + }; + + # System + system.stateVersion = "22.11"; + system.autoUpgrade.enable = true; + +} From 24fc6f9688e9e8c5f0dbc5070f5b0845d75b879e Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 3 Apr 2023 19:46:00 +0000 Subject: [PATCH 10/13] Update configuration.nix --- configuration.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4a75445..c581abd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -19,13 +19,6 @@ systemd-boot.consoleMode = "0"; }; - boot.initrd.luks.devices = { - root = { - device = "/dev/sda"; - preLVM = true; - }; - }; - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; nix.settings.extra-platforms = [ "aarch64-linux" ]; From 5ed62545015feb88bcb51945786c1eabfc7af332 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 3 Apr 2023 20:25:03 +0000 Subject: [PATCH 11/13] Update vm.nix --- systems/vm.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/systems/vm.nix b/systems/vm.nix index 7e62d53..31803ac 100644 --- a/systems/vm.nix +++ b/systems/vm.nix @@ -55,11 +55,6 @@ hashedPassword = "$6$aAcbLtqiqzySifls$jdKMOQjoWITHD/dWNNZVUH/qNc6aoJ7v4zYofi0U7IJSVTbmOfChS3mzaJbp57AodjdPNKPrnrip8Nlh2Qanx."; packages = with pkgs; [ - # Fonts - fira - fira-mono - restic - neofetch ]; }; @@ -71,11 +66,6 @@ environment.systemPackages = with pkgs; [ - avahi - cargo - dmidecode - libcamera - lshw nix-index toybox unzip From d305cd5fc3431f1935616c100a582c98f0cba3b2 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 3 Apr 2023 22:21:20 +0000 Subject: [PATCH 12/13] Update configuration.nix --- configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index c581abd..dd3df7f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -12,7 +12,6 @@ # Latest kernel boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = [ "vfio-pci.ids=8086:9b41" "qxl" "bochs_drm"]; boot.loader = { systemd-boot.enable = true; From 8470d6e6a4938ad4a5a523075da5b1e277c712d2 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 4 Apr 2023 13:11:08 +0000 Subject: [PATCH 13/13] Update vm.nix --- systems/vm.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/systems/vm.nix b/systems/vm.nix index 31803ac..97c510d 100644 --- a/systems/vm.nix +++ b/systems/vm.nix @@ -19,13 +19,6 @@ systemd-boot.consoleMode = "0"; }; - boot.initrd.luks.devices = { - root = { - device = "/dev/sda"; - preLVM = true; - }; - }; - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; nix.settings.extra-platforms = [ "aarch64-linux" ];