Compare commits
No commits in common. "d492658eccd1f8c18e552d7a09a9f7b1d071ebdd" and "698e0b6ec2b49326da9de79eb9fc83b4837b8d19" have entirely different histories.
d492658ecc
...
698e0b6ec2
10 changed files with 110 additions and 141 deletions
|
|
@ -7,28 +7,18 @@ draw_bold_text_with_bright_colors: true
|
|||
|
||||
colors:
|
||||
primary:
|
||||
background: '0xf8f8f8'
|
||||
foreground: '0x2a2b33'
|
||||
background: "0x19181A"
|
||||
foreground: "0xFCFCFA"
|
||||
|
||||
normal:
|
||||
black: '0x000000'
|
||||
red: '0xde3d35'
|
||||
green: '0x3e953a'
|
||||
yellow: '0xd2b67b'
|
||||
blue: '0x2f5af3'
|
||||
magenta: '0xa00095'
|
||||
cyan: '0x3e953a'
|
||||
white: '0xbbbbbb'
|
||||
|
||||
bright:
|
||||
black: '0x000000'
|
||||
red: '0xde3d35'
|
||||
green: '0x3e953a'
|
||||
yellow: '0xd2b67b'
|
||||
blue: '0x2f5af3'
|
||||
magenta: '0xa00095'
|
||||
cyan: '0x3e953a'
|
||||
white: '0xffffff'
|
||||
black: "0x19181A"
|
||||
red: "0xcc6666"
|
||||
green: "0xa9dc76"
|
||||
yellow: "0xffd866"
|
||||
cyan: "0x78dce8"
|
||||
magenta: "0xFC9867"
|
||||
blue: "0xAB9DF2"
|
||||
white: "0xFCFCFA"
|
||||
|
||||
window:
|
||||
dynamic_title: true
|
||||
|
|
|
|||
|
|
@ -14,12 +14,11 @@ set $left h
|
|||
set $down j
|
||||
set $up k
|
||||
set $right l
|
||||
#set $term wezterm
|
||||
set $term alacritty
|
||||
set $term wezterm
|
||||
set $wallpaper /home/stefan/wall.png
|
||||
set $lock swaylock -t -i $wallpaper --scaling=fill
|
||||
set $font CaskaydiaCove Nerd Font 10
|
||||
set $menucolor -H 23 -b \
|
||||
set $menucolor \
|
||||
--tf=$white --tb=$cyan \
|
||||
--ff=$black --fb=$white \
|
||||
--cf=$cyan --cb=$white \
|
||||
|
|
@ -27,20 +26,14 @@ set $menucolor -H 23 -b \
|
|||
--af=$black --ab=$white2 \
|
||||
--hf=$white --hb=$cyan \
|
||||
--sf=$white --sb=$cyan
|
||||
set $menu bemenu-run -p run $menucolor
|
||||
set $otpmenu ykman oath accounts code -s "$(ykman oath accounts list | bemenu -i $menucolor)" | wl-copy
|
||||
set $menu bemenu-run -H 23 -b -p run $menucolor
|
||||
font $font
|
||||
|
||||
input "1:1:AT_Translated_Set_2_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 "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 eDP-1 scale 1.25
|
||||
|
||||
|
|
@ -52,7 +45,6 @@ floating_modifier $mod normal
|
|||
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+o exec keepassxc
|
||||
bindsym $mod+Shift+o exec $otpmenu
|
||||
bindsym $mod+z exec $lock
|
||||
bindsym $mod+Up exec light -A 5
|
||||
bindsym $mod+Down exec light -U 5
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[theme]
|
||||
theme = "plain"
|
||||
name = "plain"
|
||||
[theme.overrides]
|
||||
idle_bg = "#fafafa"
|
||||
idle_fg = "#000000"
|
||||
|
|
@ -17,45 +17,49 @@ separator = "|"
|
|||
|
||||
|
||||
[icons]
|
||||
icons = "none"
|
||||
name = "none"
|
||||
[icons.overrides]
|
||||
backlight = [
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
]
|
||||
bat = [
|
||||
" ",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
]
|
||||
bat_charging = ""
|
||||
cogs = ""
|
||||
disk_drive = ""
|
||||
headphones = " "
|
||||
memory_mem = ""
|
||||
net_down = ""
|
||||
net_up = ""
|
||||
backlight_empty = ""
|
||||
backlight_full = ""
|
||||
backlight_partial1 = ""
|
||||
backlight_partial2 = ""
|
||||
backlight_partial3 = ""
|
||||
bat = ""
|
||||
bat_charging = ""
|
||||
bat_discharging = ""
|
||||
bat_empty = ""
|
||||
bat_quarter = ""
|
||||
bat_half = ""
|
||||
bat_three_quarters = ""
|
||||
bat_full = ""
|
||||
cogs = "龍"
|
||||
disk_drive = ""
|
||||
headphones = " "
|
||||
memory_mem = ""
|
||||
net_down = "DOWN"
|
||||
net_up = "UP"
|
||||
net_vpn = " "
|
||||
net_wired = ""
|
||||
net_wireless = " "
|
||||
thermometer = " "
|
||||
time = ""
|
||||
volume_muted = " MUTE"
|
||||
volume = [
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
]
|
||||
net_wireless = " "
|
||||
thermometer = " "
|
||||
time = ""
|
||||
volume_empty = ""
|
||||
volume_full = ""
|
||||
volume_half = ""
|
||||
volume_muted= " MUTE"
|
||||
|
||||
|
||||
[[block]]
|
||||
block = "net"
|
||||
device = "wlp166s0"
|
||||
format = " $icon $ip$frequency "
|
||||
device = "wg"
|
||||
hide_inactive = true
|
||||
hide_missing = true
|
||||
|
||||
[[block]]
|
||||
block = "net"
|
||||
device = "wlo1"
|
||||
hide_inactive = true
|
||||
hide_missing = true
|
||||
|
||||
[[block]]
|
||||
block = "custom"
|
||||
|
|
@ -65,19 +69,23 @@ command = '''echo " $(cat /sys/class/thermal/thermal_zone0/temp | head -c 2)
|
|||
block = "disk_space"
|
||||
path = "/"
|
||||
info_type = "available"
|
||||
format = " $icon $available "
|
||||
unit = "GB"
|
||||
format = "{icon} {available}"
|
||||
interval = 20
|
||||
warning = 20.0
|
||||
alert = 10.0
|
||||
|
||||
[[block]]
|
||||
block = "memory"
|
||||
format = " $icon $mem_used/$mem_total "
|
||||
display_type = "memory"
|
||||
format_mem = "{mem_total_used_percents}"
|
||||
icons_format = " {icon}"
|
||||
clickable = false
|
||||
|
||||
[[block]]
|
||||
block = "load"
|
||||
interval = 1
|
||||
format = " $icon $1m "
|
||||
format = "{1m}"
|
||||
|
||||
[[block]]
|
||||
block = "sound"
|
||||
|
|
@ -90,9 +98,11 @@ block = "backlight"
|
|||
block = "battery"
|
||||
device = "BAT1"
|
||||
interval = 10
|
||||
format = " $icon $percentage ($time) "
|
||||
format = "{percentage} ({time})"
|
||||
full_format = "{percentage} ({time}) "
|
||||
icons_format = " {icon} "
|
||||
|
||||
[[block]]
|
||||
block = "time"
|
||||
interval = 60
|
||||
format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M') "
|
||||
format = "%Y-%m-%d %H:%M"
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ return {
|
|||
window_close_confirmation = 'NeverPrompt',
|
||||
default_prog = { '/run/current-system/sw/bin/bash' },
|
||||
|
||||
selection_fg = 'black',
|
||||
selection_bg = '#fafafa',
|
||||
|
||||
keys = {
|
||||
{
|
||||
key = 'Escape',
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ in
|
|||
];
|
||||
boot.blacklistedKernelModules = [ "hid-sensor-hub" ];
|
||||
hardware.acpilight.enable = true;
|
||||
hardware.video.hidpi.enable = lib.mkDefault true;
|
||||
services.xserver.dpi = 125;
|
||||
environment.variables = {
|
||||
VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ lib, fetchFromGitHub, python311Packages, wrapQtAppsHook, pkgs }:
|
||||
{ lib, fetchFromGitHub, python310Packages, wrapQtAppsHook, pkgs }:
|
||||
|
||||
let
|
||||
pname = "nagstamon";
|
||||
version = "v3.12.0";
|
||||
|
||||
in python311Packages.buildPythonApplication rec {
|
||||
version = "v3.10.1";
|
||||
in python310Packages.buildPythonApplication rec {
|
||||
inherit pname;
|
||||
inherit version;
|
||||
|
||||
|
|
@ -12,7 +11,7 @@ in python311Packages.buildPythonApplication rec {
|
|||
owner = "HenriWahl";
|
||||
repo = "Nagstamon";
|
||||
rev = version;
|
||||
sha256 = "sha256-SI0FPTqJquaVyl/gpp883eGLq7tZ6J0fqn0jp77M8GM=";
|
||||
sha256 = "sha256-TdwvHQDDQqZ6uvdCTJCMCdivM/vaZpMrpLRMKN2y76Y=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
@ -23,17 +22,17 @@ in python311Packages.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python311Packages.beautifulsoup4
|
||||
python311Packages.configparser
|
||||
python311Packages.dateutil
|
||||
python311Packages.keyring
|
||||
python311Packages.lxml
|
||||
python311Packages.psutil
|
||||
python311Packages.pyqt5_with_qtmultimedia
|
||||
python311Packages.requests
|
||||
python311Packages.requests-kerberos
|
||||
python311Packages.setuptools
|
||||
python311Packages.xlib
|
||||
python310Packages.beautifulsoup4
|
||||
python310Packages.configparser
|
||||
python310Packages.dateutil
|
||||
python310Packages.keyring
|
||||
python310Packages.lxml
|
||||
python310Packages.psutil
|
||||
python310Packages.pyqt5_with_qtmultimedia
|
||||
python310Packages.requests
|
||||
python310Packages.requests-kerberos
|
||||
python310Packages.setuptools
|
||||
python310Packages.xlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ in {
|
|||
EDITOR = "nvim";
|
||||
STARSHIP_CONFIG = "/etc/starship.toml";
|
||||
HISTCONTROL = "ignoreboth";
|
||||
NIXOS_OZONE_WL = "y";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -175,4 +174,8 @@ in {
|
|||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||
};
|
||||
};
|
||||
|
||||
# yubikey support
|
||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||
services.pcscd.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
qt.platformTheme = "qt5ct";
|
||||
qt5.platformTheme = "qt5ct";
|
||||
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
|
|
@ -99,6 +99,10 @@ in
|
|||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
|
||||
config.pipewire = {
|
||||
"context.properties" = { "default.clock.rate" = 48000; };
|
||||
};
|
||||
};
|
||||
services.udev.packages = [
|
||||
(pkgs.writeTextFile {
|
||||
|
|
@ -110,9 +114,9 @@ in
|
|||
})
|
||||
];
|
||||
|
||||
fonts.enableDefaultPackages = true;
|
||||
fonts.enableDefaultFonts = true;
|
||||
fonts.fontconfig.antialias = true;
|
||||
fonts.packages = with pkgs; [
|
||||
fonts.fonts = with pkgs; [
|
||||
corefonts
|
||||
emacs-all-the-icons-fonts
|
||||
fira-code
|
||||
|
|
@ -157,7 +161,6 @@ in
|
|||
numix-cursor-theme
|
||||
|
||||
alacritty
|
||||
gimp
|
||||
imv
|
||||
inkscape
|
||||
keepassxc
|
||||
|
|
@ -169,11 +172,10 @@ in
|
|||
nodePackages.insect
|
||||
pavucontrol
|
||||
pcmanfm
|
||||
pulseeffects-pw
|
||||
qrencode
|
||||
uxplay
|
||||
unstable.wezterm
|
||||
unstable.prusa-slicer
|
||||
unstable.super-slicer-latest
|
||||
wezterm
|
||||
|
||||
solaar
|
||||
gdk-pixbuf
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{ config, lib, buildPythonPackage, pkgs, fetchPypi,... }:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
unstable = import <nixos-unstable> { };
|
||||
let unstable = import <nixos-unstable> { };
|
||||
in {
|
||||
|
||||
services.emacs.package = pkgs.emacs29-pgtk;
|
||||
services.emacs.package = pkgs.emacsPgtk;
|
||||
nixpkgs.overlays = [
|
||||
(import (builtins.fetchTarball {
|
||||
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
|
||||
}))
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
gnumake
|
||||
|
|
@ -14,23 +18,23 @@ in {
|
|||
unstable.golangci-lint
|
||||
unstable.gopls
|
||||
unstable.rust-analyzer
|
||||
#unstable.esphome
|
||||
|
||||
(python310.withPackages
|
||||
unstable.nodePackages.pyright
|
||||
(python39.withPackages
|
||||
(python-packages: with python-packages; [
|
||||
black
|
||||
diagrams
|
||||
pymemcache
|
||||
pyyaml
|
||||
requests
|
||||
python-lsp-server
|
||||
])
|
||||
)
|
||||
]))
|
||||
|
||||
mariadb-client
|
||||
musl
|
||||
|
||||
dbeaver
|
||||
emacs29-pgtk
|
||||
emacs-gtk
|
||||
gitAndTools.delta
|
||||
lazygit
|
||||
ltrace
|
||||
|
|
|
|||
|
|
@ -3,29 +3,10 @@
|
|||
let
|
||||
unstable = import <nixos-unstable> { config.allowUnfree = true; };
|
||||
cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) { };
|
||||
nagstamon = pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { };
|
||||
myslack = pkgs.slack.overrideAttrs (oldAttrs: rec {
|
||||
fixupPhase = ''
|
||||
sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar
|
||||
|
||||
rm $out/bin/slack
|
||||
makeWrapper $out/lib/slack/slack $out/bin/slack \
|
||||
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
|
||||
--suffix PATH : ${lib.makeBinPath [ pkgs.xdg-utils ]} \
|
||||
--add-flags "--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer"
|
||||
'';
|
||||
});
|
||||
nagstamon =
|
||||
pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) { };
|
||||
in {
|
||||
|
||||
environment.variables = {
|
||||
USE_GKE_GCLOUD_AUTH_PLUGIN = "True";
|
||||
};
|
||||
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
package = unstable.tailscale;
|
||||
};
|
||||
|
||||
security.pki.certificateFiles = [
|
||||
../dotfiles/certs/NetzmarktCA.crt
|
||||
../dotfiles/certs/vcenter.netzmarkt.lan.crt
|
||||
|
|
@ -40,12 +21,8 @@ in {
|
|||
172.20.0.2 grafana.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 database
|
||||
127.0.0.1 youtube.com
|
||||
127.0.0.1 www.youtube.com
|
||||
'';
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
@ -55,10 +32,6 @@ in {
|
|||
# (import ../packages/vaultsink.nix) needs opensource verson
|
||||
cloudstation
|
||||
nagstamon
|
||||
yubikey-manager
|
||||
anydesk
|
||||
chromium
|
||||
nodejs
|
||||
|
||||
drone-cli
|
||||
govc
|
||||
|
|
@ -68,18 +41,10 @@ in {
|
|||
(unstable.google-cloud-sdk.withExtraComponents [
|
||||
unstable.google-cloud-sdk.components.gke-gcloud-auth-plugin
|
||||
])
|
||||
myslack
|
||||
unstable.slack
|
||||
unstable.velero
|
||||
|
||||
unstable.obs-studio
|
||||
unstable.obs-studio-plugins.wlrobs
|
||||
|
||||
unstable.mindustry-wayland
|
||||
prusa-slicer
|
||||
];
|
||||
|
||||
# yubikey support
|
||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||
services.pcscd.enable = true;
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue