From 35366b13a28be75c7c6e78a95cac122e383b1e40 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 17 Aug 2021 23:42:14 -0600 Subject: [PATCH 1/7] [taffybar] css tweaks --- dotfiles/config/taffybar/gotham.css | 2 +- dotfiles/config/taffybar/material.css | 9 +++++---- dotfiles/config/taffybar/taffybar.css | 4 +--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dotfiles/config/taffybar/gotham.css b/dotfiles/config/taffybar/gotham.css index eca3686e..bc08262e 100644 --- a/dotfiles/config/taffybar/gotham.css +++ b/dotfiles/config/taffybar/gotham.css @@ -17,7 +17,7 @@ @define-color active-window-color @white; @define-color urgent-window-color @taffy-blue; -@define-color font-color @base5; +@define-color font-color @white; @define-color menu-background-color @white; @define-color menu-font-color @black; @define-color bar-background @base0; diff --git a/dotfiles/config/taffybar/material.css b/dotfiles/config/taffybar/material.css index cdd50d6d..0e8756b0 100644 --- a/dotfiles/config/taffybar/material.css +++ b/dotfiles/config/taffybar/material.css @@ -266,10 +266,11 @@ @define-color white #FFFFFF; @define-color active-window-color @white; -@define-color urgent-window-color @; -@define-color font-color @base5; +@define-color urgent-window-color @blue-grey; +@define-color font-color @white; +@define-color font-shadow-color @black; @define-color menu-background-color @white; @define-color menu-font-color @black; -@define-color bar-background @base0; +@define-color bar-background @pink-darken-4; @define-color accent @red; -@define-color menu-highlight @magenta; +@define-color menu-highlight @deep-orange; diff --git a/dotfiles/config/taffybar/taffybar.css b/dotfiles/config/taffybar/taffybar.css index 5ff55dbe..8da31007 100644 --- a/dotfiles/config/taffybar/taffybar.css +++ b/dotfiles/config/taffybar/taffybar.css @@ -10,7 +10,7 @@ font-size: 10pt; font-weight: bold; color: @font-color; - text-shadow: 2px 2px @black; + text-shadow: 1px 1px @font-shadow-color; } .taffy-box { @@ -45,11 +45,9 @@ padding-left: 2px; padding-top: 0px; font-size: 10pt; - color: @white; opacity: 1; font-weight: bold; transition: color .5s; - text-shadow: 2px 2px @black; } .contents .window-icon { From c32bf0dba9a510a542992a7a51d457c7aad653ea Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 17 Aug 2021 23:42:28 -0600 Subject: [PATCH 2/7] [taffybar] Don't import gotham.css --- dotfiles/config/taffybar/taffybar | 2 +- dotfiles/config/taffybar/taffybar.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar index eab3b26d..dd3d0555 160000 --- a/dotfiles/config/taffybar/taffybar +++ b/dotfiles/config/taffybar/taffybar @@ -1 +1 @@ -Subproject commit eab3b26dee4158154644f1a7e0cd1e72249f048b +Subproject commit dd3d05555fb997d0a558cfc28bb34680f25ad9a1 diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs index c9a2a64c..e597bb87 100644 --- a/dotfiles/config/taffybar/taffybar.hs +++ b/dotfiles/config/taffybar/taffybar.hs @@ -134,7 +134,7 @@ cssFilesByHostname = main = do hostName <- getHostName homeDirectory <- getHomeDirectory - let relativeFiles = fromMaybe ["gotham.css", "taffybar.css"] $ lookup hostName cssFilesByHostname + let relativeFiles = fromMaybe ["taffybar.css"] $ lookup hostName cssFilesByHostname cssFiles <- mapM (getUserConfigFile "taffybar") relativeFiles let myCPU = deocrateWithSetClassAndBoxes "cpu" $ From 3d8c0e8d73cb75b5dfbe43f0d173a73fff3ecac3 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 17 Aug 2021 23:43:01 -0600 Subject: [PATCH 3/7] [NixOS] Bump home-manager --- nixos/home-manager | 2 +- nixos/home-manager.nix | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/nixos/home-manager b/nixos/home-manager index ad5aea1a..ec260995 160000 --- a/nixos/home-manager +++ b/nixos/home-manager @@ -1 +1 @@ -Subproject commit ad5aea1a32bc2e6343da207a7969492d501ccfc6 +Subproject commit ec260995e25a38be212b4ba807de2b763fee996d diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index a33f5774..54288744 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -71,23 +71,20 @@ services.git-sync = { enable = true; - repositories = [ - { - name = "config"; + repositories = { + config = { path = "/home/imalison/config"; uri = "git@github.com:IvanMalison/config.git"; - } - { - name = "org"; + }; + org = { path = "/home/imalison/org"; uri = "git@github.com:IvanMalison/org.git"; - } - { - name = "password-store"; + }; + password-store = { path = "/home/imalison/.password-store"; uri = "git@github.com:IvanMalison/.password-store.git"; - } - ]; + }; + }; }; systemd.user.services.setxkbmap = { From c7aaa1399d73fa6ea502bb9355f6c8965928cc6e Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 17 Aug 2021 23:43:14 -0600 Subject: [PATCH 4/7] [XMonad] Bump submodules --- dotfiles/config/xmonad/xmonad | 2 +- dotfiles/config/xmonad/xmonad-contrib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad index 3e762702..aa18707c 160000 --- a/dotfiles/config/xmonad/xmonad +++ b/dotfiles/config/xmonad/xmonad @@ -1 +1 @@ -Subproject commit 3e762702454b86a7eb35b893e424ad56a801067b +Subproject commit aa18707c3ef96db88208509c2a18c6670e831661 diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib index 3509e91b..22a64f65 160000 --- a/dotfiles/config/xmonad/xmonad-contrib +++ b/dotfiles/config/xmonad/xmonad-contrib @@ -1 +1 @@ -Subproject commit 3509e91b15e71c934978258663513360c7ea2849 +Subproject commit 22a64f65ae61f86513f819b1e16fc2bec3326341 From 8e0e189cd4cf02a94a80a88785a3dccbb58cb08c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 17 Aug 2021 23:44:09 -0600 Subject: [PATCH 5/7] [NixOS] Enable audio in raspberry pi --- nixos/raspberry-pi.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix index 4ac4cbcf..e5240d8f 100644 --- a/nixos/raspberry-pi.nix +++ b/nixos/raspberry-pi.nix @@ -2,6 +2,7 @@ { hardware.raspberry-pi."4".fkms-3d.enable = true; + hardware.raspberry-pi."4".audio.enable = true; boot = { kernelPackages = pkgs.linuxPackages_rpi4; From 2b05086decc045b570e94251bee790980fe5a3dc Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 18 Aug 2021 00:18:32 -0600 Subject: [PATCH 6/7] Bring back quill_from_seed.sh --- dotfiles/lib/bin/quill_from_seed.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 dotfiles/lib/bin/quill_from_seed.sh diff --git a/dotfiles/lib/bin/quill_from_seed.sh b/dotfiles/lib/bin/quill_from_seed.sh new file mode 100755 index 00000000..6b96ad94 --- /dev/null +++ b/dotfiles/lib/bin/quill_from_seed.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +encrypted_seed_file="$1" + +shift + +gpg --decrypt "$encrypted_seed_file" 2>/dev/null | keysmith private-key -f - -o - | quill --pem-file - "$@" From b9c0dbac4a879c2828a27bb2b5d6544f452594a8 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 18 Aug 2021 06:44:40 +0000 Subject: [PATCH 7/7] [NixOS] Remove piclone --- nixos/raspberry-pi.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix index e5240d8f..44bd4596 100644 --- a/nixos/raspberry-pi.nix +++ b/nixos/raspberry-pi.nix @@ -37,7 +37,6 @@ environment.systemPackages = with pkgs; [ raspberrypi-eeprom - piclone ]; nix = {