From a6f2ac08687fac021b7b4a0b06face3e41275bf8 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 17 Aug 2024 03:17:40 +0200 Subject: [PATCH] move home-manager config to subdirectory --- flake.nix | 2 +- config.nix => home/config.nix | 0 {machines => home/machines}/desktop.nix | 0 {machines => home/machines}/headless.nix | 0 {machines => home/machines}/laptop.nix | 0 {machines => home/machines}/pvv-terminal.nix | 0 {profiles => home/profiles}/audio.nix | 0 {profiles => home/profiles}/base/default.nix | 0 {profiles => home/profiles}/default.nix | 0 {profiles => home/profiles}/games/default.nix | 0 {profiles => home/profiles}/gui.nix | 0 {profiles => home/profiles}/non-nixos.nix | 0 {profiles => home/profiles}/xsession/default.nix | 0 {profiles => home/profiles}/xsession/dunstrc.nix | 0 {profiles => home/profiles}/xsession/polybar.nix | 0 {profiles => home/profiles}/xsession/terminal.nix | 0 {profiles => home/profiles}/zsh/default.nix | 0 {profiles => home/profiles}/zsh/p10k.zsh | 0 {scripts => home/scripts}/dmenu_run_systemd | 0 {scripts => home/scripts}/dmenuaudio | 0 {scripts => home/scripts}/dmenuunicode | 0 {scripts => home/scripts}/emojis.txt | 0 overlays/mumble.nix | 6 ------ 23 files changed, 1 insertion(+), 7 deletions(-) rename config.nix => home/config.nix (100%) rename {machines => home/machines}/desktop.nix (100%) rename {machines => home/machines}/headless.nix (100%) rename {machines => home/machines}/laptop.nix (100%) rename {machines => home/machines}/pvv-terminal.nix (100%) rename {profiles => home/profiles}/audio.nix (100%) rename {profiles => home/profiles}/base/default.nix (100%) rename {profiles => home/profiles}/default.nix (100%) rename {profiles => home/profiles}/games/default.nix (100%) rename {profiles => home/profiles}/gui.nix (100%) rename {profiles => home/profiles}/non-nixos.nix (100%) rename {profiles => home/profiles}/xsession/default.nix (100%) rename {profiles => home/profiles}/xsession/dunstrc.nix (100%) rename {profiles => home/profiles}/xsession/polybar.nix (100%) rename {profiles => home/profiles}/xsession/terminal.nix (100%) rename {profiles => home/profiles}/zsh/default.nix (100%) rename {profiles => home/profiles}/zsh/p10k.zsh (100%) rename {scripts => home/scripts}/dmenu_run_systemd (100%) rename {scripts => home/scripts}/dmenuaudio (100%) rename {scripts => home/scripts}/dmenuunicode (100%) rename {scripts => home/scripts}/emojis.txt (100%) delete mode 100644 overlays/mumble.nix diff --git a/flake.nix b/flake.nix index 6d14f6f..6c08853 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ // mkHomes [ "pvv-terminal" ] { username = "danio"; homeDirectory = "/home/pvv/d/danio"; }; nixosModules = { - home-manager = nixlib.genAttrs allMachines (machine: import ./machines/${machine}.nix); + home-manager = nixlib.genAttrs allMachines (machine: import ./home/machines/${machine}.nix); }; overlays = [ diff --git a/config.nix b/home/config.nix similarity index 100% rename from config.nix rename to home/config.nix diff --git a/machines/desktop.nix b/home/machines/desktop.nix similarity index 100% rename from machines/desktop.nix rename to home/machines/desktop.nix diff --git a/machines/headless.nix b/home/machines/headless.nix similarity index 100% rename from machines/headless.nix rename to home/machines/headless.nix diff --git a/machines/laptop.nix b/home/machines/laptop.nix similarity index 100% rename from machines/laptop.nix rename to home/machines/laptop.nix diff --git a/machines/pvv-terminal.nix b/home/machines/pvv-terminal.nix similarity index 100% rename from machines/pvv-terminal.nix rename to home/machines/pvv-terminal.nix diff --git a/profiles/audio.nix b/home/profiles/audio.nix similarity index 100% rename from profiles/audio.nix rename to home/profiles/audio.nix diff --git a/profiles/base/default.nix b/home/profiles/base/default.nix similarity index 100% rename from profiles/base/default.nix rename to home/profiles/base/default.nix diff --git a/profiles/default.nix b/home/profiles/default.nix similarity index 100% rename from profiles/default.nix rename to home/profiles/default.nix diff --git a/profiles/games/default.nix b/home/profiles/games/default.nix similarity index 100% rename from profiles/games/default.nix rename to home/profiles/games/default.nix diff --git a/profiles/gui.nix b/home/profiles/gui.nix similarity index 100% rename from profiles/gui.nix rename to home/profiles/gui.nix diff --git a/profiles/non-nixos.nix b/home/profiles/non-nixos.nix similarity index 100% rename from profiles/non-nixos.nix rename to home/profiles/non-nixos.nix diff --git a/profiles/xsession/default.nix b/home/profiles/xsession/default.nix similarity index 100% rename from profiles/xsession/default.nix rename to home/profiles/xsession/default.nix diff --git a/profiles/xsession/dunstrc.nix b/home/profiles/xsession/dunstrc.nix similarity index 100% rename from profiles/xsession/dunstrc.nix rename to home/profiles/xsession/dunstrc.nix diff --git a/profiles/xsession/polybar.nix b/home/profiles/xsession/polybar.nix similarity index 100% rename from profiles/xsession/polybar.nix rename to home/profiles/xsession/polybar.nix diff --git a/profiles/xsession/terminal.nix b/home/profiles/xsession/terminal.nix similarity index 100% rename from profiles/xsession/terminal.nix rename to home/profiles/xsession/terminal.nix diff --git a/profiles/zsh/default.nix b/home/profiles/zsh/default.nix similarity index 100% rename from profiles/zsh/default.nix rename to home/profiles/zsh/default.nix diff --git a/profiles/zsh/p10k.zsh b/home/profiles/zsh/p10k.zsh similarity index 100% rename from profiles/zsh/p10k.zsh rename to home/profiles/zsh/p10k.zsh diff --git a/scripts/dmenu_run_systemd b/home/scripts/dmenu_run_systemd similarity index 100% rename from scripts/dmenu_run_systemd rename to home/scripts/dmenu_run_systemd diff --git a/scripts/dmenuaudio b/home/scripts/dmenuaudio similarity index 100% rename from scripts/dmenuaudio rename to home/scripts/dmenuaudio diff --git a/scripts/dmenuunicode b/home/scripts/dmenuunicode similarity index 100% rename from scripts/dmenuunicode rename to home/scripts/dmenuunicode diff --git a/scripts/emojis.txt b/home/scripts/emojis.txt similarity index 100% rename from scripts/emojis.txt rename to home/scripts/emojis.txt diff --git a/overlays/mumble.nix b/overlays/mumble.nix deleted file mode 100644 index ca156ba..0000000 --- a/overlays/mumble.nix +++ /dev/null @@ -1,6 +0,0 @@ -self: super: -{ - mumble = super.mumble.override (OldAttr: { - pulseSupport = true; - }); -}