From 34ef08870956529fa61441b27547bbea39dd5ca6 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 18 Feb 2025 09:45:06 +0100 Subject: [PATCH] Spring cleanup --- instances/sif/hm.nix | 36 ++++++++++----------------- modules/hm/development/docker.nix | 5 +++- modules/hm/development/kubernetes.nix | 27 +++++++++++--------- modules/hm/development/latex.nix | 2 +- modules/hm/development/markdown.nix | 7 ++---- modules/hm/development/nix.nix | 6 ++--- modules/hm/development/web.nix | 5 +++- modules/hm/helix.nix | 10 +++----- 8 files changed, 46 insertions(+), 52 deletions(-) diff --git a/instances/sif/hm.nix b/instances/sif/hm.nix index 159f7b9..04b3cf7 100644 --- a/instances/sif/hm.nix +++ b/instances/sif/hm.nix @@ -13,9 +13,15 @@ }; packages = builtins.attrValues { inherit (pkgs) + # brave + # discord + # droidcam # element-desktop # matrix client # evolution # freecad + # gnome-font-viewer + # gucharmap + # keyboard-switch # krita # minecraft # mycrypto @@ -23,37 +29,26 @@ # retroarchFull # shotwell # signal-desktop + # skypeforlinux # slack + # transmission_4 # wineFull + # wireguard-tools authenticator bluetui - # brave chromium - # discord - # droidcam eog evince file-roller - gallery-dl - # gnome-font-viewer - gnome-screenshot - gnome-system-monitor - # gucharmap heroic - inkscape - # keyboard-switch openvpn p7zip pavucontrol procps protonvpn-gui - # skypeforlinux spotify tdesktop teams-for-linux - thunderbird - # transmission_4 - # wireguard-tools xournalpp ; }; @@ -66,12 +61,6 @@ xsession = { enable = true; numlock.enable = true; - # initExtra = '' - # ## Touchpad - # ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1 - # ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1 - # ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Disable While Typing Enabled' 1 - # ''; }; imports = [ @@ -81,8 +70,8 @@ ../../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/go.nix + # ../../modules/hm/development/javascript.nix ../../modules/hm/development/kubernetes.nix ../../modules/hm/development/latex.nix ../../modules/hm/development/markdown.nix @@ -93,6 +82,7 @@ # ../../modules/hm/alacritty.nix # ../../modules/hm/autorandr.nix + # ../../modules/hm/biblio.nix # ../../modules/hm/bitwarden.nix # ../../modules/hm/blender.nix # ../../modules/hm/carapace.nix @@ -118,7 +108,7 @@ # ../../modules/hm/twmn.nix # ../../modules/hm/update_background.nix # ../../modules/hm/vivaldi.nix - ../../modules/hm/biblio.nix + ../../modules/hm/cava.nix ../../modules/hm/easyeffects.nix ../../modules/hm/firefox.nix diff --git a/modules/hm/development/docker.nix b/modules/hm/development/docker.nix index 31c5d34..5a3c90d 100644 --- a/modules/hm/development/docker.nix +++ b/modules/hm/development/docker.nix @@ -8,7 +8,10 @@ # (builtins.attrValues { inherit (pkgs) docker-compose; }) # ++ lib.optionals config.programs.helix.enable ( - builtins.attrValues { inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; } + builtins.attrValues { + inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; + inherit (pkgs) docker-compose-language-service; + } ); # home.shellAliases = { # "dkcd" = "docker-compose down"; diff --git a/modules/hm/development/kubernetes.nix b/modules/hm/development/kubernetes.nix index 544902a..48b6a02 100644 --- a/modules/hm/development/kubernetes.nix +++ b/modules/hm/development/kubernetes.nix @@ -1,24 +1,27 @@ { pkgs, ... }: +let + helm = pkgs.wrapHelm pkgs.kubernetes-helm { + plugins = builtins.attrValues { + inherit (pkgs.kubernetes-helmPlugins) + helm-diff + # helm-secrets + ; + }; + }; +in { home = { shellAliases = { "k" = "kubectl"; }; packages = [ - (pkgs.wrapHelm pkgs.kubernetes-helm { - plugins = builtins.attrValues { - inherit (pkgs.kubernetes-helmPlugins) - helm-diff - # helm-secrets - ; - }; - }) + # pkgs.kustomize + # pkgs.lens + helm + pkgs.awscli2 + pkgs.k9s pkgs.kubectl pkgs.kubelogin-oidc - # pkgs.kustomize - pkgs.k9s - pkgs.awscli2 - pkgs.lens pkgs.kubevirt ]; }; diff --git a/modules/hm/development/latex.nix b/modules/hm/development/latex.nix index b9b3b31..9ee5b2a 100644 --- a/modules/hm/development/latex.nix +++ b/modules/hm/development/latex.nix @@ -23,7 +23,7 @@ ); home.file.".latexmkrc".text = '' - $pdf_previewer = 'zathura %O %S'; + $pdf_previewer = '${pkgs.zathura}/bin/zathura %O %S'; $pdf_update_method = 2 ''; } diff --git a/modules/hm/development/markdown.nix b/modules/hm/development/markdown.nix index fcc128c..961d0b0 100644 --- a/modules/hm/development/markdown.nix +++ b/modules/hm/development/markdown.nix @@ -4,9 +4,6 @@ , ... }: { - home.packages = [ - pkgs.pandoc - # pkgs.pandoc-drawio-filter - # pkgs.pandoc-imagine - ] ++ lib.optionals config.programs.helix.enable [ pkgs.marksman ]; + home.packages = + lib.optionals config.programs.helix.enable [ pkgs.marksman ]; } diff --git a/modules/hm/development/nix.nix b/modules/hm/development/nix.nix index a9df62a..d4ff305 100644 --- a/modules/hm/development/nix.nix +++ b/modules/hm/development/nix.nix @@ -7,11 +7,11 @@ home.packages = (builtins.attrValues { inherit (pkgs) - nixpkgs-fmt - nixfmt-classic + # nixpkgs-review nix-prefetch-scripts - nixpkgs-review nix-tree + nixfmt-classic + nixpkgs-fmt ; }) ++ lib.optionals config.programs.helix.enable [ pkgs.nil ] diff --git a/modules/hm/development/web.nix b/modules/hm/development/web.nix index aa2839f..121c8d1 100644 --- a/modules/hm/development/web.nix +++ b/modules/hm/development/web.nix @@ -1,4 +1,7 @@ { pkgs, ... }: { - home.packages = [ pkgs.httpie ]; + home.packages = [ + pkgs.bruno + pkgs.httpie + ]; } diff --git a/modules/hm/helix.nix b/modules/hm/helix.nix index 491c8c8..1912f52 100644 --- a/modules/hm/helix.nix +++ b/modules/hm/helix.nix @@ -15,12 +15,10 @@ }; programs.helix = { enable = true; - languages.language = [ - { - name = "nix"; - auto-format = true; - } - ]; + languages.language = [{ + name = "nix"; + auto-format = true; + }]; languages.language-server = { nil.config.nil = { formatting.command = [ "nixpkgs-fmt" ];