This commit is contained in:
Schrottkatze 2023-01-29 13:38:53 +01:00
parent 0ed9538e44
commit 03402ab8cc
3 changed files with 36 additions and 10 deletions

View file

@ -158,11 +158,13 @@ users.users.jade = {
inkscape-with-extensions virglrenderer ddccontrol-db glab inkscape-with-extensions virglrenderer ddccontrol-db glab
firebird-emu obs-studio kdenlive openal firebird-emu obs-studio kdenlive openal
mullvad mullvad-vpn mullvad mullvad-vpn
sl lolcat ifuse bitwarden bitwarden-cli sl lolcat ifuse
fspy spacenav-cube-example fspy spacenav-cube-example
cava appimage-run cava appimage-run
spacenavd libspnav fluent-reader spacenavd libspnav fluent-reader
#prismlauncher #prismlauncher
evolution
godot
gitg gnome-builder git-crypt gitg gnome-builder git-crypt
gpick qdirstat file whois ffmpeg_5 scribus p7zip file nmap cmatrix tree socat libreoffice gpick qdirstat file whois ffmpeg_5 scribus p7zip file nmap cmatrix tree socat libreoffice
]; ];
@ -178,7 +180,7 @@ users.users.jade = {
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
nerdfonts montserrat noto-fonts nerdfonts montserrat noto-fonts atkinson-hyperlegible
]; ];
programs.mtr.enable = true; programs.mtr.enable = true;

View file

@ -16,6 +16,26 @@ let
ocr-screenshot = pkgs.writeShellScriptBin "ocr-screenshot.sh" (builtins.readFile ../scripts/desktop/ocr-screenshot.sh); ocr-screenshot = pkgs.writeShellScriptBin "ocr-screenshot.sh" (builtins.readFile ../scripts/desktop/ocr-screenshot.sh);
# rofi calculator copied from https://github.com/barbuk/menu-qalc # rofi calculator copied from https://github.com/barbuk/menu-qalc
menu-qalc = pkgs.writeShellScriptBin "menu-qalc" (builtins.readFile ../scripts/desktop/menu-qalc.sh); menu-qalc = pkgs.writeShellScriptBin "menu-qalc" (builtins.readFile ../scripts/desktop/menu-qalc.sh);
#bitw = pkgs.buildGo118Module rec {
#pname = "bitw";
#version = "0.1.0";
#src = pkgs.fetchFromGitHub {
#owner = "mvdan";
#repo = "bitw";
#rev = "9da6ca0287ae8e4b1aa7fcdf7c4e8c2736718c3b";
#sha256 = "sha256-qe9y6BEsfsEiPFXlM/SFliSd+2fnfDMHyw/O6EE5hpA=";
#};
#nativeBuildInputs = with pkgs; [ gitMinimal ];
#doCheck = false;
#vendorHash = "sha256-KQr0DtyH3xzlFwsDl3MGLRRLQC4+EtdTOG7IhmNCzV4=";
#vendorHash = null;
#GOFLAGS = "-mod=readonly";
#proxyVendor = true;
#deleteVendor = true;
#preBuild = ''
#go mod vendor
#'';
#};
in with lib; { in with lib; {
options.jade.desktop = { options.jade.desktop = {
enable = mkEnableOption "Enable the i3 setup"; enable = mkEnableOption "Enable the i3 setup";
@ -35,6 +55,10 @@ in with lib; {
libqalculate # needed by menu-qalc libqalculate # needed by menu-qalc
ddgr jq # needed by searchwolf ddgr jq # needed by searchwolf
brillo # kb backlight brillo # kb backlight
# pw manager
bitwarden bitwarden-cli
# custom scripts # custom scripts
window-screenshot desktop-ctl em-record em-play em-play-loop ocr-screenshot menu-qalc window-screenshot desktop-ctl em-record em-play em-play-loop ocr-screenshot menu-qalc
pc-get pc-set searchwolf pc-get pc-set searchwolf
@ -166,7 +190,7 @@ in with lib; {
# }}} # }}}
# Visuals {{{ # Visuals {{{
fonts = { fonts = {
names = [ "Montserrat" ]; names = [ "Atkinson Hyperlegible" ];
style = "Regular"; style = "Regular";
size = 9.0; size = 9.0;
}; };
@ -374,11 +398,11 @@ in with lib; {
name = "phinger-cursors"; name = "phinger-cursors";
size = 30; size = 30;
}; };
#font = { font = {
#package = pkgs.montserrat; package = pkgs.atkinson-hyperlegible;
#name = "Montserrat"; name = "Atkinson Hyperlegible";
#size = 11; size = 11.5;
#}; };
iconTheme = { iconTheme = {
package = pkgs.gruvbox-dark-icons-gtk; package = pkgs.gruvbox-dark-icons-gtk;
name = "gruvbox-dark-icons"; name = "gruvbox-dark-icons";

View file

@ -44,7 +44,7 @@ listview {
element { element {
border: 0; border: 0;
padding: 10px; padding: 10px;
font: "Mono 8"; font: "Atkinson Hyperlegible 8";
orientation: vertical; orientation: vertical;
border-radius: 10px; border-radius: 10px;
} }
@ -68,7 +68,7 @@ element-text selected, element-icon selected {
element-text, element-icon { element-text, element-icon {
font-size: 2em; font-size: 2em;
font: "Montserrat"; font: "Atkinson Hyperlegible";
horizontal-align: 0.5; horizontal-align: 0.5;
} }