diff --git a/README.md b/README.md index 6867182..c7de8df 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,22 @@ 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/) +## Host Nix files: (nix-configs/hosts/) + +These files are for the systems themselves such as my custom desktop, Thinkpad X13s or my homelab. + +| 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/) These files are for the desktops (DE or WM) that I use at times. @@ -30,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. @@ -67,6 +58,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) diff --git a/flake.nix b/flake.nix index f05f202..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.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; + url = github:nix-community/disko/latest; inputs.nixpkgs.follows = "nixpkgs"; }; nix-software-center.url = "github:snowfallorg/nix-software-center"; 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;