From d4dba203e3f68705bf1ddb7e1573242bae1076a7 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 13 Jan 2025 09:38:56 +0100 Subject: [PATCH] treewide: cleanup some unused modules/programs --- machines/kholinar/default.nix | 1 - modules/nixos/games/default.nix | 2 -- modules/nixos/games/mumble/default.nix | 19 ------------------ modules/nixos/programs/default.nix | 1 - modules/nixos/programs/obs/default.nix | 27 -------------------------- modules/shared/development/default.nix | 2 ++ 6 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 modules/nixos/games/mumble/default.nix delete mode 100644 modules/nixos/programs/obs/default.nix diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix index 342a04bb..c05e5e4c 100644 --- a/machines/kholinar/default.nix +++ b/machines/kholinar/default.nix @@ -45,7 +45,6 @@ eid.enable = true; element.enable = true; hledger.enable = true; - obs.enable = true; torrents.enable = true; }; }; diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix index 81a21aca..9dafef54 100644 --- a/modules/nixos/games/default.nix +++ b/modules/nixos/games/default.nix @@ -3,7 +3,6 @@ { imports = [ ./minecraft - ./mumble ./particles ./steam ./tetris @@ -17,7 +16,6 @@ config = lib.mkIf config.chvp.games.enable { chvp.games = { minecraft.client = lib.mkDefault false; - mumble.enable = lib.mkDefault true; steam.enable = lib.mkDefault true; }; }; diff --git a/modules/nixos/games/mumble/default.nix b/modules/nixos/games/mumble/default.nix deleted file mode 100644 index de14f89b..00000000 --- a/modules/nixos/games/mumble/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.chvp.games.mumble.enable = lib.mkOption { - default = false; - example = true; - }; - - config = lib.mkIf config.chvp.games.mumble.enable { - chvp.base.zfs.homeLinks = [ - { path = ".config/Mumble"; type = "data"; } - { path = ".local/share/Mumble"; type = "data"; } - ]; - - home-manager.users.charlotte = { ... }: { - home.packages = with pkgs; [ mumble ]; - }; - }; -} diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix index c1d65ffc..41fb3299 100644 --- a/modules/nixos/programs/default.nix +++ b/modules/nixos/programs/default.nix @@ -5,7 +5,6 @@ ./calibre ./eid ./element - ./obs ./torrents ]; } diff --git a/modules/nixos/programs/obs/default.nix b/modules/nixos/programs/obs/default.nix deleted file mode 100644 index b218edb0..00000000 --- a/modules/nixos/programs/obs/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.chvp.programs.obs.enable = lib.mkOption { - default = false; - example = true; - }; - - config = lib.mkIf config.chvp.programs.obs.enable { - boot.kernelModules = [ "v4l2loopback" ]; - boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ]; - boot.extraModprobeConfig = '' - options v4l2loopback video_nr=9 card_label="obs" - ''; - - chvp.base.zfs.homeLinks = [ - { path = ".config/obs-studio"; type = "data"; } - ]; - - home-manager.users.charlotte = { pkgs, ... }: { - programs.obs-studio = { - enable = true; - plugins = [ pkgs.obs-studio-plugins.wlrobs ]; - }; - }; - }; -} diff --git a/modules/shared/development/default.nix b/modules/shared/development/default.nix index 7da43c2a..7cbaeafe 100644 --- a/modules/shared/development/default.nix +++ b/modules/shared/development/default.nix @@ -94,6 +94,8 @@ :mode "\\(?:Brewfile\\|Capfile\\|Gemfile\\(?:\\.[a-zA-Z0-9._-]+\\)?\\|[rR]akefile\\)\\'" :custom (ruby-insert-encoding-magic-comment nil "Don't insert encoding magic comment") + :config + (add-to-list 'eglot-server-programs `(ruby-mode . ("ruby-lsp"))) ) ;; Rust language support