commit c69cc841e2e604a9175a1f1639ca3a8d6a9319df
parent 30b88d491b2a60b4f4c9f361e8ae2ab366316f1f
Author: Friedel Schön <[email protected]>
Date: Mon, 5 Aug 2024 22:13:38 +0200
rename dmenu-dynamicoptions patch
Diffstat:
18 files changed, 150 insertions(+), 162 deletions(-)
diff --git a/common/make-service.nix b/common/make-service.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> { }, system ? builtins.currentSystem }:
+{ pkgs ? import <nixpkgs> { } }:
{ name, services, supervise }:
diff --git a/common/suckless-pkg.nix b/common/suckless-pkg.nix
@@ -0,0 +1,21 @@
+{ stdenv, lib }:
+
+{ configHeader ? null, extraConfig ? { }, ... }@args:
+
+let
+ configs = extraConfig // (lib.optionalAttrs (configHeader != null) { "config.h" = configHeader; });
+ configurePhase = lib.concatStrings (lib.mapAttrsToList (dest: src: "ln -sfv ${src} ${dest}\n") configs);
+in
+stdenv.mkDerivation (
+ (builtins.removeAttrs args [ "configHeader" "extraConfig" ]) // {
+
+ inherit configurePhase;
+
+ buildPhase = ''
+ make all
+ '';
+
+ installPhase = ''
+ make PREFIX=$out install
+ '';
+})
+\ No newline at end of file
diff --git a/configs/dmenu.h b/configs/dmenu.h
@@ -1,18 +1,4 @@
-/* See LICENSE file for copyright and license details. */
-/* Default settings; can be overriden by command line. */
-
-static const char black[] = "#282828";
-static const char blue[] = "#83a598"; // focused window border
-static const char gray2[] = "#282828"; // unfocused window border
-static const char gray3[] = "#3c3836";
-static const char gray4[] = "#282828";
-static const char green[] = "#8ec07c";
-static const char orange[] = "#fe8019";
-static const char pink[] = "#d3869b";
-static const char red[] = "#fb4934";
-static const char white[] = "#ebdbb2";
-static const char yellow[] = "#b8bb26";
-static const char col_borderbar[] = "#1e2122";
+#include "theme.h"
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
static int user_bh = 10; /* add an defined amount of pixels to the bar height */
@@ -20,11 +6,9 @@ static int centered = 0; /* -c option; centers dmenu on screen */
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[] = {"Monaco:size=10"};
+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] = {
/* fg bg border */
[SchemeNorm] = {white, gray3, blue},
diff --git a/configs/dwm.h b/configs/dwm.h
@@ -107,7 +107,7 @@ static const Key keys[] = {
{MODKEY | ShiftMask, XK_w, spawn, COMMAND("surf")},
{MODKEY, XK_w, spawn, COMMAND("firefox")},
{MODKEY, XK_space, spawn, COMMAND("dmenu_run")},
- {MODKEY, XK_m, spawn, SHELL("man -k | dmenu -l 25 | cut -d' ' -f1-2 | sed -E 's/(\\S+) \\((\\S+)\\)/\\2 \\1/' | xargs st -f 'SF Mono' -e man -s")},
+ {MODKEY, XK_m, spawn, SHELL("man -k . | dmenu -l 25 | cut -d' ' -f1-2 | sed -E 's/(\\S+) \\((\\S+)\\)/\\2 \\1/' | xargs st -f 'SF Mono' -e man -s")},
{0, XF86XK_MonBrightnessUp, spawn, BACKLIGHT(monitor_backlight, "+5%")},
{0, XF86XK_MonBrightnessDown, spawn, BACKLIGHT(monitor_backlight, "5%-")},
{0, XF86XK_KbdBrightnessUp, spawn, BACKLIGHT(keyboard_backlight, "+5%")},
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[] = "Monaco:pixelsize=13:antialias=true:autohint=true";
+static char font[] = "Monaco:size=9";
static int borderpx = 5;
/*
diff --git a/home.nix b/home.nix
@@ -3,22 +3,22 @@
rec {
# Home Manager needs a bit of information about you and the paths it should
# manage.
- home.username = "friedel";
- home.homeDirectory = "/home/friedel";
+ home.username = "friedel"; # EDIT ME
+ home.homeDirectory = "/home/friedel"; # EDIT ME
# The home.packages option allows you to install Nix packages into your
# environment.
home.packages = [
- (import pkgs/dmenu.nix { configHeader = configs/dmenu.h; })
- (import pkgs/dwm.nix { configHeader = configs/dwm.h; })
- (import pkgs/pretty-svstat.nix { })
- (import pkgs/slstatus.nix { configHeader = configs/slstatus.h; })
- (import pkgs/st.nix { configHeader = configs/st.h; })
- (import pkgs/void-runit.nix { })
- (import pkgs/weakbox.nix { })
- (import pkgs/stw.nix { configHeader = configs/stw.h; })
- (import pkgs/tabbed.nix { configHeader = configs/tabbed.h; })
- (import pkgs/surf.nix { configHeader = configs/surf.h; })
+ (pkgs.callPackage pkgs/dmenu.nix { })
+ (pkgs.callPackage pkgs/dwm.nix { })
+ (pkgs.callPackage pkgs/pretty-svstat.nix { })
+ (pkgs.callPackage pkgs/slstatus.nix { })
+ (pkgs.callPackage pkgs/st.nix { })
+ (pkgs.callPackage pkgs/void-runit.nix { })
+ (pkgs.callPackage pkgs/weakbox.nix { })
+ (pkgs.callPackage pkgs/stw.nix { })
+ (pkgs.callPackage pkgs/tabbed.nix { })
+ (pkgs.callPackage pkgs/surf.nix { })
# use nix' nix, it is more up-to-date
pkgs.nix
@@ -37,6 +37,7 @@ rec {
".xinitrc".source = dotfiles/xinitrc;
".Xresources".source = dotfiles/xresources;
+ "home-manager".source = ./.;
};
home.sessionVariables = {
diff --git a/patches/dmenu-dynamicoptions-5.2.diff b/patches/dmenu-dynamicoptions.diff
diff --git a/personal.nix b/personal.nix
@@ -0,0 +1,4 @@
+{
+ home.username = "friedel";
+ home.homeDirectory = "/home/friedel";
+}
diff --git a/pkgs/dmenu.nix b/pkgs/dmenu.nix
@@ -1,15 +1,23 @@
-{ pkgs ? import <nixpkgs> { }
-, configHeader
+{ pkgs
+, fetchurl
+, mkSucklessPackage ? pkgs.callPackage ../common/suckless-pkg.nix { }
}:
-with pkgs; stdenv.mkDerivation rec {
+mkSucklessPackage {
name = "dmenu";
src = fetchurl {
url = "https://dl.suckless.org/tools/dmenu-5.2.tar.gz";
hash = "sha256-1NTKd7WRQPJyJy21N+BbuRpZFPVoAmUtxX5hp3PUN5I=";
};
- buildInputs = [
+ configHeader = ../configs/dmenu.h;
+ extraConfig = {
+ dmenu_path = ../assets/dmenu_path;
+ "theme.h" = pkgs.callPackage ../theme.nix { };
+ };
+
+
+ buildInputs = with pkgs; [
xorg.libX11
xorg.libXinerama
xorg.libXft
@@ -18,34 +26,21 @@ with pkgs; stdenv.mkDerivation rec {
patches = [
../patches/dmenu-dynamicoptions-5.2.diff
- (pkgs.fetchurl {
+ (fetchurl {
url = https://tools.suckless.org/dmenu/patches/bar_height/dmenu-bar-height-5.2.diff;
hash = "sha256-YzPGmjkjHNIy4kxsY5GthitR/jKkUE7Pl8I8C/pcSLo=";
})
- (pkgs.fetchurl {
+ (fetchurl {
url = https://tools.suckless.org/dmenu/patches/case-insensitive/dmenu-caseinsensitive-5.0.diff;
hash = "sha256-TH/3HoIxkFJ+zqDuqISjQLmgjHlYlZKnopjrmxOoZ0U=";
})
- (pkgs.fetchurl {
+ (fetchurl {
url = https://tools.suckless.org/dmenu/patches/highlight/dmenu-highlight-4.9.diff;
hash = "sha256-T0Y3YbFt/yVc7cTimJ8HZNQ9zKvd/G1XhfyimPaLQWA=";
})
- (pkgs.fetchurl {
+ (fetchurl {
url = https://tools.suckless.org/dmenu/patches/numbers/dmenu-numbers-20220512-28fb3e2.diff;
hash = "sha256-dXAmbub13PUDjygoxsK0PNnCPc5yNWOIPtrNLvy8fSw=";
})
];
-
- configurePhase = ''
- # ln -sf ${../assets/dmenu_path} dmenu_path
- # ln -sf ${configHeader} config.h
- '';
-
- buildPhase = ''
- make all
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
}
diff --git a/pkgs/dwm.nix b/pkgs/dwm.nix
@@ -1,14 +1,20 @@
-{ pkgs ? import <nixpkgs> { }
-, configHeader
+{ pkgs
+, fetchurl
+, mkSucklessPackage ? pkgs.callPackage ../common/suckless-pkg.nix { }
}:
-pkgs.stdenv.mkDerivation rec {
+mkSucklessPackage {
name = "dwm";
- src = pkgs.fetchurl {
+ src = fetchurl {
url = https://dl.suckless.org/dwm/dwm-6.5.tar.gz;
hash = "sha256-Ideev6ny+5MUGDbCZmy4H0eExp1k5/GyNS+blwuglyk=";
};
+ configHeader = ../configs/dwm.h;
+ extraConfig = {
+ "theme.h" = pkgs.callPackage ../theme.nix { };
+ };
+
buildInputs = with pkgs; [
xorg.libX11
xorg.libXft
@@ -19,25 +25,13 @@ pkgs.stdenv.mkDerivation rec {
# a mix of these patches: statuscolor, statuspadding, systray
../patches/dwm-statusbar.diff
- (pkgs.fetchurl {
+ (fetchurl {
url = https://dwm.suckless.org/patches/activetagindicatorbar/dwm-activetagindicatorbar-6.2.diff;
hash = "sha256-VKqFvR4u+Q6ya+PqaFAuuYfIZb4i3VN2gBTEb564hyA=";
})
- (pkgs.fetchurl {
+ (fetchurl {
url = https://dwm.suckless.org/patches/urgentborder/dwm-6.2-urg-border.diff;
hash = "sha256-nPpKIovwTPKdRL6aiWAr6Mt4dXhryvsTw1l00j1QE8w=";
})
];
-
- configurePhase = ''
- ln -sf ${configHeader} config.h
- '';
-
- buildPhase = ''
- make all
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
}
diff --git a/pkgs/pretty-svstat.nix b/pkgs/pretty-svstat.nix
@@ -1,10 +1,13 @@
-{ pkgs ? import <nixpkgs> { }, config ? { } }:
+{ stdenv
+, fetchgit
+}:
-with pkgs; stdenv.mkDerivation {
+stdenv.mkDerivation {
name = "pretty-svstat";
- src = fetchGit {
+ src = fetchgit {
url = "https://git.friedelschoen.io/pretty-svstat";
rev = "7de4a8b1d49a5c0a72e17794c536d0b3e003bdcf";
+ hash = "sha256-IVxkvbbWSaP1b1HF3LZHyfUDzXAYy+Vfp7aZzNoVf2Q=";
};
buildPhase = ''
diff --git a/pkgs/slstatus.nix b/pkgs/slstatus.nix
@@ -1,13 +1,18 @@
-{ pkgs ? import <nixpkgs> { }, configHeader }:
+{ pkgs
+, fetchurl
+, mkSucklessPackage ? pkgs.callPackage ../common/suckless-pkg.nix { }
+}:
-with pkgs; stdenv.mkDerivation rec {
+mkSucklessPackage {
name = "slstatus";
src = fetchurl {
url = https://dl.suckless.org/tools/slstatus-1.0.tar.gz;
hash = "sha256-bW0KFsCN2dIRFywwxHIHASZ6P0DNyTjbPzhvaits/1Q=";
};
- buildInputs = [
+ configHeader = ../configs/slstatus.h;
+
+ buildInputs = with pkgs; [
xorg.libX11
];
@@ -15,16 +20,4 @@ with pkgs; stdenv.mkDerivation rec {
../patches/slstatus-battery-remaining.diff
../patches/slstatus-notify.diff
];
-
- configurePhase = ''
- ln -s ${configHeader} config.h
- '';
-
- buildPhase = ''
- make all
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
}
diff --git a/pkgs/st.nix b/pkgs/st.nix
@@ -1,19 +1,25 @@
-{ pkgs ? import <nixpkgs> { }, configHeader }:
+{ pkgs
+, fetchurl
+, mkSucklessPackage ? pkgs.callPackage ../common/suckless-pkg.nix { }
+,
+}:
-with pkgs; stdenv.mkDerivation rec {
+mkSucklessPackage rec {
pname = "st";
version = "0.9.2";
- src = pkgs.fetchurl {
+ src = fetchurl {
url = "https://dl.suckless.org/st/st-${version}.tar.gz";
hash = "sha256-ayFdT0crIdYjLzDyIRF6d34kvP7miVXd77dCZGf5SUs=";
};
- nativeBuildInputs = [
+ configHeader = ../configs/st.h;
+
+ nativeBuildInputs = with pkgs; [
pkg-config
];
- buildInputs = [
+ buildInputs = with pkgs; [
fontconfig
freetype
xorg.libX11
@@ -23,21 +29,9 @@ with pkgs; stdenv.mkDerivation rec {
patches = [
../patches/st-remove-terminfo.diff
../patches/st-scrollback-ringbuffer.diff
- (pkgs.fetchurl {
+ (fetchurl {
url = https://st.suckless.org/patches/anysize/st-anysize-20220718-baa9357.diff;
hash = "sha256-eO8MEPRb3uaCTtBznG+LaojXqlcj4eT422rQgpxopfo=";
})
];
-
- configurePhase = ''
- ln -sf ${configHeader} config.h
- '';
-
- buildPhase = ''
- make all
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
}
diff --git a/pkgs/stw.nix b/pkgs/stw.nix
@@ -1,30 +1,23 @@
-{ pkgs ? import <nixpkgs> { }, configHeader }:
+{ pkgs
+, fetchgit
+, mkSucklessPackage ? pkgs.callPackage ../common/suckless-pkg.nix { }
+}:
-with pkgs; stdenv.mkDerivation {
+mkSucklessPackage {
name = "stw";
src = fetchGit {
url = "https://github.com/sineemore/stw";
rev = "54377209c6313c9637aab904d06c5c383414a5ee";
};
- nativeBuildInputs = [
+ configHeader = ../configs/stw.h;
+
+ nativeBuildInputs = with pkgs; [
pkg-config
];
- buildInputs = [
+ buildInputs = with pkgs; [
xorg.libXft
fontconfig
];
-
- configurePhase = ''
- ln -sf ${configHeader} config.h
- '';
-
- buildPhase = ''
- make all
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
}
diff --git a/pkgs/surf.nix b/pkgs/surf.nix
@@ -1,17 +1,19 @@
-{ pkgs ? import <nixpkgs> { }, configHeader }:
+{ pkgs, fetchurl, mkSucklessPackage ? pkgs.callPackage ../common/suckless-pkg.nix { } }:
-with pkgs; stdenv.mkDerivation rec {
+mkSucklessPackage {
name = "surf";
src = fetchurl {
url = https://dl.suckless.org/surf/surf-2.1.tar.gz;
hash = "sha256-cuWCkguiWmRiA+k8LSMx2H8DA3ooiU1sfpmvAO4EMlc=";
};
- nativeBuildInputs = [
+ configHeader = ../configs/surf.h;
+
+ nativeBuildInputs = with pkgs; [
pkg-config
];
- buildInputs = [
+ buildInputs = with pkgs; [
glib
gcr
gtk3-x11
@@ -20,37 +22,25 @@ with pkgs; stdenv.mkDerivation rec {
];
patches = [
- (pkgs.fetchurl {
+ (fetchurl {
url = https://surf.suckless.org/patches/homepage/surf-2.0-homepage.diff;
hash = "sha256-hYBQeaNc0dCr/lE3c0aQO08q8Z+dB2SFryYGiBGZDzY=";
})
- (pkgs.fetchurl {
+ (fetchurl {
url = https://surf.suckless.org/patches/history/surf-2.1-history.diff;
hash = "sha256-t7uI2SEjcG90xSp9g6lSheE9O+B9kx7Ggu9zlrt5X2o=";
})
- (pkgs.fetchurl {
+ (fetchurl {
url = https://surf.suckless.org/patches/clipboard-instead-of-primary/surf-clipboard-20200112-a6a8878.diff;
hash = "sha256-eDwZ3KwCcETkPufWM52YyLKtVdc+PRNQZC1xI6ZYUFs=";
})
- (pkgs.fetchurl {
+ (fetchurl {
url = https://surf.suckless.org/patches/searchengines/surf-searchengines-20220804-609ea1c.diff;
hash = "sha256-F99gbM9sDDdvDj11J22kn2fu6sIKehD3Ecjm3syb3IU=";
})
- (pkgs.fetchurl {
+ (fetchurl {
url = https://surf.suckless.org/patches/short-title/surf-short-title-20210206-7dcce9e.diff;
hash = "sha256-763QcUq4c3Kj+tqjqrFFksMOuJFrnGg9ESt5eJIcaO4=";
})
];
-
- configurePhase = ''
- ln -sf ${configHeader} config.h
- '';
-
- buildPhase = ''
- make all
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
}
diff --git a/pkgs/tabbed.nix b/pkgs/tabbed.nix
@@ -1,25 +1,19 @@
-{ pkgs ? import <nixpkgs> { }, configHeader }:
+{ pkgs, fetchurl, mkSucklessPackage ? pkgs.callPackage ../common/suckless-pkg.nix { } }:
-with pkgs; stdenv.mkDerivation rec {
+mkSucklessPackage {
name = "tabbed";
src = fetchurl {
url = "https://dl.suckless.org/tools/tabbed-0.8.tar.gz";
hash = "sha256-lb3/zLBxCDBo0rVVwlJOnHxXybZElNRsaX5njUmgo9c=";
};
- buildInputs = [
+ configHeader = ../configs/tabbed.h;
+ extraConfig = {
+ "theme.h" = pkgs.callPackage ../theme.nix { };
+ };
+
+ buildInputs = with pkgs; [
xorg.libXft
];
- configurePhase = ''
- ln -sf ${configHeader} config.h
- '';
-
- buildPhase = ''
- make all
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
}
diff --git a/pkgs/void-runit.nix b/pkgs/void-runit.nix
@@ -4,7 +4,7 @@ with pkgs; stdenv.mkDerivation rec {
name = "runit-utils";
version = "20231124";
- src = pkgs.fetchzip {
+ src = fetchzip {
url = "https://github.com/void-linux/void-runit/archive/refs/tags/${version}.tar.gz";
hash = "sha256-XGQcRaaGntAx4HFLTLZRjMGcejtJyJQEF/yXfQmzrZs=";
};
diff --git a/theme.nix b/theme.nix
@@ -0,0 +1,20 @@
+{ lib }:
+let
+ colors = {
+ black = "#282828";
+ blue = "#83a598";
+ gray2 = "#282828";
+ gray3 = "#3c3836";
+ gray4 = "#282828";
+ green = "#8ec07c";
+ orange = "#fe8019";
+ pink = "#d3869b";
+ red = "#fb4934";
+ white = "#ebdbb2";
+ yellow = "#b8bb26";
+ col_borderbar = "#1e2122";
+ };
+
+ header = lib.concatStrings (lib.mapAttrsToList (name: value: "static const char ${name}[] = \"${value}\";\n") colors);
+in
+builtins.toFile "theme.h" header
+\ No newline at end of file
