diff options
| -rw-r--r-- | overlay/btop.nix | 4 | ||||
| -rw-r--r-- | overlay/default.nix | 6 | ||||
| -rw-r--r-- | overlay/discord.nix | 27 | ||||
| -rw-r--r-- | overlay/fish.nix | 2 | ||||
| -rw-r--r-- | overlay/vim-full.nix | 16 | ||||
| -rw-r--r-- | users/seth/programs/default.nix | 12 |
6 files changed, 40 insertions, 27 deletions
diff --git a/overlay/btop.nix b/overlay/btop.nix index b2a5b24..62b105b 100644 --- a/overlay/btop.nix +++ b/overlay/btop.nix @@ -4,10 +4,10 @@ _: prev: { then prev.symlinkJoin { inherit (prev.btop) passthru; - name = "btop-nodesktop"; + name = "btop-nodesktop-${prev.btop.version}"; paths = [prev.btop]; postBuild = '' - rm $out/share/applications/btop.desktop + rm -rf $out/share/{icons,applications} ''; } else prev.btop; diff --git a/overlay/default.nix b/overlay/default.nix index 24e3420..a4d96a2 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -4,10 +4,8 @@ ( prev.lib.pipe ./. [ builtins.readDir - builtins.attrNames - - (builtins.filter (n: n != "default.nix")) - (map (f: import ./${f})) + (prev.lib.filterAttrs (n: _: n != "default.nix")) + (prev.lib.mapAttrsToList (f: _: import ./${f})) ] ) final diff --git a/overlay/discord.nix b/overlay/discord.nix index cb651cd..fa9d805 100644 --- a/overlay/discord.nix +++ b/overlay/discord.nix @@ -1,28 +1,17 @@ _: prev: let + flags = "--enable-gpu-rasterization --enable-zero-copy --enable-gpu-compositing --enable-native-gpu-memory-buffers --enable-oop-rasterization --enable-features=UseSkiaRenderer,WaylandWindowDecorations"; + mkOverride = d: let # TODO: re-enable openASAR when gnome wayland decorations work with it d' = d; #.override {withOpenASAR = true;}; - inherit (d') pname; - - desktopName = - if pname == "discord-canary" - then "Discord Canary" - else "Discord"; - - flags = "--enable-gpu-rasterization --enable-zero-copy --enable-gpu-compositing --enable-native-gpu-memory-buffers --enable-oop-rasterization --enable-features=UseSkiaRenderer,WaylandWindowDecorations"; - - desktopItem = prev.makeDesktopItem { - name = pname; - exec = "${builtins.replaceStrings [" "] [""] desktopName} ${flags}"; - icon = pname; - inherit desktopName; - genericName = d'.meta.description; - categories = ["Network" "InstantMessaging"]; - mimeTypes = ["x-scheme-handler/discord"]; - }; in if prev.stdenv.isLinux - then d'.overrideAttrs (_: {inherit desktopItem;}) + then + d'.overrideAttrs (old: { + desktopItem = old.desktopItem.override (old': { + exec = "${old'.exec} ${flags}"; + }); + }) else d'; in { discord = mkOverride prev.discord; diff --git a/overlay/fish.nix b/overlay/fish.nix index 4e7fffc..d998ada 100644 --- a/overlay/fish.nix +++ b/overlay/fish.nix @@ -7,7 +7,7 @@ _: prev: { name = "fish-nodesktop"; paths = [prev.fish]; postBuild = '' - rm $out/share/applications/fish.desktop + rm -rf $out/share/{applications,icons} ''; } else prev.fish; diff --git a/overlay/vim-full.nix b/overlay/vim-full.nix new file mode 100644 index 0000000..9a419b1 --- /dev/null +++ b/overlay/vim-full.nix @@ -0,0 +1,16 @@ +_: prev: { + vim-full = + if prev.stdenv.isLinux + then + prev.vimUtils.makeCustomizable ( + prev.symlinkJoin { + inherit (prev.vim-full) passthru; + name = "vim-nodesktop-${prev.vim-full.version}"; + paths = [prev.vim-full]; + postBuild = '' + rm -rf $out/share/{icons,applications} + ''; + } + ) + else prev.vim-full; +} diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix index a213e21..22200a6 100644 --- a/users/seth/programs/default.nix +++ b/users/seth/programs/default.nix @@ -19,7 +19,17 @@ nurl rclone restic - inputs.getchvim.packages.${pkgs.stdenv.hostPlatform.system}.default + (let + getchvim = inputs.getchvim.packages.${pkgs.stdenv.hostPlatform.system}.default; + in + # remove desktop file + symlinkJoin { + name = builtins.replaceStrings ["neovim"] ["neovim-nodesktop"] getchvim.name; + paths = [getchvim]; + postBuild = '' + rm -rf $out/share/{applications,icons} + ''; + }) ]; catppuccin.flavour = "mocha"; |