diff --git a/flake.nix b/flake.nix index a1fb008..bea4ab2 100644 --- a/flake.nix +++ b/flake.nix @@ -11,11 +11,11 @@ ]; imports = [ - ./outputs/pkgs + ./flake/pkgs ]; flake = { - nixosConfigurations = import ./outputs/nixos.nix {inherit self inputs nixpkgs;}; + nixosConfigurations = import ./flake/nixos.nix {inherit self inputs nixpkgs;}; }; }); diff --git a/outputs/nixos.nix b/flake/nixos.nix similarity index 79% rename from outputs/nixos.nix rename to flake/nixos.nix index 970f7f3..8c5fa6d 100644 --- a/outputs/nixos.nix +++ b/flake/nixos.nix @@ -5,7 +5,7 @@ let hm = inputs.home-manager.nixosModules.home-manager; - systemInputs = "${self}/inputs/system"; + systemInputs = "${self}/sys"; hosts = "${systemInputs}/hosts"; base = "${systemInputs}/modules/base"; @@ -31,6 +31,17 @@ in workstation ]; }; + ookst480s = nixosSystem { + inherit specialArgs; + system = "x86_64-linux"; + modules = [ + "${hosts}/ookst480s" + hm + base + + workstation + ]; + }; ooksmedia = nixosSystem { inherit specialArgs; system = "x86_64-linux"; diff --git a/outputs/overlays/default.nix b/flake/overlays/default.nix similarity index 100% rename from outputs/overlays/default.nix rename to flake/overlays/default.nix diff --git a/outputs/pkgs/default.nix b/flake/pkgs/default.nix similarity index 100% rename from outputs/pkgs/default.nix rename to flake/pkgs/default.nix diff --git a/outputs/pkgs/live-buds-cli/default.nix b/flake/pkgs/live-buds-cli/default.nix similarity index 67% rename from outputs/pkgs/live-buds-cli/default.nix rename to flake/pkgs/live-buds-cli/default.nix index 3c61e4f..f47931c 100644 --- a/outputs/pkgs/live-buds-cli/default.nix +++ b/flake/pkgs/live-buds-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, pkg-config, dbus, libpulseaudio, bluez }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, dbus, libpulseaudio, bluez }: rustPlatform.buildRustPackage rec { pname = "live-buds-cli"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; - cargoSha256 = "w/dt7Q9TACw5N/+QNAKMUEngf8sAhWyGslnw3B16crQ="; # you will need to determine this hash + cargoSha256 = "w/dt7Q9TACw5N/+QNAKMUEngf8sAhWyGslnw3B16crQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpulseaudio bluez dbus ]; @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A free cli tool to control your Galaxy buds live, Galaxy Buds+, Galaxy Buds Pro, Galaxy Buds 2 and Galaxy Buds 2 Pro"; license = licenses.gpl3; - #maintainers = [ maintainers.ooks-io ]; # replace with your maintainer info platforms = platforms.unix; }; } diff --git a/outputs/shell.nix b/flake/shell.nix similarity index 100% rename from outputs/shell.nix rename to flake/shell.nix diff --git a/inputs/home/modules/config/default.nix b/home/modules/config/default.nix similarity index 100% rename from inputs/home/modules/config/default.nix rename to home/modules/config/default.nix diff --git a/inputs/home/modules/config/home/default.nix b/home/modules/config/home/default.nix similarity index 100% rename from inputs/home/modules/config/home/default.nix rename to home/modules/config/home/default.nix diff --git a/inputs/home/modules/config/mimeApps/default.nix b/home/modules/config/mimeApps/default.nix similarity index 100% rename from inputs/home/modules/config/mimeApps/default.nix rename to home/modules/config/mimeApps/default.nix diff --git a/inputs/home/modules/config/monitors/default.nix b/home/modules/config/monitors/default.nix similarity index 100% rename from inputs/home/modules/config/monitors/default.nix rename to home/modules/config/monitors/default.nix diff --git a/inputs/home/modules/config/nix/default.nix b/home/modules/config/nix/default.nix similarity index 100% rename from inputs/home/modules/config/nix/default.nix rename to home/modules/config/nix/default.nix diff --git a/inputs/home/modules/config/userDirs/default.nix b/home/modules/config/userDirs/default.nix similarity index 100% rename from inputs/home/modules/config/userDirs/default.nix rename to home/modules/config/userDirs/default.nix diff --git a/inputs/home/modules/console/default.nix b/home/modules/console/default.nix similarity index 100% rename from inputs/home/modules/console/default.nix rename to home/modules/console/default.nix diff --git a/inputs/home/modules/console/editor/default.nix b/home/modules/console/editor/default.nix similarity index 100% rename from inputs/home/modules/console/editor/default.nix rename to home/modules/console/editor/default.nix diff --git a/inputs/home/modules/console/editor/helix/default.nix b/home/modules/console/editor/helix/default.nix similarity index 100% rename from inputs/home/modules/console/editor/helix/default.nix rename to home/modules/console/editor/helix/default.nix diff --git a/inputs/home/modules/console/editor/helix/languages.nix b/home/modules/console/editor/helix/languages.nix similarity index 100% rename from inputs/home/modules/console/editor/helix/languages.nix rename to home/modules/console/editor/helix/languages.nix diff --git a/inputs/home/modules/console/editor/helix/theme.nix b/home/modules/console/editor/helix/theme.nix similarity index 100% rename from inputs/home/modules/console/editor/helix/theme.nix rename to home/modules/console/editor/helix/theme.nix diff --git a/inputs/home/modules/console/editor/nvim/default.nix b/home/modules/console/editor/nvim/default.nix similarity index 100% rename from inputs/home/modules/console/editor/nvim/default.nix rename to home/modules/console/editor/nvim/default.nix diff --git a/inputs/home/modules/console/editor/nvim/keymapping.nix b/home/modules/console/editor/nvim/keymapping.nix similarity index 100% rename from inputs/home/modules/console/editor/nvim/keymapping.nix rename to home/modules/console/editor/nvim/keymapping.nix diff --git a/inputs/home/modules/console/editor/nvim/plugins/default.nix b/home/modules/console/editor/nvim/plugins/default.nix similarity index 100% rename from inputs/home/modules/console/editor/nvim/plugins/default.nix rename to home/modules/console/editor/nvim/plugins/default.nix diff --git a/inputs/home/modules/console/editor/nvim/plugins/indent.nix b/home/modules/console/editor/nvim/plugins/indent.nix similarity index 100% rename from inputs/home/modules/console/editor/nvim/plugins/indent.nix rename to home/modules/console/editor/nvim/plugins/indent.nix diff --git a/inputs/home/modules/console/editor/nvim/plugins/lualine.nix b/home/modules/console/editor/nvim/plugins/lualine.nix similarity index 100% rename from inputs/home/modules/console/editor/nvim/plugins/lualine.nix rename to home/modules/console/editor/nvim/plugins/lualine.nix diff --git a/inputs/home/modules/console/editor/nvim/plugins/telescope.nix b/home/modules/console/editor/nvim/plugins/telescope.nix similarity index 100% rename from inputs/home/modules/console/editor/nvim/plugins/telescope.nix rename to home/modules/console/editor/nvim/plugins/telescope.nix diff --git a/inputs/home/modules/console/editor/nvim/settings.nix b/home/modules/console/editor/nvim/settings.nix similarity index 100% rename from inputs/home/modules/console/editor/nvim/settings.nix rename to home/modules/console/editor/nvim/settings.nix diff --git a/inputs/home/modules/console/fileManager/default.nix b/home/modules/console/fileManager/default.nix similarity index 100% rename from inputs/home/modules/console/fileManager/default.nix rename to home/modules/console/fileManager/default.nix diff --git a/inputs/home/modules/console/fileManager/lf/default.nix b/home/modules/console/fileManager/lf/default.nix similarity index 100% rename from inputs/home/modules/console/fileManager/lf/default.nix rename to home/modules/console/fileManager/lf/default.nix diff --git a/inputs/home/modules/console/multiplexer/default.nix b/home/modules/console/multiplexer/default.nix similarity index 100% rename from inputs/home/modules/console/multiplexer/default.nix rename to home/modules/console/multiplexer/default.nix diff --git a/inputs/home/modules/console/multiplexer/tmux/default.nix b/home/modules/console/multiplexer/tmux/default.nix similarity index 100% rename from inputs/home/modules/console/multiplexer/tmux/default.nix rename to home/modules/console/multiplexer/tmux/default.nix diff --git a/inputs/home/modules/console/multiplexer/zellij/default.nix b/home/modules/console/multiplexer/zellij/default.nix similarity index 100% rename from inputs/home/modules/console/multiplexer/zellij/default.nix rename to home/modules/console/multiplexer/zellij/default.nix diff --git a/inputs/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix b/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix similarity index 100% rename from inputs/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix rename to home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix diff --git a/inputs/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix b/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix similarity index 100% rename from inputs/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix rename to home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix diff --git a/inputs/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix b/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix similarity index 100% rename from inputs/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix rename to home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix diff --git a/inputs/home/modules/console/prompt/default.nix b/home/modules/console/prompt/default.nix similarity index 100% rename from inputs/home/modules/console/prompt/default.nix rename to home/modules/console/prompt/default.nix diff --git a/inputs/home/modules/console/prompt/starship/default.nix b/home/modules/console/prompt/starship/default.nix similarity index 100% rename from inputs/home/modules/console/prompt/starship/default.nix rename to home/modules/console/prompt/starship/default.nix diff --git a/inputs/home/modules/console/shell/bash/default.nix b/home/modules/console/shell/bash/default.nix similarity index 100% rename from inputs/home/modules/console/shell/bash/default.nix rename to home/modules/console/shell/bash/default.nix diff --git a/inputs/home/modules/console/shell/default.nix b/home/modules/console/shell/default.nix similarity index 100% rename from inputs/home/modules/console/shell/default.nix rename to home/modules/console/shell/default.nix diff --git a/inputs/home/modules/console/shell/fish/default.nix b/home/modules/console/shell/fish/default.nix similarity index 100% rename from inputs/home/modules/console/shell/fish/default.nix rename to home/modules/console/shell/fish/default.nix diff --git a/inputs/home/modules/console/shell/zsh/default.nix b/home/modules/console/shell/zsh/default.nix similarity index 100% rename from inputs/home/modules/console/shell/zsh/default.nix rename to home/modules/console/shell/zsh/default.nix diff --git a/inputs/home/modules/console/utility/default.nix b/home/modules/console/utility/default.nix similarity index 77% rename from inputs/home/modules/console/utility/default.nix rename to home/modules/console/utility/default.nix index 3540a60..b878df2 100644 --- a/inputs/home/modules/console/utility/default.nix +++ b/home/modules/console/utility/default.nix @@ -5,7 +5,6 @@ ./git ./tools ./ssh - ./transientServices ]; options.homeModules.console.utility = { @@ -21,8 +20,5 @@ tools = { enable = lib.mkEnableOption "Enable various console tools"; }; - transientServices = { - enable = lib.mkEnableOption "Enable various console transientServices"; - }; }; } diff --git a/inputs/home/modules/console/utility/git/default.nix b/home/modules/console/utility/git/default.nix similarity index 100% rename from inputs/home/modules/console/utility/git/default.nix rename to home/modules/console/utility/git/default.nix diff --git a/inputs/home/modules/console/utility/nixIndex/default.nix b/home/modules/console/utility/nixIndex/default.nix similarity index 100% rename from inputs/home/modules/console/utility/nixIndex/default.nix rename to home/modules/console/utility/nixIndex/default.nix diff --git a/inputs/home/modules/console/utility/ssh/default.nix b/home/modules/console/utility/ssh/default.nix similarity index 100% rename from inputs/home/modules/console/utility/ssh/default.nix rename to home/modules/console/utility/ssh/default.nix diff --git a/inputs/home/modules/console/utility/tools/default.nix b/home/modules/console/utility/tools/default.nix similarity index 100% rename from inputs/home/modules/console/utility/tools/default.nix rename to home/modules/console/utility/tools/default.nix diff --git a/inputs/home/modules/default.nix b/home/modules/default.nix similarity index 100% rename from inputs/home/modules/default.nix rename to home/modules/default.nix diff --git a/inputs/home/modules/desktop/browser/brave/default.nix b/home/modules/desktop/browser/brave/default.nix similarity index 100% rename from inputs/home/modules/desktop/browser/brave/default.nix rename to home/modules/desktop/browser/brave/default.nix diff --git a/inputs/home/modules/desktop/browser/chrome/default.nix b/home/modules/desktop/browser/chrome/default.nix similarity index 100% rename from inputs/home/modules/desktop/browser/chrome/default.nix rename to home/modules/desktop/browser/chrome/default.nix diff --git a/inputs/home/modules/desktop/browser/default.nix b/home/modules/desktop/browser/default.nix similarity index 100% rename from inputs/home/modules/desktop/browser/default.nix rename to home/modules/desktop/browser/default.nix diff --git a/inputs/home/modules/desktop/browser/firefox/default.nix b/home/modules/desktop/browser/firefox/default.nix similarity index 100% rename from inputs/home/modules/desktop/browser/firefox/default.nix rename to home/modules/desktop/browser/firefox/default.nix diff --git a/inputs/home/modules/desktop/browser/firefox/settings/narsilUserjs.nix b/home/modules/desktop/browser/firefox/settings/narsilUserjs.nix similarity index 100% rename from inputs/home/modules/desktop/browser/firefox/settings/narsilUserjs.nix rename to home/modules/desktop/browser/firefox/settings/narsilUserjs.nix diff --git a/inputs/home/modules/desktop/browser/firefox/settings/ooksJs.nix b/home/modules/desktop/browser/firefox/settings/ooksJs.nix similarity index 100% rename from inputs/home/modules/desktop/browser/firefox/settings/ooksJs.nix rename to home/modules/desktop/browser/firefox/settings/ooksJs.nix diff --git a/inputs/home/modules/desktop/browser/firefox/theme/penguinFox.nix b/home/modules/desktop/browser/firefox/theme/penguinFox.nix similarity index 100% rename from inputs/home/modules/desktop/browser/firefox/theme/penguinFox.nix rename to home/modules/desktop/browser/firefox/theme/penguinFox.nix diff --git a/inputs/home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix b/home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix similarity index 100% rename from inputs/home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix rename to home/modules/desktop/browser/firefox/theme/penguinFoxContent.nix diff --git a/inputs/home/modules/desktop/browser/schizofox/default.nix b/home/modules/desktop/browser/schizofox/default.nix similarity index 100% rename from inputs/home/modules/desktop/browser/schizofox/default.nix rename to home/modules/desktop/browser/schizofox/default.nix diff --git a/inputs/home/modules/desktop/communication/default.nix b/home/modules/desktop/communication/default.nix similarity index 100% rename from inputs/home/modules/desktop/communication/default.nix rename to home/modules/desktop/communication/default.nix diff --git a/inputs/home/modules/desktop/communication/discord/default.nix b/home/modules/desktop/communication/discord/default.nix similarity index 100% rename from inputs/home/modules/desktop/communication/discord/default.nix rename to home/modules/desktop/communication/discord/default.nix diff --git a/inputs/home/modules/desktop/creative/audio/audacity/default.nix b/home/modules/desktop/creative/audio/audacity/default.nix similarity index 100% rename from inputs/home/modules/desktop/creative/audio/audacity/default.nix rename to home/modules/desktop/creative/audio/audacity/default.nix diff --git a/inputs/home/modules/desktop/creative/audio/default.nix b/home/modules/desktop/creative/audio/default.nix similarity index 100% rename from inputs/home/modules/desktop/creative/audio/default.nix rename to home/modules/desktop/creative/audio/default.nix diff --git a/inputs/home/modules/desktop/creative/default.nix b/home/modules/desktop/creative/default.nix similarity index 100% rename from inputs/home/modules/desktop/creative/default.nix rename to home/modules/desktop/creative/default.nix diff --git a/inputs/home/modules/desktop/creative/image/default.nix b/home/modules/desktop/creative/image/default.nix similarity index 100% rename from inputs/home/modules/desktop/creative/image/default.nix rename to home/modules/desktop/creative/image/default.nix diff --git a/inputs/home/modules/desktop/creative/image/inkscape/default.nix b/home/modules/desktop/creative/image/inkscape/default.nix similarity index 100% rename from inputs/home/modules/desktop/creative/image/inkscape/default.nix rename to home/modules/desktop/creative/image/inkscape/default.nix diff --git a/inputs/home/modules/desktop/default.nix b/home/modules/desktop/default.nix similarity index 100% rename from inputs/home/modules/desktop/default.nix rename to home/modules/desktop/default.nix diff --git a/inputs/home/modules/desktop/gaming/bottles/default.nix b/home/modules/desktop/gaming/bottles/default.nix similarity index 100% rename from inputs/home/modules/desktop/gaming/bottles/default.nix rename to home/modules/desktop/gaming/bottles/default.nix diff --git a/inputs/home/modules/desktop/gaming/default.nix b/home/modules/desktop/gaming/default.nix similarity index 100% rename from inputs/home/modules/desktop/gaming/default.nix rename to home/modules/desktop/gaming/default.nix diff --git a/inputs/home/modules/desktop/gaming/factorio/default.nix b/home/modules/desktop/gaming/factorio/default.nix similarity index 100% rename from inputs/home/modules/desktop/gaming/factorio/default.nix rename to home/modules/desktop/gaming/factorio/default.nix diff --git a/inputs/home/modules/desktop/gaming/lutris/default.nix b/home/modules/desktop/gaming/lutris/default.nix similarity index 100% rename from inputs/home/modules/desktop/gaming/lutris/default.nix rename to home/modules/desktop/gaming/lutris/default.nix diff --git a/inputs/home/modules/desktop/media/default.nix b/home/modules/desktop/media/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/default.nix rename to home/modules/desktop/media/default.nix diff --git a/inputs/home/modules/desktop/media/image/default.nix b/home/modules/desktop/media/image/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/image/default.nix rename to home/modules/desktop/media/image/default.nix diff --git a/inputs/home/modules/desktop/media/image/imv/default.nix b/home/modules/desktop/media/image/imv/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/image/imv/default.nix rename to home/modules/desktop/media/image/imv/default.nix diff --git a/inputs/home/modules/desktop/media/music/default.nix b/home/modules/desktop/media/music/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/music/default.nix rename to home/modules/desktop/media/music/default.nix diff --git a/inputs/home/modules/desktop/media/music/easyeffects/default.nix b/home/modules/desktop/media/music/easyeffects/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/music/easyeffects/default.nix rename to home/modules/desktop/media/music/easyeffects/default.nix diff --git a/inputs/home/modules/desktop/media/music/tui/default.nix b/home/modules/desktop/media/music/tui/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/music/tui/default.nix rename to home/modules/desktop/media/music/tui/default.nix diff --git a/inputs/home/modules/desktop/media/video/default.nix b/home/modules/desktop/media/video/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/video/default.nix rename to home/modules/desktop/media/video/default.nix diff --git a/inputs/home/modules/desktop/media/video/jellyfin/default.nix b/home/modules/desktop/media/video/jellyfin/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/video/jellyfin/default.nix rename to home/modules/desktop/media/video/jellyfin/default.nix diff --git a/inputs/home/modules/desktop/media/video/mpv/default.nix b/home/modules/desktop/media/video/mpv/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/video/mpv/default.nix rename to home/modules/desktop/media/video/mpv/default.nix diff --git a/inputs/home/modules/desktop/media/video/youtube/default.nix b/home/modules/desktop/media/video/youtube/default.nix similarity index 100% rename from inputs/home/modules/desktop/media/video/youtube/default.nix rename to home/modules/desktop/media/video/youtube/default.nix diff --git a/inputs/home/modules/desktop/productivity/default.nix b/home/modules/desktop/productivity/default.nix similarity index 100% rename from inputs/home/modules/desktop/productivity/default.nix rename to home/modules/desktop/productivity/default.nix diff --git a/inputs/home/modules/desktop/productivity/obsidian/default.nix b/home/modules/desktop/productivity/obsidian/default.nix similarity index 100% rename from inputs/home/modules/desktop/productivity/obsidian/default.nix rename to home/modules/desktop/productivity/obsidian/default.nix diff --git a/inputs/home/modules/desktop/productivity/office/default.nix b/home/modules/desktop/productivity/office/default.nix similarity index 100% rename from inputs/home/modules/desktop/productivity/office/default.nix rename to home/modules/desktop/productivity/office/default.nix diff --git a/inputs/home/modules/desktop/productivity/zathura/default.nix b/home/modules/desktop/productivity/zathura/default.nix similarity index 100% rename from inputs/home/modules/desktop/productivity/zathura/default.nix rename to home/modules/desktop/productivity/zathura/default.nix diff --git a/inputs/home/modules/desktop/security/default.nix b/home/modules/desktop/security/default.nix similarity index 100% rename from inputs/home/modules/desktop/security/default.nix rename to home/modules/desktop/security/default.nix diff --git a/inputs/home/modules/desktop/security/polkit/default.nix b/home/modules/desktop/security/polkit/default.nix similarity index 100% rename from inputs/home/modules/desktop/security/polkit/default.nix rename to home/modules/desktop/security/polkit/default.nix diff --git a/inputs/home/modules/desktop/terminal/default.nix b/home/modules/desktop/terminal/default.nix similarity index 100% rename from inputs/home/modules/desktop/terminal/default.nix rename to home/modules/desktop/terminal/default.nix diff --git a/inputs/home/modules/desktop/terminal/foot/default.nix b/home/modules/desktop/terminal/foot/default.nix similarity index 100% rename from inputs/home/modules/desktop/terminal/foot/default.nix rename to home/modules/desktop/terminal/foot/default.nix diff --git a/inputs/home/modules/desktop/terminal/kitty/default.nix b/home/modules/desktop/terminal/kitty/default.nix similarity index 100% rename from inputs/home/modules/desktop/terminal/kitty/default.nix rename to home/modules/desktop/terminal/kitty/default.nix diff --git a/inputs/home/modules/desktop/tools/default.nix b/home/modules/desktop/tools/default.nix similarity index 100% rename from inputs/home/modules/desktop/tools/default.nix rename to home/modules/desktop/tools/default.nix diff --git a/inputs/home/modules/desktop/tools/kdeconnect/default.nix b/home/modules/desktop/tools/kdeconnect/default.nix similarity index 100% rename from inputs/home/modules/desktop/tools/kdeconnect/default.nix rename to home/modules/desktop/tools/kdeconnect/default.nix diff --git a/inputs/home/modules/desktop/wayland/bar/ags/default.nix b/home/modules/desktop/wayland/bar/ags/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/bar/ags/default.nix rename to home/modules/desktop/wayland/bar/ags/default.nix diff --git a/inputs/home/modules/desktop/wayland/bar/default.nix b/home/modules/desktop/wayland/bar/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/bar/default.nix rename to home/modules/desktop/wayland/bar/default.nix diff --git a/inputs/home/modules/desktop/wayland/bar/eww/default.nix b/home/modules/desktop/wayland/bar/eww/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/bar/eww/default.nix rename to home/modules/desktop/wayland/bar/eww/default.nix diff --git a/inputs/home/modules/desktop/wayland/bar/waybar/default.nix b/home/modules/desktop/wayland/bar/waybar/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/bar/waybar/default.nix rename to home/modules/desktop/wayland/bar/waybar/default.nix diff --git a/inputs/home/modules/desktop/wayland/default.nix b/home/modules/desktop/wayland/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/default.nix rename to home/modules/desktop/wayland/default.nix diff --git a/inputs/home/modules/desktop/wayland/launcher/anyrun/default.nix b/home/modules/desktop/wayland/launcher/anyrun/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/launcher/anyrun/default.nix rename to home/modules/desktop/wayland/launcher/anyrun/default.nix diff --git a/inputs/home/modules/desktop/wayland/launcher/default.nix b/home/modules/desktop/wayland/launcher/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/launcher/default.nix rename to home/modules/desktop/wayland/launcher/default.nix diff --git a/inputs/home/modules/desktop/wayland/launcher/rofi/default.nix b/home/modules/desktop/wayland/launcher/rofi/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/launcher/rofi/default.nix rename to home/modules/desktop/wayland/launcher/rofi/default.nix diff --git a/inputs/home/modules/desktop/wayland/launcher/tofi/default.nix b/home/modules/desktop/wayland/launcher/tofi/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/launcher/tofi/default.nix rename to home/modules/desktop/wayland/launcher/tofi/default.nix diff --git a/inputs/home/modules/desktop/wayland/lockscreen/default.nix b/home/modules/desktop/wayland/lockscreen/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/lockscreen/default.nix rename to home/modules/desktop/wayland/lockscreen/default.nix diff --git a/inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix b/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix rename to home/modules/desktop/wayland/lockscreen/hyprlock/default.nix diff --git a/inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix b/home/modules/desktop/wayland/lockscreen/swaylock/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix rename to home/modules/desktop/wayland/lockscreen/swaylock/default.nix diff --git a/inputs/home/modules/desktop/wayland/notification/default.nix b/home/modules/desktop/wayland/notification/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/notification/default.nix rename to home/modules/desktop/wayland/notification/default.nix diff --git a/inputs/home/modules/desktop/wayland/notification/mako/default.nix b/home/modules/desktop/wayland/notification/mako/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/notification/mako/default.nix rename to home/modules/desktop/wayland/notification/mako/default.nix diff --git a/inputs/home/modules/desktop/wayland/utility/default.nix b/home/modules/desktop/wayland/utility/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/utility/default.nix rename to home/modules/desktop/wayland/utility/default.nix diff --git a/inputs/home/modules/desktop/wayland/utility/gammastep/default.nix b/home/modules/desktop/wayland/utility/gammastep/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/utility/gammastep/default.nix rename to home/modules/desktop/wayland/utility/gammastep/default.nix diff --git a/inputs/home/modules/desktop/wayland/utility/tools/default.nix b/home/modules/desktop/wayland/utility/tools/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/utility/tools/default.nix rename to home/modules/desktop/wayland/utility/tools/default.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/default.nix b/home/modules/desktop/wayland/windowManager/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/default.nix rename to home/modules/desktop/wayland/windowManager/default.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/default.nix rename to home/modules/desktop/wayland/windowManager/hyprland/default.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix rename to home/modules/desktop/wayland/windowManager/hyprland/extras/default.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix rename to home/modules/desktop/wayland/windowManager/hyprland/extras/hyprcapture/default.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix rename to home/modules/desktop/wayland/windowManager/hyprland/extras/hyprshade/default.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/pkgs/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/default.nix rename to home/modules/desktop/wayland/windowManager/hyprland/pkgs/default.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprbrightness.nix b/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprbrightness.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprbrightness.nix rename to home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprbrightness.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprvolume.nix b/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprvolume.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprvolume.nix rename to home/modules/desktop/wayland/windowManager/hyprland/pkgs/hyprvolume.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/binds.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/default.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/env.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/exec.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/gestures.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/hyprpaper.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/inputs.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/misc.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/monitor.nix diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix b/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix similarity index 100% rename from inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix rename to home/modules/desktop/wayland/windowManager/hyprland/settings/rules.nix diff --git a/inputs/home/modules/theme/cursor/default.nix b/home/modules/theme/cursor/default.nix similarity index 100% rename from inputs/home/modules/theme/cursor/default.nix rename to home/modules/theme/cursor/default.nix diff --git a/inputs/home/modules/theme/default.nix b/home/modules/theme/default.nix similarity index 100% rename from inputs/home/modules/theme/default.nix rename to home/modules/theme/default.nix diff --git a/inputs/home/modules/theme/fonts/default.nix b/home/modules/theme/fonts/default.nix similarity index 100% rename from inputs/home/modules/theme/fonts/default.nix rename to home/modules/theme/fonts/default.nix diff --git a/inputs/home/modules/theme/gtk/default.nix b/home/modules/theme/gtk/default.nix similarity index 100% rename from inputs/home/modules/theme/gtk/default.nix rename to home/modules/theme/gtk/default.nix diff --git a/inputs/home/modules/theme/qt/default.nix b/home/modules/theme/qt/default.nix similarity index 100% rename from inputs/home/modules/theme/qt/default.nix rename to home/modules/theme/qt/default.nix diff --git a/inputs/home/modules/theme/wallpaper/default.nix b/home/modules/theme/wallpaper/default.nix similarity index 100% rename from inputs/home/modules/theme/wallpaper/default.nix rename to home/modules/theme/wallpaper/default.nix diff --git a/inputs/home/profile/base/default.nix b/home/profile/base/default.nix similarity index 88% rename from inputs/home/profile/base/default.nix rename to home/profile/base/default.nix index dc860cb..511bf5b 100644 --- a/inputs/home/profile/base/default.nix +++ b/home/profile/base/default.nix @@ -14,8 +14,6 @@ in homeModules = { config = { - # nix.enable = true; - # nixColors.enable = true; home.enable = true; userDirs.enable = true; mimeApps.enable = true; @@ -37,7 +35,6 @@ in nixIndex.enable = true; git.enable = true; tools.enable = true; - transientServices.enable = true; }; }; }; diff --git a/inputs/home/profile/creative/default.nix b/home/profile/creative/default.nix similarity index 100% rename from inputs/home/profile/creative/default.nix rename to home/profile/creative/default.nix diff --git a/inputs/home/profile/default.nix b/home/profile/default.nix similarity index 100% rename from inputs/home/profile/default.nix rename to home/profile/default.nix diff --git a/inputs/home/profile/gaming/default.nix b/home/profile/gaming/default.nix similarity index 100% rename from inputs/home/profile/gaming/default.nix rename to home/profile/gaming/default.nix diff --git a/inputs/home/profile/hyprland/default.nix b/home/profile/hyprland/default.nix similarity index 100% rename from inputs/home/profile/hyprland/default.nix rename to home/profile/hyprland/default.nix diff --git a/inputs/home/profile/productivity/default.nix b/home/profile/productivity/default.nix similarity index 100% rename from inputs/home/profile/productivity/default.nix rename to home/profile/productivity/default.nix diff --git a/inputs/home/profile/themes/default.nix b/home/profile/themes/default.nix similarity index 100% rename from inputs/home/profile/themes/default.nix rename to home/profile/themes/default.nix diff --git a/inputs/home/profile/themes/minimal/default.nix b/home/profile/themes/minimal/default.nix similarity index 100% rename from inputs/home/profile/themes/minimal/default.nix rename to home/profile/themes/minimal/default.nix diff --git a/inputs/home/profile/themes/phone/default.nix b/home/profile/themes/phone/default.nix similarity index 100% rename from inputs/home/profile/themes/phone/default.nix rename to home/profile/themes/phone/default.nix diff --git a/inputs/home/user/erika@ookst480.nix b/home/user/erika@ookst480.nix similarity index 100% rename from inputs/home/user/erika@ookst480.nix rename to home/user/erika@ookst480.nix diff --git a/inputs/home/user/ooks/ooksdesk/default.nix b/home/user/ooks/ooksdesk/default.nix similarity index 100% rename from inputs/home/user/ooks/ooksdesk/default.nix rename to home/user/ooks/ooksdesk/default.nix diff --git a/inputs/home/user/ooks/ooksmedia/default.nix b/home/user/ooks/ooksmedia/default.nix similarity index 100% rename from inputs/home/user/ooks/ooksmedia/default.nix rename to home/user/ooks/ooksmedia/default.nix diff --git a/inputs/home/user/ooks/ooksmicro/default.nix b/home/user/ooks/ooksmicro/default.nix similarity index 100% rename from inputs/home/user/ooks/ooksmicro/default.nix rename to home/user/ooks/ooksmicro/default.nix diff --git a/inputs/home/user/ooks/ooksphone/default.nix b/home/user/ooks/ooksphone/default.nix similarity index 100% rename from inputs/home/user/ooks/ooksphone/default.nix rename to home/user/ooks/ooksphone/default.nix diff --git a/inputs/home/user/ooks/ookst480s/default.nix b/home/user/ooks/ookst480s/default.nix similarity index 100% rename from inputs/home/user/ooks/ookst480s/default.nix rename to home/user/ooks/ookst480s/default.nix diff --git a/inputs/default.nix b/inputs/default.nix deleted file mode 100644 index 5587101..0000000 --- a/inputs/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./home - ./system - ]; -} diff --git a/inputs/home/modules/console/utility/transientServices/default.nix b/inputs/home/modules/console/utility/transientServices/default.nix deleted file mode 100644 index 0a6fa65..0000000 --- a/inputs/home/modules/console/utility/transientServices/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -# taken from github:NotAShelf/fufexan -{ pkgs, config, lib, ... }: -let - cfg = config.homeModules.console.utility.transientServices; - apply-hm-env = pkgs.writeShellScript "apply-hm-env" '' - ${lib.optionalString (config.home.sessionPath != []) '' - export PATH=${builtins.concatStringsSep ":" config.home.sessionPath}:$PATH - ''} - ${builtins.concatStringsSep "\n" (lib.mapAttrsToList (k: v: '' - export ${k}=${toString v} - '') - config.home.sessionVariables)} - ${config.home.sessionVariablesExtra} - exec "$@" - ''; - - # runs processes as systemd transient services - run-as-service = pkgs.writeShellScriptBin "run-as-service" '' - exec ${pkgs.systemd}/bin/systemd-run \ - --slice=app-manual.slice \ - --property=ExitType=cgroup \ - --user \ - --wait \ - bash -lc "exec ${apply-hm-env} $@" - ''; -in -{ - config = lib.mkIf cfg.enable { - home = { - packages = [run-as-service]; - }; - }; -} diff --git a/inputs/system/hosts/ooksmedia/default.nix b/inputs/system/hosts/ooksmedia/default.nix deleted file mode 100644 index 0905938..0000000 --- a/inputs/system/hosts/ooksmedia/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, inputs, pkgs, ... }: - -{ - imports = [ ./hardware-configuration.nix ]; - - activeProfiles = ["base" "gaming"]; - - systemModules.user = { - ooks.enable = true; - shell = "fish"; - }; - - systemModules.hardware = { - cpu.type = "intel"; - gpu.type = "nvidia"; - }; - - systemModules.networking.tailscale = { - enable = true; - server = true; - }; - - networking = { - hostName = "ooksmedia"; - }; - boot = { - kernelPackages = pkgs.linuxPackages_xanmod_latest; - }; -} diff --git a/inputs/system/hosts/ooks-x1/default.nix b/sys/hosts/ooks-x1/default.nix similarity index 100% rename from inputs/system/hosts/ooks-x1/default.nix rename to sys/hosts/ooks-x1/default.nix diff --git a/inputs/system/hosts/ooks-x1/hardware-configuration.nix b/sys/hosts/ooks-x1/hardware-configuration.nix similarity index 100% rename from inputs/system/hosts/ooks-x1/hardware-configuration.nix rename to sys/hosts/ooks-x1/hardware-configuration.nix diff --git a/inputs/system/hosts/ooksdesk/default.nix b/sys/hosts/ooksdesk/default.nix similarity index 100% rename from inputs/system/hosts/ooksdesk/default.nix rename to sys/hosts/ooksdesk/default.nix diff --git a/inputs/system/hosts/ooksdesk/hardware-configuration.nix b/sys/hosts/ooksdesk/hardware-configuration.nix similarity index 100% rename from inputs/system/hosts/ooksdesk/hardware-configuration.nix rename to sys/hosts/ooksdesk/hardware-configuration.nix diff --git a/sys/hosts/ooksmedia/default.nix b/sys/hosts/ooksmedia/default.nix new file mode 100644 index 0000000..260974c --- /dev/null +++ b/sys/hosts/ooksmedia/default.nix @@ -0,0 +1,48 @@ +{ lib, pkgs, ... }: + +let + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn3ff3HaZHIyH4K13k8Mwqu/o7jIABJ8rANK+r2PfJk"; +in + +{ + imports = [ + ./hardware-configuration.nix + ]; + + systemModules.host = { + name = "ooksmedia"; + type = "desktop"; + function = [ + "workstation" + "gaming" + "media-server" + ]; + admin = { + name = "ooks"; + shell = "fish"; + sshKey = key; + homeManager = true; + }; + hardware = { + cpu.type = "intel"; + cpu.amd.pstate.enable = true; + gpu.type = "nvidia"; + features = [ + "audio" + "video" + "ssd" + ]; + }; + }; + + systemModules.networking.tailscale = { + enable = true; + server = true; + }; + + boot = { + kernelPackages = pkgs.linuxPackages_xanmod_latest; + }; + + system.stateVersion = lib.mkDefault "23.11"; +} diff --git a/inputs/system/hosts/ooksmedia/hardware-configuration.nix b/sys/hosts/ooksmedia/hardware-configuration.nix similarity index 100% rename from inputs/system/hosts/ooksmedia/hardware-configuration.nix rename to sys/hosts/ooksmedia/hardware-configuration.nix diff --git a/inputs/system/hosts/ooksmicro/default.nix b/sys/hosts/ooksmicro/default.nix similarity index 100% rename from inputs/system/hosts/ooksmicro/default.nix rename to sys/hosts/ooksmicro/default.nix diff --git a/inputs/system/hosts/ooksmicro/hardware-configuration.nix b/sys/hosts/ooksmicro/hardware-configuration.nix similarity index 100% rename from inputs/system/hosts/ooksmicro/hardware-configuration.nix rename to sys/hosts/ooksmicro/hardware-configuration.nix diff --git a/inputs/system/hosts/ooksphone/default.nix b/sys/hosts/ooksphone/default.nix similarity index 100% rename from inputs/system/hosts/ooksphone/default.nix rename to sys/hosts/ooksphone/default.nix diff --git a/inputs/system/hosts/ooksphone/modules/default.nix b/sys/hosts/ooksphone/modules/default.nix similarity index 100% rename from inputs/system/hosts/ooksphone/modules/default.nix rename to sys/hosts/ooksphone/modules/default.nix diff --git a/inputs/system/hosts/ooksphone/modules/openssh.nix b/sys/hosts/ooksphone/modules/openssh.nix similarity index 100% rename from inputs/system/hosts/ooksphone/modules/openssh.nix rename to sys/hosts/ooksphone/modules/openssh.nix diff --git a/inputs/system/hosts/ooksphone/modules/theme.nix b/sys/hosts/ooksphone/modules/theme.nix similarity index 100% rename from inputs/system/hosts/ooksphone/modules/theme.nix rename to sys/hosts/ooksphone/modules/theme.nix diff --git a/inputs/system/hosts/ookst480s/default.nix b/sys/hosts/ookst480s/default.nix similarity index 84% rename from inputs/system/hosts/ookst480s/default.nix rename to sys/hosts/ookst480s/default.nix index 7963fc9..cbf61af 100644 --- a/inputs/system/hosts/ookst480s/default.nix +++ b/sys/hosts/ookst480s/default.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, lib, ... }: +{ pkgs, lib, ... }: let inherit (lib) mkDefault; @@ -8,8 +8,7 @@ in { imports = [ ./hardware-configuration.nix - ../../modules - ]; + ]; systemModules.host = { @@ -25,7 +24,14 @@ in hardware = { cpu.type = "intel"; gpu.type = "intel"; - features = [ "bluetooth" "backlight" "battery" "ssd" ]; + features = [ + "bluetooth" + "backlight" + "battery" + "ssd" + "audio" + "video" + ]; battery = { powersave = { minFreq = 800; diff --git a/inputs/system/hosts/ookst480s/hardware-configuration.nix b/sys/hosts/ookst480s/hardware-configuration.nix similarity index 100% rename from inputs/system/hosts/ookst480s/hardware-configuration.nix rename to sys/hosts/ookst480s/hardware-configuration.nix diff --git a/inputs/system/modules/base/boot/default.nix b/sys/modules/base/boot/default.nix similarity index 100% rename from inputs/system/modules/base/boot/default.nix rename to sys/modules/base/boot/default.nix diff --git a/inputs/system/modules/base/boot/loader/default.nix b/sys/modules/base/boot/loader/default.nix similarity index 100% rename from inputs/system/modules/base/boot/loader/default.nix rename to sys/modules/base/boot/loader/default.nix diff --git a/inputs/system/modules/base/boot/loader/grub.nix b/sys/modules/base/boot/loader/grub.nix similarity index 100% rename from inputs/system/modules/base/boot/loader/grub.nix rename to sys/modules/base/boot/loader/grub.nix diff --git a/inputs/system/modules/base/boot/loader/systemd.nix b/sys/modules/base/boot/loader/systemd.nix similarity index 100% rename from inputs/system/modules/base/boot/loader/systemd.nix rename to sys/modules/base/boot/loader/systemd.nix diff --git a/inputs/system/modules/base/boot/plymouth.nix b/sys/modules/base/boot/plymouth.nix similarity index 100% rename from inputs/system/modules/base/boot/plymouth.nix rename to sys/modules/base/boot/plymouth.nix diff --git a/inputs/system/modules/base/default.nix b/sys/modules/base/default.nix similarity index 100% rename from inputs/system/modules/base/default.nix rename to sys/modules/base/default.nix diff --git a/inputs/system/modules/base/displayManager/default.nix b/sys/modules/base/displayManager/default.nix similarity index 100% rename from inputs/system/modules/base/displayManager/default.nix rename to sys/modules/base/displayManager/default.nix diff --git a/inputs/system/modules/base/displayManager/tuigreet.nix b/sys/modules/base/displayManager/tuigreet.nix similarity index 100% rename from inputs/system/modules/base/displayManager/tuigreet.nix rename to sys/modules/base/displayManager/tuigreet.nix diff --git a/inputs/system/modules/base/host/admin.nix b/sys/modules/base/host/admin.nix similarity index 95% rename from inputs/system/modules/base/host/admin.nix rename to sys/modules/base/host/admin.nix index af2ecee..cce85c2 100644 --- a/inputs/system/modules/base/host/admin.nix +++ b/sys/modules/base/host/admin.nix @@ -58,7 +58,7 @@ in verbose = true; extraSpecialArgs = { inherit inputs outputs self; }; users.${cfg.name} = { - imports = [ "${self}/inputs/home/user/${cfg.name}/${host.name}" ]; + imports = [ "${self}/home/user/${cfg.name}/${host.name}" ]; }; }; }; diff --git a/inputs/system/modules/base/host/default.nix b/sys/modules/base/host/default.nix similarity index 100% rename from inputs/system/modules/base/host/default.nix rename to sys/modules/base/host/default.nix diff --git a/inputs/system/modules/base/host/hardware/common.nix b/sys/modules/base/host/hardware/common.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/common.nix rename to sys/modules/base/host/hardware/common.nix diff --git a/inputs/system/modules/base/host/hardware/cpu/amd.nix b/sys/modules/base/host/hardware/cpu/amd.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/cpu/amd.nix rename to sys/modules/base/host/hardware/cpu/amd.nix diff --git a/inputs/system/modules/base/host/hardware/cpu/default.nix b/sys/modules/base/host/hardware/cpu/default.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/cpu/default.nix rename to sys/modules/base/host/hardware/cpu/default.nix diff --git a/inputs/system/modules/base/host/hardware/cpu/intel.nix b/sys/modules/base/host/hardware/cpu/intel.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/cpu/intel.nix rename to sys/modules/base/host/hardware/cpu/intel.nix diff --git a/inputs/system/modules/base/host/hardware/default.nix b/sys/modules/base/host/hardware/default.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/default.nix rename to sys/modules/base/host/hardware/default.nix diff --git a/inputs/system/modules/base/host/hardware/features/audio.nix b/sys/modules/base/host/hardware/features/audio.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/features/audio.nix rename to sys/modules/base/host/hardware/features/audio.nix diff --git a/inputs/system/modules/base/host/hardware/features/backlight.nix b/sys/modules/base/host/hardware/features/backlight.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/features/backlight.nix rename to sys/modules/base/host/hardware/features/backlight.nix diff --git a/inputs/system/modules/base/host/hardware/features/battery.nix b/sys/modules/base/host/hardware/features/battery.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/features/battery.nix rename to sys/modules/base/host/hardware/features/battery.nix diff --git a/inputs/system/modules/base/host/hardware/features/bluetooth.nix b/sys/modules/base/host/hardware/features/bluetooth.nix similarity index 84% rename from inputs/system/modules/base/host/hardware/features/bluetooth.nix rename to sys/modules/base/host/hardware/features/bluetooth.nix index c002138..874ce99 100644 --- a/inputs/system/modules/base/host/hardware/features/bluetooth.nix +++ b/sys/modules/base/host/hardware/features/bluetooth.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, self, ... }: let features = config.systemModules.host.hardware.features; @@ -14,7 +14,7 @@ in }; environment.systemPackages = with pkgs; [ - live-buds-cli + self.packages.${pkgs.system}.live-buds-cli bluetuith ]; diff --git a/inputs/system/modules/base/host/hardware/features/default.nix b/sys/modules/base/host/hardware/features/default.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/features/default.nix rename to sys/modules/base/host/hardware/features/default.nix diff --git a/inputs/system/modules/base/host/hardware/features/ssd.nix b/sys/modules/base/host/hardware/features/ssd.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/features/ssd.nix rename to sys/modules/base/host/hardware/features/ssd.nix diff --git a/inputs/system/modules/base/host/hardware/features/video.nix b/sys/modules/base/host/hardware/features/video.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/features/video.nix rename to sys/modules/base/host/hardware/features/video.nix diff --git a/inputs/system/modules/base/host/hardware/gpu/amd.nix b/sys/modules/base/host/hardware/gpu/amd.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/gpu/amd.nix rename to sys/modules/base/host/hardware/gpu/amd.nix diff --git a/inputs/system/modules/base/host/hardware/gpu/default.nix b/sys/modules/base/host/hardware/gpu/default.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/gpu/default.nix rename to sys/modules/base/host/hardware/gpu/default.nix diff --git a/inputs/system/modules/base/host/hardware/gpu/intel.nix b/sys/modules/base/host/hardware/gpu/intel.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/gpu/intel.nix rename to sys/modules/base/host/hardware/gpu/intel.nix diff --git a/inputs/system/modules/base/host/hardware/gpu/nvidia.nix b/sys/modules/base/host/hardware/gpu/nvidia.nix similarity index 100% rename from inputs/system/modules/base/host/hardware/gpu/nvidia.nix rename to sys/modules/base/host/hardware/gpu/nvidia.nix diff --git a/inputs/system/modules/base/host/name.nix b/sys/modules/base/host/name.nix similarity index 100% rename from inputs/system/modules/base/host/name.nix rename to sys/modules/base/host/name.nix diff --git a/inputs/system/modules/base/host/role.nix b/sys/modules/base/host/role.nix similarity index 100% rename from inputs/system/modules/base/host/role.nix rename to sys/modules/base/host/role.nix diff --git a/inputs/system/modules/base/host/type.nix b/sys/modules/base/host/type.nix similarity index 100% rename from inputs/system/modules/base/host/type.nix rename to sys/modules/base/host/type.nix diff --git a/inputs/system/modules/base/locale.nix b/sys/modules/base/locale.nix similarity index 100% rename from inputs/system/modules/base/locale.nix rename to sys/modules/base/locale.nix diff --git a/inputs/system/modules/base/networking/default.nix b/sys/modules/base/networking/default.nix similarity index 100% rename from inputs/system/modules/base/networking/default.nix rename to sys/modules/base/networking/default.nix diff --git a/inputs/system/modules/base/networking/firewall.nix b/sys/modules/base/networking/firewall.nix similarity index 100% rename from inputs/system/modules/base/networking/firewall.nix rename to sys/modules/base/networking/firewall.nix diff --git a/inputs/system/modules/base/networking/resolved.nix b/sys/modules/base/networking/resolved.nix similarity index 100% rename from inputs/system/modules/base/networking/resolved.nix rename to sys/modules/base/networking/resolved.nix diff --git a/inputs/system/modules/base/networking/ssh.nix b/sys/modules/base/networking/ssh.nix similarity index 100% rename from inputs/system/modules/base/networking/ssh.nix rename to sys/modules/base/networking/ssh.nix diff --git a/inputs/system/modules/base/networking/tailscale.nix b/sys/modules/base/networking/tailscale.nix similarity index 100% rename from inputs/system/modules/base/networking/tailscale.nix rename to sys/modules/base/networking/tailscale.nix diff --git a/inputs/system/modules/base/networking/tcp.nix b/sys/modules/base/networking/tcp.nix similarity index 100% rename from inputs/system/modules/base/networking/tcp.nix rename to sys/modules/base/networking/tcp.nix diff --git a/inputs/system/modules/base/networking/tools.nix b/sys/modules/base/networking/tools.nix similarity index 100% rename from inputs/system/modules/base/networking/tools.nix rename to sys/modules/base/networking/tools.nix diff --git a/inputs/system/modules/base/nix/default.nix b/sys/modules/base/nix/default.nix similarity index 100% rename from inputs/system/modules/base/nix/default.nix rename to sys/modules/base/nix/default.nix diff --git a/inputs/system/modules/base/nix/nh.nix b/sys/modules/base/nix/nh.nix similarity index 100% rename from inputs/system/modules/base/nix/nh.nix rename to sys/modules/base/nix/nh.nix diff --git a/inputs/system/modules/base/nix/nixpkgs.nix b/sys/modules/base/nix/nixpkgs.nix similarity index 100% rename from inputs/system/modules/base/nix/nixpkgs.nix rename to sys/modules/base/nix/nixpkgs.nix diff --git a/inputs/system/modules/base/nix/subs.nix b/sys/modules/base/nix/subs.nix similarity index 100% rename from inputs/system/modules/base/nix/subs.nix rename to sys/modules/base/nix/subs.nix diff --git a/inputs/system/modules/base/security/default.nix b/sys/modules/base/security/default.nix similarity index 100% rename from inputs/system/modules/base/security/default.nix rename to sys/modules/base/security/default.nix diff --git a/inputs/system/modules/base/security/kernel.nix b/sys/modules/base/security/kernel.nix similarity index 100% rename from inputs/system/modules/base/security/kernel.nix rename to sys/modules/base/security/kernel.nix diff --git a/inputs/system/modules/base/security/pam.nix b/sys/modules/base/security/pam.nix similarity index 100% rename from inputs/system/modules/base/security/pam.nix rename to sys/modules/base/security/pam.nix diff --git a/inputs/system/modules/base/security/polkit.nix b/sys/modules/base/security/polkit.nix similarity index 100% rename from inputs/system/modules/base/security/polkit.nix rename to sys/modules/base/security/polkit.nix diff --git a/inputs/system/modules/base/security/sudo.nix b/sys/modules/base/security/sudo.nix similarity index 100% rename from inputs/system/modules/base/security/sudo.nix rename to sys/modules/base/security/sudo.nix diff --git a/inputs/system/modules/base/services/dbus.nix b/sys/modules/base/services/dbus.nix similarity index 100% rename from inputs/system/modules/base/services/dbus.nix rename to sys/modules/base/services/dbus.nix diff --git a/inputs/system/modules/base/services/default.nix b/sys/modules/base/services/default.nix similarity index 100% rename from inputs/system/modules/base/services/default.nix rename to sys/modules/base/services/default.nix diff --git a/inputs/system/modules/base/services/gnome.nix b/sys/modules/base/services/gnome.nix similarity index 100% rename from inputs/system/modules/base/services/gnome.nix rename to sys/modules/base/services/gnome.nix diff --git a/inputs/system/modules/base/services/gvfs.nix b/sys/modules/base/services/gvfs.nix similarity index 100% rename from inputs/system/modules/base/services/gvfs.nix rename to sys/modules/base/services/gvfs.nix diff --git a/inputs/system/modules/base/services/system76Scheduler.nix b/sys/modules/base/services/system76Scheduler.nix similarity index 100% rename from inputs/system/modules/base/services/system76Scheduler.nix rename to sys/modules/base/services/system76Scheduler.nix diff --git a/inputs/system/modules/base/shell/bash/default.nix b/sys/modules/base/shell/bash/default.nix similarity index 100% rename from inputs/system/modules/base/shell/bash/default.nix rename to sys/modules/base/shell/bash/default.nix diff --git a/inputs/system/modules/base/shell/default.nix b/sys/modules/base/shell/default.nix similarity index 100% rename from inputs/system/modules/base/shell/default.nix rename to sys/modules/base/shell/default.nix diff --git a/inputs/system/modules/base/shell/fish/default.nix b/sys/modules/base/shell/fish/default.nix similarity index 100% rename from inputs/system/modules/base/shell/fish/default.nix rename to sys/modules/base/shell/fish/default.nix diff --git a/inputs/system/modules/base/shell/zsh/default.nix b/sys/modules/base/shell/zsh/default.nix similarity index 100% rename from inputs/system/modules/base/shell/zsh/default.nix rename to sys/modules/base/shell/zsh/default.nix diff --git a/inputs/system/modules/base/virtualization/default.nix b/sys/modules/base/virtualization/default.nix similarity index 100% rename from inputs/system/modules/base/virtualization/default.nix rename to sys/modules/base/virtualization/default.nix diff --git a/inputs/system/modules/roles/gaming/default.nix b/sys/modules/roles/gaming/default.nix similarity index 100% rename from inputs/system/modules/roles/gaming/default.nix rename to sys/modules/roles/gaming/default.nix diff --git a/inputs/system/modules/roles/media-server/default.nix b/sys/modules/roles/media-server/default.nix similarity index 100% rename from inputs/system/modules/roles/media-server/default.nix rename to sys/modules/roles/media-server/default.nix diff --git a/inputs/system/modules/roles/media-server/services/default.nix b/sys/modules/roles/media-server/services/default.nix similarity index 100% rename from inputs/system/modules/roles/media-server/services/default.nix rename to sys/modules/roles/media-server/services/default.nix diff --git a/inputs/system/modules/roles/media-server/services/nixarr.nix b/sys/modules/roles/media-server/services/nixarr.nix similarity index 100% rename from inputs/system/modules/roles/media-server/services/nixarr.nix rename to sys/modules/roles/media-server/services/nixarr.nix diff --git a/inputs/system/modules/roles/workstation/default.nix b/sys/modules/roles/workstation/default.nix similarity index 100% rename from inputs/system/modules/roles/workstation/default.nix rename to sys/modules/roles/workstation/default.nix diff --git a/inputs/system/modules/roles/workstation/programs/1password.nix b/sys/modules/roles/workstation/programs/1password.nix similarity index 100% rename from inputs/system/modules/roles/workstation/programs/1password.nix rename to sys/modules/roles/workstation/programs/1password.nix diff --git a/inputs/system/modules/roles/workstation/programs/dconf.nix b/sys/modules/roles/workstation/programs/dconf.nix similarity index 100% rename from inputs/system/modules/roles/workstation/programs/dconf.nix rename to sys/modules/roles/workstation/programs/dconf.nix diff --git a/inputs/system/modules/roles/workstation/programs/default.nix b/sys/modules/roles/workstation/programs/default.nix similarity index 100% rename from inputs/system/modules/roles/workstation/programs/default.nix rename to sys/modules/roles/workstation/programs/default.nix diff --git a/inputs/system/modules/roles/workstation/programs/kdeconnect.nix b/sys/modules/roles/workstation/programs/kdeconnect.nix similarity index 100% rename from inputs/system/modules/roles/workstation/programs/kdeconnect.nix rename to sys/modules/roles/workstation/programs/kdeconnect.nix