foosinn/nix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

work

Browse source
This commit is contained in:
Stefan Schwarz 2024-01-03 15:26:33 +01:00
parent 698e0b6ec2
commit 49ae5f3981
10 changed files with 129 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dotfiles/alacritty.yml
View file

@ -7,18 +7,28 @@ draw_bold_text_with_bright_colors: true
colors: colors:
primary: primary:
background: "0x19181A" background: '0xf8f8f8'
foreground: "0xFCFCFA" foreground: '0x2a2b33'
normal: normal:
black: "0x19181A" black: '0x000000'
red: "0xcc6666" red: '0xde3d35'
green: "0xa9dc76" green: '0x3e953a'
yellow: "0xffd866" yellow: '0xd2b67b'
cyan: "0x78dce8" blue: '0x2f5af3'
magenta: "0xFC9867" magenta: '0xa00095'
blue: "0xAB9DF2" cyan: '0x3e953a'
white: "0xFCFCFA" white: '0xbbbbbb'
bright:
black: '0x000000'
red: '0xde3d35'
green: '0x3e953a'
yellow: '0xd2b67b'
blue: '0x2f5af3'
magenta: '0xa00095'
cyan: '0x3e953a'
white: '0xffffff'
window: window:
dynamic_title: true dynamic_title: true

14
dotfiles/sway/config
View file

@ -14,11 +14,12 @@ set $left h
set $down j set $down j
set $up k set $up k
set $right l set $right l
set $term wezterm #set $term wezterm
set $term alacritty
set $wallpaper /home/stefan/wall.png set $wallpaper /home/stefan/wall.png
set $lock swaylock -t -i $wallpaper --scaling=fill set $lock swaylock -t -i $wallpaper --scaling=fill
set $font CaskaydiaCove Nerd Font 10 set $font CaskaydiaCove Nerd Font 10
set $menucolor \ set $menucolor -H 23 -b \
--tf=$white --tb=$cyan \ --tf=$white --tb=$cyan \
--ff=$black --fb=$white \ --ff=$black --fb=$white \
--cf=$cyan --cb=$white \ --cf=$cyan --cb=$white \
@ -26,14 +27,20 @@ set $menucolor \
--af=$black --ab=$white2 \ --af=$black --ab=$white2 \
--hf=$white --hb=$cyan \ --hf=$white --hb=$cyan \
--sf=$white --sb=$cyan --sf=$white --sb=$cyan
set $menu bemenu-run -H 23 -b -p run $menucolor set $menu bemenu-run -p run $menucolor
set $otpmenu ykman oath accounts code -s "$(ykman oath accounts list | bemenu -i $menucolor)" | wl-copy
font $font font $font
input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de input "1:1:AT_Translated_Set_2_keyboard" xkb_layout de
input "0:0:TUXEDO_Keyboard" xkb_layout de input "0:0:TUXEDO_Keyboard" xkb_layout de
input 1130:35:HID_046a:0023 xkb_layout de
input "2362:628:PIXA3854:00_093A:0274_Touchpad" click_method clickfinger
output * bg $wallpaper fill output * bg $wallpaper fill
output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz output "BenQ Corporation BenQ SW2700 83H03922SL0" res --custom 2560x1440@60Hz
output "BenQ Corporation BenQ SW2700 83H03922SL0" pos 1440 720
output "BNQ BenQ PD2705Q W4N00777019" transform 270
output "BNQ BenQ PD2705Q W4N00777019" pos 0 0
output "Dell Inc. Dell U4919DW HZVZWP2" res 5120x1440 output "Dell Inc. Dell U4919DW HZVZWP2" res 5120x1440
output eDP-1 scale 1.25 output eDP-1 scale 1.25
@ -45,6 +52,7 @@ floating_modifier $mod normal
bindsym $mod+Shift+c reload bindsym $mod+Shift+c reload
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
bindsym $mod+o exec keepassxc bindsym $mod+o exec keepassxc
bindsym $mod+Shift+o exec $otpmenu
bindsym $mod+z exec $lock bindsym $mod+z exec $lock
bindsym $mod+Up exec light -A 5 bindsym $mod+Up exec light -A 5
bindsym $mod+Down exec light -U 5 bindsym $mod+Down exec light -U 5

