palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates to make cream work

Browse source
This commit is contained in:
Ingolf Wagner 2023-02-16 13:52:15 +01:00
parent c09c3a5baf
commit 4a7826fee1
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
11 changed files with 92 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
nixos/machines/cream/configuration.nix
View file

@ -13,7 +13,7 @@
#./wifi-access-point.nix #./wifi-access-point.nix
#./wireshark.nix #./wireshark.nix
#./scanner.nix #./scanner.nix
#./qemu.nix ./qemu.nix
./wireguard.nix ./wireguard.nix
]; ];
@ -47,14 +47,14 @@
# fonts # fonts
# ----- # -----
programs.custom.urxvt.fontSize = 12; programs.custom.urxvt.fontSize = 16;
programs.custom.xterm.fontSize = 12; programs.custom.urxvt.fontType = "vector";
system.custom.fonts.dpi = 200; programs.custom.xterm.fontSize = 16;
# todo : add xterm fontType
virtualisation = { virtualisation = {
docker.enable = true; docker.enable = true;
podman.enable = true; podman.enable = true;
virtualbox = { virtualbox = {
host.enable = false; host.enable = false;
guest.x11 = false; guest.x11 = false;
@ -68,6 +68,7 @@
}; };
services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.enable = true;
services.xserver.videoDrivers = [ "modesetting" ];
custom.samba-share = { custom.samba-share = {
enable = false; enable = false;
@ -77,25 +78,13 @@
}; };
}; };
# enable this to use sidequest
programs.adb.enable = true;
users.users.mainUser.extraGroups = [ "adbusers" "video" ];
# for congress and streaming # for congress and streaming
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;
# extraPackages = [ #driSupport = true;
# intel-media-driver # LIBVA_DRIVER_NAME=iHD #driSupport32Bit = true;
# vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
# vaapiVdpau
# libvdpau-va-gl
# ];
driSupport = true;
driSupport32Bit = true;
}; };
#nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
#};
system.stateVersion = "22.11"; # Did you read the comment? system.stateVersion = "22.11"; # Did you read the comment?

10
nixos/machines/cream/hardware-configuration.nix
View file

@ -62,18 +62,12 @@
swapDevices = [ ]; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s13f0u4c2.useDHCP = lib.mkDefault true;
# networking.interfaces.tinc.private.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
#powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display # high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true; hardware.video.hidpi.enable = lib.mkDefault true;
} }

2
nixos/machines/cream/qemu.nix
View file

@ -8,10 +8,10 @@
environment.systemPackages = [ environment.systemPackages = [
pkgs.qemu_kvm pkgs.qemu_kvm
(pkgs.quickemu.override { qemu = pkgs.qemu_kvm; })
pkgs.virt-manager pkgs.virt-manager
]; ];
users.users.mainUser.extraGroups = [ "libvirtd" ]; users.users.mainUser.extraGroups = [ "libvirtd" ];
} }

16
nixos/machines/cream/syncthing.nix
View file

@ -20,10 +20,10 @@
enable = true; enable = true;
path = "/home/palo/.password-store"; path = "/home/palo/.password-store";
}; };
private = { #private = {
enable = true; # enable = true;
path = "/home/palo/private"; # path = "/home/palo/private";
}; #};
art = { art = {
enable = true; enable = true;
path = "/home/palo/art"; path = "/home/palo/art";
@ -47,10 +47,10 @@
enable = true; enable = true;
path = "/home/palo/music-library"; path = "/home/palo/music-library";
}; };
music-projects = { # music-projects = {
enable = true; # enable = true;
path = "/home/palo/music-projects"; # path = "/home/palo/music-projects";
}; # };
}; };
}; };

68
nixos/modules/programs/urxvt.nix
View file

