diff --git a/provision/modules/system/terminal.nix b/provision/modules/system/terminal.nix index f4654bbb..d40bcf5c 100644 --- a/provision/modules/system/terminal.nix +++ b/provision/modules/system/terminal.nix @@ -13,7 +13,6 @@ in { pciutils # Utilities for inspecting and manipulating devices connected to the PCI bus. chezmoi # Manages your dotfiles across multiple machines, ensuring consistency and version control. btop # Terminal-based resource monitor, providing an interactive view of system resources. - cookcli # Command-line tool for managing Cook, a job scheduling system. nix-search-cli # Command-line utility for searching the Nix package repository. rbw # Command-line interface to the Bitwarden password manager. pinentry-curses # Simple curses-based passphrase entry dialog for GnuPG. diff --git a/provision/overlays/default.nix b/provision/overlays/default.nix index 0dc67353..c1360c4c 100644 --- a/provision/overlays/default.nix +++ b/provision/overlays/default.nix @@ -2,13 +2,9 @@ * other ".nix" files in this directory are automatically loaded. */ final: prev: { - sway-scratchpad = final.callPackage ../pkgs/sway-scratchpad.nix {}; advcpmv = final.callPackage ../pkgs/advcpmv.nix {}; - taskopen = final.callPackage ../pkgs/taskopen.nix {}; - cookcli = final.callPackage ../pkgs/cookcli.nix {}; nx_tzdb = final.callPackage ../pkgs/nx_tzdb.nix {}; yuzu-archive = final.libsForQt5.callPackage ../pkgs/yuzu-archive.nix {}; gnome-set-panel-monitor = final.callPackage ../pkgs/gnome-set-panel-monitor.nix {}; - gnome-maximize-lonely-window = final.callPackage ../pkgs/gnome-maximize-lonely-window.nix {}; gnome-fullscreen-to-empty-workspace = final.callPackage ../pkgs/gnome-fullscreen-to-empty-workspace.nix {}; } diff --git a/provision/pkgs/cookcli.nix b/provision/pkgs/cookcli.nix deleted file mode 100644 index aa53eaf2..00000000 --- a/provision/pkgs/cookcli.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "cookcli"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "cooklang"; - repo = "cookcli"; - rev = "v${version}"; - hash = "sha256-43++90St6XxUn7fhCooH+YEZhA2eTJcPVASaDMOZ8EU="; - }; - - cargoHash = "sha256-2Pr6td6TpXcUna2GmLHMDKxLFsWN3LM72/PvFyFOHw0="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ]; - - env = { - OPENSSL_NO_VENDOR = true; - }; - - meta = with lib; { - description = "Command line program which provides a suite of tools to create shopping lists and maintain recipes"; - homepage = "https://github.com/cooklang/cookcli.git"; - changelog = "https://github.com/cooklang/cookcli/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - mainProgram = "cookcli"; - }; -} diff --git a/provision/pkgs/gnome-fullscreen-to-empty-workspace.nix b/provision/pkgs/gnome-fullscreen-to-empty-workspace.nix index 7b1299ae..2adc694e 100644 --- a/provision/pkgs/gnome-fullscreen-to-empty-workspace.nix +++ b/provision/pkgs/gnome-fullscreen-to-empty-workspace.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "onsah"; repo = "fullscreen-to-new-workspace"; - rev = "8237de39f420307c0c08b72a0d9af042c03440ed"; - hash = "sha256-pdRReQDHDu3nWvMGhPryU6++pT7ohB8KPvxFwDSsFaw="; + rev = "26014b6f8d569891381ab2ebc75c74a51d2454df"; + hash = "sha256-S9mvODQqOBCmA+L1TBJm/c1v5Y+qVKuFpQf799LEwcI="; }; installPhase = '' diff --git a/provision/pkgs/gnome-set-panel-monitor.nix b/provision/pkgs/gnome-set-panel-monitor.nix index da258907..7e5cad82 100644 --- a/provision/pkgs/gnome-set-panel-monitor.nix +++ b/provision/pkgs/gnome-set-panel-monitor.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gnome-set-panel-monitor"; - version = "git-2024-04-11"; + version = "git-2024-08-28"; src = fetchFromGitHub { owner = "starr-dusT"; repo = "gnome-set-panel-monitor"; - rev = "b1dadb63c153cb9e1c546eb1d151b169d4c05e39"; - hash = "sha256-iHLd4TYgpTxwrPnfx80H+JGV8SpP1wrGgRPPnMyaUaA="; + rev = "62d1a7e7ed83d56b33e32f1ad948c99a559b6dbd"; + hash = "sha256-NB/DycA/VxIeFQk2l0MW7G5VVdJI/Zemy2l28VZx2Cc="; }; installPhase = '' diff --git a/provision/pkgs/sway-scratchpad.nix b/provision/pkgs/sway-scratchpad.nix deleted file mode 100644 index ebaf00f8..00000000 --- a/provision/pkgs/sway-scratchpad.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "sway-scratchpad"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "matejc"; - repo = "sway-scratchpad"; - rev = "2f4d39927a154108f193771a90ae7f298e7ae65f"; - hash = "sha256-TgiwU95BbKFvISDe8+wn8VQ+8vQNuGsb+7p9kP//5lw="; - }; - - cargoHash = "sha256-VLWjpb9OmYkBykP51YURWnvgzI1DW0731DbDcJh/7h8="; - - meta = with lib; { - description = "Convert a command to a scratchpad, and toggle visibility with sway/i3."; - homepage = "https://github.com/matejc/sway-scratchpad"; - license = licenses.bsd2; - maintainers = [ maintainers.starr-dusT ]; - }; -} diff --git a/provision/pkgs/taskopen.nix b/provision/pkgs/taskopen.nix deleted file mode 100644 index d819c66f..00000000 --- a/provision/pkgs/taskopen.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nim }: - -stdenv.mkDerivation rec { - pname = "taskopen"; - version = "2.0.0alpha"; - - src = fetchFromGitHub { - owner = "jschlatow"; - repo = "taskopen"; - rev = "12b04b871a4e50d07cabf8574a7347abf54ff43f"; - hash = "sha256-7OxfZ+KfcbrDYFAxi2D/GmHHqoCEmi+t9CeC0DkVhVY="; - }; - - buildInputs = [ nim ]; - - buildPhase = '' - export HOME=$(pwd)/home; mkdir -p $HOME - ''; - - installPhase = '' - make PREFIX=$out - make PREFIX=$out install - ''; - - meta = with lib; { - description = "Wrapper for interaction with taskwarrior annotations."; - homepage = "https://github.com/jschlatow/taskopen"; - license = [ licenses.gpl2 ]; - maintainers = [ maintainers.starr-dusT ]; - }; -}