From 63aebf5e712487288b1735b814c88333f4daed3d Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 17 Feb 2025 11:01:17 -0700 Subject: [PATCH 1/8] update headers and add dev section --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6867182..da5865a 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ These files are for the partition layouts that I use. - `luks-btrfs-subvolumes.nix` : This is the main layout that I use for pretty much every system that I install NixOS on -## Desktop Nix files: (nix-configs/desktops/) +### Desktop Nix files: (nix-configs/desktops/) These files are for the desktops (DE or WM) that I use at times. @@ -30,13 +30,13 @@ These files are for the desktops (DE or WM) that I use at times. - `pantheon.nix` : This file is for the desktop and login manager (this removes AppCenter) - `sway.nix` : This file is for the Sway WM -## Hosts Nix files: (nix-configs/hosts/) +#### Hosts Nix files: (nix-configs/hosts/) These files are for the systems themselves such as my Pinebook Pro, Raspberry Pi 4B or HP Omen. **NOTE:** These are only really used to set the hostname, install the NVIDIA driver (like for thelio-nvidia) and such. -### x86_64 Nix files: (nix-configs/systems/x86_64/) +##### x86_64 Nix files: (nix-configs/systems/x86_64/) - `shepard` : This is my System76 nebula49. - `garrus` : This is my System76 Galago Pro (galp5). @@ -46,7 +46,7 @@ These files are for the systems themselves such as my Pinebook Pro, Raspberry Pi - `sovereign` : This was a Linode instance but it could be for other VPS services as well. - `harbinger` : This was a Linode instance but it could be for other VPS services as well. -### aarch64 Nix files: (nix-configs/systems/aarch64/) +##### aarch64 Nix files: (nix-configs/systems/aarch64/) - `jaal.nix` : This is my Pinebook Pro. - `drack.nix` : This is my Thinkpad X13s. @@ -67,6 +67,12 @@ These files are for websites such as LAMP and NGINX. Most of these are no longer - `stoners-space.nix` : This file is for Mastodon on my stoners.space domain, simple changes can be made for a different domain. - `nginx-owncast.nix` : This file is a NGINX reverse proxy for [Owncast](https://owncast.online) though it is not currently working. +## Development Nix files: (nix-configs/dev/) + +These files are for either `nix-shell` (default nix) or `nix develop` (flakes): + +- `rust` : This is grabs cargo, rustc and others from nixpkgs but also sets the RUST_BACKTRACE variable as 1 to enable it. + ### Screenshots ![GNOME Installation](screenshots/nixos-gnome.png) From 4505f6f086e10a7a8e0550c88196ffa023968556 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 17 Feb 2025 11:11:36 -0700 Subject: [PATCH 2/8] start work on table --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index da5865a..39ca191 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,13 @@ These files are for the partition layouts that I use. - `luks-btrfs-subvolumes.nix` : This is the main layout that I use for pretty much every system that I install NixOS on +## Host Nix files: (nix-configs/hosts/) + +| Hostname | Role | Architecture | +| --------:| ----:| -------------:| +| Shepard | 💻️ | x86_64-linux | +| Peebee | 📱 | aarch64-linux | + ### Desktop Nix files: (nix-configs/desktops/) These files are for the desktops (DE or WM) that I use at times. From 3f73fca2c543a553dde326b8929a42aa091bf6ab Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 17 Feb 2025 11:19:16 -0700 Subject: [PATCH 3/8] finish table for hosts --- README.md | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 39ca191..8b58389 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,18 @@ These files are for the partition layouts that I use. ## Host Nix files: (nix-configs/hosts/) -| Hostname | Role | Architecture | -| --------:| ----:| -------------:| -| Shepard | 💻️ | x86_64-linux | -| Peebee | 📱 | aarch64-linux | +These files are for the systems themselves such as my custom desktop, Thinkpad X13s or my homelab. + +| Hostname | Role | Architecture | +| ----------:| ----:| ---------------:| +| `shepard` | 🖥️ | `x86_64-linux` | +| `edi` | ☁️ | `x86_64-linux` | +| `garrus` | 💻 | `x86_64-linux` | +| `drack` | 💻 | `aarch64-linux` | +| `jaal` | 💻 | `aarch64-linux` | +| `vetra` | ☁️ | `aarch64-linux` | +| `peebee` | 📱 | `aarch64-linux` | +| `lexi` | 📱 | `aarch64-linux` | ### Desktop Nix files: (nix-configs/desktops/) @@ -37,30 +45,6 @@ These files are for the desktops (DE or WM) that I use at times. - `pantheon.nix` : This file is for the desktop and login manager (this removes AppCenter) - `sway.nix` : This file is for the Sway WM -#### Hosts Nix files: (nix-configs/hosts/) - -These files are for the systems themselves such as my Pinebook Pro, Raspberry Pi 4B or HP Omen. - -**NOTE:** These are only really used to set the hostname, install the NVIDIA driver (like for thelio-nvidia) and such. - -##### x86_64 Nix files: (nix-configs/systems/x86_64/) - -- `shepard` : This is my System76 nebula49. -- `garrus` : This is my System76 Galago Pro (galp5). -- `grunt` : This is my Google Pixel Slate. -- `edi` : This is my custom build for homelab stuff. -- `thelio-nvidia` : This is my work Thelio B1. -- `sovereign` : This was a Linode instance but it could be for other VPS services as well. -- `harbinger` : This was a Linode instance but it could be for other VPS services as well. - -##### aarch64 Nix files: (nix-configs/systems/aarch64/) - -- `jaal.nix` : This is my Pinebook Pro. -- `drack.nix` : This is my Thinkpad X13s. -- `peebee.nix` : This is my PinePhone. -- `lexi.nix` : This is my OnePlus 6T. -- `vetra.nix` : This is my Raspberry Pi 4B. - ## Web Nix files: (nix-configs/web/) These files are for websites such as LAMP and NGINX. Most of these are no longer being used so they may not work with the latest changes. From 6fb71ec656a8fcd14eeaceda1f67971474dedead Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 17 Feb 2025 11:22:55 -0700 Subject: [PATCH 4/8] update table with an about section --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8b58389..c7de8df 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,16 @@ These files are for the partition layouts that I use. These files are for the systems themselves such as my custom desktop, Thinkpad X13s or my homelab. -| Hostname | Role | Architecture | -| ----------:| ----:| ---------------:| -| `shepard` | 🖥️ | `x86_64-linux` | -| `edi` | ☁️ | `x86_64-linux` | -| `garrus` | 💻 | `x86_64-linux` | -| `drack` | 💻 | `aarch64-linux` | -| `jaal` | 💻 | `aarch64-linux` | -| `vetra` | ☁️ | `aarch64-linux` | -| `peebee` | 📱 | `aarch64-linux` | -| `lexi` | 📱 | `aarch64-linux` | +| Hostname | About | Role | Architecture | +| ----------:| -----:| ----:| ---------------:| +| `shepard` | System76 nebula49 | 🖥️ | `x86_64-linux` | +| `edi` | custom build for homelab stuff | ☁️ | `x86_64-linux` | +| `garrus` | System76 Lemur Pro (lemp13) | 💻 | `x86_64-linux` | +| `drack` | Thinkpad X13s | 💻 | `aarch64-linux` | +| `jaal` | PineBook Pro | 💻 | `aarch64-linux` | +| `vetra` | Raspberry Pi 4B | ☁️ | `aarch64-linux` | +| `peebee` | PinePhone | 📱 | `aarch64-linux` | +| `lexi` | OnePlus 6T | 📱 | `aarch64-linux` | ### Desktop Nix files: (nix-configs/desktops/) From 4cd56569b296f8008962f1729722ea9b0e576f87 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 17 Feb 2025 21:21:47 +0000 Subject: [PATCH 5/8] follow disko/latest --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index f05f202..6584bf3 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ #nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; disko = { - url = github:nix-community/disko; + url = github:nix-community/disko/lastest; inputs.nixpkgs.follows = "nixpkgs"; }; nix-software-center.url = "github:snowfallorg/nix-software-center"; From 7924d211eb1448392e5e0fe445ef449ec6bf29ab Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 17 Feb 2025 21:22:15 +0000 Subject: [PATCH 6/8] follow stable again --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6584bf3..56fd634 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Generic System Flake file"; inputs = { - #nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + #nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; + #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; disko = { url = github:nix-community/disko/lastest; inputs.nixpkgs.follows = "nixpkgs"; From 618eaa80271288b2aeaaa2397867d5389ce74acb Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 17 Feb 2025 21:22:38 +0000 Subject: [PATCH 7/8] update home.nix to latest stable --- home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.nix b/home.nix index 31cff6f..c0b8b7f 100644 --- a/home.nix +++ b/home.nix @@ -14,7 +14,7 @@ # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; nixpkgs.config = { allowUnfree = true; From 758dba2c7ece46d080d768f19df53c3ed670862b Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 17 Feb 2025 21:26:18 +0000 Subject: [PATCH 8/8] fix typo and enable 24.11 --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 56fd634..62b3048 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Generic System Flake file"; inputs = { - #nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; disko = { - url = github:nix-community/disko/lastest; + url = github:nix-community/disko/latest; inputs.nixpkgs.follows = "nixpkgs"; }; nix-software-center.url = "github:snowfallorg/nix-software-center";