From f93a17a74fb258678e98120dc248da0bc7d0e164 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Fri, 23 Dec 2022 21:21:46 +0100 Subject: [PATCH] Better organized development configurations --- baldur/hm.nix | 15 ++++++------- hm_modules/__basic.nix | 1 - hm_modules/cpp.nix | 1 - hm_modules/data_analysis.nix | 6 ----- hm_modules/development/cpp.nix | 1 + hm_modules/development/data.nix | 7 ++++++ hm_modules/development/docker.nix | 9 ++++++++ hm_modules/{ => development}/go.nix | 0 hm_modules/development/javascript.nix | 2 ++ .../kubernetes.nix} | 0 hm_modules/{ => development}/latex.nix | 0 hm_modules/development/nix.nix | 10 +++++++++ hm_modules/{ => development}/pycharm.nix | 0 hm_modules/{ => development}/python.nix | 0 hm_modules/development/rust.nix | 3 +++ hm_modules/javascript.nix | 2 -- hm_modules/rust.nix | 3 --- loki/configuration.nix | 3 +++ loki/hm.nix | 18 +++++++-------- odin/hm.nix | 22 +++++++++---------- thor/hm.nix | 19 ++++++++-------- 21 files changed, 70 insertions(+), 52 deletions(-) delete mode 100644 hm_modules/cpp.nix delete mode 100644 hm_modules/data_analysis.nix create mode 100644 hm_modules/development/cpp.nix create mode 100644 hm_modules/development/data.nix create mode 100644 hm_modules/development/docker.nix rename hm_modules/{ => development}/go.nix (100%) create mode 100644 hm_modules/development/javascript.nix rename hm_modules/{kubernetes-admin.nix => development/kubernetes.nix} (100%) rename hm_modules/{ => development}/latex.nix (100%) create mode 100644 hm_modules/development/nix.nix rename hm_modules/{ => development}/pycharm.nix (100%) rename hm_modules/{ => development}/python.nix (100%) create mode 100644 hm_modules/development/rust.nix delete mode 100644 hm_modules/javascript.nix delete mode 100644 hm_modules/rust.nix diff --git a/baldur/hm.nix b/baldur/hm.nix index 8ea4d86..3a9393e 100644 --- a/baldur/hm.nix +++ b/baldur/hm.nix @@ -12,14 +12,13 @@ imports = [ ../hm_modules/__basic.nix - # ../hm_modules/cpp.nix - # ../hm_modules/data_analysis.nix - # ../hm_modules/go.nix - # ../hm_modules/java.nix - # ../hm_modules/javascript.nix - # ../hm_modules/latex.nix - # ../hm_modules/python.nix - # ../hm_modules/rust.nix + # ../hm_modules/development/cpp.nix + # ../hm_modules/development/data.nix + # ../hm_modules/development/go.nix + # ../hm_modules/development/javascript.nix + # ../hm_modules/development/latex.nix + # ../hm_modules/development/python.nix + # ../hm_modules/development/rust.nix # ../hm_modules/fonts.nix ../hm_modules/helix.nix diff --git a/hm_modules/__basic.nix b/hm_modules/__basic.nix index c732287..c7ae095 100644 --- a/hm_modules/__basic.nix +++ b/hm_modules/__basic.nix @@ -9,7 +9,6 @@ mmv-go neofetch nixos-option - nix-tree pv ripgrep unrar diff --git a/hm_modules/cpp.nix b/hm_modules/cpp.nix deleted file mode 100644 index 2f6794b..0000000 --- a/hm_modules/cpp.nix +++ /dev/null @@ -1 +0,0 @@ -{ pkgs, ... }: { home.packages = with pkgs; [ clang-tools ]; } diff --git a/hm_modules/data_analysis.nix b/hm_modules/data_analysis.nix deleted file mode 100644 index abf4ca9..0000000 --- a/hm_modules/data_analysis.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ - nodePackages.vscode-langservers-extracted - yaml-language-server - ]; -} diff --git a/hm_modules/development/cpp.nix b/hm_modules/development/cpp.nix new file mode 100644 index 0000000..8c7cab2 --- /dev/null +++ b/hm_modules/development/cpp.nix @@ -0,0 +1 @@ +{ pkgs, config, lib, ... }: { home.packages = with pkgs; lib.optionals config.programs.helix.enable [ clang-tools cmake-language-server ]; } diff --git a/hm_modules/development/data.nix b/hm_modules/development/data.nix new file mode 100644 index 0000000..22d6251 --- /dev/null +++ b/hm_modules/development/data.nix @@ -0,0 +1,7 @@ +{ config, pkgs, lib, ... }: { + home.packages = with pkgs; lib.optionals config.programs.helix.enable [ + nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS + yaml-language-server # YAML + taplo-cli # TOML + ]; +} diff --git a/hm_modules/development/docker.nix b/hm_modules/development/docker.nix new file mode 100644 index 0000000..39684ad --- /dev/null +++ b/hm_modules/development/docker.nix @@ -0,0 +1,9 @@ +{ pkgs, config, lib, ... }: { + home.packages = with pkgs; [ + docker-compose + docker-machine + ] ++ lib.optionals config.programs.helix.enable [ + nodePackages.dockerfile-language-server-nodejs + ]; +} + diff --git a/hm_modules/go.nix b/hm_modules/development/go.nix similarity index 100% rename from hm_modules/go.nix rename to hm_modules/development/go.nix diff --git a/hm_modules/development/javascript.nix b/hm_modules/development/javascript.nix new file mode 100644 index 0000000..18b681d --- /dev/null +++ b/hm_modules/development/javascript.nix @@ -0,0 +1,2 @@ +{ pkgs, lib, config, ... }: { home.packages = with pkgs; lib.optionals config.programs.helix.enable [ nodePackages.typescript-language-server ]; } + diff --git a/hm_modules/kubernetes-admin.nix b/hm_modules/development/kubernetes.nix similarity index 100% rename from hm_modules/kubernetes-admin.nix rename to hm_modules/development/kubernetes.nix diff --git a/hm_modules/latex.nix b/hm_modules/development/latex.nix similarity index 100% rename from hm_modules/latex.nix rename to hm_modules/development/latex.nix diff --git a/hm_modules/development/nix.nix b/hm_modules/development/nix.nix new file mode 100644 index 0000000..bfec5a4 --- /dev/null +++ b/hm_modules/development/nix.nix @@ -0,0 +1,10 @@ +{ pkgs, config, lib, ... }: { + home.packages = with pkgs; [ + nixpkgs-fmt + nix-prefetch-scripts + nix-review + nix-tree + ] ++ lib.optionals config.programs.helix.enable [ + nil + ]; +} diff --git a/hm_modules/pycharm.nix b/hm_modules/development/pycharm.nix similarity index 100% rename from hm_modules/pycharm.nix rename to hm_modules/development/pycharm.nix diff --git a/hm_modules/python.nix b/hm_modules/development/python.nix similarity index 100% rename from hm_modules/python.nix rename to hm_modules/development/python.nix diff --git a/hm_modules/development/rust.nix b/hm_modules/development/rust.nix new file mode 100644 index 0000000..e398993 --- /dev/null +++ b/hm_modules/development/rust.nix @@ -0,0 +1,3 @@ +{ pkgs, lib, config, ... }: { + home.packages = with pkgs; [ bacon cargo clippy rustfmt ] ++ (lib.optionals config.programs.helix.enable [ rust-analyzer ]); +} diff --git a/hm_modules/javascript.nix b/hm_modules/javascript.nix deleted file mode 100644 index a1f3074..0000000 --- a/hm_modules/javascript.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ pkgs, ... }: { home.packages = with pkgs; [ flow ]; } - diff --git a/hm_modules/rust.nix b/hm_modules/rust.nix deleted file mode 100644 index 04f9a87..0000000 --- a/hm_modules/rust.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ bacon cargo clippy rust-analyzer rustfmt ]; -} diff --git a/loki/configuration.nix b/loki/configuration.nix index c5ca0d1..b294feb 100644 --- a/loki/configuration.nix +++ b/loki/configuration.nix @@ -420,6 +420,9 @@ with lib; { }]; esphome = { }; frontend = { }; + google_assistant = { + project_id = "light-cathode-372118"; + }; history = { }; logbook = { }; # logger.default = "debug"; diff --git a/loki/hm.nix b/loki/hm.nix index a2264e7..64ae272 100644 --- a/loki/hm.nix +++ b/loki/hm.nix @@ -28,7 +28,6 @@ file htop neofetch - nix-prefetch-scripts ripgrep wget xclip @@ -38,14 +37,14 @@ imports = [ ../hm_modules/__basic.nix - # ../hm_modules/cpp.nix - ../hm_modules/data_analysis.nix - # ../hm_modules/go.nix - # ../hm_modules/java.nix - # ../hm_modules/javascript.nix - # ../hm_modules/latex.nix - # ../hm_modules/python.nix - # ../hm_modules/rust.nix + # ../hm_modules/development/cpp.nix + ../hm_modules/development/data.nix + # ../hm_modules/development/go.nix + # ../hm_modules/development/javascript.nix + # ../hm_modules/development/latex.nix + # ../hm_modules/development/nix.nix + # ../hm_modules/development/python.nix + # ../hm_modules/development/rust.nix ../hm_modules/fonts.nix ../hm_modules/bash.nix @@ -71,6 +70,7 @@ ../hm_modules/tmux.nix ../hm_modules/zoxide.nix ../hm_modules/zsh.nix + ../hm_modules/shell_aliases.nix ]; diff --git a/odin/hm.nix b/odin/hm.nix index 9649cfb..53529e8 100644 --- a/odin/hm.nix +++ b/odin/hm.nix @@ -12,8 +12,6 @@ cava discord dmenu - docker-compose - docker-machine droidcam easyeffects # element-desktop # matrix client @@ -44,7 +42,6 @@ mendeley # minecraft # mycrypto - nix-prefetch-scripts obsidian openvpn p7zip @@ -91,14 +88,16 @@ imports = [ ../hm_modules/__basic.nix - ../hm_modules/cpp.nix - ../hm_modules/data_analysis.nix - # ../hm_modules/go.nix - # ../hm_modules/java.nix - ../hm_modules/javascript.nix - ../hm_modules/latex.nix - ../hm_modules/python.nix - ../hm_modules/rust.nix + ../hm_modules/development/cpp.nix + ../hm_modules/development/data.nix + ../hm_modules/development/docker.nix + # ../hm_modules/development/go.nix + ../hm_modules/development/javascript.nix + ../hm_modules/development/kubernetes.nix + ../hm_modules/development/latex.nix + ../hm_modules/development/nix.nix + ../hm_modules/development/python.nix + ../hm_modules/development/rust.nix ../hm_modules/alacritty.nix ../hm_modules/autorandr.nix @@ -118,7 +117,6 @@ # ../hm_modules/keepassxc.nix ../hm_modules/kdeconnect.nix ../hm_modules/kitty.nix - ../hm_modules/kubernetes-admin.nix ../hm_modules/lf.nix ../hm_modules/libinput-gestures.nix ../hm_modules/lsd.nix diff --git a/thor/hm.nix b/thor/hm.nix index c49b14e..79236fe 100644 --- a/thor/hm.nix +++ b/thor/hm.nix @@ -45,7 +45,6 @@ mendeley # minecraft # mycrypto - nix-prefetch-scripts obsidian openvpn p7zip @@ -82,14 +81,15 @@ imports = [ ../hm_modules/__basic.nix - ../hm_modules/cpp.nix - ../hm_modules/data_analysis.nix - # ../hm_modules/go.nix - # ../hm_modules/java.nix - ../hm_modules/javascript.nix - ../hm_modules/latex.nix - ../hm_modules/python.nix - ../hm_modules/rust.nix + ../hm_modules/development/cpp.nix + ../hm_modules/development/data.nix + # ../hm_modules/development/go.nix + ../hm_modules/development/javascript.nix + ../hm_modules/development/kubernetes.nix + ../hm_modules/development/latex.nix + ../hm_modules/development/nix.nix + ../hm_modules/development/python.nix + ../hm_modules/development/rust.nix ../hm_modules/alacritty.nix ../hm_modules/autorandr.nix @@ -109,7 +109,6 @@ ../hm_modules/kdeconnect.nix # ../hm_modules/keepassxc.nix ../hm_modules/kitty.nix - ../hm_modules/kubernetes-admin.nix ../hm_modules/lf.nix ../hm_modules/lsd.nix ../hm_modules/mangohud.nix