88
dotfiles/sway/status.toml
View file

@ -1,5 +1,5 @@
[theme] [theme]
name = "plain" theme = "plain"
[theme.overrides] [theme.overrides]
idle_bg = "#fafafa" idle_bg = "#fafafa"
idle_fg = "#000000" idle_fg = "#000000"
@ -17,49 +17,45 @@ separator = "|"
[icons] [icons]
name = "none" icons = "none"
[icons.overrides] [icons.overrides]
backlight_empty = "" backlight = [
backlight_full = "" "󰌶",
backlight_partial1 = "" "󱩏",
backlight_partial2 = "" "󱩒",
backlight_partial3 = "" "󱩕",
bat = "" "󰛨",
bat_charging = "" ]
bat_discharging = "" bat = [
bat_empty = "" "󱃍 ",
bat_quarter = "" "󰁻",
bat_half = "" "󰁾",
bat_three_quarters = "" "󰂁",
bat_full = "" "󰁹",
cogs = "龍" ]
disk_drive = "" bat_charging = ""
headphones = "  " cogs = ""
memory_mem = "" disk_drive = "󱛟"
net_down = "DOWN" headphones = "  "
net_up = "UP" memory_mem = "󰍛"
net_down = "󰅛"
net_up = "󰱓"
net_vpn = " " net_vpn = " "
net_wired = "" net_wired = ""
net_wireless = " " net_wireless = " 󰖩"
thermometer = "  " thermometer = " 󰔏 "
time = "" time = "󰥔"
volume_empty = "" volume_muted = "󰖁 MUTE"
volume_full = "" volume = [
volume_half = "" "",
volume_muted= " MUTE" "󰕾",
"",
]
[[block]] [[block]]
block = "net" block = "net"
device = "wg" device = "wlp166s0"
hide_inactive = true format = " $icon $ip$frequency "
hide_missing = true
[[block]]
block = "net"
device = "wlo1"
hide_inactive = true
hide_missing = true
[[block]] [[block]]
block = "custom" block = "custom"
@ -69,23 +65,19 @@ command = '''echo " $(cat /sys/class/thermal/thermal_zone0/temp | head -c 2)
block = "disk_space" block = "disk_space"
path = "/" path = "/"
info_type = "available" info_type = "available"
unit = "GB" format = " $icon $available "
format = "{icon} {available}"
interval = 20 interval = 20
warning = 20.0 warning = 20.0
alert = 10.0 alert = 10.0
[[block]] [[block]]
block = "memory" block = "memory"
display_type = "memory" format = " $icon $mem_used/$mem_total "
format_mem = "{mem_total_used_percents}"
icons_format = " {icon}"
clickable = false
[[block]] [[block]]
block = "load" block = "load"
interval = 1 interval = 1
format = "{1m}" format = " $icon $1m "
[[block]] [[block]]
block = "sound" block = "sound"
@ -98,11 +90,9 @@ block = "backlight"
block = "battery" block = "battery"
device = "BAT1" device = "BAT1"
interval = 10 interval = 10
format = "{percentage} ({time})" format = " $icon $percentage ($time) "
full_format = "{percentage} ({time}) "
icons_format = " {icon} "
[[block]] [[block]]
block = "time" block = "time"
interval = 60 interval = 60
format = "%Y-%m-%d %H:%M" format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M') "

3
dotfiles/wezterm.lua
View file

@ -12,9 +12,6 @@ return {
window_close_confirmation = 'NeverPrompt', window_close_confirmation = 'NeverPrompt',
default_prog = { '/run/current-system/sw/bin/bash' }, default_prog = { '/run/current-system/sw/bin/bash' },
selection_fg = 'black',
selection_bg = '#fafafa',
keys = { keys = {
{ {
key = 'Escape', key = 'Escape',

1
hardware/framework.nix
View file

@ -68,7 +68,6 @@ in
]; ];
boot.blacklistedKernelModules = [ "hid-sensor-hub" ]; boot.blacklistedKernelModules = [ "hid-sensor-hub" ];
hardware.acpilight.enable = true; hardware.acpilight.enable = true;
hardware.video.hidpi.enable = lib.mkDefault true;
services.xserver.dpi = 125; services.xserver.dpi = 125;
environment.variables = { environment.variables = {
VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl"); VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");

31
packages/nagstamon.nix
View file

@ -1,9 +1,10 @@
{ lib, fetchFromGitHub, python310Packages, wrapQtAppsHook, pkgs }: { lib, fetchFromGitHub, python311Packages, wrapQtAppsHook, pkgs }:
let let
pname = "nagstamon"; pname = "nagstamon";
version = "v3.10.1"; version = "v3.12.0";
in python310Packages.buildPythonApplication rec {
in python311Packages.buildPythonApplication rec {
inherit pname; inherit pname;
inherit version; inherit version;
@ -11,7 +12,7 @@ in python310Packages.buildPythonApplication rec {
owner = "HenriWahl"; owner = "HenriWahl";
repo = "Nagstamon"; repo = "Nagstamon";
rev = version; rev = version;
sha256 = "sha256-TdwvHQDDQqZ6uvdCTJCMCdivM/vaZpMrpLRMKN2y76Y="; sha256 = "sha256-SI0FPTqJquaVyl/gpp883eGLq7tZ6J0fqn0jp77M8GM=";
}; };
doCheck = false; doCheck = false;
@ -22,17 +23,17 @@ in python310Packages.buildPythonApplication rec {
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
python310Packages.beautifulsoup4 python311Packages.beautifulsoup4
python310Packages.configparser python311Packages.configparser
python310Packages.dateutil python311Packages.dateutil
python310Packages.keyring python311Packages.keyring
python310Packages.lxml python311Packages.lxml
python310Packages.psutil python311Packages.psutil
python310Packages.pyqt5_with_qtmultimedia python311Packages.pyqt5_with_qtmultimedia
python310Packages.requests python311Packages.requests
python310Packages.requests-kerberos python311Packages.requests-kerberos
python310Packages.setuptools python311Packages.setuptools
python310Packages.xlib python311Packages.xlib
]; ];
meta = with lib; { meta = with lib; {

5
roles/base.nix
View file

@ -49,6 +49,7 @@ in {
EDITOR = "nvim"; EDITOR = "nvim";
STARSHIP_CONFIG = "/etc/starship.toml"; STARSHIP_CONFIG = "/etc/starship.toml";
HISTCONTROL = "ignoreboth"; HISTCONTROL = "ignoreboth";
NIXOS_OZONE_WL = "y";
}; };
}; };
@ -174,8 +175,4 @@ in {
LC_IDENTIFICATION = "de_DE.UTF-8"; LC_IDENTIFICATION = "de_DE.UTF-8";
}; };
}; };
# yubikey support
services.udev.packages = [ pkgs.yubikey-personalization ];
services.pcscd.enable = true;
} }

15
roles/desktop.nix
View file

@ -90,7 +90,7 @@ in
}; };
}; };
qt5.platformTheme = "qt5ct"; qt.platformTheme = "qt5ct";
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
@ -99,10 +99,6 @@ in
alsa.enable = true; alsa.enable = true;
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = true;
config.pipewire = {
"context.properties" = { "default.clock.rate" = 48000; };
};
}; };
services.udev.packages = [ services.udev.packages = [
(pkgs.writeTextFile { (pkgs.writeTextFile {
@ -114,9 +110,9 @@ in
}) })
]; ];
fonts.enableDefaultFonts = true; fonts.enableDefaultPackages = true;
fonts.fontconfig.antialias = true; fonts.fontconfig.antialias = true;
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
corefonts corefonts
emacs-all-the-icons-fonts emacs-all-the-icons-fonts
fira-code fira-code
@ -161,6 +157,7 @@ in
numix-cursor-theme numix-cursor-theme
alacritty alacritty
gimp
imv imv
inkscape inkscape
keepassxc keepassxc
@ -175,7 +172,9 @@ in
pulseeffects-pw pulseeffects-pw
qrencode qrencode
uxplay uxplay
wezterm unstable.wezterm
unstable.prusa-slicer
unstable.super-slicer-latest
solaar solaar
gdk-pixbuf gdk-pixbuf

22
roles/dev.nix
View file

@ -1,14 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, buildPythonPackage, pkgs, fetchPypi,... }:
let unstable = import <nixos-unstable> { }; let
unstable = import <nixos-unstable> { };
in { in {
services.emacs.package = pkgs.emacsPgtk; services.emacs.package = pkgs.emacs29-pgtk;
nixpkgs.overlays = [
(import (builtins.fetchTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
}))
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnumake gnumake
@ -18,23 +14,23 @@ in {
unstable.golangci-lint unstable.golangci-lint
unstable.gopls unstable.gopls
unstable.rust-analyzer unstable.rust-analyzer
#unstable.esphome
unstable.nodePackages.pyright (python310.withPackages
(python39.withPackages
(python-packages: with python-packages; [ (python-packages: with python-packages; [
black black
diagrams diagrams
pymemcache pymemcache
pyyaml pyyaml
requests requests
])) python-lsp-server
])
)
mariadb-client mariadb-client
musl musl
dbeaver dbeaver
emacs-gtk emacs29-pgtk
gitAndTools.delta gitAndTools.delta
lazygit lazygit
ltrace ltrace

27
roles/work.nix
View file

@ -7,6 +7,15 @@ let
pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { }; pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { };
in { in {
environment.variables = {
USE_GKE_GCLOUD_AUTH_PLUGIN = "True";
};
services.tailscale = {
enable = true;
package = unstable.tailscale;
};
security.pki.certificateFiles = [ security.pki.certificateFiles = [
../dotfiles/certs/NetzmarktCA.crt ../dotfiles/certs/NetzmarktCA.crt
../dotfiles/certs/vcenter.netzmarkt.lan.crt ../dotfiles/certs/vcenter.netzmarkt.lan.crt
@ -21,8 +30,12 @@ in {
172.20.0.2 grafana.kind 172.20.0.2 grafana.kind
172.20.0.2 alert.kind 172.20.0.2 alert.kind
#192.168.2.111 hass.home.f2o.io
#127.0.0.1 auth-dev.thobits.com #127.0.0.1 auth-dev.thobits.com
127.0.0.1 database 127.0.0.1 database
127.0.0.1 youtube.com
127.0.0.1 www.youtube.com
''; '';
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -32,6 +45,10 @@ in {
# (import ../packages/vaultsink.nix) needs opensource verson # (import ../packages/vaultsink.nix) needs opensource verson
cloudstation cloudstation
nagstamon nagstamon
yubikey-manager
anydesk
chromium
nodejs
drone-cli drone-cli
govc govc
@ -41,10 +58,18 @@ in {
(unstable.google-cloud-sdk.withExtraComponents [ (unstable.google-cloud-sdk.withExtraComponents [
unstable.google-cloud-sdk.components.gke-gcloud-auth-plugin unstable.google-cloud-sdk.components.gke-gcloud-auth-plugin
]) ])
unstable.slack slack
unstable.velero unstable.velero
unstable.obs-studio unstable.obs-studio
unstable.obs-studio-plugins.wlrobs unstable.obs-studio-plugins.wlrobs
unstable.mindustry-wayland
prusa-slicer
]; ];
# yubikey support
services.udev.packages = [ pkgs.yubikey-personalization ];
services.pcscd.enable = true;
} }