From 735b20f17387c6ef05bd43d7db3e613e2cf26bda Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 10 Feb 2022 23:20:54 -0300 Subject: [PATCH] remove setscheme and setwallpaper --- hosts/atlas/default.nix | 2 +- pkgs/default.nix | 8 ----- pkgs/setscheme-wofi/default.nix | 26 ---------------- pkgs/setscheme/default.nix | 49 ------------------------------ pkgs/setwallpaper-wofi/default.nix | 26 ---------------- pkgs/setwallpaper/default.nix | 41 ------------------------- 6 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 pkgs/setscheme-wofi/default.nix delete mode 100644 pkgs/setscheme/default.nix delete mode 100644 pkgs/setwallpaper-wofi/default.nix delete mode 100644 pkgs/setwallpaper/default.nix diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix index c4797488..f846b71e 100644 --- a/hosts/atlas/default.nix +++ b/hosts/atlas/default.nix @@ -14,7 +14,7 @@ in ../common ../common/misterio-greetd.nix ../common/pipewire.nix - ../common/podman.nix + ../common/docker.nix ../common/postgres.nix ../common/steam.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index e0a50d6d..471b52be 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,16 +6,8 @@ preferredplayer = pkgs.callPackage ./preferredplayer { }; - setscheme = pkgs.callPackage ./setscheme { }; - setwallpaper = pkgs.callPackage ./setwallpaper { }; - pass-wofi = pkgs.callPackage ./pass-wofi { }; - setscheme-wofi = - pkgs.callPackage ./setscheme-wofi { inherit (pkgs.gnome) zenity; }; - setwallpaper-wofi = - pkgs.callPackage ./setwallpaper-wofi { inherit (pkgs.gnome) zenity; }; - alacritty-ligatures = pkgs.callPackage ./alacritty-ligatures { }; clematis = pkgs.callPackage ./clematis { }; diff --git a/pkgs/setscheme-wofi/default.nix b/pkgs/setscheme-wofi/default.nix deleted file mode 100644 index 12179408..00000000 --- a/pkgs/setscheme-wofi/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, pkgs, stdenv, writeShellScriptBin, setscheme, wofi, zenity }: - -with lib; - -stdenv.mkDerivation { - name = "setscheme-wofi"; - version = "1.0"; - src = writeShellScriptBin "setscheme-wofi" '' - set -o pipefail - chosen=$(${setscheme}/bin/setscheme -L | ${wofi}/bin/wofi -S dmenu $@) && \ - ${setscheme}/bin/setscheme $chosen --show-trace --verbose 2>&1 | \ - stdbuf -oL -eL awk '/^ / { print int(+$2) ; next } $0 { print "# " $0 }' | \ - ${zenity}/bin/zenity --progress --pulsate --auto-close --auto-kill --title "Change color scheme" - ''; - dontBuild = true; - dontConfigure = true; - installPhase = - "install -Dm 0755 $src/bin/setscheme-wofi $out/bin/setscheme-wofi"; - - meta = { - description = "A wofi graphical menu for setscheme"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ misterio77 ]; - }; -} diff --git a/pkgs/setscheme/default.nix b/pkgs/setscheme/default.nix deleted file mode 100644 index f7b3b23d..00000000 --- a/pkgs/setscheme/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, writeShellScriptBin, installShellFiles, coreutils }: - -with lib; - -stdenv.mkDerivation { - name = "setscheme"; - version = "1.0"; - src = writeShellScriptBin "setscheme" '' - if [ "$1" == "-L" ]; then - nix eval --raw nix-colors#colorSchemes --apply 's: builtins.concatStringsSep "\n" (builtins.attrNames s)' 2> /dev/null - exit 0 - elif [ "$1" == "-R" ]; then - scheme=$(setscheme -L | ${coreutils}/bin/shuf -n 1) - echo $scheme - exit 0 - elif [ "$1" == "generate" ]; then - scheme="null" - if [ -z "$2" ]; then - mode="\"dark\"" - else - mode="\"$2\"" - shift 1 - fi - else - scheme="\"$1\"" - mode="null" - fi - - sed -i "s/currentScheme\.$HOSTNAME = .*;/currentScheme\.$HOSTNAME = $scheme;/" /dotfiles/users/$USER/rice.nix && \ - sed -i "s/currentMode = .*;/currentMode = $mode;/" /dotfiles/users/$USER/rice.nix && \ - home-manager switch --flake /dotfiles ''${@:2} - ''; - dontBuild = true; - dontConfigure = true; - nativeBuildInputs = [ installShellFiles ]; - installPhase = '' - install -Dm 0755 $src/bin/setscheme $out/bin/setscheme - installShellCompletion --cmd setscheme \ - --fish <(echo 'complete -c setscheme -d "Which scheme to set" -r -f -a "(setscheme -L)"') - ''; - - meta = { - description = "Script for setting colorscheme on my hm setup"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ misterio77 ]; - }; -} - diff --git a/pkgs/setwallpaper-wofi/default.nix b/pkgs/setwallpaper-wofi/default.nix deleted file mode 100644 index 4c79cb0f..00000000 --- a/pkgs/setwallpaper-wofi/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, pkgs, stdenv, writeShellScriptBin, setwallpaper, wofi, zenity }: - -with lib; - -stdenv.mkDerivation { - name = "setwallpaper-wofi"; - version = "1.0"; - src = writeShellScriptBin "setwallpaper-wofi" '' - set -o pipefail - chosen=$(${setwallpaper}/bin/setwallpaper -L | ${wofi}/bin/wofi -S dmenu $@) && \ - ${setwallpaper}/bin/setwallpaper $chosen --show-trace --verbose 2>&1 | \ - stdbuf -oL -eL awk '/^ / { print int(+$2) ; next } $0 { print "# " $0 }' | \ - ${zenity}/bin/zenity --progress --pulsate --auto-close --auto-kill --title "Change wallpaper" - ''; - dontBuild = true; - dontConfigure = true; - installPhase = - "install -Dm 0755 $src/bin/setwallpaper-wofi $out/bin/setwallpaper-wofi"; - - meta = { - description = "A wofi graphical menu for setwallpaper"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ misterio77 ]; - }; -} diff --git a/pkgs/setwallpaper/default.nix b/pkgs/setwallpaper/default.nix deleted file mode 100644 index ce91d6eb..00000000 --- a/pkgs/setwallpaper/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ pkgs, lib, stdenv, writeShellScriptBin, installShellFiles, coreutils }: - -with lib; - -stdenv.mkDerivation { - name = "setwallpaper"; - version = "1.0"; - src = writeShellScriptBin "setwallpaper" '' - if [ "$1" == "-L" ]; then - nix eval --raw self#wallpapers --apply 's: builtins.concatStringsSep "\n" (builtins.attrNames s)' 2> /dev/null - exit 0 - elif [ "$1" == "-R" ]; then - wallpaper=$(setwallpaper -L | ${coreutils}/bin/shuf -n 1) - echo $wallpaper - exit 0 - elif [ "$1" == "generate" ]; then - wallpaper="null" - else - wallpaper="\"$1\"" - fi - - sed -i "s/currentWallpaper\.$HOSTNAME = .*;/currentWallpaper\.$HOSTNAME = $wallpaper;/" /dotfiles/users/$USER/rice.nix && \ - home-manager -v switch --flake /dotfiles ''${@:2} - ''; - dontBuild = true; - dontConfigure = true; - nativeBuildInputs = [ installShellFiles ]; - installPhase = '' - install -Dm 0755 $src/bin/setwallpaper $out/bin/setwallpaper - installShellCompletion --cmd setwallpaper \ - --fish <(echo 'complete -c setwallpaper -d "Which wallpaper to set" -r -f -a "(setwallpaper -L)"') - ''; - - meta = { - description = "Script for setting wallpapers on my hm setup"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ misterio77 ]; - }; -} -