commit 0b5115d3f77d549bf442a4000f52a492b25d48e1
parent c433d47759b99d7b9844020279fe5f12e8ebe5b9
Author: Friedel Schön <[email protected]>
Date: Mon, 2 Sep 2024 23:39:57 +0200
macbook updates
Diffstat:
9 files changed, 63 insertions(+), 33 deletions(-)
diff --git a/configs/dmenu.h b/configs/dmenu.h
@@ -8,8 +8,8 @@ static int min_width = 500; /* minimum width when centered */
/* -fn option overrides fonts[0]; default X11 font or font set */
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
static const char *dynamic = NULL; /* -dy option; dynamic command to run on input change */
-static const char *fonts[] = {"Source Code Pro:size=9"};
-static const char *colors[][3] = {
+static const char *fonts[] = {"Monaco:size=9"};
+static const char *colors_[][3] = {
/* fg bg border */
[SchemeNorm] = {white, gray3, blue},
[SchemeSel] = {gray4, blue, gray3},
@@ -19,6 +19,16 @@ static const char *colors[][3] = {
[SchemeNormHighlight] = {gray3, white},
};
+
+static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { "#000000", "#eaffea", "#9eeeee" }, // fg = white, bg = gray2, border = gray2
+ [SchemeSel] = { "#eaffea", "#448844", "#55aaaa" }, // fg = blue, bg = gray3, border = blue
+ [SchemeOut] = { "#eaffea", "#999999", "#ff0000" }, // fg = orange (light green), bg = gray3, border = red
+ [3] = { "#999999", "#eaffea", "#cccccc" }, // fg = gray3, bg = orange (light green), border = gray2
+ [4] = { "#999999", "#448844", "#cccccc" } // fg = gray3, bg = green, border = gray2
+};
+
/* -l and -g options; controls number of lines and columns in grid if > 0 */
static unsigned int lines = 0;
static unsigned int columns = 0;
diff --git a/configs/dwm.h b/configs/dwm.h
@@ -21,16 +21,27 @@ static const int systraypinningfailfirst =
1; /* 1: if pinning fails, display systray on the first monitor, False:
display systray on the last monitor*/
static const int showsystray = 1; /* 0 means no systray */
-static const char *fonts[] = {"Source Code Pro:size=9"};
-static const char *colors[][3] = { // dark
+static const char *fonts[] = {"Monaco:size=9"};
+static const char *colors__[][3] = { // dark
/* fg bg border */
- [SchemeNorm] = {gray2, white, gray2},
- [SchemeSel] = {gray2, blue, blue},
- [SchemeUrg] = {white, orange, orange},
- [3] = {gray3, orange, gray2},
- [4] = {gray3, green, gray2}
+ [SchemeNorm] = { white, gray2, gray2 },
+ [SchemeSel] = { blue, gray3, blue },
+ [SchemeUrg] = { orange, gray3, red },
+ [3] = { gray3, orange, gray2 },
+ [4] = { gray3, green, gray2 }
};
+
+
+static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { "#000000", "#eaffea", "#9eeeee" }, // fg = white, bg = gray2, border = gray2
+ [SchemeSel] = { "#eaffea", "#448844", "#55aaaa" }, // fg = blue, bg = gray3, border = blue
+ [SchemeUrg] = { "#eaffea", "#999999", "#ff0000" }, // fg = orange (light green), bg = gray3, border = red
+ [3] = { "#999999", "#eaffea", "#cccccc" }, // fg = gray3, bg = orange (light green), border = gray2
+ [4] = { "#999999", "#448844", "#cccccc" } // fg = gray3, bg = green, border = gray2
+};
+
static const char dwmrc[] = ".dwmrc";
/* tagging */
diff --git a/configs/st.h b/configs/st.h
@@ -5,7 +5,7 @@
*
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/
-static char font[] = "Fira Code:size=9";
+static char font[] = "Monaco:size=10";
static int borderpx = 5;
/*
@@ -146,7 +146,7 @@ static const char **const themes[] = {
}};
-static const char *colorname__[] = /* themes[GRUVBOX_DARK]; */ {
+static const char *colorname[] = /* GRUVBOX_LIGHT */ {
// normal colors
"#708089", "#f85552", "#8da101", "#dfa000", "#3a94c5", "#df69ba", "#35a77c",
"#939f91",
@@ -155,12 +155,12 @@ static const char *colorname__[] = /* themes[GRUVBOX_DARK]; */ {
"#829181", "#e66868", "#93b259", "#dfa000", "#3a94c5", "#df69ba", "#35a77c",
"#a6b0a0",
- [FOREGROUND] = "#5c6a72", // foreground
- [BACKGROUND] = "#fdf6e3", // background
+ [FOREGROUND] = "#282828", // "#5c6a72", // foreground
+ [BACKGROUND] = "#ffffea", // "#fdf6e3", // background
};
-static const char *colorname[] = { // real gruvbox dark
+static const char *colornam__e[] = { // real gruvbox dark
"#665c54",
"#cc241d",
"#98971a",
@@ -177,8 +177,10 @@ static const char *colorname[] = { // real gruvbox dark
"#d3869b",
"#8ec07c",
"#bdae93",
- [FOREGROUND] = "#ebdbb2",
- [BACKGROUND] = "#282828"};
+ // [FOREGROUND] = "#FFFFea",
+ [FOREGROUND] = "#ebdbb2",
+ [BACKGROUND] = "#282828"
+};
static const char *colorname___[] = {
"#3e3e3e", "#970b16", "#07962a", "#f7edc7", "#003e8a", "#e94691", "#89d1ec",
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
@@ -2,7 +2,7 @@
let g:gruvbox_italic=1
colorscheme one
-set background=dark
+set background=light
set termguicolors
let g:airline_theme='one'
diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc
@@ -4,7 +4,7 @@
setxkbmap -layout us -variant intl
# set background
-xsetroot -solid '#ebdbb2'
+xsetroot -solid '#4d4d4d'
# set security
xhost +si:localuser:$USER
diff --git a/home.nix b/home.nix
@@ -34,7 +34,7 @@ rec {
home.file = {
".xservice".source = (import common/make-service.nix { }) rec {
name = "home-service";
- services = import ./services.nix { inherit pkgs; };
+ services = pkgs.callPackage ./services.nix {};
supervise = sv: "/tmp/${name}/supervise.${sv}";
};
@@ -45,7 +45,7 @@ rec {
home.sessionVariables = {
EDITOR = "vim";
- PLAN9 = "${pkgs.plan9port}/plan9";
+ PLAN9 = "$HOME/plan9";
WEAKBOX = "$HOME/.glibc";
HOMEMANAGER = ./.;
};
@@ -69,11 +69,12 @@ rec {
syntaxHighlighting.enable = true;
shellAliases = {
- ls = "${pkgs.eza}/bin/eza";
- clip = "${pkgs.xclip}/bin/xclip -selection clipboard";
- neofetch = "${pkgs.fastfetch}/bin/fastfetch";
- ccat = "${pkgs.bat}/bin/bat --style=plain --paging=never --theme=OneHalfDark";
+ ls = "eza";
+ clip = "xclip -selection clipboard";
+ neofetch = "fastfetch";
+ ccat = "bat --style=plain --paging=never --theme=OneHalfDark";
hm = "home-manager";
+ cuts = "cut -d ' ''"; # cut by space
};
history = {
@@ -113,7 +114,7 @@ rec {
ale
];
settings = {
- background = "dark";
+ background = "light";
number = true;
tabstop = 4;
shiftwidth = 4;
diff --git a/pkgs/pretty-svstat.nix b/pkgs/pretty-svstat.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation {
name = "pretty-svstat";
src = fetchgit {
- url = "https://git.friedelschoen.io/pretty-svstat";
+ url = "https://git.friedelschoen.io/util/pretty-svstat";
rev = "7de4a8b1d49a5c0a72e17794c536d0b3e003bdcf";
hash = "sha256-IVxkvbbWSaP1b1HF3LZHyfUDzXAYy+Vfp7aZzNoVf2Q=";
};
diff --git a/pkgs/weakbox.nix b/pkgs/weakbox.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
name = "weakbox";
src = fetchGit {
- url = "https://git.friedelschoen.io/weakbox";
+ url = "https://git.friedelschoen.io/util/weakbox";
rev = "8f7e0468e1fc92e57c8a77f1a49a67846fcce114";
};
diff --git a/services.nix b/services.nix
@@ -1,6 +1,12 @@
-{ pkgs ? import <nixpkgs> { } }:
+{ writeScript, ... }:
-with pkgs; [
+
+let
+ stw-background = "#4d4d4d";
+ stw-foreground = "#eeeeee";
+ stw-font = "Monaco:size=9";
+
+in [
{
name = "9wm";
enable = false;
@@ -66,10 +72,10 @@ with pkgs; [
'';
}
{
- name = "cbatticon";
+ name = "battery-applet";
enable = true;
setup = "";
- run = writeScript "cbatticon-run" ''
+ run = writeScript "battery-applet-run" ''
#!/bin/sh
exec cbatticon
@@ -118,7 +124,7 @@ with pkgs; [
run = writeScript "stw-service-run" ''
#!/bin/sh
- exec stw -p 1 -b '#ebdbb2' -f '#3c3836' -F 'Source Code Pro:size=9' -B 10 -y 20 sh -c 'echo -- services -- ; psv /var/service/* ~/.xservice/* 2> /dev/null | sort -k2,2 -k1,1'
+ exec stw -b '${stw-background}' -f '${stw-foreground}' -F '${stw-font}' -p 1 -B 10 -y 20 sh -c 'echo -- services -- ; psv /var/service/* ~/.xservice/* 2> /dev/null | sort -k2,2 -k1,1'
'';
}
{
@@ -128,7 +134,7 @@ with pkgs; [
run = writeScript "stw-xbps-run" ''
#!/bin/sh
- exec stw -b '#ebdbb2' -f '#3c3836' -F 'Source Code Pro:size=9' -B 10 -p 120 -y 100% -Y -100% sh -c 'echo -- updates -- && xbps-install -Mun | cut -d" " -f1'
+ exec stw -b '${stw-background}' -f '${stw-foreground}' -F '${stw-font}' -B 10 -p 120 -y 100% -Y -100% sh -c 'echo -- updates -- && xbps-install -Mun | cut -d" " -f1'
'';
}
{