@ -4,11 +4,8 @@
# urxvt --help 2>&1| sed -n '/: /s/^ */! URxvt*/gp' | les # urxvt --help 2>&1| sed -n '/: /s/^ */! URxvt*/gp' | les
with lib; with lib;
let let
cfg = config.programs.custom.urxvt; cfg = config.programs.custom.urxvt;
in in
{ {
@ -16,6 +13,11 @@ in
enable = mkEnableOption "configure and enable urxvt"; enable = mkEnableOption "configure and enable urxvt";
fontType = mkOption {
type = types.enum [ "bitmap" "vector" ];
default = "bitmap";
};
fontSize = mkOption { fontSize = mkOption {
type = types.int; type = types.int;
default = 17; default = 17;
@ -73,41 +75,47 @@ in
"X11/Xresource.d/urxvt-font".source = "X11/Xresource.d/urxvt-font".source =
let let
fontFamily = "terminus";
normalFont = fontSize:
"-*-${fontFamily}-medium-*-*-*-${toString fontSize}-*-*-*-*-*-*-*";
boldFont = fontSize:
"-*-${fontFamily}-bold-*-*-*-${toString fontSize}-*-*-*-*-*-*-*";
italicFont = normalFont;
itallicBoldFont = boldFont;
backupFont = fontSize:
"xft:TerminessTTF Nerd Font:pixelsize=${toString fontSize}";
fontCommand = key: fontSize: '' bitmapPart =
URxvt.keysym.M-${key}: command:\033]710;${normalFont fontSize},${backupFont fontSize}\007\033]711;${boldFont fontSize},${backupFont fontSize}\007 let
''; # use xfontsel or fontmatrix to choose line
fontFamily = "terminus";
normalFont = fontSize:
"-*-${fontFamily}-medium-*-*-*-${toString fontSize}-*-*-*-*-*-*-*";
boldFont = fontSize:
"-*-${fontFamily}-bold-*-*-*-${toString fontSize}-*-*-*-*-*-*-*";
italicFont = normalFont;
itallicBoldFont = boldFont;
in
''
URxvt.font: ${normalFont cfg.fontSize}
URxvt.boldFont: ${boldFont cfg.fontSize}
URxvt.italicFont: ${italicFont cfg.fontSize}
URxvt.bolditalicFont: ${itallicBoldFont cfg.fontSize}
'';
vectorPart =
let
# show available fonts = `fc-list`
backupFont = fontSize: style:
#"xft:TerminessTTF Nerd Font:pixelsize=${toString fontSize}";
"xft:JetBrains Mono:pixelsize=${toString fontSize}${optionalString (style != null) ",style:${style}"}";
in
''
URxvt.font: ${backupFont cfg.fontSize null}
URxvt.boldFont: ${backupFont cfg.fontSize "Bold"}
URxvt.italicFont: ${backupFont cfg.fontSize "Italic"}
URxvt.bolditalicFont: ${backupFont cfg.fontSize "Bold Italic"}
'';
in in
pkgs.writeText "Xresource-urxvt-font" '' pkgs.writeText "Xresource-urxvt-font" ''
URxvt.allow_bold: true URxvt.allow_bold: true
URxvt.xftAntialias: true URxvt.xftAntialias: true
!! use xfontsel or fontmatrix to choose line ${optionalString (cfg.fontType == "bitmap") bitmapPart}
!URxvt.font: ${normalFont cfg.fontSize},${backupFont cfg.fontSize} ${optionalString (cfg.fontType == "vector") vectorPart}
!URxvt.boldFont: ${boldFont cfg.fontSize},${backupFont cfg.fontSize}
!URxvt.italicFont: ${italicFont cfg.fontSize},${backupFont cfg.fontSize}
!URxvt.bolditalicFont: ${itallicBoldFont cfg.fontSize},${backupFont cfg.fontSize}
URxvt.font: ${normalFont cfg.fontSize}
URxvt.boldFont: ${boldFont cfg.fontSize}
URxvt.italicFont: ${italicFont cfg.fontSize}
URxvt.bolditalicFont: ${itallicBoldFont cfg.fontSize}
${fontCommand "F1" cfg.fontSize}
${fontCommand "F2" (cfg.fontSize + 5)}
${fontCommand "F3" (cfg.fontSize + 10)}
${fontCommand "F4" (cfg.fontSize + 20)}
''; '';
"X11/Xresource.d/urxvt-colors".source = "X11/Xresource.d/urxvt-colors".source =

18
nixos/modules/system/font.nix
View file

@ -1,21 +1,18 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
let let
cfg = config.system.custom.fonts; cfg = config.system.custom.fonts;
in in
{ {
options.system.custom.fonts = { options.system.custom.fonts = {
enable = mkEnableOption "enable fonts"; enable = mkEnableOption "enable fonts";
dpi = mkOption { size = mkOption {
type = types.int; type = types.int;
default = 141; default = 17;
description = '' description = ''
dpi of the monitor size of the font
''; '';
}; };
}; };
@ -25,7 +22,8 @@ in
# see https://nixos.wiki/wiki/Fonts # see https://nixos.wiki/wiki/Fonts
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.xserver.dpi = cfg.dpi; # only set this on x220 to 141, if resolution is shit.
#services.xserver.dpi = cfg.dpi;
fonts = { fonts = {
@ -33,8 +31,8 @@ in
enableGhostscriptFonts = true; enableGhostscriptFonts = true;
fontDir.enable = true; fontDir.enable = true;
# todo brauch ich überhaupt die urxvt und xterm configurationen?
fontconfig = { fontconfig = {
#dpi = cfg.dpi;
subpixel = { subpixel = {
lcdfilter = "default"; lcdfilter = "default";
rgba = "rgb"; rgba = "rgb";
@ -45,7 +43,7 @@ in
}; };
enable = true; enable = true;
antialias = true; antialias = true;
#defaultFonts = { monospace = [ "inconsolata" ]; }; defaultFonts = { monospace = [ "JetBrains Mono" ]; };
}; };
fonts = with pkgs; [ fonts = with pkgs; [
@ -61,9 +59,9 @@ in
# ------------ # ------------
# nerdfonts # nerdfonts
powerline-fonts powerline-fonts
#font-awesome-ttf
font-awesome font-awesome
fira-code-symbols fira-code-symbols
jetbrains-mono
# shell font # shell font
# ---------- # ----------

7
nixos/modules/system/x11.nix
View file

@ -3,9 +3,7 @@
with lib; with lib;
let let
cfg = config.system.custom.x11; cfg = config.system.custom.x11;
in in
{ {
@ -87,6 +85,11 @@ in
# across different files # across different files
# just add a file into `/etc/X11/Xresource.d/` and it will be # just add a file into `/etc/X11/Xresource.d/` and it will be
# evaluated. # evaluated.
# todo this is better:
#include "/etc/X11/Xresources.d/xterm"
#include "/etc/X11/Xresources.d/rxvt-unicode"
#include "/etc/X11/Xresources.d/fonts"
#include "/etc/X11/Xresources.d/xscreensaver"
services.xserver.displayManager.sessionCommands = '' services.xserver.displayManager.sessionCommands = ''
for file in `ls /etc/X11/Xresource.d/` for file in `ls /etc/X11/Xresource.d/`
do do

19
nixos/system/all/syncthing.nix
View file

@ -10,8 +10,7 @@ with lib; {
"${name}" = { "${name}" = {
name = name; name = name;
id = id; id = id;
#addresses = addresses = [ "tcp://${name}.private:22000" ];
# [ "tcp://${name}.private:22000" ];
}; };
}; };
in in
@ -49,7 +48,7 @@ with lib; {
private = { private = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "sterni" "mobi" "bobi" ]; devices = [ "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = { versioning = {
type = "simple"; type = "simple";
params.keep = "10"; params.keep = "10";
@ -58,7 +57,7 @@ with lib; {
art = { art = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "sterni" "bumba" ]; devices = [ "pepe" "cream" "sterni" "bumba" ];
versioning = { versioning = {
type = "simple"; type = "simple";
params.keep = "2"; params.keep = "2";
@ -67,7 +66,7 @@ with lib; {
password-store = { password-store = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "sterni" "mobi" "bobi" ]; devices = [ "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = { versioning = {
type = "simple"; type = "simple";
params.keep = "10"; params.keep = "10";
@ -76,12 +75,12 @@ with lib; {
desktop = { desktop = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "sterni" "mobi" "bobi" ]; devices = [ "pepe" "cream" "sterni" "mobi" "bobi" ];
}; };
finance = { finance = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "sterni" "mobi" "bobi" ]; devices = [ "pepe" "cream" "sterni" "mobi" "bobi" ];
versioning = { versioning = {
type = "simple"; type = "simple";
params.keep = "10"; params.keep = "10";
@ -103,7 +102,7 @@ with lib; {
enable = lib.mkDefault false; enable = lib.mkDefault false;
id = "wwbvs-5lfbh"; id = "wwbvs-5lfbh";
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "sterni" "robi" ]; devices = [ "pepe" "cream" "sterni" "robi" ];
versioning = { versioning = {
type = "simple"; type = "simple";
params.keep = "10"; params.keep = "10";
@ -132,7 +131,7 @@ with lib; {
enable = lib.mkDefault false; enable = lib.mkDefault false;
id = "gytmq-r2zrx"; id = "gytmq-r2zrx";
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "sterni" "robi" ]; devices = [ "pepe" "cream" "sterni" "robi" ];
versioning = { versioning = {
type = "simple"; type = "simple";
params.keep = "10"; params.keep = "10";
@ -142,7 +141,7 @@ with lib; {
enable = lib.mkDefault false; enable = lib.mkDefault false;
id = "acfhu-r4t4f"; id = "acfhu-r4t4f";
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "sterni" "robi" ]; devices = [ "pepe" "cream" "sterni" "robi" ];
versioning = { versioning = {
type = "simple"; type = "simple";
params.keep = "10"; params.keep = "10";

10
nixos/system/desktop/home-manager/doom-emacs.nix
View file

@ -1,8 +1,16 @@
{ pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
home-manager.users.mainUser = { home-manager.users.mainUser = {
programs.doom-emacs = { programs.doom-emacs = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
doomPrivateDir = ./doom.d; doomPrivateDir = ./doom.d;
extraConfig = ''
;; "monospace" means use the system default. However, the default is usually two
;; points larger than I'd like, so I specify size 12 here.
(setq doom-font
(font-spec :family "Jetbrains Mono" :size ${toString config.programs.custom.urxvt.fontSize} :weight 'light))
;(setq doom-font
; (font-spec :family "Terminus" :size ${toString config.programs.custom.urxvt.fontSize} :weight 'light))
'';
emacsPackagesOverlay = self: super: { emacsPackagesOverlay = self: super: {
# fixes https://github.com/vlaci/nix-doom-emacs/issues/394 # fixes https://github.com/vlaci/nix-doom-emacs/issues/394

16
nixos/system/desktop/home-manager/doom.d/config.el
View file

@ -1,20 +1,4 @@
;; configure theme ;; configure theme
(setq doom-theme 'doom-solarized-light) (setq doom-theme 'doom-solarized-light)
; dotspacemacs-default-font '("Terminus"
; :size ${toString fontSize}
; :weight normal
; :width normal
; :powerline-scale 1.1)
;; "monospace" means use the system default. However, the default is usually two
;; points larger than I'd like, so I specify size 12 here.
;(setq doom-font (font-spec :family "JetBrainsMono" :size 12 :weight 'light)
; doom-variable-pitch-font (font-spec :family "Noto Serif" :size 13)
; ivy-posframe-font (font-spec :family "JetBrainsMono" :size 15))
(setq doom-font (font-spec :family "Terminus" :size 12 :weight 'light)
;doom-variable-pitch-font (font-spec :family "Noto Serif" :size 13)
;ivy-posframe-font (font-spec :family "JetBrainsMono" :size 15)
)

13
nixos/system/desktop/home-manager/i3.nix
View file

@ -93,17 +93,13 @@ in
in in
[ [
{ command = "${pkgs.albert}/bin/albert"; always = true; } { command = "${pkgs.albert}/bin/albert"; always = true; }
#{
# command = "${pkgs.polygon-art.polygon-art}/bin/rings --height ${toString height} --width ${toString width} /dev/shm/background.png && ${pkgs.feh}/bin/feh --bg-scale /dev/shm/background.png";
# always = true;
#}
{ command = toString backgroundCommand; always = true; } { command = toString backgroundCommand; always = true; }
#{ command = "${pkgs.flameshot}/bin/flameshot"; always = true; } #{ command = "${pkgs.flameshot}/bin/flameshot"; always = true; }
# { command = "systemctl --user restart polybar"; always = true; notification = false; } # { command = "systemctl --user restart polybar"; always = true; notification = false; }
]; ];
fonts = { fonts = {
names = [ "Terminus" ]; names = [ "JetBrains Mono" ];
size = 9.0; size = 11.0;
}; };
bars = bars =
with colorTheme; with colorTheme;
@ -117,10 +113,9 @@ in
workspaceButtons = true; workspaceButtons = true;
workspaceNumbers = true; workspaceNumbers = true;
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${config.users.users.mainUser.home}/.config/i3status-rust/config-my.toml"; statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${config.users.users.mainUser.home}/.config/i3status-rust/config-my.toml";
#fonts = [ "Terminus" ];
fonts = { fonts = {
names = [ "Terminus" ]; names = [ "JetBrains Mono" ];
size = 9.0; size = 11.0;
}; };
trayOutput = "primary"; trayOutput = "primary";
colors = { colors = {