From 1a8295a5a5d3f7a3b21bcb56041de5ebd7557dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sat, 27 Dec 2025 07:58:20 +0100 Subject: [PATCH] remove pkgs.niveum.lib.defaultApplications --- configs/default.nix | 2 +- configs/dunst.nix | 2 +- configs/i3.nix | 6 +++--- flake.nix | 4 ++++ lib/default.nix | 6 ------ 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/configs/default.nix b/configs/default.nix index 2529126..bcf76e4 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -187,7 +187,7 @@ in dconf.enable = true; dconf.settings = { # Change the default terminal for Nemo - "org/cinnamon/desktop/applications/terminal".exec = pkgs.lib.niveum.defaultApplications.terminal; + "org/cinnamon/desktop/applications/terminal".exec = lib.getExe pkgs.niveum-terminal; }; }; } diff --git a/configs/dunst.nix b/configs/dunst.nix index e696b16..835cd86 100644 --- a/configs/dunst.nix +++ b/configs/dunst.nix @@ -43,7 +43,7 @@ in { sticky_history = true; history_length = 20; dmenu = "${pkgs.rofi}/bin/rofi -display-run dunst -show run"; - browser = pkgs.lib.niveum.defaultApplications.browser; + browser = lib.getExe pkgs.niveum-browser; verbosity = "mesg"; corner_radius = 0; mouse_left_click = "do_action"; diff --git a/configs/i3.nix b/configs/i3.nix index 44d3bde..b4fe99b 100644 --- a/configs/i3.nix +++ b/configs/i3.nix @@ -216,9 +216,9 @@ in { "${modifier}+w" = "layout tabbed"; "${modifier}+q" = "exec ${config.services.clipmenu.package}/bin/clipmenu"; - "${modifier}+Return" = "exec ${pkgs.lib.niveum.defaultApplications.terminal}"; - "${modifier}+t" = "exec ${pkgs.lib.niveum.defaultApplications.fileManager}"; - "${modifier}+y" = "exec ${pkgs.lib.niveum.defaultApplications.browser}"; + "${modifier}+Return" = "exec ${lib.getExe pkgs.niveum-terminal}"; + "${modifier}+t" = "exec ${lib.getExe pkgs.niveum-filemanager}"; + "${modifier}+y" = "exec ${lib.getExe pkgs.niveum-browser}"; "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}"; "${modifier}+Shift+d" = "exec ${pkgs.notemenu}/bin/notemenu"; diff --git a/flake.nix b/flake.nix index 5c0dc19..c675364 100644 --- a/flake.nix +++ b/flake.nix @@ -155,6 +155,10 @@ }; overlays.default = final: prev: { + niveum-terminal = prev.alacritty; + niveum-browser = prev.firefox; + niveum-filemanager = prev.pcmanfm; + # wrapped from upstream wrapScript = { diff --git a/lib/default.nix b/lib/default.nix index ed8fa45..4f62946 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -69,12 +69,6 @@ in }; }; - defaultApplications = { - terminal = "alacritty"; - browser = "${pkgs.firefox}/bin/firefox"; - fileManager = "${pkgs.pcmanfm}/bin/pcmanfm"; - }; - retiolumAddresses = lib.mapAttrs (_: v: { inherit (v.retiolum) ipv4 ipv6; }) ( lib.filterAttrs (_: v: v ? "retiolum") systems );