From 326622b71103542446bbf2a0c2cbf8ba6e970938 Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Sun, 5 May 2024 18:01:34 +0200 Subject: [PATCH] some package cleanup (most likely more to come) --- hosts/del/configuration.nix | 1 + hosts/del/programs.nix | 27 --------------------------- hosts/niks/configuration.nix | 1 + hosts/niks/programs.nix | 27 --------------------------- modules/gui/foot.nix | 2 +- modules/gui/hypr/land.nix | 2 +- 6 files changed, 4 insertions(+), 56 deletions(-) diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix index 9f01cfe..5bebbb1 100644 --- a/hosts/del/configuration.nix +++ b/hosts/del/configuration.nix @@ -99,6 +99,7 @@ driver = pkgs.libfprint-2-tod1-goodix; }; }; + smartd.enable = true; }; services.journald = { diff --git a/hosts/del/programs.nix b/hosts/del/programs.nix index 8617773..2099dde 100644 --- a/hosts/del/programs.nix +++ b/hosts/del/programs.nix @@ -19,9 +19,6 @@ in { keepassxc eza ripgrep - libnotify - rofi-wayland - rofi-calc session-desktop signal-desktop-beta element-desktop @@ -39,8 +36,6 @@ in { helvum ddccontrol ddccontrol-db - bluez - blueman easyeffects lbry libreoffice-fresh @@ -63,7 +58,6 @@ in { trash-cli bibata-cursors nixpkgs-wayland.swww - opentabletdriver networkmanagerapplet nixpkgs-wayland.wl-clipboard nixpkgs-wayland.wlsunset @@ -99,9 +93,7 @@ in { "rustc" "rustfmt" ]) - wayland showmethekey - polkit libsForQt5.polkit-kde-agent asciinema asciinema-agg @@ -109,8 +101,6 @@ in { appimage-run file virt-manager - weechat - flowblade fastfetch git-annex gamemode @@ -122,58 +112,42 @@ in { espeak ezquake imagemagick - weston pavucontrol psmisc mesa-demos - nnn #aseprite-unfree jq fq - gnumake - gdb - tea - codeberg-cli progress parallel p7zip xxd - tldr mpc-cli playerctl xdg-user-dirs - meson wiki-tui lshw tree ydotool piper - smartmontools agenix.default nh.default exiv2 krita - mypaint - logseq gamescope - vitetris - gtetrinet config.boot.kernelPackages.cpupower config.boot.kernelPackages.perf usbutils - libsForQt5.dolphin kiwix inkscape gomuks nushell twitch-tui - hugo ytfzf mat2 simplex-chat-desktop libsixel lsix - ollama qmk python3 wev @@ -183,7 +157,6 @@ in { rustdesk superTuxKart solaar - glfw-wayland-minecraft httpie mangohud nix-index diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index 07783be..983c470 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -65,6 +65,7 @@ }; ratbagd.enable = true; + smartd.enable = true; }; services.journald = { diff --git a/hosts/niks/programs.nix b/hosts/niks/programs.nix index 0c0b883..b1ed19a 100644 --- a/hosts/niks/programs.nix +++ b/hosts/niks/programs.nix @@ -19,9 +19,6 @@ in { keepassxc eza ripgrep - libnotify - rofi-wayland - rofi-calc session-desktop signal-desktop-beta element-desktop @@ -39,8 +36,6 @@ in { helvum ddccontrol ddccontrol-db - bluez - blueman easyeffects lbry libreoffice-fresh @@ -63,7 +58,6 @@ in { trash-cli bibata-cursors nixpkgs-wayland.swww - opentabletdriver networkmanagerapplet nixpkgs-wayland.wl-clipboard nixpkgs-wayland.wlsunset @@ -99,9 +93,7 @@ in { "rustc" "rustfmt" ]) - wayland showmethekey - polkit libsForQt5.polkit-kde-agent asciinema asciinema-agg @@ -109,8 +101,6 @@ in { appimage-run file virt-manager - weechat - flowblade fastfetch git-annex gamemode @@ -122,58 +112,42 @@ in { espeak ezquake imagemagick - weston pavucontrol psmisc mesa-demos - nnn aseprite-unfree jq fq - gnumake - gdb - tea - codeberg-cli progress parallel p7zip xxd - tldr mpc-cli playerctl xdg-user-dirs - meson wiki-tui lshw tree ydotool piper - smartmontools agenix.default nh.default exiv2 krita - mypaint - logseq gamescope - vitetris - gtetrinet config.boot.kernelPackages.cpupower config.boot.kernelPackages.perf usbutils - libsForQt5.dolphin kiwix inkscape gomuks nushell twitch-tui - hugo ytfzf mat2 simplex-chat-desktop libsixel lsix - ollama qmk python3 wev @@ -183,7 +157,6 @@ in { rustdesk superTuxKart solaar - glfw-wayland-minecraft httpie mangohud nix-index diff --git a/modules/gui/foot.nix b/modules/gui/foot.nix index e967f61..5c72f55 100644 --- a/modules/gui/foot.nix +++ b/modules/gui/foot.nix @@ -53,7 +53,7 @@ in { bell = { urgent = "yes"; notify = "yes"; - command = "notify-send bell"; + command = "${pkgs.libnotify}/bin/notify-send bell"; command-focused = "no"; }; scrollback = { diff --git a/modules/gui/hypr/land.nix b/modules/gui/hypr/land.nix index 5484c31..a786ef6 100644 --- a/modules/gui/hypr/land.nix +++ b/modules/gui/hypr/land.nix @@ -339,7 +339,7 @@ in { # TODO what the fuck is this ", XF86TouchpadToggle, exec, " # TODO fix this maybe - "$mainMod, T, exec, grim -g \"$(slurp)\" -t ppm - | tesseract -l pol - - | wl-copy && notify-send \"Copied text: \" \"\\\"$(wl-paste)\\\"\"" + "$mainMod, T, exec, grim -g \"$(slurp)\" -t ppm - | tesseract -l pol - - | wl-copy && ${pkgs.libnotify}/bin/notify-send \"Copied text: \" \"\\\"$(wl-paste)\\\"\"" # TODO fix this "$mainMod, SEMICOLON, exec, ~/.config/rofi/powermenu/type-2/powermenu.sh" "$mainMod, G, togglegroup"