From 0b1e231acc4e6d97c632c1c0f99615c9108df9e1 Mon Sep 17 00:00:00 2001 From: willemml Date: Wed, 14 Feb 2024 21:17:53 -0800 Subject: [PATCH] Updates glassbox boot disk --- README.md | 30 ++---------------------------- nixos/hosts/glassbox.nix | 4 ++-- nixos/profiles/default.nix | 2 +- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 6a3d10a..4e288c6 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,11 @@ My dotfiles using Nix. System configuration done using [nix-darwin](https://github.com/LnL7/nix-darwin) and -[NixOS](https://nixos.org/). User configuration using [home-manager](https://github.com/nix-community/home-manager). This repo is put -together as a flake using [flake-parts](https://github.com/hercules-ci/flake-parts). On NixOS home-manager is used -as a NixOS module, on Darwin it is used separately from nix-darwin. - -dotfiles.nix is inspired by [terlar/nix-config](https://github.com/terlar/nix-config/tree/main), [~rycee/configurations](https://sr.ht/~rycee/configurations/) -and [hlissner/dotfiles](https://github.com/hlissner/dotfiles). +[NixOS](https://nixos.org/). User configuration using [home-manager](https://github.com/nix-community/home-manager). +This repo is put together as a flake using [flake-parts](https://github.com/hercules-ci/flake-parts). All Nix code in this repo is formatted using [alejandra](https://github.com/kamadorueda/alejandra). - # Usage -Show what this flake provides: - - nix flake show - Switch both system (NixOS) and home: nixos-rebuild switch --flake . @@ -23,14 +14,6 @@ Switch system (nix-darwin): darwin-rebuild switch --flake . -Switch home only (on Darwin): - - nix run .#home - -Build home without switching: - - nix build .#home - Update all inputs: nix flake update --commit-lock-file @@ -47,12 +30,3 @@ Enter the dev shell (if not using [nix-direnv](https://github.com/nix-community/ nix develop - -# Tasks - - -## TODO Services as modules - -Services should be converted to modules. -These should ideally support both linux and darwin hosts (launchd and systemd). - diff --git a/nixos/hosts/glassbox.nix b/nixos/hosts/glassbox.nix index 2bcc7f9..f86020e 100644 --- a/nixos/hosts/glassbox.nix +++ b/nixos/hosts/glassbox.nix @@ -23,12 +23,12 @@ boot.loader.efi.canTouchEfiVariables = true; fileSystems."/" = { - device = "/dev/disk/by-uuid/4e9a4d87-4b00-413b-84c0-62e737a012a9"; + device = "/dev/disk/by-uuid/18ed28ca-03c5-4ed8-8a31-fac727b74722"; fsType = "ext4"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/1641-A38E"; + device = "/dev/disk/by-uuid/DFEC-14F2"; fsType = "vfat"; }; diff --git a/nixos/profiles/default.nix b/nixos/profiles/default.nix index 9e9b1b9..0864016 100644 --- a/nixos/profiles/default.nix +++ b/nixos/profiles/default.nix @@ -36,7 +36,7 @@ console.keyMap = "colemak"; console.packages = [pkgs.terminus_font]; - environment.systemPackages = [pkgs.parted]; + environment.systemPackages = with pkgs; [parted usbutils pciutils]; services.zerotierone = { joinNetworks = globals.zerotier.networks;