diff --git a/flake.nix b/flake.nix index 3b53756..f8758a7 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ }; - outputs = { self, nixpkgs, ... } @ inputs: { + outputs = { self, nixpkgs, home-manager, ... } @ inputs: { tokyo-night-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation { @@ -88,43 +88,57 @@ }; - nixosConfigurations.homebox = nixpkgs.lib.nixosSystem { - specialArgs = { - inputs = inputs // { - nathan-home-manager = import ./home-manager/default.nix; - tokyo-night-sddm-theme = self.tokyo-night-sddm-theme; - }; + nixosConfigurations = { + + homebox = nixpkgs.lib.nixosSystem { + specialArgs = { + inputs = inputs // { + nathan-home-manager = import ./home-manager/nathan; + tokyo-night-sddm-theme = self.tokyo-night-sddm-theme; + }; + }; + modules = [ + ./system-config/configuration/homebox + ./system-config + ]; + }; + + laptop = nixpkgs.lib.nixosSystem { + specialArgs = { + inputs = inputs // { + nathan-home-manager = import ./home-manager/nathan; + tokyo-night-sddm-theme = self.tokyo-night-sddm-theme; + }; + }; + modules = [ + ./system-config/configuration/laptop + ./system-config + ]; + }; + + live = nixpkgs.lib.nixosSystem { + specialArgs = { + inputs = inputs // { + nathan-home-manager = import ./home-manager/nathan; + tokyo-night-sddm-theme = self.tokyo-night-sddm-theme; + }; + }; + modules = [ + ./system-config/configuration/live + ./system-config + ]; }; - modules = [ - ./system-config/configuration/homebox - ./system-config - ]; }; - nixosConfigurations.laptop = nixpkgs.lib.nixosSystem { - specialArgs = { - inputs = inputs // { - nathan-home-manager = import ./home-manager/default.nix; - tokyo-night-sddm-theme = self.tokyo-night-sddm-theme; - }; - }; - modules = [ - ./system-config/configuration/laptop - ./system-config - ]; - }; - nixosConfigurations.live = nixpkgs.lib.nixosSystem { - specialArgs = { - inputs = inputs // { - nathan-home-manager = import ./home-manager/default.nix; - tokyo-night-sddm-theme = self.tokyo-night-sddm-theme; - }; + homeConfigurations = { + + "nix-on-droid" = home-manager.lib.homeManagerConfiguration { + + pkgs = import nixpkgs { system = "arm64-linux"; }; + + modules = [ ./home-manager/nathan ]; }; - modules = [ - ./system-config/configuration/live - ./system-config - ]; }; }; } diff --git a/home-manager/default.nix b/home-manager/nathan/default.nix similarity index 69% rename from home-manager/default.nix rename to home-manager/nathan/default.nix index 8798d1b..9b6d927 100644 --- a/home-manager/default.nix +++ b/home-manager/nathan/default.nix @@ -8,9 +8,16 @@ ./impermanence ]; - options.homeconfig.host = lib.options.mkOption { - type = lib.types.str; - default = null; + options.homeconfig = { + host = lib.options.mkOption { + type = lib.types.str; + default = null; + }; + + home-manager.enable = lib.options.mkOption { + type = lib.types.bool; + default = false; + }; }; config = { @@ -40,5 +47,7 @@ programs.ssh.enable = true; + programs.home-manager.enable = config.homeconfig.home-manager.enable; + }; } diff --git a/home-manager/dotfiles/Wallpaper/bluescape.jpg b/home-manager/nathan/dotfiles/Wallpaper/bluescape.jpg similarity index 100% rename from home-manager/dotfiles/Wallpaper/bluescape.jpg rename to home-manager/nathan/dotfiles/Wallpaper/bluescape.jpg diff --git a/home-manager/dotfiles/Wallpaper/galaxy.jpg b/home-manager/nathan/dotfiles/Wallpaper/galaxy.jpg similarity index 100% rename from home-manager/dotfiles/Wallpaper/galaxy.jpg rename to home-manager/nathan/dotfiles/Wallpaper/galaxy.jpg diff --git a/home-manager/dotfiles/Wallpaper/kurisu.gif b/home-manager/nathan/dotfiles/Wallpaper/kurisu.gif similarity index 100% rename from home-manager/dotfiles/Wallpaper/kurisu.gif rename to home-manager/nathan/dotfiles/Wallpaper/kurisu.gif diff --git a/home-manager/dotfiles/Wallpaper/kurisu.jpg b/home-manager/nathan/dotfiles/Wallpaper/kurisu.jpg similarity index 100% rename from home-manager/dotfiles/Wallpaper/kurisu.jpg rename to home-manager/nathan/dotfiles/Wallpaper/kurisu.jpg diff --git a/home-manager/dotfiles/Wallpaper/llenn.png b/home-manager/nathan/dotfiles/Wallpaper/llenn.png similarity index 100% rename from home-manager/dotfiles/Wallpaper/llenn.png rename to home-manager/nathan/dotfiles/Wallpaper/llenn.png diff --git a/home-manager/dotfiles/Wallpaper/megumin.png b/home-manager/nathan/dotfiles/Wallpaper/megumin.png similarity index 100% rename from home-manager/dotfiles/Wallpaper/megumin.png rename to home-manager/nathan/dotfiles/Wallpaper/megumin.png diff --git a/home-manager/dotfiles/Wallpaper/megumin1.gif b/home-manager/nathan/dotfiles/Wallpaper/megumin1.gif similarity index 100% rename from home-manager/dotfiles/Wallpaper/megumin1.gif rename to home-manager/nathan/dotfiles/Wallpaper/megumin1.gif diff --git a/home-manager/dotfiles/Wallpaper/megumin2.gif b/home-manager/nathan/dotfiles/Wallpaper/megumin2.gif similarity index 100% rename from home-manager/dotfiles/Wallpaper/megumin2.gif rename to home-manager/nathan/dotfiles/Wallpaper/megumin2.gif diff --git a/home-manager/dotfiles/Wallpaper/ngnl.jpg b/home-manager/nathan/dotfiles/Wallpaper/ngnl.jpg similarity index 100% rename from home-manager/dotfiles/Wallpaper/ngnl.jpg rename to home-manager/nathan/dotfiles/Wallpaper/ngnl.jpg diff --git a/home-manager/dotfiles/Wallpaper/orangescape.jpg b/home-manager/nathan/dotfiles/Wallpaper/orangescape.jpg similarity index 100% rename from home-manager/dotfiles/Wallpaper/orangescape.jpg rename to home-manager/nathan/dotfiles/Wallpaper/orangescape.jpg diff --git a/home-manager/dotfiles/Wallpaper/rezero.gif b/home-manager/nathan/dotfiles/Wallpaper/rezero.gif similarity index 100% rename from home-manager/dotfiles/Wallpaper/rezero.gif rename to home-manager/nathan/dotfiles/Wallpaper/rezero.gif diff --git a/home-manager/dotfiles/Wallpaper/sao.gif b/home-manager/nathan/dotfiles/Wallpaper/sao.gif similarity index 100% rename from home-manager/dotfiles/Wallpaper/sao.gif rename to home-manager/nathan/dotfiles/Wallpaper/sao.gif diff --git a/home-manager/dotfiles/Wallpaper/sao.png b/home-manager/nathan/dotfiles/Wallpaper/sao.png similarity index 100% rename from home-manager/dotfiles/Wallpaper/sao.png rename to home-manager/nathan/dotfiles/Wallpaper/sao.png diff --git a/home-manager/dotfiles/Wallpaper/sinon.gif b/home-manager/nathan/dotfiles/Wallpaper/sinon.gif similarity index 100% rename from home-manager/dotfiles/Wallpaper/sinon.gif rename to home-manager/nathan/dotfiles/Wallpaper/sinon.gif diff --git a/home-manager/dotfiles/ags/README.md b/home-manager/nathan/dotfiles/ags/README.md similarity index 100% rename from home-manager/dotfiles/ags/README.md rename to home-manager/nathan/dotfiles/ags/README.md diff --git a/home-manager/dotfiles/ags/bluetooth.js b/home-manager/nathan/dotfiles/ags/bluetooth.js similarity index 100% rename from home-manager/dotfiles/ags/bluetooth.js rename to home-manager/nathan/dotfiles/ags/bluetooth.js diff --git a/home-manager/dotfiles/ags/brightness.js b/home-manager/nathan/dotfiles/ags/brightness.js similarity index 100% rename from home-manager/dotfiles/ags/brightness.js rename to home-manager/nathan/dotfiles/ags/brightness.js diff --git a/home-manager/dotfiles/ags/clock.js b/home-manager/nathan/dotfiles/ags/clock.js similarity index 100% rename from home-manager/dotfiles/ags/clock.js rename to home-manager/nathan/dotfiles/ags/clock.js diff --git a/home-manager/dotfiles/ags/config.js b/home-manager/nathan/dotfiles/ags/config.js similarity index 100% rename from home-manager/dotfiles/ags/config.js rename to home-manager/nathan/dotfiles/ags/config.js diff --git a/home-manager/dotfiles/ags/media.js b/home-manager/nathan/dotfiles/ags/media.js similarity index 100% rename from home-manager/dotfiles/ags/media.js rename to home-manager/nathan/dotfiles/ags/media.js diff --git a/home-manager/dotfiles/ags/notif.js b/home-manager/nathan/dotfiles/ags/notif.js similarity index 100% rename from home-manager/dotfiles/ags/notif.js rename to home-manager/nathan/dotfiles/ags/notif.js diff --git a/home-manager/dotfiles/ags/notification.js b/home-manager/nathan/dotfiles/ags/notification.js similarity index 100% rename from home-manager/dotfiles/ags/notification.js rename to home-manager/nathan/dotfiles/ags/notification.js diff --git a/home-manager/dotfiles/ags/power.js b/home-manager/nathan/dotfiles/ags/power.js similarity index 100% rename from home-manager/dotfiles/ags/power.js rename to home-manager/nathan/dotfiles/ags/power.js diff --git a/home-manager/dotfiles/ags/settings.js b/home-manager/nathan/dotfiles/ags/settings.js similarity index 100% rename from home-manager/dotfiles/ags/settings.js rename to home-manager/nathan/dotfiles/ags/settings.js diff --git a/home-manager/dotfiles/ags/style.css b/home-manager/nathan/dotfiles/ags/style.css similarity index 100% rename from home-manager/dotfiles/ags/style.css rename to home-manager/nathan/dotfiles/ags/style.css diff --git a/home-manager/dotfiles/ags/systemtray.js b/home-manager/nathan/dotfiles/ags/systemtray.js similarity index 100% rename from home-manager/dotfiles/ags/systemtray.js rename to home-manager/nathan/dotfiles/ags/systemtray.js diff --git a/home-manager/dotfiles/ags/wifi.js b/home-manager/nathan/dotfiles/ags/wifi.js similarity index 100% rename from home-manager/dotfiles/ags/wifi.js rename to home-manager/nathan/dotfiles/ags/wifi.js diff --git a/home-manager/dotfiles/ags/workspaces.js b/home-manager/nathan/dotfiles/ags/workspaces.js similarity index 100% rename from home-manager/dotfiles/ags/workspaces.js rename to home-manager/nathan/dotfiles/ags/workspaces.js diff --git a/home-manager/dotfiles/default.nix b/home-manager/nathan/dotfiles/default.nix similarity index 100% rename from home-manager/dotfiles/default.nix rename to home-manager/nathan/dotfiles/default.nix diff --git a/home-manager/dotfiles/hypr/main.conf b/home-manager/nathan/dotfiles/hypr/main.conf similarity index 100% rename from home-manager/dotfiles/hypr/main.conf rename to home-manager/nathan/dotfiles/hypr/main.conf diff --git a/home-manager/dotfiles/hypr/otf.conf b/home-manager/nathan/dotfiles/hypr/otf.conf similarity index 100% rename from home-manager/dotfiles/hypr/otf.conf rename to home-manager/nathan/dotfiles/hypr/otf.conf diff --git a/home-manager/dotfiles/hypr/pyprland.toml b/home-manager/nathan/dotfiles/hypr/pyprland.toml similarity index 100% rename from home-manager/dotfiles/hypr/pyprland.toml rename to home-manager/nathan/dotfiles/hypr/pyprland.toml diff --git a/home-manager/dotfiles/swaylock/config b/home-manager/nathan/dotfiles/swaylock/config similarity index 100% rename from home-manager/dotfiles/swaylock/config rename to home-manager/nathan/dotfiles/swaylock/config diff --git a/home-manager/dotfiles/wal/templates/cava_config b/home-manager/nathan/dotfiles/wal/templates/cava_config similarity index 100% rename from home-manager/dotfiles/wal/templates/cava_config rename to home-manager/nathan/dotfiles/wal/templates/cava_config diff --git a/home-manager/dotfiles/wal/templates/colors-ags.css b/home-manager/nathan/dotfiles/wal/templates/colors-ags.css similarity index 100% rename from home-manager/dotfiles/wal/templates/colors-ags.css rename to home-manager/nathan/dotfiles/wal/templates/colors-ags.css diff --git a/home-manager/dotfiles/wal/templates/colors-discord.css b/home-manager/nathan/dotfiles/wal/templates/colors-discord.css similarity index 100% rename from home-manager/dotfiles/wal/templates/colors-discord.css rename to home-manager/nathan/dotfiles/wal/templates/colors-discord.css diff --git a/home-manager/dotfiles/wal/templates/colors-hypr.conf b/home-manager/nathan/dotfiles/wal/templates/colors-hypr.conf similarity index 100% rename from home-manager/dotfiles/wal/templates/colors-hypr.conf rename to home-manager/nathan/dotfiles/wal/templates/colors-hypr.conf diff --git a/home-manager/dotfiles/wayvnc/config b/home-manager/nathan/dotfiles/wayvnc/config similarity index 100% rename from home-manager/dotfiles/wayvnc/config rename to home-manager/nathan/dotfiles/wayvnc/config diff --git a/home-manager/dotfiles/wayvnc/rsa_key.pem b/home-manager/nathan/dotfiles/wayvnc/rsa_key.pem similarity index 100% rename from home-manager/dotfiles/wayvnc/rsa_key.pem rename to home-manager/nathan/dotfiles/wayvnc/rsa_key.pem diff --git a/home-manager/dotfiles/wayvnc/rsa_key.pem.pub b/home-manager/nathan/dotfiles/wayvnc/rsa_key.pem.pub similarity index 100% rename from home-manager/dotfiles/wayvnc/rsa_key.pem.pub rename to home-manager/nathan/dotfiles/wayvnc/rsa_key.pem.pub diff --git a/home-manager/impermanence/default.nix b/home-manager/nathan/impermanence/default.nix similarity index 100% rename from home-manager/impermanence/default.nix rename to home-manager/nathan/impermanence/default.nix diff --git a/home-manager/packages/default.nix b/home-manager/nathan/packages/default.nix similarity index 100% rename from home-manager/packages/default.nix rename to home-manager/nathan/packages/default.nix diff --git a/home-manager/packages/scripts/default.nix b/home-manager/nathan/packages/scripts/default.nix similarity index 100% rename from home-manager/packages/scripts/default.nix rename to home-manager/nathan/packages/scripts/default.nix diff --git a/home-manager/programs/ags/default.nix b/home-manager/nathan/programs/ags/default.nix similarity index 100% rename from home-manager/programs/ags/default.nix rename to home-manager/nathan/programs/ags/default.nix diff --git a/home-manager/programs/calcurse/default.nix b/home-manager/nathan/programs/calcurse/default.nix similarity index 100% rename from home-manager/programs/calcurse/default.nix rename to home-manager/nathan/programs/calcurse/default.nix diff --git a/home-manager/programs/default.nix b/home-manager/nathan/programs/default.nix similarity index 100% rename from home-manager/programs/default.nix rename to home-manager/nathan/programs/default.nix diff --git a/home-manager/programs/firefox/default.nix b/home-manager/nathan/programs/firefox/default.nix similarity index 100% rename from home-manager/programs/firefox/default.nix rename to home-manager/nathan/programs/firefox/default.nix diff --git a/home-manager/programs/hyprland/default.nix b/home-manager/nathan/programs/hyprland/default.nix similarity index 100% rename from home-manager/programs/hyprland/default.nix rename to home-manager/nathan/programs/hyprland/default.nix diff --git a/home-manager/programs/pywal/default.nix b/home-manager/nathan/programs/pywal/default.nix similarity index 100% rename from home-manager/programs/pywal/default.nix rename to home-manager/nathan/programs/pywal/default.nix diff --git a/home-manager/programs/rofi/default.nix b/home-manager/nathan/programs/rofi/default.nix similarity index 100% rename from home-manager/programs/rofi/default.nix rename to home-manager/nathan/programs/rofi/default.nix diff --git a/home-manager/programs/swaylock/default.nix b/home-manager/nathan/programs/swaylock/default.nix similarity index 100% rename from home-manager/programs/swaylock/default.nix rename to home-manager/nathan/programs/swaylock/default.nix diff --git a/home-manager/programs/terminal/bat/default.nix b/home-manager/nathan/programs/terminal/bat/default.nix similarity index 100% rename from home-manager/programs/terminal/bat/default.nix rename to home-manager/nathan/programs/terminal/bat/default.nix diff --git a/home-manager/programs/terminal/default.nix b/home-manager/nathan/programs/terminal/default.nix similarity index 100% rename from home-manager/programs/terminal/default.nix rename to home-manager/nathan/programs/terminal/default.nix diff --git a/home-manager/programs/terminal/eza/default.nix b/home-manager/nathan/programs/terminal/eza/default.nix similarity index 100% rename from home-manager/programs/terminal/eza/default.nix rename to home-manager/nathan/programs/terminal/eza/default.nix diff --git a/home-manager/programs/terminal/fzf/default.nix b/home-manager/nathan/programs/terminal/fzf/default.nix similarity index 100% rename from home-manager/programs/terminal/fzf/default.nix rename to home-manager/nathan/programs/terminal/fzf/default.nix diff --git a/home-manager/programs/terminal/kitty/default.nix b/home-manager/nathan/programs/terminal/kitty/default.nix similarity index 100% rename from home-manager/programs/terminal/kitty/default.nix rename to home-manager/nathan/programs/terminal/kitty/default.nix diff --git a/home-manager/programs/terminal/tmux/default.nix b/home-manager/nathan/programs/terminal/tmux/default.nix similarity index 100% rename from home-manager/programs/terminal/tmux/default.nix rename to home-manager/nathan/programs/terminal/tmux/default.nix diff --git a/home-manager/programs/terminal/zoxide/default.nix b/home-manager/nathan/programs/terminal/zoxide/default.nix similarity index 100% rename from home-manager/programs/terminal/zoxide/default.nix rename to home-manager/nathan/programs/terminal/zoxide/default.nix diff --git a/home-manager/programs/terminal/zsh/default.nix b/home-manager/nathan/programs/terminal/zsh/default.nix similarity index 100% rename from home-manager/programs/terminal/zsh/default.nix rename to home-manager/nathan/programs/terminal/zsh/default.nix diff --git a/home-manager/programs/wayvnc/default.nix b/home-manager/nathan/programs/wayvnc/default.nix similarity index 100% rename from home-manager/programs/wayvnc/default.nix rename to home-manager/nathan/programs/wayvnc/default.nix diff --git a/home-manager/services/custom/default.nix b/home-manager/nathan/services/custom/default.nix similarity index 100% rename from home-manager/services/custom/default.nix rename to home-manager/nathan/services/custom/default.nix diff --git a/home-manager/services/default.nix b/home-manager/nathan/services/default.nix similarity index 100% rename from home-manager/services/default.nix rename to home-manager/nathan/services/default.nix diff --git a/home-manager/services/mpd/default.nix b/home-manager/nathan/services/mpd/default.nix similarity index 100% rename from home-manager/services/mpd/default.nix rename to home-manager/nathan/services/mpd/default.nix