From 9e33f85778db1902edad29ed06ac6584b5faf860 Mon Sep 17 00:00:00 2001 From: caandt Date: Fri, 11 Oct 2024 01:00:10 -0500 Subject: [PATCH] split config into user and system dirs --- flake.nix | 4 ++-- configuration.nix => system/configuration.nix | 0 .../hardware-configuration.nix | 0 {config => user/config}/alacritty/alacritty.toml | 0 {config => user/config}/awesome/rc.lua | 0 {config => user/config}/awesome/theme.lua | 0 {config => user/config}/bash/aliases | 0 {config => user/config}/bash/bashrc | 0 {config => user/config}/bash/custom | 0 {config => user/config}/bash/history | 0 {config => user/config}/bash/startup | 0 {config => user/config}/bash/xdg | 0 {config => user/config}/fcitx5/config | 0 {config => user/config}/fcitx5/profile | 0 .../config}/fontconfig/conf.d/10-no-sub-pixel.conf | 0 .../config}/fontconfig/conf.d/15-no-ligature-monospace.conf | 0 .../config}/fontconfig/conf.d/99-japanese-fonts.conf | 0 {config => user/config}/fontconfig/fonts.conf | 0 {config => user/config}/gdb/gdbinit.py | 0 {config => user/config}/git/config | 0 {config => user/config}/lsd/config.yaml | 0 {config => user/config}/picom/picom.conf | 0 {config => user/config}/python/startup.py | 0 {config => user/config}/qt5ct/qt5ct.conf | 0 {config => user/config}/readline/inputrc | 0 {config => user/config}/starship.toml | 0 {config => user/config}/sx/sxrc | 0 {config => user/config}/tmux/tmux.conf | 0 home.nix => user/home.nix | 2 +- 29 files changed, 3 insertions(+), 3 deletions(-) rename configuration.nix => system/configuration.nix (100%) rename hardware-configuration.nix => system/hardware-configuration.nix (100%) rename {config => user/config}/alacritty/alacritty.toml (100%) rename {config => user/config}/awesome/rc.lua (100%) rename {config => user/config}/awesome/theme.lua (100%) rename {config => user/config}/bash/aliases (100%) rename {config => user/config}/bash/bashrc (100%) rename {config => user/config}/bash/custom (100%) rename {config => user/config}/bash/history (100%) rename {config => user/config}/bash/startup (100%) rename {config => user/config}/bash/xdg (100%) rename {config => user/config}/fcitx5/config (100%) rename {config => user/config}/fcitx5/profile (100%) rename {config => user/config}/fontconfig/conf.d/10-no-sub-pixel.conf (100%) rename {config => user/config}/fontconfig/conf.d/15-no-ligature-monospace.conf (100%) rename {config => user/config}/fontconfig/conf.d/99-japanese-fonts.conf (100%) rename {config => user/config}/fontconfig/fonts.conf (100%) rename {config => user/config}/gdb/gdbinit.py (100%) rename {config => user/config}/git/config (100%) rename {config => user/config}/lsd/config.yaml (100%) rename {config => user/config}/picom/picom.conf (100%) rename {config => user/config}/python/startup.py (100%) rename {config => user/config}/qt5ct/qt5ct.conf (100%) rename {config => user/config}/readline/inputrc (100%) rename {config => user/config}/starship.toml (100%) rename {config => user/config}/sx/sxrc (100%) rename {config => user/config}/tmux/tmux.conf (100%) rename home.nix => user/home.nix (99%) diff --git a/flake.nix b/flake.nix index 5d76e6f..955b083 100644 --- a/flake.nix +++ b/flake.nix @@ -27,14 +27,14 @@ nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { inherit system; modules = [ - ./configuration.nix + system/configuration.nix overlays ]; }; homeConfigurations.ahnwuoa = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ - ./home.nix + user/home.nix overlays ]; }; diff --git a/configuration.nix b/system/configuration.nix similarity index 100% rename from configuration.nix rename to system/configuration.nix diff --git a/hardware-configuration.nix b/system/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to system/hardware-configuration.nix diff --git a/config/alacritty/alacritty.toml b/user/config/alacritty/alacritty.toml similarity index 100% rename from config/alacritty/alacritty.toml rename to user/config/alacritty/alacritty.toml diff --git a/config/awesome/rc.lua b/user/config/awesome/rc.lua similarity index 100% rename from config/awesome/rc.lua rename to user/config/awesome/rc.lua diff --git a/config/awesome/theme.lua b/user/config/awesome/theme.lua similarity index 100% rename from config/awesome/theme.lua rename to user/config/awesome/theme.lua diff --git a/config/bash/aliases b/user/config/bash/aliases similarity index 100% rename from config/bash/aliases rename to user/config/bash/aliases diff --git a/config/bash/bashrc b/user/config/bash/bashrc similarity index 100% rename from config/bash/bashrc rename to user/config/bash/bashrc diff --git a/config/bash/custom b/user/config/bash/custom similarity index 100% rename from config/bash/custom rename to user/config/bash/custom diff --git a/config/bash/history b/user/config/bash/history similarity index 100% rename from config/bash/history rename to user/config/bash/history diff --git a/config/bash/startup b/user/config/bash/startup similarity index 100% rename from config/bash/startup rename to user/config/bash/startup diff --git a/config/bash/xdg b/user/config/bash/xdg similarity index 100% rename from config/bash/xdg rename to user/config/bash/xdg diff --git a/config/fcitx5/config b/user/config/fcitx5/config similarity index 100% rename from config/fcitx5/config rename to user/config/fcitx5/config diff --git a/config/fcitx5/profile b/user/config/fcitx5/profile similarity index 100% rename from config/fcitx5/profile rename to user/config/fcitx5/profile diff --git a/config/fontconfig/conf.d/10-no-sub-pixel.conf b/user/config/fontconfig/conf.d/10-no-sub-pixel.conf similarity index 100% rename from config/fontconfig/conf.d/10-no-sub-pixel.conf rename to user/config/fontconfig/conf.d/10-no-sub-pixel.conf diff --git a/config/fontconfig/conf.d/15-no-ligature-monospace.conf b/user/config/fontconfig/conf.d/15-no-ligature-monospace.conf similarity index 100% rename from config/fontconfig/conf.d/15-no-ligature-monospace.conf rename to user/config/fontconfig/conf.d/15-no-ligature-monospace.conf diff --git a/config/fontconfig/conf.d/99-japanese-fonts.conf b/user/config/fontconfig/conf.d/99-japanese-fonts.conf similarity index 100% rename from config/fontconfig/conf.d/99-japanese-fonts.conf rename to user/config/fontconfig/conf.d/99-japanese-fonts.conf diff --git a/config/fontconfig/fonts.conf b/user/config/fontconfig/fonts.conf similarity index 100% rename from config/fontconfig/fonts.conf rename to user/config/fontconfig/fonts.conf diff --git a/config/gdb/gdbinit.py b/user/config/gdb/gdbinit.py similarity index 100% rename from config/gdb/gdbinit.py rename to user/config/gdb/gdbinit.py diff --git a/config/git/config b/user/config/git/config similarity index 100% rename from config/git/config rename to user/config/git/config diff --git a/config/lsd/config.yaml b/user/config/lsd/config.yaml similarity index 100% rename from config/lsd/config.yaml rename to user/config/lsd/config.yaml diff --git a/config/picom/picom.conf b/user/config/picom/picom.conf similarity index 100% rename from config/picom/picom.conf rename to user/config/picom/picom.conf diff --git a/config/python/startup.py b/user/config/python/startup.py similarity index 100% rename from config/python/startup.py rename to user/config/python/startup.py diff --git a/config/qt5ct/qt5ct.conf b/user/config/qt5ct/qt5ct.conf similarity index 100% rename from config/qt5ct/qt5ct.conf rename to user/config/qt5ct/qt5ct.conf diff --git a/config/readline/inputrc b/user/config/readline/inputrc similarity index 100% rename from config/readline/inputrc rename to user/config/readline/inputrc diff --git a/config/starship.toml b/user/config/starship.toml similarity index 100% rename from config/starship.toml rename to user/config/starship.toml diff --git a/config/sx/sxrc b/user/config/sx/sxrc similarity index 100% rename from config/sx/sxrc rename to user/config/sx/sxrc diff --git a/config/tmux/tmux.conf b/user/config/tmux/tmux.conf similarity index 100% rename from config/tmux/tmux.conf rename to user/config/tmux/tmux.conf diff --git a/home.nix b/user/home.nix similarity index 99% rename from home.nix rename to user/home.nix index 0ae13dd..bacb9b7 100644 --- a/home.nix +++ b/user/home.nix @@ -3,7 +3,7 @@ let username = "ahnwuoa"; homeDirectory = "/home/${username}"; - mkln = x: config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.local/nixos/${x}"; + mkln = x: config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.local/nixos/user/${x}"; in { home.username = username;