aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.githooks/pre-commit5
-rw-r--r--.sops.yaml10
-rw-r--r--README.md8
-rw-r--r--share/cfg/waybar.css192
-rw-r--r--treefmt.nix41
5 files changed, 144 insertions, 112 deletions
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
deleted file mode 100755
index 8d10382..0000000
--- a/.githooks/pre-commit
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -xeou pipefail
-
-treefmt
diff --git a/.sops.yaml b/.sops.yaml
index d8d94e5..6d61077 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -6,8 +6,8 @@ keys:
creation_rules:
- path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
key_groups:
- - age:
- - *admin_miran
- - *machine_wonderland
- - *machine_sagittarius
- - *machine_underworld
+ - age:
+ - *admin_miran
+ - *machine_wonderland
+ - *machine_sagittarius
+ - *machine_underworld
diff --git a/README.md b/README.md
index d38d207..80b0f74 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
# Nixos dotfiles
-After cloning the repo run
-``sh
-git config --local core.hookspath .githooks/
-``
-to set up git hooks.
+After cloning the repo run `sh
+git config --local core.hookspath .githooks/` to
+set up git hooks.
diff --git a/share/cfg/waybar.css b/share/cfg/waybar.css
index 9cc27fd..9bbb802 100644
--- a/share/cfg/waybar.css
+++ b/share/cfg/waybar.css
@@ -1,66 +1,66 @@
* {
- /* `otf-font-awesome` is required to be installed for icons */
- font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
- font-size: 13px;
+ /* `otf-font-awesome` is required to be installed for icons */
+ font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+ font-size: 13px;
}
window#waybar {
- background-color: rgba(43, 48, 59, 0.5);
- border-bottom: 3px solid rgba(100, 114, 125, 0.5);
- color: #ffffff;
- transition-property: background-color;
- transition-duration: .5s;
+ background-color: rgba(43, 48, 59, 0.5);
+ border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+ color: #ffffff;
+ transition-property: background-color;
+ transition-duration: 0.5s;
}
window#waybar.hidden {
- opacity: 0.2;
+ opacity: 0.2;
}
window#waybar.termite {
- background-color: #3F3F3F;
+ background-color: #3f3f3f;
}
window#waybar.chromium {
- background-color: #000000;
- border: none;
+ background-color: #000000;
+ border: none;
}
button {
- /* Use box-shadow instead of border so the text isn't offset */
- box-shadow: inset 0 -3px transparent;
- /* Avoid rounded borders under each button name */
- border: none;
- border-radius: 0;
+ /* Use box-shadow instead of border so the text isn't offset */
+ box-shadow: inset 0 -3px transparent;
+ /* Avoid rounded borders under each button name */
+ border: none;
+ border-radius: 0;
}
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
button:hover {
- background: inherit;
- box-shadow: inset 0 -3px #ffffff;
+ background: inherit;
+ box-shadow: inset 0 -3px #ffffff;
}
#workspaces button {
- padding: 0;
- background-color: transparent;
- color: #ffffff;
+ padding: 0;
+ background-color: transparent;
+ color: #ffffff;
}
#workspaces button:hover {
- background: rgba(0, 0, 0, 0.2);
+ background: rgba(0, 0, 0, 0.2);
}
#workspaces button.focused {
- background-color: #64727D;
- box-shadow: inset 0 -3px #ffffff;
+ background-color: #64727d;
+ box-shadow: inset 0 -3px #ffffff;
}
#workspaces button.urgent {
- background-color: #eb4d4b;
+ background-color: #eb4d4b;
}
#mode {
- background-color: #64727D;
- box-shadow: inset 0 -3px #ffffff;
+ background-color: #64727d;
+ box-shadow: inset 0 -3px #ffffff;
}
#clock,
@@ -80,192 +80,192 @@ button:hover {
#scratchpad,
#power-profiles-daemon,
#mpd {
- padding: 0;
- color: #ffffff;
+ padding: 0;
+ color: #ffffff;
}
#window {
- margin: 0 4px;
+ margin: 0 4px;
}
#clock {
- background-color: #64727D;
+ background-color: #64727d;
}
#battery {
- background-color: #ffffff;
- color: #000000;
+ background-color: #ffffff;
+ color: #000000;
}
#battery.charging, #battery.plugged {
- color: #ffffff;
- background-color: #26A65B;
+ color: #ffffff;
+ background-color: #26a65b;
}
@keyframes blink {
- to {
+ to {
background-color: #ffffff;
color: #000000;
- }
+ }
}
/* Using steps() instead of linear as a timing function to limit cpu usage */
#battery.critical:not(.charging) {
- background-color: #f53c3c;
- color: #ffffff;
- animation-name: blink;
- animation-duration: 0.5s;
- animation-timing-function: steps(12);
- animation-iteration-count: infinite;
- animation-direction: alternate;
+ background-color: #f53c3c;
+ color: #ffffff;
+ animation-name: blink;
+ animation-duration: 0.5s;
+ animation-timing-function: steps(12);
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
}
#power-profiles-daemon {
- padding-right: 15px;
+ padding-right: 15px;
}
#power-profiles-daemon.performance {
- background-color: #f53c3c;
- color: #ffffff;
+ background-color: #f53c3c;
+ color: #ffffff;
}
#power-profiles-daemon.balanced {
- background-color: #2980b9;
- color: #ffffff;
+ background-color: #2980b9;
+ color: #ffffff;
}
#power-profiles-daemon.power-saver {
- background-color: #2ecc71;
- color: #000000;
+ background-color: #2ecc71;
+ color: #000000;
}
label:focus {
- background-color: #000000;
+ background-color: #000000;
}
#cpu {
- background-color: #2ecc71;
- color: #000000;
+ background-color: #2ecc71;
+ color: #000000;
}
#memory {
- background-color: #9b59b6;
+ background-color: #9b59b6;
}
#disk {
- background-color: #964B00;
+ background-color: #964b00;
}
#backlight {
- background-color: #90b1b1;
+ background-color: #90b1b1;
}
#network {
- background-color: #2980b9;
+ background-color: #2980b9;
}
#network.disconnected {
- background-color: #f53c3c;
+ background-color: #f53c3c;
}
#pulseaudio {
- background-color: #f1c40f;
- color: #000000;
+ background-color: #f1c40f;
+ color: #000000;
}
#pulseaudio.muted {
- background-color: #90b1b1;
- color: #2a5c45;
+ background-color: #90b1b1;
+ color: #2a5c45;
}
#wireplumber {
- background-color: #fff0f5;
- color: #000000;
+ background-color: #fff0f5;
+ color: #000000;
}
#wireplumber.muted {
- background-color: #f53c3c;
+ background-color: #f53c3c;
}
#temperature {
- background-color: #f0932b;
+ background-color: #f0932b;
}
#temperature.critical {
- background-color: #eb4d4b;
+ background-color: #eb4d4b;
}
#tray {
- background-color: #2980b9;
+ background-color: #2980b9;
}
#tray > .passive {
- -gtk-icon-effect: dim;
+ -gtk-icon-effect: dim;
}
#tray > .needs-attention {
- -gtk-icon-effect: highlight;
- background-color: #eb4d4b;
+ -gtk-icon-effect: highlight;
+ background-color: #eb4d4b;
}
#idle_inhibitor {
- background-color: #2d3436;
+ background-color: #2d3436;
}
#idle_inhibitor.activated {
- background-color: #ecf0f1;
- color: #2d3436;
+ background-color: #ecf0f1;
+ color: #2d3436;
}
#language {
- background: #00b093;
- color: #740864;
- padding: 0 5px;
- margin: 0 5px;
- min-width: 16px;
+ background: #00b093;
+ color: #740864;
+ padding: 0 5px;
+ margin: 0 5px;
+ min-width: 16px;
}
#keyboard-state {
- background: #97e1ad;
- color: #000000;
- padding: 0 0px;
- margin: 0 5px;
- min-width: 16px;
+ background: #97e1ad;
+ color: #000000;
+ padding: 0 0px;
+ margin: 0 5px;
+ min-width: 16px;
}
#keyboard-state > label {
- padding: 0 5px;
+ padding: 0 5px;
}
#keyboard-state > label.locked {
- background: rgba(0, 0, 0, 0.2);
+ background: rgba(0, 0, 0, 0.2);
}
#scratchpad {
- background: rgba(0, 0, 0, 0.2);
+ background: rgba(0, 0, 0, 0.2);
}
#scratchpad.empty {
- background-color: transparent;
+ background-color: transparent;
}
#privacy {
- padding: 0;
+ padding: 0;
}
#privacy-item {
- padding: 0 5px;
- color: white;
+ padding: 0 5px;
+ color: white;
}
#privacy-item.screenshare {
- background-color: #cf5700;
+ background-color: #cf5700;
}
#privacy-item.audio-in {
- background-color: #1ca000;
+ background-color: #1ca000;
}
#privacy-item.audio-out {
- background-color: #0069d4;
+ background-color: #0069d4;
}
diff --git a/treefmt.nix b/treefmt.nix
index 970592a..03f31a2 100644
--- a/treefmt.nix
+++ b/treefmt.nix
@@ -1,5 +1,44 @@
{ ... }:
{
projectRootFile = "flake.nix";
- programs.nixfmt.enable = true;
+ programs = {
+ nixfmt.enable = true;
+ beautysh = {
+ enable = true;
+ includes = [
+ "*.sh"
+ "*.bash"
+ ".envrc"
+ ];
+ };
+ deno = {
+ enable = true;
+ includes = [
+ "*.css"
+ "*.html"
+ "*.js"
+ "*.json"
+ "*.json5"
+ "*.jsonc"
+ "*.jsx"
+ "*.less"
+ "*.markdown"
+ "*.md"
+ "*.sass"
+ "*.scss"
+ "*.ts"
+ "*.tsx"
+ "*.yaml"
+ "*.yml"
+ ];
+ };
+ };
+
+ settings.global.excludes = [
+ "secrets/*"
+ ".gitattributes"
+ ".gitignore"
+ ".ignore"
+ ".helix/ignore"
+ ];
}