diff options
Diffstat (limited to 'modules/home')
| -rw-r--r-- | modules/home/editors/neovim/default.nix | 65 | ||||
| -rw-r--r-- | modules/home/editors/zed/default.nix | 70 | ||||
| -rw-r--r-- | modules/home/media/jellyfin-mpv-shim/default.nix | 31 | ||||
| -rw-r--r-- | modules/home/media/nixcord/default.nix | 11 |
4 files changed, 19 insertions, 158 deletions
diff --git a/modules/home/editors/neovim/default.nix b/modules/home/editors/neovim/default.nix index c9d30db..cbfd261 100644 --- a/modules/home/editors/neovim/default.nix +++ b/modules/home/editors/neovim/default.nix @@ -6,59 +6,12 @@ }: let - inherit (lib) - mkOption - types - mkIf - optionals - ; + inherit (lib) mkEnableOption mkIf optionals; cfg = config.nx.editors.neovim; in { options.nx.editors.neovim = { - enable = mkOption { - description = "Neovim editor"; - type = types.bool; - default = true; - }; - - langs = { - python = mkOption { - description = "enable the python integration"; - type = types.bool; - default = false; - }; - go = mkOption { - description = "enable go integration"; - type = types.bool; - default = false; - }; - ts = mkOption { - description = "enable the js/ts integration"; - type = types.bool; - default = false; - }; - nix = mkOption { - description = "enable the nix integration"; - type = types.bool; - default = true; - }; - lua = mkOption { - description = "enable the lua integration"; - type = types.bool; - default = true; - }; - latex = mkOption { - description = "enable latex integration"; - type = types.bool; - default = false; - }; - typst = mkOption { - description = "enable typst integration"; - type = types.bool; - default = false; - }; - }; + enable = mkEnableOption "Neovim editor"; }; config = mkIf cfg.enable { @@ -75,16 +28,14 @@ in fd gcc ] - ++ (optionals cfg.langs.ts [ pkgs.nodePackages.typescript-language-server ]) - ++ (optionals cfg.langs.python [ ]) - ++ (optionals cfg.langs.go [ pkgs.gopls ]) - ++ (optionals cfg.langs.nix [ + ++ (optionals true [ pkgs.gopls ]) + ++ (optionals true [ pkgs.nil pkgs.nixfmt ]) - ++ (optionals cfg.langs.lua [ pkgs.lua-language-server ]) - ++ (optionals cfg.langs.latex [ pkgs.texlab ]) - ++ (optionals cfg.langs.typst [ pkgs.tinymist ]); + ++ (optionals true [ pkgs.lua-language-server ]) + ++ (optionals true [ pkgs.texlab ]) + ++ (optionals true [ pkgs.tinymist ]); plugins = with pkgs.vimPlugins; [ gruvbox-nvim @@ -111,4 +62,4 @@ in ''; }; }; -} +}
\ No newline at end of file diff --git a/modules/home/editors/zed/default.nix b/modules/home/editors/zed/default.nix index 58835fb..5fe90ed 100644 --- a/modules/home/editors/zed/default.nix +++ b/modules/home/editors/zed/default.nix @@ -5,82 +5,18 @@ }: let - inherit (lib) - mkEnableOption - mkOption - types - mkIf - optionals - ; + inherit (lib) mkEnableOption mkIf; cfg = config.nx.editors.zed-editor; in { options.nx.editors.zed-editor = { enable = mkEnableOption "zed editor"; - - langs = { - nix = mkOption { - description = "enable nix integration"; - type = types.bool; - default = true; - }; - python = mkOption { - description = "enable python integration"; - type = types.bool; - default = false; - }; - rust = mkOption { - description = "enable rust integration"; - type = types.bool; - default = false; - }; - go = mkOption { - description = "enable go integration"; - type = types.bool; - default = false; - }; - lua = mkOption { - description = "enable lua integration"; - type = types.bool; - default = false; - }; - docker = mkOption { - description = "enable docker integration"; - type = types.bool; - default = false; - }; - java = mkOption { - description = "enable java integration"; - type = types.bool; - default = false; - }; - cmake = mkOption { - description = "enable cmake integration"; - type = types.bool; - default = false; - }; - toml = mkOption { - description = "enable toml integration"; - type = types.bool; - default = false; - }; - }; }; config = mkIf cfg.enable { programs.zed-editor = { enable = true; - extensions = - [ ] - ++ (optionals cfg.langs.nix [ "nix" ]) - ++ (optionals cfg.langs.python [ "python" ]) - ++ (optionals cfg.langs.rust [ "rust" ]) - ++ (optionals cfg.langs.go [ "go" ]) - ++ (optionals cfg.langs.lua [ "lua" ]) - ++ (optionals cfg.langs.docker [ "dockerfile" ]) - ++ (optionals cfg.langs.java [ "java" ]) - ++ (optionals cfg.langs.cmake [ "cmake" ]) - ++ (optionals cfg.langs.toml [ "toml" ]); + extensions = [ "nix" ]; userSettings = { telemetry = { metrics = false; @@ -113,4 +49,4 @@ in }; }; }; -} +}
\ No newline at end of file diff --git a/modules/home/media/jellyfin-mpv-shim/default.nix b/modules/home/media/jellyfin-mpv-shim/default.nix index 53826f6..679a1c6 100644 --- a/modules/home/media/jellyfin-mpv-shim/default.nix +++ b/modules/home/media/jellyfin-mpv-shim/default.nix @@ -1,32 +1,11 @@ { config, lib, ... }: let cfg = config.nx.media.jellyfin-mpv-shim; - # Reference your custom mpv options - mpvOpt = config.nx.media.mpv; - inherit (lib) - mkEnableOption - mkIf - mkOption - types - optionalAttrs - ; + inherit (lib) mkEnableOption mkIf optionalAttrs; in { options.nx.media.jellyfin-mpv-shim = { enable = mkEnableOption "Jellyfin MPV Shim"; - name = mkOption { - description = "Name of player"; - type = types.str; - default = "mpv-shim"; - }; - hdrExpansion = mkOption { - type = types.bool; - default = mpvOpt.hdrExpansion; - }; - targetPeak = mkOption { - type = types.int; - default = mpvOpt.targetPeak; - }; }; config = mkIf cfg.enable { @@ -37,16 +16,16 @@ in services.jellyfin-mpv-shim = { enable = true; settings = { - player_name = cfg.name; + player_name = "mpv-shim"; allow_transcode_to_h256 = true; }; mpvConfig = { vo = "gpu-next"; gpu-api = "vulkan"; target-colorspace-hint = "yes"; - target-peak = cfg.targetPeak; + target-peak = 500; } - // (optionalAttrs cfg.hdrExpansion { + // (optionalAttrs false { target-trc = "pq"; target-prim = "bt.2020"; #target-peak = 406; @@ -56,4 +35,4 @@ in }); }; }; -} +}
\ No newline at end of file diff --git a/modules/home/media/nixcord/default.nix b/modules/home/media/nixcord/default.nix index 8f3b665..c7f2b4b 100644 --- a/modules/home/media/nixcord/default.nix +++ b/modules/home/media/nixcord/default.nix @@ -5,16 +5,11 @@ }: let cfg = config.nx.media.nixcord; - inherit (lib) mkEnableOption mkOption types mkIf; + inherit (lib) mkEnableOption mkIf; in { options.nx.media.nixcord = { enable = mkEnableOption "nixcord and setup"; - frameless = mkOption { - description = "Make discord frameless"; - type = types.bool; - default = true; - }; }; config = mkIf cfg.enable { programs.nixcord = { @@ -23,7 +18,7 @@ in themeLinks = [ "https://refact0r.github.io/system24/theme/system24.theme.css" ]; - frameless = cfg.frameless; + frameless = true; plugins = { alwaysAnimate.enable = false; imageLink.enable = true; @@ -33,4 +28,4 @@ in }; }; }; -} +}
\ No newline at end of file |