From e019e80eac1b03a5c177ef5d358b720bdbc774ac Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 5 Dec 2021 16:56:41 +0100 Subject: gkleen@sif: taffybar --- accounts/gkleen@sif/xmobar/default.nix | 7 ---- accounts/gkleen@sif/xmobar/nixpkgs.nix | 9 ----- accounts/gkleen@sif/xmobar/package.yaml | 13 ------ accounts/gkleen@sif/xmobar/shell.nix | 28 ------------- accounts/gkleen@sif/xmobar/stack.nix | 17 -------- accounts/gkleen@sif/xmobar/stack.yaml | 10 ----- accounts/gkleen@sif/xmobar/stack.yaml.lock | 12 ------ accounts/gkleen@sif/xmobar/stackage.nix | 31 -------------- accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix | 13 ------ accounts/gkleen@sif/xmobar/xmobar.hs | 54 ------------------------- 10 files changed, 194 deletions(-) delete mode 100644 accounts/gkleen@sif/xmobar/default.nix delete mode 100644 accounts/gkleen@sif/xmobar/nixpkgs.nix delete mode 100644 accounts/gkleen@sif/xmobar/package.yaml delete mode 100644 accounts/gkleen@sif/xmobar/shell.nix delete mode 100644 accounts/gkleen@sif/xmobar/stack.nix delete mode 100644 accounts/gkleen@sif/xmobar/stack.yaml delete mode 100644 accounts/gkleen@sif/xmobar/stack.yaml.lock delete mode 100644 accounts/gkleen@sif/xmobar/stackage.nix delete mode 100644 accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix delete mode 100644 accounts/gkleen@sif/xmobar/xmobar.hs (limited to 'accounts/gkleen@sif/xmobar') diff --git a/accounts/gkleen@sif/xmobar/default.nix b/accounts/gkleen@sif/xmobar/default.nix deleted file mode 100644 index fcac5e60..00000000 --- a/accounts/gkleen@sif/xmobar/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -argumentPackages@{ ... }: - -let - # defaultPackages = (import ./stackage.nix {}); - # haskellPackages = defaultPackages // argumentPackages; - haskellPackages = argumentPackages; -in haskellPackages.callPackage ./xmobar-yggdrasil.nix {} diff --git a/accounts/gkleen@sif/xmobar/nixpkgs.nix b/accounts/gkleen@sif/xmobar/nixpkgs.nix deleted file mode 100644 index 783ede00..00000000 --- a/accounts/gkleen@sif/xmobar/nixpkgs.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ nixpkgs ? import -}: - -import ((nixpkgs {}).fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs"; - rev = "10e61bf5be57736035ec7a804cb0bf3d083bf2cf"; - sha256 = "0fplfm2zx4vk7gs8bdcxnvzkdmpx2w0llqwf8475z9dz9cl132rm"; -}) diff --git a/accounts/gkleen@sif/xmobar/package.yaml b/accounts/gkleen@sif/xmobar/package.yaml deleted file mode 100644 index b638b6ac..00000000 --- a/accounts/gkleen@sif/xmobar/package.yaml +++ /dev/null @@ -1,13 +0,0 @@ -name: xmobar-yggdrasil - -executables: - xmobar: - dependencies: - - base - - xmobar - - main: xmobar.hs - source-dirs: - - . - - ghc-options: -threaded diff --git a/accounts/gkleen@sif/xmobar/shell.nix b/accounts/gkleen@sif/xmobar/shell.nix deleted file mode 100644 index 16beb322..00000000 --- a/accounts/gkleen@sif/xmobar/shell.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ nixpkgs ? import ./nixpkgs.nix {} }: - -let - inherit (nixpkgs {}) pkgs; - haskellPackages = import ./stackage.nix { inherit nixpkgs; }; - - drv = haskellPackages.callPackage ./xmobar-yggdrasil.nix {}; - override = oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; []) ++ (with haskellPackages; [ stack cabal-install cabal2nix ]); - shellHook = '' - export PROMPT_INFO="${oldAttrs.name}" - - if [ -n "$ZSH_VERSION" ]; then - autoload -U +X compinit && compinit - autoload -U +X bashcompinit && bashcompinit - fi - eval "$(stack --bash-completion-script stack)" - - ${oldAttrs.shellHook} - ''; - }; - - dummy = pkgs.stdenv.mkDerivation { - name = "interactive-xmobar-environment"; - shellHook = ""; - }; -in pkgs.lib.overrideDerivation dummy override - #pkgs.lib.overrideDerivation drv.env override diff --git a/accounts/gkleen@sif/xmobar/stack.nix b/accounts/gkleen@sif/xmobar/stack.nix deleted file mode 100644 index 17a49e04..00000000 --- a/accounts/gkleen@sif/xmobar/stack.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ghc, nixpkgs ? import ./nixpkgs.nix {} }: - -let - haskellPackages = import ./stackage.nix { inherit nixpkgs; }; - inherit (nixpkgs {}) pkgs; -in pkgs.haskell.lib.buildStackProject { - inherit ghc; - inherit (haskellPackages) stack; - name = "stackenv"; - buildInputs = (with pkgs; - [ xorg.libX11 xorg.libXrandr xorg.libXinerama xorg.libXScrnSaver xorg.libXext xorg.libXft - cairo - glib - ]) ++ (with haskellPackages; - [ - ]); -} diff --git a/accounts/gkleen@sif/xmobar/stack.yaml b/accounts/gkleen@sif/xmobar/stack.yaml deleted file mode 100644 index b8ed1147..00000000 --- a/accounts/gkleen@sif/xmobar/stack.yaml +++ /dev/null @@ -1,10 +0,0 @@ -nix: - enable: true - shell-file: stack.nix - -resolver: lts-13.21 - -packages: - - . - -extra-deps: [] diff --git a/accounts/gkleen@sif/xmobar/stack.yaml.lock b/accounts/gkleen@sif/xmobar/stack.yaml.lock deleted file mode 100644 index fcc2f5f3..00000000 --- a/accounts/gkleen@sif/xmobar/stack.yaml.lock +++ /dev/null @@ -1,12 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: [] -snapshots: -- completed: - size: 498180 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/13/21.yaml - sha256: eff2de19a6d4691ccbf6edc1fba858f1918683047dce0f09adede874bbd2a8f3 - original: lts-13.21 diff --git a/accounts/gkleen@sif/xmobar/stackage.nix b/accounts/gkleen@sif/xmobar/stackage.nix deleted file mode 100644 index c162ca2c..00000000 --- a/accounts/gkleen@sif/xmobar/stackage.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ nixpkgs ? import ./nixpkgs.nix {} -, snapshot ? "lts-13.21" -}: - -let - stackage = import (fetchTarball { - url = "https://stackage.serokell.io/zb36jsy3r5h4ydz0pnp00g9vk94dvv03-stackage/default.nix.tar.gz"; - sha256 = "0h6f80gds0ds77y51hhiadh2h2k8njqq8n0gayp729ana9m9agma"; - }); - - overlays = - [ stackage."${snapshot}" - (self: super: { - haskell = super.haskell // { - packages = super.haskell.packages // { - "${snapshot}" = super.haskell.packages."${snapshot}".override { - overrides = hself: hsuper: { - zip-archive = self.haskell.lib.overrideCabal hsuper.zip-archive (old: { - testToolDepends = old.testToolDepends ++ (with self; [ unzip which ]); - }); - alex = self.haskell.lib.dontCheck hsuper.alex; - }; - }; - }; - }; - } - ) - ]; - - inherit (nixpkgs { inherit overlays; }) pkgs; -in pkgs.haskell.packages."${snapshot}" diff --git a/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix b/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix deleted file mode 100644 index 852fb8e5..00000000 --- a/accounts/gkleen@sif/xmobar/xmobar-yggdrasil.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ mkDerivation, base, hpack, lib, xmobar }: -mkDerivation { - pname = "xmobar-yggdrasil"; - version = "0.0.0"; - src = ./.; - isLibrary = false; - isExecutable = true; - libraryToolDepends = [ hpack ]; - executableHaskellDepends = [ base xmobar ]; - preConfigure = "hpack"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; -} diff --git a/accounts/gkleen@sif/xmobar/xmobar.hs b/accounts/gkleen@sif/xmobar/xmobar.hs deleted file mode 100644 index 322b4449..00000000 --- a/accounts/gkleen@sif/xmobar/xmobar.hs +++ /dev/null @@ -1,54 +0,0 @@ -import Xmobar - -import Data.List (intercalate) - - -main :: IO () -main = xmobar config - where - config = defaultConfig - { font = "xft:FiraCode Nerd Font Mono:style=Regular:pixelsize=21" - , position = OnScreen 0 $ TopP 0 307 - , bgColor = "black" - , fgColor = "#808080" - , overrideRedirect = False - , template = - let left = intercalate " | " - [ "%XMonadWorkspaces%" - , "%XMonadLayout%" - , "%XMonadTitle%" - ] - right = intercalate " | " - [ {- "%status%" - , -} "%battery%" - , "%kbd%" - , "%worktime%" - , "%worktime-today%" - , "%date%" - , "%weekdate%" - , "%time%" - ] - in left <> "}{" <> right - , commands = - [ Run $ NamedXPropertyLog "_XMONAD_WORKSPACES" "XMonadWorkspaces" - , Run $ NamedXPropertyLog "_XMONAD_LAYOUT" "XMonadLayout" - , Run $ NamedXPropertyLog "_XMONAD_TITLE" "XMonadTitle" - , Run $ Date "%Y-%m-%d" "date" 500 - , Run $ Date "W%V-%u" "weekdate" 500 - , Run $ Date "%H:%M:%S%Ez" "time" 2 - , Run $ Com "worktime" [] "worktime" 1500 - , Run $ Com "worktime" ["today"] "worktime-today" 1500 - , Run $ Com "ssh" ["status.odin"] "status" 600 - , Run $ Kbd [("us(dvp)", "dvp")] - , Run $ Battery - [ "--template", " () AC " - , "--suffix", "On" - , "--Low", "10" - , "--High", "80" - , "--low", "darkred" - , "--normal", "darkorange" - , "--high", "darkgreen" - , "-p", "3" - ] 50 - ] - } -- cgit v1.2.3