From 1125327236d006ebf2b301a55a7a377fb53c7940 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Fri, 21 Feb 2025 11:18:28 +0100 Subject: [PATCH] Simpler configuration --- instances/sif/hm.nix | 13 +++++---- instances/thor/hm.nix | 66 +++++++++++++++++++++---------------------- modules/hm/office.nix | 2 +- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/instances/sif/hm.nix b/instances/sif/hm.nix index 04b3cf7..3b38f3f 100644 --- a/instances/sif/hm.nix +++ b/instances/sif/hm.nix @@ -66,18 +66,18 @@ imports = [ ../../modules/hm/__basic.nix + # ../../modules/hm/development/cpp.nix # ../../modules/hm/development/database.nix - ../../modules/hm/development/cpp.nix ../../modules/hm/development/data.nix ../../modules/hm/development/docker.nix # ../../modules/hm/development/go.nix # ../../modules/hm/development/javascript.nix ../../modules/hm/development/kubernetes.nix - ../../modules/hm/development/latex.nix + # ../../modules/hm/development/latex.nix ../../modules/hm/development/markdown.nix ../../modules/hm/development/nix.nix ../../modules/hm/development/python.nix - ../../modules/hm/development/rust.nix + # ../../modules/hm/development/rust.nix ../../modules/hm/development/web.nix # ../../modules/hm/alacritty.nix @@ -99,6 +99,7 @@ # ../../modules/hm/mangohud.nix # ../../modules/hm/megasync.nix # ../../modules/hm/nautilus.nix + # ../../modules/hm/obs-studio.nix # ../../modules/hm/pycharm.nix # ../../modules/hm/rofi.nix # ../../modules/hm/screen_locker.nix @@ -108,7 +109,7 @@ # ../../modules/hm/twmn.nix # ../../modules/hm/update_background.nix # ../../modules/hm/vivaldi.nix - + # ../../modules/hm/vscode.nix ../../modules/hm/cava.nix ../../modules/hm/easyeffects.nix ../../modules/hm/firefox.nix @@ -122,7 +123,7 @@ ../../modules/hm/ncspot.nix ../../modules/hm/noti.nix ../../modules/hm/nushell.nix - ../../modules/hm/obs-studio.nix + ../../modules/hm/office.nix ../../modules/hm/office.nix ../../modules/hm/pass.nix ../../modules/hm/pro_audio.nix @@ -131,12 +132,12 @@ ../../modules/hm/syncthing.nix ../../modules/hm/vim.nix ../../modules/hm/virtualization.nix - ../../modules/hm/vscode.nix ../../modules/hm/webapp.nix ../../modules/hm/xresources.nix ../../modules/hm/yazi.nix ../../modules/hm/zathura.nix ../../modules/hm/zellij.nix + ]; home.stateVersion = "24.11"; diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index eca4ba9..a444d4a 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -72,73 +72,73 @@ ../../modules/hm/__basic.nix # ../../modules/hm/development/cpp.nix - ../../modules/hm/development/data.nix # ../../modules/hm/development/database.nix - ../../modules/hm/development/docker.nix # ../../modules/hm/development/go.nix # ../../modules/hm/development/javascript.nix - ../../modules/hm/development/kubernetes.nix # ../../modules/hm/development/latex.nix + # ../../modules/hm/development/rust.nix + ../../modules/hm/development/data.nix + ../../modules/hm/development/docker.nix + ../../modules/hm/development/kubernetes.nix ../../modules/hm/development/markdown.nix ../../modules/hm/development/nix.nix ../../modules/hm/development/python.nix - # ../../modules/hm/development/rust.nix ../../modules/hm/development/web.nix # ../../modules/hm/alacritty.nix - ../../modules/hm/autorandr.nix - ../../modules/hm/biblio.nix + # ../../modules/hm/autorandr.nix + # ../../modules/hm/biblio.nix # ../../modules/hm/bitwarden.nix - ../../modules/hm/blender_nvidia.nix # ../../modules/hm/carapace.nix # ../../modules/hm/dwarf-fortress.nix - ../../modules/hm/easyeffects.nix - ../../modules/hm/firefox.nix - # ../../modules/hm/vivaldi.nix - ../../modules/hm/fonts.nix # ../../modules/hm/gnome_shell.nix # ../../modules/hm/grobi.nix - ../../modules/hm/gtk_theme.nix - ../../modules/hm/heif.nix - ../../modules/hm/helix.nix - ../../modules/hm/jellyfin-player.nix - ../../modules/hm/joystickwake.nix + # ../../modules/hm/jellyfin-player.nix # ../../modules/hm/kakoune.nix - ../../modules/hm/kdeconnect.nix # ../../modules/hm/keepassxc.nix # ../../modules/hm/kicad.nix - ../../modules/hm/kitty.nix # ../../modules/hm/lutris.nix - ../../modules/hm/mangohud.nix - ../../modules/hm/megasync.nix - ../../modules/hm/mpv.nix # ../../modules/hm/nautilus.nix - ../../modules/hm/ncspot.nix - ../../modules/hm/noti.nix - ../../modules/hm/nushell.nix # ../../modules/hm/obs-studio.nix - ../../modules/hm/office.nix - ../../modules/hm/pass.nix - ../../modules/hm/picom.nix - ../../modules/hm/pro_audio.nix + # ../../modules/hm/picom.nix # ../../modules/hm/pycharm.nix - ../../modules/hm/rclone-mount.nix - ../../modules/hm/research.nix # ../../modules/hm/rofi.nix # ../../modules/hm/screen_locker.nix # ../../modules/hm/security.nix # ../../modules/hm/spotifyd.nix - ../../modules/hm/syncthing.nix # ../../modules/hm/thunar.nix # ../../modules/hm/twmn.nix # ../../modules/hm/update_background.nix + # ../../modules/hm/vivaldi.nix + # ../../modules/hm/vscode.nix + ../../modules/hm/blender_nvidia.nix + ../../modules/hm/easyeffects.nix + ../../modules/hm/firefox.nix + ../../modules/hm/fonts.nix + ../../modules/hm/gtk_theme.nix + ../../modules/hm/heif.nix + ../../modules/hm/helix.nix + ../../modules/hm/joystickwake.nix + ../../modules/hm/kdeconnect.nix + ../../modules/hm/kitty.nix + ../../modules/hm/mangohud.nix + ../../modules/hm/megasync.nix + ../../modules/hm/mpv.nix + ../../modules/hm/ncspot.nix + ../../modules/hm/noti.nix + ../../modules/hm/nushell.nix + ../../modules/hm/office.nix + ../../modules/hm/pass.nix + ../../modules/hm/pro_audio.nix + ../../modules/hm/rclone-mount.nix + ../../modules/hm/research.nix + ../../modules/hm/syncthing.nix ../../modules/hm/vim.nix ../../modules/hm/virtualization.nix - # ../../modules/hm/vscode.nix ../../modules/hm/webapp.nix ../../modules/hm/xresources.nix - ../../modules/hm/zathura.nix ../../modules/hm/yazi.nix + ../../modules/hm/zathura.nix ../../modules/hm/zellij.nix ]; diff --git a/modules/hm/office.nix b/modules/hm/office.nix index e24c0fb..1745540 100644 --- a/modules/hm/office.nix +++ b/modules/hm/office.nix @@ -3,7 +3,7 @@ home.packages = builtins.attrValues { inherit (pkgs) hunspell - # libreoffice-fresh + libreoffice-fresh ; inherit (pkgs.hunspellDicts) en_GB-large en_US-large it_IT; };