Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ed95ed104b
@ -266,10 +266,11 @@
|
|||||||
@define-color white #FFFFFF;
|
@define-color white #FFFFFF;
|
||||||
|
|
||||||
@define-color active-window-color @white;
|
@define-color active-window-color @white;
|
||||||
@define-color urgent-window-color @;
|
@define-color urgent-window-color @blue-grey;
|
||||||
@define-color font-color @base5;
|
@define-color font-color @white;
|
||||||
|
@define-color font-shadow-color @black;
|
||||||
@define-color menu-background-color @white;
|
@define-color menu-background-color @white;
|
||||||
@define-color menu-font-color @black;
|
@define-color menu-font-color @black;
|
||||||
@define-color bar-background @base0;
|
@define-color bar-background @pink-darken-4;
|
||||||
@define-color accent @red;
|
@define-color accent @red;
|
||||||
@define-color menu-highlight @magenta;
|
@define-color menu-highlight @deep-orange;
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit eab3b26dee4158154644f1a7e0cd1e72249f048b
|
Subproject commit dd3d05555fb997d0a558cfc28bb34680f25ad9a1
|
@ -10,7 +10,7 @@
|
|||||||
font-size: 10pt;
|
font-size: 10pt;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: @font-color;
|
color: @font-color;
|
||||||
text-shadow: 2px 2px @black;
|
text-shadow: 1px 1px @font-shadow-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
.taffy-box {
|
.taffy-box {
|
||||||
@ -45,11 +45,9 @@
|
|||||||
padding-left: 2px;
|
padding-left: 2px;
|
||||||
padding-top: 0px;
|
padding-top: 0px;
|
||||||
font-size: 10pt;
|
font-size: 10pt;
|
||||||
color: @white;
|
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
transition: color .5s;
|
transition: color .5s;
|
||||||
text-shadow: 2px 2px @black;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.contents .window-icon {
|
.contents .window-icon {
|
||||||
|
@ -134,7 +134,7 @@ cssFilesByHostname =
|
|||||||
main = do
|
main = do
|
||||||
hostName <- getHostName
|
hostName <- getHostName
|
||||||
homeDirectory <- getHomeDirectory
|
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
|
cssFiles <- mapM (getUserConfigFile "taffybar") relativeFiles
|
||||||
|
|
||||||
let myCPU = deocrateWithSetClassAndBoxes "cpu" $
|
let myCPU = deocrateWithSetClassAndBoxes "cpu" $
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 3e762702454b86a7eb35b893e424ad56a801067b
|
Subproject commit aa18707c3ef96db88208509c2a18c6670e831661
|
@ -1 +1 @@
|
|||||||
Subproject commit 3509e91b15e71c934978258663513360c7ea2849
|
Subproject commit 22a64f65ae61f86513f819b1e16fc2bec3326341
|
7
dotfiles/lib/bin/quill_from_seed.sh
Executable file
7
dotfiles/lib/bin/quill_from_seed.sh
Executable file
@ -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 - "$@"
|
@ -1 +1 @@
|
|||||||
Subproject commit ad5aea1a32bc2e6343da207a7969492d501ccfc6
|
Subproject commit ec260995e25a38be212b4ba807de2b763fee996d
|
@ -71,23 +71,20 @@
|
|||||||
|
|
||||||
services.git-sync = {
|
services.git-sync = {
|
||||||
enable = true;
|
enable = true;
|
||||||
repositories = [
|
repositories = {
|
||||||
{
|
config = {
|
||||||
name = "config";
|
|
||||||
path = "/home/imalison/config";
|
path = "/home/imalison/config";
|
||||||
uri = "git@github.com:IvanMalison/config.git";
|
uri = "git@github.com:IvanMalison/config.git";
|
||||||
}
|
};
|
||||||
{
|
org = {
|
||||||
name = "org";
|
|
||||||
path = "/home/imalison/org";
|
path = "/home/imalison/org";
|
||||||
uri = "git@github.com:IvanMalison/org.git";
|
uri = "git@github.com:IvanMalison/org.git";
|
||||||
}
|
};
|
||||||
{
|
password-store = {
|
||||||
name = "password-store";
|
|
||||||
path = "/home/imalison/.password-store";
|
path = "/home/imalison/.password-store";
|
||||||
uri = "git@github.com:IvanMalison/.password-store.git";
|
uri = "git@github.com:IvanMalison/.password-store.git";
|
||||||
}
|
};
|
||||||
];
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.setxkbmap = {
|
systemd.user.services.setxkbmap = {
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
hardware.raspberry-pi."4".fkms-3d.enable = true;
|
hardware.raspberry-pi."4".fkms-3d.enable = true;
|
||||||
|
hardware.raspberry-pi."4".audio.enable = true;
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = pkgs.linuxPackages_rpi4;
|
kernelPackages = pkgs.linuxPackages_rpi4;
|
||||||
@ -40,7 +41,6 @@
|
|||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
raspberrypi-eeprom
|
raspberrypi-eeprom
|
||||||
piclone
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
|
Loading…
Reference in New Issue
Block a user