Rename homes/{softwares => programs}

diff --git a/homes/julm.nix b/homes/julm.nix
index e55ad14f27daf1f3efa2b31272c647f6a03b183e..b9fd3579c563039a0d460f5ff26b2da5fd548ca8 100644 (file)
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, config, hostName, ... }:
 {
 imports = [
-  ./softwares.nix
+  ./programs.nix
   ./options.nix
   julm/mutt.nix
   (import (julm/hosts + "/${hostName}.nix"))
@@ -19,7 +19,7 @@ programs.firefox = {
         "security.identityblock.show_extended_validation" = true;
         "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
       };
-      userChrome = builtins.readFile softwares/firefox/userChrome.css;
+      userChrome = builtins.readFile programs/firefox/userChrome.css;
     }; in {
       "rp4xy6ye.2021" = lib.mkMerge [defaultProfile {
         id = 0;

diff --git a/homes/programs.nix b/homes/programs.nix
new file mode 100644 (file)
index 0000000..881bde8
--- /dev/null
+++ b/homes/programs.nix
@@ -0,0 +1,22 @@
+{
+imports = [
+  programs/aria2c.nix
+  programs/bash.nix
+  programs/direnv.nix
+  programs/emacs.nix
+  programs/firefox.nix
+  programs/ghc.nix
+  programs/git.nix
+  programs/gnupg.nix
+  programs/htop.nix
+  programs/irssi.nix
+  programs/mpv.nix
+  programs/redshift.nix
+  programs/ssh.nix
+  programs/tmux.nix
+  programs/urxvt.nix
+  programs/vim.nix
+  programs/xmonad.nix
+  programs/zsh.nix
+];
+}

diff --git a/homes/softwares/Xmodmap b/homes/programs/Xmodmap
similarity index 100%
rename from homes/softwares/Xmodmap
rename to homes/programs/Xmodmap

diff --git a/homes/softwares/aria2c.nix b/homes/programs/aria2c.nix
similarity index 100%
rename from homes/softwares/aria2c.nix
rename to homes/programs/aria2c.nix

diff --git a/homes/softwares/bash.nix b/homes/programs/bash.nix
similarity index 100%
rename from homes/softwares/bash.nix
rename to homes/programs/bash.nix

diff --git a/homes/softwares/direnv.nix b/homes/programs/direnv.nix
similarity index 100%
rename from homes/softwares/direnv.nix
rename to homes/programs/direnv.nix

diff --git a/homes/softwares/emacs.nix b/homes/programs/emacs.nix
similarity index 100%
rename from homes/softwares/emacs.nix
rename to homes/programs/emacs.nix

diff --git a/homes/softwares/firefox.nix b/homes/programs/firefox.nix
similarity index 100%
rename from homes/softwares/firefox.nix
rename to homes/programs/firefox.nix

diff --git a/homes/softwares/firefox/userChrome.css b/homes/programs/firefox/userChrome.css
similarity index 100%
rename from homes/softwares/firefox/userChrome.css
rename to homes/programs/firefox/userChrome.css

diff --git a/homes/softwares/ghc.nix b/homes/programs/ghc.nix
similarity index 100%
rename from homes/softwares/ghc.nix
rename to homes/programs/ghc.nix

diff --git a/homes/softwares/git.nix b/homes/programs/git.nix
similarity index 100%
rename from homes/softwares/git.nix
rename to homes/programs/git.nix

diff --git a/homes/softwares/gnupg.nix b/homes/programs/gnupg.nix
similarity index 100%
rename from homes/softwares/gnupg.nix
rename to homes/programs/gnupg.nix

diff --git a/homes/softwares/gnupg/keyserver.pem b/homes/programs/gnupg/keyserver.pem
similarity index 100%
rename from homes/softwares/gnupg/keyserver.pem
rename to homes/programs/gnupg/keyserver.pem

diff --git a/homes/softwares/htop.nix b/homes/programs/htop.nix
similarity index 100%
rename from homes/softwares/htop.nix
rename to homes/programs/htop.nix

diff --git a/homes/softwares/irssi.nix b/homes/programs/irssi.nix
similarity index 100%
rename from homes/softwares/irssi.nix
rename to homes/programs/irssi.nix

diff --git a/homes/softwares/irssi/default.theme b/homes/programs/irssi/default.theme
similarity index 100%
rename from homes/softwares/irssi/default.theme
rename to homes/programs/irssi/default.theme

diff --git a/homes/softwares/mcabberrc b/homes/programs/mcabberrc
similarity index 100%
rename from homes/softwares/mcabberrc
rename to homes/programs/mcabberrc

diff --git a/homes/softwares/mpv.nix b/homes/programs/mpv.nix
similarity index 100%
rename from homes/softwares/mpv.nix
rename to homes/programs/mpv.nix

diff --git a/homes/softwares/redshift.nix b/homes/programs/redshift.nix
similarity index 100%
rename from homes/softwares/redshift.nix
rename to homes/programs/redshift.nix

diff --git a/homes/softwares/ssh.nix b/homes/programs/ssh.nix
similarity index 100%
rename from homes/softwares/ssh.nix
rename to homes/programs/ssh.nix

diff --git a/homes/softwares/stack/config.yaml b/homes/programs/stack/config.yaml
similarity index 100%
rename from homes/softwares/stack/config.yaml
rename to homes/programs/stack/config.yaml

diff --git a/homes/softwares/tmux.conf b/homes/programs/tmux.conf
similarity index 100%
rename from homes/softwares/tmux.conf
rename to homes/programs/tmux.conf

diff --git a/homes/softwares/tmux.nix b/homes/programs/tmux.nix
similarity index 100%
rename from homes/softwares/tmux.nix
rename to homes/programs/tmux.nix

diff --git a/homes/softwares/urxvt.nix b/homes/programs/urxvt.nix
similarity index 100%
rename from homes/softwares/urxvt.nix
rename to homes/programs/urxvt.nix

diff --git a/homes/softwares/vim.nix b/homes/programs/vim.nix
similarity index 100%
rename from homes/softwares/vim.nix
rename to homes/programs/vim.nix

diff --git a/homes/softwares/vim/LanguageClient.vim b/homes/programs/vim/LanguageClient.vim
similarity index 100%
rename from homes/softwares/vim/LanguageClient.vim
rename to homes/programs/vim/LanguageClient.vim

diff --git a/homes/softwares/vim/ale.vim b/homes/programs/vim/ale.vim
similarity index 100%
rename from homes/softwares/vim/ale.vim
rename to homes/programs/vim/ale.vim

diff --git a/homes/softwares/vim/coc-settings.json b/homes/programs/vim/coc-settings.json
similarity index 100%
rename from homes/softwares/vim/coc-settings.json
rename to homes/programs/vim/coc-settings.json

diff --git a/homes/softwares/vim/coc.vim b/homes/programs/vim/coc.vim
similarity index 100%
rename from homes/softwares/vim/coc.vim
rename to homes/programs/vim/coc.vim

diff --git a/homes/softwares/vim/init.vim b/homes/programs/vim/init.vim
similarity index 100%
rename from homes/softwares/vim/init.vim
rename to homes/programs/vim/init.vim

diff --git a/homes/softwares/vim/syntastic.vim b/homes/programs/vim/syntastic.vim
similarity index 100%
rename from homes/softwares/vim/syntastic.vim
rename to homes/programs/vim/syntastic.vim

diff --git a/homes/softwares/xmonad.nix b/homes/programs/xmonad.nix
similarity index 100%
rename from homes/softwares/xmonad.nix
rename to homes/programs/xmonad.nix

diff --git a/homes/softwares/xmonad/xmobar.hs b/homes/programs/xmonad/xmobar.hs
similarity index 100%
rename from homes/softwares/xmonad/xmobar.hs
rename to homes/programs/xmonad/xmobar.hs

diff --git a/homes/softwares/xmonad/xmonad.hs b/homes/programs/xmonad/xmonad.hs
similarity index 100%
rename from homes/softwares/xmonad/xmonad.hs
rename to homes/programs/xmonad/xmonad.hs

diff --git a/homes/softwares/zsh.nix b/homes/programs/zsh.nix
similarity index 100%
rename from homes/softwares/zsh.nix
rename to homes/programs/zsh.nix

diff --git a/homes/sevy.nix b/homes/sevy.nix
index 111404f91da0c774b26e06267a327bd4f5e7f174..5c89f30f30259f2789b5f04de4083454943d61b4 100644 (file)
--- a/homes/sevy.nix
+++ b/homes/sevy.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, config, hostName, ... }:
 {
 imports = [
-  ./softwares.nix
+  ./programs.nix
   ./options.nix
 ];
 host.desktop =

diff --git a/homes/softwares.nix b/homes/softwares.nix
deleted file mode 100644 (file)
index be38af8..0000000
--- a/homes/softwares.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-imports = [
-  softwares/aria2c.nix
-  softwares/bash.nix
-  softwares/direnv.nix
-  softwares/emacs.nix
-  softwares/firefox.nix
-  softwares/ghc.nix
-  softwares/git.nix
-  softwares/gnupg.nix
-  softwares/htop.nix
-  softwares/irssi.nix
-  softwares/mpv.nix
-  softwares/redshift.nix
-  softwares/ssh.nix
-  softwares/tmux.nix
-  softwares/urxvt.nix
-  softwares/vim.nix
-  softwares/xmonad.nix
-  softwares/zsh.nix
-];
-}