From 29036763369e4eb1c28e79451a76e2d68694c3fb Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Wed, 25 Jan 2023 20:15:06 -0800 Subject: [PATCH] Use modules folder --- hosts/desktop.nix | 6 ++-- hosts/home.nix | 28 +++++++++--------- {emacs => modules/emacs}/.doom.d/config.el | 0 {emacs => modules/emacs}/.doom.d/init.el | 0 {emacs => modules/emacs}/.doom.d/packages.el | 0 {emacs => modules/emacs}/.doom.d/splash.jpg | Bin {emacs => modules/emacs}/default.nix | 2 +- {fcitx5 => modules/fcitx5}/arrow.png | Bin {fcitx5 => modules/fcitx5}/default.nix | 0 {fcitx5 => modules/fcitx5}/radio.png | Bin {fcitx5 => modules/fcitx5}/theme.conf | 0 firefox.nix => modules/firefox/default.nix | 2 +- git.nix => modules/git/default.nix | 0 i3.nix => modules/i3/default.nix | 2 +- {neovim => modules/neovim}/default.nix | 0 {neovim => modules/neovim}/vimrc | 0 picom.nix => modules/picom/default.nix | 0 {polybar => modules/polybar}/aozora.nix | 0 {polybar => modules/polybar}/default.nix | 0 .../polybar}/polybar-now-playing.nix | 0 ranger.nix => modules/ranger/default.nix | 0 {rofi => modules/rofi}/default.nix | 0 {rofi => modules/rofi}/power.nix | 0 {rofi => modules/rofi}/power.sh | 0 {rofi => modules/rofi}/theme.rasi | 0 {startpage => modules/startpage}/default.nix | 0 {startpage => modules/startpage}/dir.nix | 0 .../startpage}/html/anilist.svg | 0 .../startpage}/html/envelope-regular.svg | 0 {startpage => modules/startpage}/html/git.svg | 0 .../startpage}/html/index.html | 0 .../startpage}/html/jellyfin.svg | 0 .../startpage}/html/nixos.svg | 0 .../startpage}/html/nyaa.webp | Bin .../startpage}/html/style.css | 0 terminal.nix => modules/terminal/default.nix | 2 +- {theme => modules/theme}/default.nix | 0 .../theme}/everforest/default.nix | 0 {theme => modules/theme}/everforest/gtk.nix | 0 {theme => modules/theme}/nord/default.nix | 0 twemoji.nix => modules/twemoji/default.nix | 0 {wallpapers => modules/wallpapers}/178869.jpg | Bin .../wallpapers}/178869_1366x768.jpg | Bin {wallpapers => modules/wallpapers}/306286.jpg | Bin {wallpapers => modules/wallpapers}/README.md | 0 .../wallpapers}/roxynord.png | Bin 46 files changed, 21 insertions(+), 21 deletions(-) rename {emacs => modules/emacs}/.doom.d/config.el (100%) rename {emacs => modules/emacs}/.doom.d/init.el (100%) rename {emacs => modules/emacs}/.doom.d/packages.el (100%) rename {emacs => modules/emacs}/.doom.d/splash.jpg (100%) rename {emacs => modules/emacs}/default.nix (90%) rename {fcitx5 => modules/fcitx5}/arrow.png (100%) rename {fcitx5 => modules/fcitx5}/default.nix (100%) rename {fcitx5 => modules/fcitx5}/radio.png (100%) rename {fcitx5 => modules/fcitx5}/theme.conf (100%) rename firefox.nix => modules/firefox/default.nix (97%) rename git.nix => modules/git/default.nix (100%) rename i3.nix => modules/i3/default.nix (99%) rename {neovim => modules/neovim}/default.nix (100%) rename {neovim => modules/neovim}/vimrc (100%) rename picom.nix => modules/picom/default.nix (100%) rename {polybar => modules/polybar}/aozora.nix (100%) rename {polybar => modules/polybar}/default.nix (100%) rename {polybar => modules/polybar}/polybar-now-playing.nix (100%) rename ranger.nix => modules/ranger/default.nix (100%) rename {rofi => modules/rofi}/default.nix (100%) rename {rofi => modules/rofi}/power.nix (100%) rename {rofi => modules/rofi}/power.sh (100%) rename {rofi => modules/rofi}/theme.rasi (100%) rename {startpage => modules/startpage}/default.nix (100%) rename {startpage => modules/startpage}/dir.nix (100%) rename {startpage => modules/startpage}/html/anilist.svg (100%) rename {startpage => modules/startpage}/html/envelope-regular.svg (100%) rename {startpage => modules/startpage}/html/git.svg (100%) rename {startpage => modules/startpage}/html/index.html (100%) rename {startpage => modules/startpage}/html/jellyfin.svg (100%) rename {startpage => modules/startpage}/html/nixos.svg (100%) rename {startpage => modules/startpage}/html/nyaa.webp (100%) rename {startpage => modules/startpage}/html/style.css (100%) rename terminal.nix => modules/terminal/default.nix (92%) rename {theme => modules/theme}/default.nix (100%) rename {theme => modules/theme}/everforest/default.nix (100%) rename {theme => modules/theme}/everforest/gtk.nix (100%) rename {theme => modules/theme}/nord/default.nix (100%) rename twemoji.nix => modules/twemoji/default.nix (100%) rename {wallpapers => modules/wallpapers}/178869.jpg (100%) rename {wallpapers => modules/wallpapers}/178869_1366x768.jpg (100%) rename {wallpapers => modules/wallpapers}/306286.jpg (100%) rename {wallpapers => modules/wallpapers}/README.md (100%) rename {wallpapers => modules/wallpapers}/roxynord.png (100%) diff --git a/hosts/desktop.nix b/hosts/desktop.nix index a63fdbe..581bedc 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: let - theme = import ../theme; + theme = import ../modules/theme; in { services = { @@ -15,7 +15,7 @@ in enable = true; theme = theme.gtkTheme pkgs; }; - background = ../wallpapers/${theme.wallpaper}; + background = ../modules/wallpapers/${theme.wallpaper}; }; defaultSession = "none+i3"; }; @@ -54,7 +54,7 @@ in mplus-outline-fonts.osdnRelease noto-fonts (nerdfonts.override { fonts = [ "FiraCode" ]; }) # required for icons - (pkgs.callPackage ../twemoji.nix {}) + (pkgs.callPackage ../modules/twemoji {}) ]; }; } diff --git a/hosts/home.nix b/hosts/home.nix index 38081c9..8c0ae6a 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -1,25 +1,25 @@ { config, pkgs, user, ... }: let - theme = import ../theme; + theme = import ../modules/theme; in { imports = [ - ../neovim - ../ranger.nix - ../fcitx5 - ../picom.nix - ../i3.nix - ../polybar - ../rofi - ../git.nix - ../terminal.nix - ../startpage - ../firefox.nix - ../emacs + ../modules/emacs + ../modules/fcitx5 + ../modules/firefox + ../modules/git + ../modules/i3 + ../modules/neovim + ../modules/picom + ../modules/polybar + ../modules/ranger + ../modules/rofi + ../modules/startpage + ../modules/terminal ]; - home.file."./.background-image".source = ../wallpapers/${theme.wallpaper}; + home.file."./.background-image".source = ../modules/wallpapers/${theme.wallpaper}; programs.home-manager.enable = true; diff --git a/emacs/.doom.d/config.el b/modules/emacs/.doom.d/config.el similarity index 100% rename from emacs/.doom.d/config.el rename to modules/emacs/.doom.d/config.el diff --git a/emacs/.doom.d/init.el b/modules/emacs/.doom.d/init.el similarity index 100% rename from emacs/.doom.d/init.el rename to modules/emacs/.doom.d/init.el diff --git a/emacs/.doom.d/packages.el b/modules/emacs/.doom.d/packages.el similarity index 100% rename from emacs/.doom.d/packages.el rename to modules/emacs/.doom.d/packages.el diff --git a/emacs/.doom.d/splash.jpg b/modules/emacs/.doom.d/splash.jpg similarity index 100% rename from emacs/.doom.d/splash.jpg rename to modules/emacs/.doom.d/splash.jpg diff --git a/emacs/default.nix b/modules/emacs/default.nix similarity index 90% rename from emacs/default.nix rename to modules/emacs/default.nix index 5fd97f8..6bdb57d 100644 --- a/emacs/default.nix +++ b/modules/emacs/default.nix @@ -11,7 +11,7 @@ git clone --depth 1 https://github.com/doomemacs/doomemacs .emacs.d fi mkdir -p .doom.d - ln -sf ${config.home.homeDirectory}/${configDir}/emacs/.doom.d/* .doom.d + ln -sf ${config.home.homeDirectory}/${configDir}/modules/emacs/.doom.d/* .doom.d ''; home.file = { ".emacs.d/everforest".source = pkgs.fetchFromGitHub { diff --git a/fcitx5/arrow.png b/modules/fcitx5/arrow.png similarity index 100% rename from fcitx5/arrow.png rename to modules/fcitx5/arrow.png diff --git a/fcitx5/default.nix b/modules/fcitx5/default.nix similarity index 100% rename from fcitx5/default.nix rename to modules/fcitx5/default.nix diff --git a/fcitx5/radio.png b/modules/fcitx5/radio.png similarity index 100% rename from fcitx5/radio.png rename to modules/fcitx5/radio.png diff --git a/fcitx5/theme.conf b/modules/fcitx5/theme.conf similarity index 100% rename from fcitx5/theme.conf rename to modules/fcitx5/theme.conf diff --git a/firefox.nix b/modules/firefox/default.nix similarity index 97% rename from firefox.nix rename to modules/firefox/default.nix index 8ced54f..bbd1dde 100644 --- a/firefox.nix +++ b/modules/firefox/default.nix @@ -1,7 +1,7 @@ { pkgs, user, ... }: let - startpageDir = import ./startpage/dir.nix; + startpageDir = import ../startpage/dir.nix; startpage = "file:///home/${user}/${startpageDir}/index.html"; firefox-csshacks = pkgs.fetchFromGitHub { owner = "MrOtherGuy"; diff --git a/git.nix b/modules/git/default.nix similarity index 100% rename from git.nix rename to modules/git/default.nix diff --git a/i3.nix b/modules/i3/default.nix similarity index 99% rename from i3.nix rename to modules/i3/default.nix index ed79147..b8eb700 100644 --- a/i3.nix +++ b/modules/i3/default.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: let - theme = import ./theme; + theme = import ../theme; mod = "Mod4"; in with theme.colors; { # Dependencies diff --git a/neovim/default.nix b/modules/neovim/default.nix similarity index 100% rename from neovim/default.nix rename to modules/neovim/default.nix diff --git a/neovim/vimrc b/modules/neovim/vimrc similarity index 100% rename from neovim/vimrc rename to modules/neovim/vimrc diff --git a/picom.nix b/modules/picom/default.nix similarity index 100% rename from picom.nix rename to modules/picom/default.nix diff --git a/polybar/aozora.nix b/modules/polybar/aozora.nix similarity index 100% rename from polybar/aozora.nix rename to modules/polybar/aozora.nix diff --git a/polybar/default.nix b/modules/polybar/default.nix similarity index 100% rename from polybar/default.nix rename to modules/polybar/default.nix diff --git a/polybar/polybar-now-playing.nix b/modules/polybar/polybar-now-playing.nix similarity index 100% rename from polybar/polybar-now-playing.nix rename to modules/polybar/polybar-now-playing.nix diff --git a/ranger.nix b/modules/ranger/default.nix similarity index 100% rename from ranger.nix rename to modules/ranger/default.nix diff --git a/rofi/default.nix b/modules/rofi/default.nix similarity index 100% rename from rofi/default.nix rename to modules/rofi/default.nix diff --git a/rofi/power.nix b/modules/rofi/power.nix similarity index 100% rename from rofi/power.nix rename to modules/rofi/power.nix diff --git a/rofi/power.sh b/modules/rofi/power.sh similarity index 100% rename from rofi/power.sh rename to modules/rofi/power.sh diff --git a/rofi/theme.rasi b/modules/rofi/theme.rasi similarity index 100% rename from rofi/theme.rasi rename to modules/rofi/theme.rasi diff --git a/startpage/default.nix b/modules/startpage/default.nix similarity index 100% rename from startpage/default.nix rename to modules/startpage/default.nix diff --git a/startpage/dir.nix b/modules/startpage/dir.nix similarity index 100% rename from startpage/dir.nix rename to modules/startpage/dir.nix diff --git a/startpage/html/anilist.svg b/modules/startpage/html/anilist.svg similarity index 100% rename from startpage/html/anilist.svg rename to modules/startpage/html/anilist.svg diff --git a/startpage/html/envelope-regular.svg b/modules/startpage/html/envelope-regular.svg similarity index 100% rename from startpage/html/envelope-regular.svg rename to modules/startpage/html/envelope-regular.svg diff --git a/startpage/html/git.svg b/modules/startpage/html/git.svg similarity index 100% rename from startpage/html/git.svg rename to modules/startpage/html/git.svg diff --git a/startpage/html/index.html b/modules/startpage/html/index.html similarity index 100% rename from startpage/html/index.html rename to modules/startpage/html/index.html diff --git a/startpage/html/jellyfin.svg b/modules/startpage/html/jellyfin.svg similarity index 100% rename from startpage/html/jellyfin.svg rename to modules/startpage/html/jellyfin.svg diff --git a/startpage/html/nixos.svg b/modules/startpage/html/nixos.svg similarity index 100% rename from startpage/html/nixos.svg rename to modules/startpage/html/nixos.svg diff --git a/startpage/html/nyaa.webp b/modules/startpage/html/nyaa.webp similarity index 100% rename from startpage/html/nyaa.webp rename to modules/startpage/html/nyaa.webp diff --git a/startpage/html/style.css b/modules/startpage/html/style.css similarity index 100% rename from startpage/html/style.css rename to modules/startpage/html/style.css diff --git a/terminal.nix b/modules/terminal/default.nix similarity index 92% rename from terminal.nix rename to modules/terminal/default.nix index 96c9e89..f154a9f 100644 --- a/terminal.nix +++ b/modules/terminal/default.nix @@ -1,7 +1,7 @@ { ... }: let - theme = import ./theme; + theme = import ../theme; in { programs.kitty = { diff --git a/theme/default.nix b/modules/theme/default.nix similarity index 100% rename from theme/default.nix rename to modules/theme/default.nix diff --git a/theme/everforest/default.nix b/modules/theme/everforest/default.nix similarity index 100% rename from theme/everforest/default.nix rename to modules/theme/everforest/default.nix diff --git a/theme/everforest/gtk.nix b/modules/theme/everforest/gtk.nix similarity index 100% rename from theme/everforest/gtk.nix rename to modules/theme/everforest/gtk.nix diff --git a/theme/nord/default.nix b/modules/theme/nord/default.nix similarity index 100% rename from theme/nord/default.nix rename to modules/theme/nord/default.nix diff --git a/twemoji.nix b/modules/twemoji/default.nix similarity index 100% rename from twemoji.nix rename to modules/twemoji/default.nix diff --git a/wallpapers/178869.jpg b/modules/wallpapers/178869.jpg similarity index 100% rename from wallpapers/178869.jpg rename to modules/wallpapers/178869.jpg diff --git a/wallpapers/178869_1366x768.jpg b/modules/wallpapers/178869_1366x768.jpg similarity index 100% rename from wallpapers/178869_1366x768.jpg rename to modules/wallpapers/178869_1366x768.jpg diff --git a/wallpapers/306286.jpg b/modules/wallpapers/306286.jpg similarity index 100% rename from wallpapers/306286.jpg rename to modules/wallpapers/306286.jpg diff --git a/wallpapers/README.md b/modules/wallpapers/README.md similarity index 100% rename from wallpapers/README.md rename to modules/wallpapers/README.md diff --git a/wallpapers/roxynord.png b/modules/wallpapers/roxynord.png similarity index 100% rename from wallpapers/roxynord.png rename to modules/wallpapers/roxynord.png