From c38f040574fd1e9fa5d730781e6d49d8129565d6 Mon Sep 17 00:00:00 2001 From: roxwize Date: Fri, 24 Jan 2025 16:08:11 -0500 Subject: [PATCH] ~ Signed-off-by: roxwize --- Justfile | 4 ++-- README.md | 4 ++-- {nix => nixos}/flake.lock | 0 {nix => nixos}/flake.nix | 0 {nix => nixos}/home/base.nix | 0 {nix => nixos}/home/dconf.nix | 0 {nix => nixos}/home/default.nix | 0 {nix => nixos}/home/firefox.nix | 0 {nix => nixos}/home/neovim.nix | 0 {nix => nixos}/home/polybar.nix | 0 {nix => nixos}/home/vscode.nix | 1 + {nix => nixos}/home/yambar.nix | 0 {nix => nixos}/hosts/base.nix | 0 {nix => nixos}/hosts/ioides/configuration.nix | 0 {nix => nixos}/hosts/ioides/hardware-configuration.nix | 0 {nix => nixos}/hosts/qemu/configuration.nix | 0 {nix => nixos}/hosts/qemu/hardware-configuration.nix | 0 {nix => nixos}/overlays.nix | 0 {nix => nixos}/packages.nix | 0 {nix => nixos}/pkgs/chibicc-uxn/default.nix | 0 {nix => nixos}/pkgs/overlay.nix | 0 21 files changed, 5 insertions(+), 4 deletions(-) rename {nix => nixos}/flake.lock (100%) rename {nix => nixos}/flake.nix (100%) rename {nix => nixos}/home/base.nix (100%) rename {nix => nixos}/home/dconf.nix (100%) rename {nix => nixos}/home/default.nix (100%) rename {nix => nixos}/home/firefox.nix (100%) rename {nix => nixos}/home/neovim.nix (100%) rename {nix => nixos}/home/polybar.nix (100%) rename {nix => nixos}/home/vscode.nix (97%) rename {nix => nixos}/home/yambar.nix (100%) rename {nix => nixos}/hosts/base.nix (100%) rename {nix => nixos}/hosts/ioides/configuration.nix (100%) rename {nix => nixos}/hosts/ioides/hardware-configuration.nix (100%) rename {nix => nixos}/hosts/qemu/configuration.nix (100%) rename {nix => nixos}/hosts/qemu/hardware-configuration.nix (100%) rename {nix => nixos}/overlays.nix (100%) rename {nix => nixos}/packages.nix (100%) rename {nix => nixos}/pkgs/chibicc-uxn/default.nix (100%) rename {nix => nixos}/pkgs/overlay.nix (100%) diff --git a/Justfile b/Justfile index b499470..fa7007b 100644 --- a/Justfile +++ b/Justfile @@ -2,10 +2,10 @@ default: @just --list rebuild host operation: - sudo nixos-rebuild {{operation}} --flake ./nix#{{host}} + sudo nixos-rebuild {{operation}} --flake ./nixos#{{host}} home-rebuild operation: - home-manager {{operation}} --flake ./nix + home-manager {{operation}} --flake ./nixos switch host: just rebuild {{host}} switch diff --git a/README.md b/README.md index d9652a5..f75fdcf 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ theoretically: nix-shell -p git just git clone https://git.sr.ht/~roxwize/.dotfiles cd .dotfiles/ -nixos-install --flake './nix#[hostname]' +nixos-install --flake './nixos#[hostname]' ``` -from my experience the process is more involved, but it ultimately boils down to those three commands above (the first command is only for bootstrapping). youll need to make a configuration for your host which involves creating default configurations with `nixos-generate-config`, copying it to your host's folder in `nix/hosts/[host]/`, editing it, and then adding it to `flake.nix`. after that you should clone the repo inside of `/home/rae/` on your filesystem +from my experience the process is more involved, but it ultimately boils down to those three commands above (the first command is only for bootstrapping). youll need to make a configuration for your host which involves creating default configurations with `nixos-generate-config`, copying it to your host's folder in `nixos/hosts/[host]/`, editing it, and then adding it to `flake.nix`. after that you should clone the repo inside of `/home/rae/` on your filesystem # usage diff --git a/nix/flake.lock b/nixos/flake.lock similarity index 100% rename from nix/flake.lock rename to nixos/flake.lock diff --git a/nix/flake.nix b/nixos/flake.nix similarity index 100% rename from nix/flake.nix rename to nixos/flake.nix diff --git a/nix/home/base.nix b/nixos/home/base.nix similarity index 100% rename from nix/home/base.nix rename to nixos/home/base.nix diff --git a/nix/home/dconf.nix b/nixos/home/dconf.nix similarity index 100% rename from nix/home/dconf.nix rename to nixos/home/dconf.nix diff --git a/nix/home/default.nix b/nixos/home/default.nix similarity index 100% rename from nix/home/default.nix rename to nixos/home/default.nix diff --git a/nix/home/firefox.nix b/nixos/home/firefox.nix similarity index 100% rename from nix/home/firefox.nix rename to nixos/home/firefox.nix diff --git a/nix/home/neovim.nix b/nixos/home/neovim.nix similarity index 100% rename from nix/home/neovim.nix rename to nixos/home/neovim.nix diff --git a/nix/home/polybar.nix b/nixos/home/polybar.nix similarity index 100% rename from nix/home/polybar.nix rename to nixos/home/polybar.nix diff --git a/nix/home/vscode.nix b/nixos/home/vscode.nix similarity index 97% rename from nix/home/vscode.nix rename to nixos/home/vscode.nix index 09f0f28..9a0f713 100644 --- a/nix/home/vscode.nix +++ b/nixos/home/vscode.nix @@ -46,6 +46,7 @@ "workbench.colorTheme" = "Catppuccin Frappé"; "workbench.iconTheme" = "catppuccin-frappe"; } // builtins.listToAttrs [ + (df "css" "esbenp.prettier-vscode") (df "html" "esbenp.prettier-vscode") (df "typescript" "esbenp.prettier-vscode") (df "javascript" "esbenp.prettier-vscode") diff --git a/nix/home/yambar.nix b/nixos/home/yambar.nix similarity index 100% rename from nix/home/yambar.nix rename to nixos/home/yambar.nix diff --git a/nix/hosts/base.nix b/nixos/hosts/base.nix similarity index 100% rename from nix/hosts/base.nix rename to nixos/hosts/base.nix diff --git a/nix/hosts/ioides/configuration.nix b/nixos/hosts/ioides/configuration.nix similarity index 100% rename from nix/hosts/ioides/configuration.nix rename to nixos/hosts/ioides/configuration.nix diff --git a/nix/hosts/ioides/hardware-configuration.nix b/nixos/hosts/ioides/hardware-configuration.nix similarity index 100% rename from nix/hosts/ioides/hardware-configuration.nix rename to nixos/hosts/ioides/hardware-configuration.nix diff --git a/nix/hosts/qemu/configuration.nix b/nixos/hosts/qemu/configuration.nix similarity index 100% rename from nix/hosts/qemu/configuration.nix rename to nixos/hosts/qemu/configuration.nix diff --git a/nix/hosts/qemu/hardware-configuration.nix b/nixos/hosts/qemu/hardware-configuration.nix similarity index 100% rename from nix/hosts/qemu/hardware-configuration.nix rename to nixos/hosts/qemu/hardware-configuration.nix diff --git a/nix/overlays.nix b/nixos/overlays.nix similarity index 100% rename from nix/overlays.nix rename to nixos/overlays.nix diff --git a/nix/packages.nix b/nixos/packages.nix similarity index 100% rename from nix/packages.nix rename to nixos/packages.nix diff --git a/nix/pkgs/chibicc-uxn/default.nix b/nixos/pkgs/chibicc-uxn/default.nix similarity index 100% rename from nix/pkgs/chibicc-uxn/default.nix rename to nixos/pkgs/chibicc-uxn/default.nix diff --git a/nix/pkgs/overlay.nix b/nixos/pkgs/overlay.nix similarity index 100% rename from nix/pkgs/overlay.nix rename to nixos/pkgs/overlay.nix