diff --git a/2configs/audio/respeaker.nix b/2configs/audio/respeaker.nix index b732d86..6d3c605 100644 --- a/2configs/audio/respeaker.nix +++ b/2configs/audio/respeaker.nix @@ -11,7 +11,7 @@ in security.rtkit.enable = true; environment.systemPackages = with pkgs; [ - alsaUtils + alsa-utils i2c-tools ponymix ]; diff --git a/2configs/bgt/social-to-irc.nix b/2configs/bgt/social-to-irc.nix index 9d9640a..98e1349 100644 --- a/2configs/bgt/social-to-irc.nix +++ b/2configs/bgt/social-to-irc.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; - krebs.brockman = { + #systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; + services.brockman = { enable = true; config = { channel = "#binaergewitter"; diff --git a/2configs/bgt/template.md b/2configs/bgt/template.md index be21d7c..11018de 100644 --- a/2configs/bgt/template.md +++ b/2configs/bgt/template.md @@ -1,5 +1,6 @@ # +-1. in signal "Die letzte sendung ist 10 tage her, wann wollen wir senden?" in 10 Tagen planen 0. Sendung twittern und mastodieren (eine Woche + eine Stunde vorher) von Ingo/l33tname (wichtig) 1. `eine` Person anrufen (den Host): - markus madmas@studio.link diff --git a/2configs/bluetooth-mpd.nix b/2configs/bluetooth-mpd.nix index 0e83a63..1582617 100644 --- a/2configs/bluetooth-mpd.nix +++ b/2configs/bluetooth-mpd.nix @@ -37,7 +37,6 @@ in { "guest ok" = "yes"; }; - sound.enable = true; # connect via https://wiki.nixos.org/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio hardware.bluetooth.enable = true; environment.etc."bluetooth/audio.conf".text = '' diff --git a/2configs/core.nix b/2configs/core.nix index 409deaa..f218c99 100644 --- a/2configs/core.nix +++ b/2configs/core.nix @@ -1,4 +1,4 @@ -{ +{pkgs, lib, config, ... }:{ # users are super important users.users = { root.openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ]; @@ -52,8 +52,6 @@ defaults.email = "letsencrypt@syntax-fehler.de"; acceptTerms = true; }; - system.stateVersion = lib.mkDefault "23.05"; - services.postgresql.package = pkgs.postgresql_14; boot.kernel.sysctl."kernel.dmesg_restrict" = 0; } diff --git a/2configs/default.nix b/2configs/default.nix index d671007..2e7413d 100644 --- a/2configs/default.nix +++ b/2configs/default.nix @@ -8,26 +8,11 @@ with lib; ./binary-cache/nixos.nix ./minimal.nix ./secrets/ssh_server.nix + ./core.nix # ./overlays/default.nix # ./security/hotfix.nix ]; - # users are super important - users.users = { - root.openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ]; - makefu = { - uid = 9001; - group = "users"; - home = "/home/makefu"; - createHome = true; - isNormalUser = true; - useDefaultShell = true; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ]; - }; - }; - # nix.settings.trusted-users = [ config.krebs.build.user.name ]; - nix.settings.experimental-features = [ "flakes" "nix-command" ]; # boot.kernelPackages = lib.mkDefault pkgs.linuxPackages; @@ -36,46 +21,10 @@ with lib; # dns.providers.lan = "hosts"; build.user = config.krebs.users.makefu; }; - - environment.systemPackages = with pkgs; [ - jq - git - gnumake - rxvt_unicode.terminfo - htop nix-output-monitor - ]; + ]; - #programs.bash.completion.enable = true; - - environment.shellAliases = { - # TODO: see .aliases - lsl = "ls -lAtr"; - ip = "ip -c -br"; - dmesg = "dmesg -L --reltime"; - psg = "ps -ef | grep"; - nmap = "nmap -oN $HOME/loot/scan-`date +\%s`.nmap -oX $HOME/loot/scan-`date +%s`.xml"; - grep = "grep --color=auto"; - }; - - nix.extraOptions = '' - auto-optimise-store = true - ''; - - #security.wrappers.sendmail = { - # source = "${pkgs.exim}/bin/sendmail"; - # setuid = true; - #}; - services.journald.extraConfig = '' - SystemMaxUse=1G - RuntimeMaxUse=128M - ''; - environment.pathsToLink = [ "/share" ]; - security.acme = { - defaults.email = "letsencrypt@syntax-fehler.de"; - acceptTerms = true; - }; system.stateVersion = lib.mkDefault "23.05"; services.postgresql.package = pkgs.postgresql_14; } diff --git a/2configs/deployment/atuin.nix b/2configs/deployment/atuin.nix index fbdf31c..b589ba9 100644 --- a/2configs/deployment/atuin.nix +++ b/2configs/deployment/atuin.nix @@ -1,12 +1,14 @@ -{ +{ config, ... }:{ services.atuin = { enable = true; - maxHistory = 900001; + maxHistoryLength = 900001; + database.createLocally = true; + # openRegistration = true; }; services.postgresql.enable = true; services.nginx.virtualHosts."atuin.euer.krebsco.de" = { enableACME = true; forceSSL = true; - locations."/".proxyPass = "http://localhost:${config.services.atuin.port}"; + locations."/".proxyPass = "http://localhost:${toString config.services.atuin.port}"; }; } diff --git a/2configs/deployment/nextcloud/default.nix b/2configs/deployment/nextcloud/default.nix index f5d738d..8d6f03f 100644 --- a/2configs/deployment/nextcloud/default.nix +++ b/2configs/deployment/nextcloud/default.nix @@ -59,7 +59,7 @@ in { enable = true; configureRedis = true; - package = pkgs.nextcloud29; + package = pkgs.nextcloud30; hostName = "o.euer.krebsco.de"; # Use HTTPS for links https = true; diff --git a/2configs/deployment/rss/urls b/2configs/deployment/rss/urls index cbc68cc..2cc32e2 100644 --- a/2configs/deployment/rss/urls +++ b/2configs/deployment/rss/urls @@ -1,9 +1,6 @@ -https://www.ebay-kleinanzeigen.de/s-heimwerken/nein/muehlhausen/bohrmaschine/k0c84l9313r5+heimwerken.versand_s:nein -https://www.ebay-kleinanzeigen.de/s-stuttgart/zigbee/k0l9280 -https://www.ebay-kleinanzeigen.de/s-70378/d%C3%B6rrautomat/k0l9334r5 -https://www.ebay-kleinanzeigen.de/s-zu-verschenken/muehlhausen/c192l9313 -https://www.ebay-kleinanzeigen.de/s-spielzeug/muehlhausen/brettspiel/k0c23l9313 -https://www.ebay-kleinanzeigen.de/s-muehlhausen/dymo/k0l9313r5 -https://www.ebay-kleinanzeigen.de/s-zu-verschenken/muehlhausen/lautsprecher/k0c192l9313r5 -https://www.ebay-kleinanzeigen.de/s-muehlhausen/preis::40/winkelschleifer/k0l9313r5 -https://www.ebay-kleinanzeigen.de/s-muehlhausen/preis::40/kontaktgrill/k0l9313r5 +https://www.kleinanzeigen.de/s-stuttgart/zigbee/k0l9280 +https://www.kleinanzeigen.de/s-70378/d%C3%B6rrautomat/k0l9334r5 +https://www.kleinanzeigen.de/s-zu-verschenken/muehlhausen/c192l9313 +https://www.kleinanzeigen.de/s-spielzeug/muehlhausen/brettspiel/k0c23l9313 +https://www.kleinanzeigen.de/s-zu-verschenken/muehlhausen/lautsprecher/k0c192l9313r5 +https://www.kleinanzeigen.de/s-stuttgart/kallax-schublade/k0l9280 diff --git a/2configs/editor/neovim/vimrc b/2configs/editor/neovim/vimrc index 2a0a59f..f58eb84 100644 --- a/2configs/editor/neovim/vimrc +++ b/2configs/editor/neovim/vimrc @@ -298,7 +298,7 @@ noremap p "+gP noremap XX "+x " Enable mouse for vim -set mouse=a +set mouse= " Buffer nav noremap z :bp diff --git a/2configs/editor/vimrc b/2configs/editor/vimrc index d270eff..73d128d 100644 --- a/2configs/editor/vimrc +++ b/2configs/editor/vimrc @@ -12,7 +12,7 @@ set background=dark set number set relativenumber -set mouse=a +set mouse= set ignorecase set incsearch set wildignore=*.o,*.obj,*.bak,*.exe,*.os diff --git a/2configs/git/forgejo.nix b/2configs/git/forgejo.nix index 525b902..00013b5 100644 --- a/2configs/git/forgejo.nix +++ b/2configs/git/forgejo.nix @@ -3,8 +3,17 @@ let DOMAIN = "cgit.euer.krebsco.de"; HTTP_PORT = 3002; in -{ + { services.nginx = { + virtualHosts."cgit.euer" = { + serverAliases = [ + "cgit.gum.r" + "git.gum.r" + "cgit.makefu.r" + "git.makefu.r" + ]; + globalRedirect = "cgit.euer.krebsco.de"; + }; virtualHosts.${DOMAIN} = { forceSSL = true; enableACME = true; @@ -14,7 +23,7 @@ in locations."/".proxyPass = "http://localhost:${toString HTTP_PORT}"; }; }; - + services.forgejo = { enable = true; database.type = "postgres"; @@ -32,6 +41,7 @@ in ENABLED = true; DEFAULT_ACTIONS_URL = "github"; }; + log.LEVEL = "Warn"; # Sending emails is completely optional # You can send a test email from the web UI at: # Profile Picture > Site Administration > Configuration > Mailer Configuration @@ -44,4 +54,12 @@ in }; #mailerPasswordFile = config.sops.secrets.forgejo-mailer-password.path; }; + + sops.secrets.forgejo-admin-password.owner = "forgejo"; + # systemd.services.forgejo.serviceConfig.ReadOnlyPaths = [ config.sops.secrets.forgejo-admin-password ]; + systemd.services.forgejo.preStart = '' + admin="${lib.getExe config.services.forgejo.package} admin user" + $admin change-password --username makefu --password "$(tr -d '\n' < ${config.sops.secrets.forgejo-admin-password.path})" || true + # $admin create --admin --email "makefu@x.r" --username makefu --password "$(tr -d '\n' < ${config.sops.secrets.forgejo-admin-password.path})" || true + ''; } diff --git a/2configs/gui/base.nix b/2configs/gui/base.nix index 80e9950..b279f9c 100644 --- a/2configs/gui/base.nix +++ b/2configs/gui/base.nix @@ -38,7 +38,7 @@ in # }; # displayManager.defaultSession = lib.mkDefault "none+awesome"; }; - environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ]; + environment.systemPackages = [ pkgs.adwaita-icon-theme ]; # lid switch is handled via button presses # services.logind.lidSwitch = lib.mkDefault "ignore"; #makefu.awesome.enable = true; @@ -55,7 +55,7 @@ in packages = with pkgs;[ pavucontrol xlockmore - rxvt_unicode-with-plugins + rxvt-unicode-unwrapped ]; }; diff --git a/2configs/gui/hyprland/default.nix b/2configs/gui/hyprland/default.nix index 49046e4..9e7ef12 100644 --- a/2configs/gui/hyprland/default.nix +++ b/2configs/gui/hyprland/default.nix @@ -35,7 +35,7 @@ in { { general = { disable_loading_bar = false; - grace = 10; + # grace = 10; hide_cursor = true; no_fade_in = false; }; @@ -70,16 +70,16 @@ in { settings = { general = { ignore_dbus_inhibit = false; - before_sleep_cmd = "loginctl lock-session"; + # before_sleep_cmd = "hyprlock"; after_sleep_cmd = "hyprctl dispatch dpms on"; # what to do when `loginctl lock-session` sends dbus lock event - lock_cmd = "pidof hyprlock || hyprlock"; + lock_cmd = "hyprlock"; }; listener = [ { timeout = 600; - on-timeout = "loginctl lock-session"; + on-timeout = "hyprlock"; } { timeout = 630; @@ -159,10 +159,10 @@ in { active_opacity = 1.0; inactive_opacity = 1.0; - drop_shadow = false; - shadow_range = 4; - shadow_render_power = 3; - "col.shadow" = "rgba(1a1a1aee)"; + #drop_shadow = false; + #shadow_range = 4; + #shadow_render_power = 3; + #"col.shadow" = "rgba(1a1a1aee)"; blur = { enabled = true; @@ -220,7 +220,7 @@ in { "$mainMod, R, exec, $menu" "$mainMod, P, pseudo, # dwindle" "$mainMod, J, togglesplit, # dwindle" - "$mainMod, L, exec, hyprlock" + "$mainMod, L, exec, loginctl lock-session" # Move focus with mainMod + arrow keys "$mainMod, left, movefocus, l" @@ -249,9 +249,8 @@ in { "$mainMod SHIFT, 6, movetoworkspace, 6" "$mainMod SHIFT, 7, movetoworkspace, 7" "$mainMod SHIFT, 8, movetoworkspace, 8" - "$mainMod SHIFT, 8, movetoworkspace, 8" "$mainMod SHIFT, 9, movetoworkspace, 9" - "$mainMod SHIFT, 10, movetoworkspace, 10" + "$mainMod SHIFT, 0, movetoworkspace, 10" # screenshot "$mainMod, Print, exec, grimblast --notify --cursor save area ~/shots/$(date +'%Y-%m-%d-At-%Ih%Mm%Ss').png" ",Print, exec, grimblast --notify --cursor copy area" @@ -261,7 +260,7 @@ in { "$mainMod, mouse:273, resizewindow" ]; bindel= [ - ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@5%-" + ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" ]; bindl= ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; diff --git a/2configs/gui/hyprland/kitty.nix b/2configs/gui/hyprland/kitty.nix index f44f26b..baf8f77 100644 --- a/2configs/gui/hyprland/kitty.nix +++ b/2configs/gui/hyprland/kitty.nix @@ -11,6 +11,10 @@ in { name = "Terminus"; size = 12; }; + keybindings = { + "shift+insert" = "paste_from_clipboard"; + "ctrl+c" = "copy_or_interrupt"; + }; settings = { update_check_interval = 0; enable_audio_bell = false; diff --git a/2configs/gui/hyprland/passwords.nix b/2configs/gui/hyprland/passwords.nix index 55d5ef4..50c4c82 100644 --- a/2configs/gui/hyprland/passwords.nix +++ b/2configs/gui/hyprland/passwords.nix @@ -11,4 +11,6 @@ in { settings.email = "makefu@x"; }; }; + services.gnome.gnome-keyring.enable = true; + security.pam.services.hyprland.enableGnomeKeyring = true; } diff --git a/2configs/gui/hyprland/waybar.jsonc b/2configs/gui/hyprland/waybar.jsonc index 56a5042..8db44fe 100644 --- a/2configs/gui/hyprland/waybar.jsonc +++ b/2configs/gui/hyprland/waybar.jsonc @@ -35,7 +35,7 @@ "hyprland/window" ], "modules-right": [ - "mpd", + // "mpd", "idle_inhibitor", "pulseaudio", "network", @@ -45,12 +45,12 @@ "temperature", "backlight", "keyboard-state", - "hyprland/language", + // "hyprland/language", "battery", - "battery#bat2", + // "battery#bat2", "clock", - "tray", - "custom/power" + "tray" + // "custom/power" ], "keyboard-state": { "numlock": true, @@ -130,8 +130,9 @@ }, "backlight": { // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] + //"format": "{percent}% {icon}", + "format": "{percent}% ☼" + // "format-icons": ["", "", "", "", "", "", "", "", ""] }, "battery": { "states": { diff --git a/2configs/gui/pipewire.nix b/2configs/gui/pipewire.nix index d526815..a93eb8e 100644 --- a/2configs/gui/pipewire.nix +++ b/2configs/gui/pipewire.nix @@ -5,7 +5,7 @@ hardware.pulseaudio.enable = lib.mkForce false; environment.systemPackages = with pkgs; [ - alsaUtils + alsa-utils pulseaudio ponymix ]; diff --git a/2configs/gui/tools.nix b/2configs/gui/tools.nix index 8f284b1..09caa9f 100644 --- a/2configs/gui/tools.nix +++ b/2configs/gui/tools.nix @@ -1,7 +1,15 @@ { config, pkgs, ... }: { - home-manager.users.${config.krebs.build.user.name}.xdg.desktopEntries.privatefox = { - name = "Privatefox"; - exec = "${pkgs.firefox}/bin/firefox -P Privatefox"; + home-manager.users.${config.krebs.build.user.name}.xdg.desktopEntries = { + privatefox = { + name = "Privatefox"; + exec = "${pkgs.firefox}/bin/firefox -P Privatefox"; + }; + bambu-studio-large = { + name = "BambuStudioLarge"; + exec = toString (pkgs.writers.writeDash "bambu-studio-large" '' + GDK_SCALE=2 XCURSOR_SIZE=32 exec ${pkgs.bambu-studio}/bin/bambu-studio + ''); + }; }; } diff --git a/2configs/gui/urxvtd.nix b/2configs/gui/urxvtd.nix index cb6c258..c4b644b 100644 --- a/2configs/gui/urxvtd.nix +++ b/2configs/gui/urxvtd.nix @@ -10,7 +10,7 @@ in { serviceConfig = { SyslogIdentifier = "urxvtd"; ExecReload = "${pkgs.coreutils}/bin/echo NOP"; - ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd"; + ExecStart = "${pkgs.rxvt-unicode}/bin/urxvtd"; Restart = "always"; RestartSec = "2s"; StartLimitBurst = 0; diff --git a/2configs/home/audio-dl.nix b/2configs/home/audio-dl.nix index 4f64bf2..69cb880 100644 --- a/2configs/home/audio-dl.nix +++ b/2configs/home/audio-dl.nix @@ -9,7 +9,7 @@ in systemd.services.mausdownload = { startAt = "6:15:00"; path = [ pkg ]; - script = "mausdownload.sh /media/silent/music/kinder/hoerbucher"; + script = "alldownload.sh /media/silent/music/kinder/podcasts"; serviceConfig= { User = "makefu"; # TODO unprivileged user }; diff --git a/2configs/home/ham/signal-rest/service.nix b/2configs/home/ham/signal-rest/service.nix index 445e009..d07fe7f 100644 --- a/2configs/home/ham/signal-rest/service.nix +++ b/2configs/home/ham/signal-rest/service.nix @@ -10,7 +10,7 @@ in { state = [ config ]; virtualisation.oci-containers.containers.signal-rest = { image = image; - #ports = [ "127.0.0.1:${toString port}:${toString port}" ]; + ports = [ "127.0.0.1:${toString port}:${toString port}" ]; extraOptions = [ "--network=host"]; volumes = [ "${config}:/home/.local/share/signal-cli" diff --git a/2configs/home/music.nix b/2configs/home/music.nix index f7c7b71..ce1b4bc 100644 --- a/2configs/home/music.nix +++ b/2configs/home/music.nix @@ -1,4 +1,4 @@ -{ config,lib, ... }: +{ pkgs,config,lib, ... }: let internal-ip = "192.168.111.11"; port = 4533; @@ -12,10 +12,13 @@ in PlaylistsPath = "/media/silent/playlists"; Address = "0.0.0.0"; }; + sops.secrets.navidrome-secrets.owner = "navidrome"; systemd.services.navidrome = { serviceConfig = { Restart = "always"; RestartSec = "15"; + EnvironmentFile = config.sops.secrets.navidrome-secrets.path; + ExecStartPre = pkgs.writers.writeDash "lol" "echo LND_LASTFM_APIKEY $ND_LASTFM_APIKEY"; BindReadOnlyPaths = [ # navidrome uses online services to download additional album metadata / covers @@ -32,6 +35,7 @@ in ]; }; unitConfig.RequiresMountsFor = [ "/media/silent" ]; + }; state = [ "/var/lib/navidrome" ]; diff --git a/2configs/home/photoprism.nix b/2configs/home/photoprism.nix index 4a99c6d..fcf409e 100644 --- a/2configs/home/photoprism.nix +++ b/2configs/home/photoprism.nix @@ -14,10 +14,8 @@ # Import | docker-compose exec photoprism photoprism import # ------------------------------------------------------------------- let - port = "2347"; - photodir = "/media/cryptX/photos"; - statedir = "/media/cryptX/lib/photoprism/appsrv"; - db-dir = "/media/cryptX/lib/photoprism/mysql"; + port = 2347; + originalsPath = "/media/cryptX/photos"; internal-ip = "192.168.111.11"; in { @@ -28,7 +26,7 @@ in "fotos" "fotos.lan" ]; - locations."/".proxyPass = "http://localhost:${port}"; + locations."/".proxyPass = "http://localhost:${toString port}"; locations."/".proxyWebsockets = true; extraConfig = '' if ( $server_addr != "${internal-ip}" ) { @@ -36,111 +34,43 @@ in } ''; }; - - #systemd.services.photoprism-network = { - # enable = true; - # wantedBy = [ "multi-user.target" ]; - # script = '' - # ${pkgs.docker}/bin/docker network create --driver bridge photoprism ||: - # ''; - # after = [ "docker.service" ]; - # before = [ - # "docker-photoprism.service" - # "docker-mysql-photoprism.service" - # ]; - #}; - - - virtualisation.oci-containers.containers.photoprism = { - image = "photoprism/photoprism:preview"; - #ports = ["${port}:${port}" ]; - volumes = [ - "${photodir}:/photoprism/originals" - "${statedir}:/photoprism/storage" - ]; - extraOptions = [ - "--security-opt" "seccomp=unconfined" - "--security-opt" "apparmor=unconfined" - #"--network=photoprism" - "--network=host" - "--device=/dev/dri" # hardware encoding - ]; - environment = { - PHOTOPRISM_HTTP_PORT = port; # Built-in Web server port - PHOTOPRISM_HTTP_COMPRESSION = "gzip"; # Improves transfer speed and bandwidth utilization (none or gzip) - PHOTOPRISM_DEBUG = "false"; # Run in debug mode (shows additional log messages) - # PHOTOPRISM_PUBLIC = "true"; # No authentication required (disables password protection) - PHOTOPRISM_READONLY = "false"; # Don't modify originals directory (reduced functionality) - PHOTOPRISM_EXPERIMENTAL = "true"; # Enables experimental features - # PHOTOPRISM_DISABLE_WEBDAV = "false"; # Disables built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS = "false"; # Disables Settings in Web UI - PHOTOPRISM_DISABLE_TENSORFLOW = "false"; # Disables using TensorFlow for image classification - PHOTOPRISM_DARKTABLE_PRESETS = "false"; # Enables Darktable presets and disables concurrent RAW conversion - PHOTOPRISM_DETECT_NSFW = "false"; # Flag photos as private that MAY be offensive (requires TensorFlow) - PHOTOPRISM_UPLOAD_NSFW = "true"; # Allow uploads that MAY be offensive - PHOTOPRISM_AUTH_MODE = "password"; - - #PHOTOPRISM_DATABASE_DRIVER = "postgres"; - #PHOTOPRISM_DATABASE_SERVER = "postgres-prism:5432"; - #PHOTOPRISM_DATABASE_NAME = "photoprism"; - #PHOTOPRISM_DATABASE_USER = "photoprism"; - #PHOTOPRISM_DATABASE_PASSWORD = "photoprism"; - - PHOTOPRISM_DATABASE_DRIVER= "mysql"; # Use MariaDB (or MySQL) instead of SQLite for improved performance - PHOTOPRISM_DATABASE_SERVER= "localhost:3306" ; # MariaDB database server (hostname:port) - PHOTOPRISM_DATABASE_NAME= "photoprism"; # MariaDB database schema name - - PHOTOPRISM_SITE_URL = "http://localhost:2342/"; # Public PhotoPrism URL + systemd.services.photoprism.serviceConfig = { + SupplementaryGroups = [ "download" "video" "render" ]; + PrivateDevices = lib.mkForce false; + }; + state = [ "/var/lib/photoprism" ]; + sops.secrets."omo-photoprism-pw" = { + group = "video"; + mode = "0750"; + }; + services.photoprism = { + enable = true; + inherit port originalsPath; + passwordFile = config.sops.secrets."omo-photoprism-pw".path; + storagePath = "/var/lib/photoprism"; + settings = { PHOTOPRISM_SITE_TITLE = "PhotoPrism"; PHOTOPRISM_SITE_CAPTION = "FeMi Fotos"; PHOTOPRISM_SITE_DESCRIPTION = "Unsere Fotos"; PHOTOPRISM_SITE_AUTHOR = "FeMi"; PHOTOPRISM_SPONSOR = "true"; + PHOTOPRISM_DEFAULT_LOCALE = "de"; + PHOTOPRISM_READONLY = "false"; # Hardware encoding PHOTOPRISM_FFMPEG_ENCODER = "intel"; PHOTOPRISM_INIT = "intel"; - - }; - environmentFiles = [ - config.sops.secrets."omo-photoprism-envfile".path - ]; - }; - - virtualisation.oci-containers.containers.mysql-photoprism = { - image = "mariadb:10.5"; - extraOptions = [ - "--security-opt" "seccomp=unconfined" - "--security-opt" "apparmor=unconfined" - #"--network=photoprism" - "--network=host" - ]; - #ports = [ "3306:3306" ]; # no need to expose the database - #cmd = [ "mysqld" - # "--transaction-isolation=READ-COMMITTED" - # "--character-set-server=utf8mb4" - # "--collation-server=utf8mb4_unicode_ci" - # "--max-connections=512" - # "--innodb-rollback-on-timeout=OFF" - # "--innodb-lock-wait-timeout=50" - #]; - volumes= [ "${db-dir}:/var/lib/mysql" ]; - environmentFiles = [ - config.sops.secrets."omo-photoprism-envfile".path - ]; - environment = { - MYSQL_DATABASE= "photoprism"; + PHOTOPRISM_DEBUG = "false"; + PHOTOPRISM_EXPERIMENTAL = "true"; + PHOTOPRISM_DISABLE_SETTINGS = "false"; + PHOTOPRISM_DISABLE_TENSORFLOW = "false"; + PHOTOPRISM_DARKTABLE_PRESETS = "false"; + PHOTOPRISM_DETECT_NSFW = "false"; + PHOTOPRISM_UPLOAD_NSFW = "true"; + PHOTOPRISM_AUTH_MODE = "password"; + PHOTOPRISM_ADMIN_USER = "admin"; + PHOTOPRISM_SITE_URL = "http://192.168.111.11:2342/"; # Public PhotoPrism URL }; }; - #virtualisation.oci-containers.containers.postgres-prism = { - # image = "postgres:12-alpine"; - # ports = [ "5432" ]; # no need to expose the database - # environment = { - # POSTGRES_DB = "photoprism"; - # POSTGRES_USER = "photoprism"; - # POSTGRES_PASSWORD = "photoprism"; - # }; - #}; - } diff --git a/2configs/hw/network-manager.nix b/2configs/hw/network-manager.nix index fd8e503..8c9a420 100644 --- a/2configs/hw/network-manager.nix +++ b/2configs/hw/network-manager.nix @@ -4,7 +4,7 @@ extraGroups = [ "networkmanager" ]; packages = with pkgs;[ networkmanagerapplet - gnome3.gnome-keyring dconf + gnome-keyring dconf ]; }; networking.wireless.enable = lib.mkForce false; diff --git a/2configs/hw/upower.nix b/2configs/hw/upower.nix index a3932fe..8567124 100644 --- a/2configs/hw/upower.nix +++ b/2configs/hw/upower.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { services.upower.enable = true; - users.users.makefu.packages = [ pkgs.gnome3.gnome-power-manager ]; + users.users.makefu.packages = [ pkgs.gnome-power-manager ]; } diff --git a/2configs/kdeconnect.nix b/2configs/kdeconnect.nix index b9110de..b3c8140 100644 --- a/2configs/kdeconnect.nix +++ b/2configs/kdeconnect.nix @@ -1,6 +1,6 @@ {pkgs, ... }: { - environment.systemPackages = with pkgs; [ kdeconnect ]; + environment.systemPackages = with pkgs; [ plasma5Packages.kdeconnect-kde ]; networking.firewall.allowedUDPPortRanges = [ { from = 1714; to = 1764; } ]; networking.firewall.allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; } diff --git a/2configs/main-laptop.nix b/2configs/main-laptop.nix index dc0d3ed..78479b2 100644 --- a/2configs/main-laptop.nix +++ b/2configs/main-laptop.nix @@ -13,7 +13,7 @@ in { ./gui/base.nix # ./gui/look-up.nix ./fetchWallpaper.nix - ./zsh-user.nix + ./zsh ./tools/core.nix ./tools/core-gui.nix ./gui/automatic-diskmount.nix diff --git a/2configs/networking/zerotier.nix b/2configs/networking/zerotier.nix index d6a70a6..027b7ed 100644 --- a/2configs/networking/zerotier.nix +++ b/2configs/networking/zerotier.nix @@ -1,7 +1,7 @@ { lib, config, ... }: { # lassulus network - clan.networking.zerotier = { + clan.core.networking.zerotier = { networkId = "ccc5da5295c853d4"; name = "nether"; }; diff --git a/2configs/printer.nix b/2configs/printer.nix index 210a9df..bcf890c 100644 --- a/2configs/printer.nix +++ b/2configs/printer.nix @@ -17,11 +17,16 @@ in { users.users."${mainUser}".extraGroups = [ "scanner" "lp" ]; +services.udev.packages = [ pkgs.utsushi ]; # scanners are printers just in reverse anyway services.saned.enable = true; + + # network scan + services.avahi.enable = true; + services.avahi.nssmdns4 = true; hardware.sane = { enable = true; - extraBackends = [ ]; + extraBackends = [ pkgs.epkowa pkgs.utsushi ]; extraConfig.xerox_mfp = '' usb 0x04e8 0x3441 ''; diff --git a/2configs/share/gum.nix b/2configs/share/gum.nix index 9647e0a..ac34d3e 100644 --- a/2configs/share/gum.nix +++ b/2configs/share/gum.nix @@ -21,15 +21,12 @@ in { "valid users" = "download"; }; }; - extraConfig = '' - # guest account = smbguest - # map to guest = bad user - # disable printing - load printers = no - printing = bsd - printcap name = /dev/null - disable spoolss = yes - ''; + settings.global = { + "load printers" = "no"; + "printing" = "bsd"; + "printcap name" = "/dev/null"; + "disable spoolss" = "yes"; + }; }; networking.firewall.interfaces.retiolum.allowedTCPPorts = [ 445 ]; networking.firewall.interfaces.wiregrill.allowedTCPPorts = [ 445 ]; diff --git a/2configs/share/hetzner-client.nix b/2configs/share/hetzner-client.nix index fde4193..35a56f4 100644 --- a/2configs/share/hetzner-client.nix +++ b/2configs/share/hetzner-client.nix @@ -17,7 +17,7 @@ in { "uid=${toString config.users.users.download.uid}" "gid=${toString config.users.groups.download.gid}" "vers=3" - #"vers=2.1" + "fsc" "rsize=65536" "wsize=130048" "iocharset=utf8" diff --git a/2configs/share/omo.nix b/2configs/share/omo.nix index 40ef3e3..6d643e6 100644 --- a/2configs/share/omo.nix +++ b/2configs/share/omo.nix @@ -101,17 +101,17 @@ in { # "guest ok" = "yes"; #}; }; - extraConfig = '' - guest account = smbguest - map to guest = bad user + settings.global = { + "guest account" = "smbguest"; + "map to guest" = "bad user"; # disable printing - load printers = no - printing = bsd - printcap name = /dev/null - disable spoolss = yes - workgroup = WORKGROUP - server string = ${config.networking.hostName} - netbios name = ${config.networking.hostName} - ''; + "load printers" = "no"; + "printing" = "bsd"; + "printcap name" = "/dev/null"; + "disable spoolss" = "yes"; + "workgroup" = "WORKGROUP"; + "server string" = config.networking.hostName; + "netbios name" = config.networking.hostName; + }; }; } diff --git a/2configs/share/wbob.nix b/2configs/share/wbob.nix index 9e5f8dd..f1b6e13 100644 --- a/2configs/share/wbob.nix +++ b/2configs/share/wbob.nix @@ -34,14 +34,14 @@ "guest ok" = "no"; }; }; - extraConfig = '' - guest account = smbguest - map to guest = bad user + settings.global = { + "guest account" = "smbguest"; + "map to guest" = "bad user"; # disable printing - load printers = no - printing = bsd - printcap name = /dev/null - disable spoolss = yes - ''; + "load printers" = "no"; + "printing" = "bsd"; + "printcap name" = "/dev/null"; + "disable spoolss" = "yes" ; + }; }; } diff --git a/2configs/sync/default.nix b/2configs/sync/default.nix index 292e9aa..f485d08 100644 --- a/2configs/sync/default.nix +++ b/2configs/sync/default.nix @@ -16,6 +16,7 @@ in { devices = (mk_peers used_peers) // { makefu-phone.id = "YP57S7C-4U7PTEV-7PNVREJ-574YUTC-XMZ6TH5-P7UL5IJ-VYGW7GV-Z6QYOQR"; makefu-ebook.id = "RRNPQ7N-BUGZUKX-EU7VSDJ-Z5BTW33-55DOSF4-RJXWV7W-BL7TUHT-TV7EJQN"; + makefu-tablet-medion.id = "RRJGBJC-B4WHTRY-MGFWEZU-JLTQWM6-M5N3CWM-MDSVVYC-LP67NM2-B3ZK4AI"; gum.id = "463N4HM-LFU3ARM-M7YU6O5-7FAVRIZ-WUOX5FN-C6A3XLZ-UCDUXQ5-2MVXDA6"; x.id = "ETMOWBT-XOYB7LJ-J4OKD7U-WHBEAP5-MPAHKXM-O4GGRKM-WERF7R4-MRS7EAU"; # override config for x omo.id = "Y5OTK3S-JOJLAUU-KTBXKUW-M7S5UEQ-MMQPUK2-7CXO5V6-NOUDLKP-PRGAFAK"; diff --git a/2configs/sync/omo-download-sync.nix b/2configs/sync/omo-download-sync.nix index bdcdd86..824e898 100644 --- a/2configs/sync/omo-download-sync.nix +++ b/2configs/sync/omo-download-sync.nix @@ -1,11 +1,12 @@ { pkgs, ... }: { + services.cachefilesd.enable = true; systemd.services.download-sync = { # startAt = "hourly"; startAt = "*:0/30"; # 30 minutes path = [ pkgs.rsync ]; script = '' - rsync -a --omit-dir-times --no-perms --no-owner --progress --stats /media/cloud/download/. /media/crypt1/download/. + rsync -a --size-only --omit-dir-times --no-perms --no-owner --progress --stats /media/cloud/download/. /media/crypt1/download/. ''; serviceConfig = { User = "download"; diff --git a/2configs/sync/share/gum.nix b/2configs/sync/share/gum.nix index fa7c058..73af35a 100644 --- a/2configs/sync/share/gum.nix +++ b/2configs/sync/share/gum.nix @@ -1,5 +1,12 @@ { services.syncthing.user = "download"; + systemd.services.syncthing = { + environment.GOMEMLIMIT = "400MiB"; + serviceConfig = { + MemoryHigh="750M"; + MemoryMax="1G"; + }; + }; services.syncthing.settings.folders = { manga = { path = "/media/cloud/sync/manga/"; @@ -11,10 +18,12 @@ id = "makefu-audiobooks"; devices = [ "omo" "makefu-phone" "x" ]; }; - download = { - path = "/media/cloud/download/"; - id = "makefu-download"; - devices = [ "omo" ]; - }; + #download = { + # path = "/media/cloud/download/"; + # id = "makefu-download"; + # #config.fsWatcherEnabled = false; + # #config.rescanIntervalS = 300; + # devices = [ "omo" ]; + #}; }; } diff --git a/2configs/sync/share/omo.nix b/2configs/sync/share/omo.nix index fb08f9c..d635109 100644 --- a/2configs/sync/share/omo.nix +++ b/2configs/sync/share/omo.nix @@ -15,10 +15,15 @@ id = "makefu-audiobooks"; devices = [ "omo" "gum" "makefu-phone" "x" ]; }; - download = { - path = "/media/crypt1/download"; - id = "makefu-download"; - devices = [ "gum" ]; + sync-photos = { + path = "/media/cryptX/photos/photoframe"; + id = "makefu-photoframe"; + devices = [ "makefu-tablet-medion" ]; }; + #download = { + # path = "/media/crypt1/download"; + # id = "makefu-download"; + # devices = [ "gum" ]; + #}; }; } diff --git a/2configs/systemdultras/ircbot.nix b/2configs/systemdultras/ircbot.nix index 9ec7a27..edcbbac 100644 --- a/2configs/systemdultras/ircbot.nix +++ b/2configs/systemdultras/ircbot.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; + #systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; services.rss-bridge = { enable = true; @@ -7,7 +7,7 @@ virtualHost = "rss.makefu.r"; }; - krebs.brockman = { + services.brockman = { enable = true; config = { channel = "#systemdultras"; diff --git a/2configs/tools/core.nix b/2configs/tools/core.nix index 378c89b..8ed9cdd 100644 --- a/2configs/tools/core.nix +++ b/2configs/tools/core.nix @@ -50,7 +50,7 @@ ${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts parallel proot - rxvt_unicode.terminfo + rxvt-unicode-unwrapped.terminfo # TODO: missing stockholm overlay # kpaste diff --git a/2configs/tools/dev.nix b/2configs/tools/dev.nix index fa281e0..5ba5115 100644 --- a/2configs/tools/dev.nix +++ b/2configs/tools/dev.nix @@ -31,6 +31,7 @@ hydra-check # git-related git-preview + jujutsu tig # (pkgs.callPackage ./init-host {}) # used more than once diff --git a/2configs/tools/maker.nix b/2configs/tools/maker.nix index 618854b..bca5e87 100644 --- a/2configs/tools/maker.nix +++ b/2configs/tools/maker.nix @@ -15,6 +15,12 @@ # cura bambu-studio ]; + networking.firewall.allowedUDPPorts = [ + 1990 2021 # bambu-studio ssdp + ]; + networking.firewall.allowedTCPPorts = [ + 8883 6000 # bambu-studio lan mode + ]; xdg.portal.enable = true; #xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; } diff --git a/2configs/tools/sec.nix b/2configs/tools/sec.nix index 6b7aa4f..0250662 100644 --- a/2configs/tools/sec.nix +++ b/2configs/tools/sec.nix @@ -4,7 +4,7 @@ users.users.makefu.packages = with pkgs; [ aria2 # mitmproxy - python3Packages.binwalk-full + binwalk dnsmasq iodine mtr diff --git a/2configs/wireguard/wiregrill-client.nix b/2configs/wireguard/wiregrill-client.nix index 99f1fb2..857d95b 100644 --- a/2configs/wireguard/wiregrill-client.nix +++ b/2configs/wireguard/wiregrill-client.nix @@ -22,8 +22,8 @@ in mkIf (hasAttr "wiregrill" config.krebs.build.host.nets) { ip6 = "${pkgs.iptables}/bin/ip6tables"; in { ips = - (optional (!isNull self.ip4) self.ip4.addr) ++ - (optional (!isNull self.ip6) self.ip6.addr); + (optional (!isNull self.ip4) (self.ip4.addr + "/32")) ++ + (optional (!isNull self.ip6) (self.ip6.addr + "/128")); listenPort = self.wireguard.port; privateKeyFile = config.sops.secrets."${config.clan.core.machineName}-wiregrill.key".path; allowedIPsAsRoutes = true; diff --git a/2configs/wireguard/wiregrill-server.nix b/2configs/wireguard/wiregrill-server.nix index c512b67..40cdb5a 100644 --- a/2configs/wireguard/wiregrill-server.nix +++ b/2configs/wireguard/wiregrill-server.nix @@ -35,10 +35,10 @@ in mkIf (hasAttr "wiregrill" config.krebs.build.host.nets) { services.dnsmasq = { enable = true; resolveLocalQueries = false; - extraConfig = /* dnsmasq */ '' - bind-interfaces - interface=retiolum,wiregrill - ''; + settings = { + bind-interfaces = true; + interface = "retiolum,wiregrill"; + }; servers = [ "1.1.1.1" ]; }; diff --git a/2configs/zsh/atuin.nix b/2configs/zsh/atuin.nix index 5b6705c..0a6c7bb 100644 --- a/2configs/zsh/atuin.nix +++ b/2configs/zsh/atuin.nix @@ -1,11 +1,13 @@ { home-manager.users.makefu.programs.atuin = { enable = true; + flags = [ "--disable-up-arrow" ]; + daemon.enable = true; settings = { auto_sync = true; sync_address = "https://atuin.euer.krebsco.de"; - search_mode = "prefix"; - # fuzzy,fulltext + search_mode = "fulltext"; + # fuzzy,fulltext,prefix update_check = false; # filter_mode = "host"; filter_mode = "global"; diff --git a/5pkgs/chitubox/default.nix b/5pkgs/chitubox/default.nix index afec114..62beaab 100644 --- a/5pkgs/chitubox/default.nix +++ b/5pkgs/chitubox/default.nix @@ -5,7 +5,7 @@ , xorg , gst_all_1 , krb5 -, alsaLib +, alsa-lib }: # via https://raw.githubusercontent.com/simon-the-sourcerer-ab/chitubox/main/default.nix stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = with xorg; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm - libxkbcommon libpulseaudio alsaLib + libxkbcommon libpulseaudio alsa-lib xcbutilwm xcbutilimage xcbutilrenderutil xcbutilkeysyms gst_all_1.gst-plugins-base gst_all_1.gstreamer krb5 ]; diff --git a/5pkgs/custom/alsa-tools/default.nix b/5pkgs/custom/alsa-tools/default.nix index 386b087..0f2bea2 100644 --- a/5pkgs/custom/alsa-tools/default.nix +++ b/5pkgs/custom/alsa-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, alsaToolTarget,fetchurl, alsaLib, ncurses, fltk13, gtk3}: +{stdenv, lib, alsaToolTarget,fetchurl, alsa-lib, ncurses, fltk13, gtk3}: stdenv.mkDerivation rec { name = "alsa-${alsaToolTarget}-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1lgvyb81md25s9ciswpdsbibmx9s030kvyylf0673w3kbamz1awl"; }; sourceRoot = "${alsaToolsName}/${alsaToolTarget}/"; - buildInputs = [ alsaLib fltk13 gtk3 ncurses ]; + buildInputs = [ alsa-lib fltk13 gtk3 ncurses ]; meta = { homepage = http://www.alsa-project.org/; diff --git a/5pkgs/default.nix b/5pkgs/default.nix index 22402b7..bb3ed2d 100644 --- a/5pkgs/default.nix +++ b/5pkgs/default.nix @@ -41,7 +41,6 @@ in { alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";}; alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";}; - brother_ql_web = (builtins.getFlake "github:makefu/brother_ql_web?rev=a3f8625f48111da8cd6f8e562c966cdca445b82d").packages.x86_64-linux.default; qcma = prev.libsForQt5.callPackage ./custom/qcma { }; inherit (callPackage ./devpi {}) devpi-web ; nodemcu-uploader = prev.pkgs.callPackage ./nodemcu-uploader {}; diff --git a/5pkgs/studio-link/default.nix b/5pkgs/studio-link/default.nix index 4189846..6333052 100644 --- a/5pkgs/studio-link/default.nix +++ b/5pkgs/studio-link/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, alsaLib +, alsa-lib , unzip , openssl , zlib @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; sourceRoot = "."; buildInputs = [ - alsaLib + alsa-lib openssl zlib pulseaudio diff --git a/flake.lock b/flake.lock index abf0bee..8a19ebb 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1725368955, - "narHash": "sha256-ujS8eHVcMwaBVYpduG++yvbRJ0I5I2QNXIl294jw2K8=", + "lastModified": 1727297915, + "narHash": "sha256-b8/IUxnd2vjV33ZJxAg14cOf6GFdzL26SCOckBa1loc=", "owner": "makefu", "repo": "audio-scripts", - "rev": "4d6486b4af5cc1e20260066d89d5bc91a344222b", + "rev": "5ff394180e52a081bbca0d21c18794edbf1dbea6", "type": "github" }, "original": { @@ -21,22 +21,66 @@ "type": "github" } }, + "brockman": { + "inputs": { + "nixos-generators": "nixos-generators", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733833740, + "narHash": "sha256-vaNjbqpR1KZhLY7/Ht+pcQuaNO+NhQ71n+0QWtaQaXo=", + "owner": "kmein", + "repo": "brockman", + "rev": "ebea6a616190dbaeda793951b008c65383be1e0a", + "type": "github" + }, + "original": { + "owner": "kmein", + "repo": "brockman", + "type": "github" + } + }, + "brother_ql_web": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1696270982, + "narHash": "sha256-PdE8ZsHrXINhkCXUbZzfmgDUSVN8cP3F3wH6ANSUueM=", + "owner": "makefu", + "repo": "brother_ql_web", + "rev": "23e01b4f08c20932c076730c37dce3fbf0083ee3", + "type": "github" + }, + "original": { + "owner": "makefu", + "repo": "brother_ql_web", + "type": "github" + } + }, "buildbot-nix": { "inputs": { "flake-parts": [ "flake-parts" ], + "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" ], "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717033539, - "narHash": "sha256-vWQLnmZSipvaosXnGze8aSqlEzaAF9PhA5sh2QYNvTc=", + "lastModified": 1734574538, + "narHash": "sha256-WDZag7bKBnxNfqE4rpkSzxP0Kr81CbR0OtVTJU4byrQ=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "ad165ae64f877adc6156b8f21c31fc74144dc8e4", + "rev": "213ab24f913967b2615bd22b8a510f06f843d008", "type": "github" }, "original": { @@ -47,19 +91,19 @@ }, "buildbot-nix_2": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_4", "nixpkgs": [ "stockholm", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_4" + "treefmt-nix": "treefmt-nix_6" }, "locked": { - "lastModified": 1717033539, - "narHash": "sha256-vWQLnmZSipvaosXnGze8aSqlEzaAF9PhA5sh2QYNvTc=", + "lastModified": 1725761443, + "narHash": "sha256-RX3qnLYaFxlvOAYL6WsM5nGjNnMZQIgKIpIxigPmiAU=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "ad165ae64f877adc6156b8f21c31fc74144dc8e4", + "rev": "ade5f42d7e56c8298d729aa0e804c8062e7a77ac", "type": "github" }, "original": { @@ -74,20 +118,20 @@ "flake-parts": [ "flake-parts" ], - "nixos-images": "nixos-images", + "nixos-facter-modules": "nixos-facter-modules", "nixpkgs": [ "nixpkgs" ], "sops-nix": "sops-nix", - "systems": "systems_2", + "systems": "systems_4", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1724065156, - "narHash": "sha256-huS0Q7r8Wipf0MBzohbuiHmFBzx+6hhsQNAwtVnEL4E=", + "lastModified": 1734701645, + "narHash": "sha256-FO3oWnmMMOLNitpQIrpmM4cf1N4mWAipf/TRba6zCFU=", "ref": "refs/heads/main", - "rev": "b29f6493433f6965d47d6f524a6f2cf37eb7a60e", - "revCount": 3743, + "rev": "0427d5ebe4f797f49e128cbe46c557d9ed941113", + "revCount": 5262, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -98,29 +142,14 @@ }, "crane": { "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "rust-overlay": [ - "lanzaboote", - "rust-overlay" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1681177078, - "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=", + "lastModified": 1707363508, + "narHash": "sha256-Cu5Mwktod5hcxxSpHl0FCeZ9la7v4KO5Tfrrs59AAJg=", "owner": "ipetkov", "repo": "crane", - "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6", + "rev": "f2926e34a1599837f3256c701739529d772e36e7", "type": "github" }, "original": { @@ -129,6 +158,27 @@ "type": "github" } }, + "data-mesher": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nether", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1726067582, + "narHash": "sha256-YAvfP6wZZuAAz7ZdWEsePDzUM7aQJEGsINkGf76eqvk=", + "rev": "8e4ee1bf99479544823c89bc6dfbc81abe5a7a50", + "type": "tarball", + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/8e4ee1bf99479544823c89bc6dfbc81abe5a7a50.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.clan.lol/clan/data-mesher/archive/main.tar.gz" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -137,11 +187,11 @@ ] }, "locked": { - "lastModified": 1723080788, - "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", + "lastModified": 1734088167, + "narHash": "sha256-OIitVU+IstPbX/NWn2jLF+/sT9dVKcO2FKeRAzlyX6c=", "owner": "nix-community", "repo": "disko", - "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", + "rev": "d32f2d1750d61a476a236526b725ec5a32e16342", "type": "github" }, "original": { @@ -153,11 +203,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -173,11 +223,11 @@ ] }, "locked": { - "lastModified": 1685662779, - "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -187,6 +237,49 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nether", + "data-mesher", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nether", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stockholm", @@ -195,11 +288,11 @@ ] }, "locked": { - "lastModified": 1715865404, - "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -210,14 +303,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -228,7 +321,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -248,6 +341,24 @@ "inputs": { "systems": "systems_5" }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -262,7 +373,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -277,16 +388,16 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -295,9 +406,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1681202837, @@ -322,11 +433,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -337,7 +448,7 @@ }, "ha-ara-menu": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -359,6 +470,31 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": [ + "buildbot-nix", + "flake-parts" + ], + "nixpkgs": [ + "buildbot-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -366,11 +502,11 @@ ] }, "locked": { - "lastModified": 1721534365, - "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "635563f245309ef5320f80c7ebcb89b2398d2949", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -381,7 +517,7 @@ }, "inventory4ce": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], @@ -410,7 +546,6 @@ "flake-parts": [ "flake-parts" ], - "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -418,16 +553,15 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1682802423, - "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=", + "lastModified": 1731941836, + "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "64b903ca87d18cef2752c19c098af275c6e51d63", + "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.3.0", "repo": "lanzaboote", "type": "github" } @@ -437,16 +571,19 @@ "clan-core": [ "clan-core" ], + "data-mesher": "data-mesher", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix_4" }, "locked": { - "lastModified": 1707119821, - "narHash": "sha256-seifaHDFLMmvSsVYdjs6/BJkzPriKiXO8wEAScoZX5Q=", + "lastModified": 1732368528, + "narHash": "sha256-WO0NAN1OLXGY9+OnFS673pEoPVOhSbOSB1Pwd0vcb4s=", "owner": "lassulus", "repo": "nether", - "rev": "5ed4b8992a9b2424b1903ebb60f39be0045bd99f", + "rev": "c242b4f6d61185edfadaccd9df4bb4e086627d32", "type": "github" }, "original": { @@ -463,11 +600,11 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -480,15 +617,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils_2" + ] }, "locked": { - "lastModified": 1682533818, - "narHash": "sha256-2Fzjk3jL7rlyLjPKWy05zU8SGm04M3mbzohk51vkw3Y=", + "lastModified": 1734338723, + "narHash": "sha256-BpJs2QnVwdE4Btsx2BcBmdsq86H7QJYv2GmoOkr1ii4=", "owner": "Mic92", "repo": "nix-ld", - "rev": "29f15b1f7e37810689974ef169496c51f6403a1b", + "rev": "911665df070e3d6c970e5a248fc4a38550bd5689", "type": "github" }, "original": { @@ -499,7 +635,7 @@ }, "nix-writers": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -518,52 +654,112 @@ "url": "https://cgit.krebsco.de/nix-writers" } }, - "nixos-hardware": { + "nixlib": { "locked": { - "lastModified": 1724878143, - "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", + "lastModified": 1636849918, + "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5", "type": "github" }, "original": { - "owner": "NixOS", - "repo": "nixos-hardware", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, - "nixos-images": { + "nixos-facter-modules": { + "locked": { + "lastModified": 1734596637, + "narHash": "sha256-MRqwVAe3gsb88u4ME1UidmZFVCx+FEnoob0zkpO9DMY=", + "owner": "numtide", + "repo": "nixos-facter-modules", + "rev": "536472754982bf03079b4b4e0261838a760587c0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nixos-facter-modules", + "type": "github" + } + }, + "nixos-generators": { "inputs": { - "nixos-stable": [ - "clan-core" - ], - "nixos-unstable": [ - "clan-core", + "nixlib": "nixlib", + "nixpkgs": [ + "brockman", "nixpkgs" ] }, "locked": { - "lastModified": 1723079397, - "narHash": "sha256-cx5ysGbD49sSPtX660tdv6MdUrKvOu/hVvNM6xls6fE=", + "lastModified": 1653339081, + "narHash": "sha256-dpim9Mtd57Yj6qt7p7UKwjWm6NnOU3S7jaEyEscSyPE=", "owner": "nix-community", - "repo": "nixos-images", - "rev": "617f2cb56213d10574bc6fdb390f6e7f5b551d7e", + "repo": "nixos-generators", + "rev": "fb3ee0f618b8c80dea1239691b15dfeb4bb46331", "type": "github" }, "original": { "owner": "nix-community", - "repo": "nixos-images", + "repo": "nixos-generators", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1734352517, + "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-hardware", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1734435836, + "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "4989a246d7a390a859852baddb1013f825435cee", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -573,38 +769,44 @@ "type": "github" } }, - "nixpkgs-stable": { + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "brother_ql_web", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "lastModified": 1682487216, + "narHash": "sha256-nguxnjaCB8kAGDZWhq6o+aHfS+2+CBMVyEaeCIGKh6M=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "5a4564ca568114890a7422e7f632d5012e35594f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "poetry2nix", "type": "github" } }, - "poetry2nix": { + "poetry2nix_2": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7", - "treefmt-nix": "treefmt-nix_3" + "systems": "systems_8", + "treefmt-nix": "treefmt-nix_5" }, "locked": { - "lastModified": 1714925202, - "narHash": "sha256-SMUOAQw5qz0WrZk13TLBi3aZ60N0Z/kDvVr7uM/khuU=", + "lastModified": 1731205797, + "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "7f5a70a6774ee386e6c764b8e49a456e8f0ef323", + "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e", "type": "github" }, "original": { @@ -619,10 +821,6 @@ "lanzaboote", "flake-compat" ], - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -631,11 +829,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1681413034, - "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -647,6 +845,8 @@ "root": { "inputs": { "audio-scripts": "audio-scripts", + "brockman": "brockman", + "brother_ql_web": "brother_ql_web", "buildbot-nix": "buildbot-nix", "clan-core": "clan-core", "flake-parts": "flake-parts", @@ -658,29 +858,25 @@ "nix-ld": "nix-ld", "nix-writers": "nix-writers", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix", + "nixpkgs": "nixpkgs_2", + "poetry2nix": "poetry2nix_2", "stockholm": "stockholm", "vscode-server": "vscode-server" } }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", + "lastModified": 1730601085, + "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", + "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", "type": "github" }, "original": { @@ -694,17 +890,14 @@ "nixpkgs": [ "clan-core", "nixpkgs" - ], - "nixpkgs-stable": [ - "clan-core" ] }, "locked": { - "lastModified": 1722897572, - "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { @@ -724,17 +917,17 @@ ] }, "locked": { - "lastModified": 1717171203, - "narHash": "sha256-anMC/Av+rEZTb4g2H6ObWts9uzyqKD+qdMKW85cq5fo=", + "lastModified": 1727553263, + "narHash": "sha256-WvojwuQ141iN7ZeTzPFDONXXS8eJc4yLprGjRcAIMpU=", "ref": "refs/heads/master", - "rev": "b5ed6effc88c20eb1044edab103630099a7d1411", - "revCount": 11997, + "rev": "9b1008814e981dc01afe9ee7446322ad512c1d72", + "revCount": 12035, "type": "git", - "url": "https://cgit.euer.krebsco.de/stockholm" + "url": "https://cgit.euer.krebsco.de/makefu/stockholm.git" }, "original": { "type": "git", - "url": "https://cgit.euer.krebsco.de/stockholm" + "url": "https://cgit.euer.krebsco.de/makefu/stockholm.git" } }, "systems": { @@ -828,6 +1021,21 @@ } }, "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -841,7 +1049,7 @@ "type": "indirect" } }, - "systems_8": { + "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -864,11 +1072,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1734543842, + "narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "76159fc74eeac0599c3618e3601ac2b980a29263", "type": "github" }, "original": { @@ -885,11 +1093,11 @@ ] }, "locked": { - "lastModified": 1723656612, - "narHash": "sha256-6Sx+/VhRPLR+kRf6rnNUFMQ66DUz1DMYajixYUe+CUU=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4a6d7dccf80a1aa2d04cfaa88d9e5511542a2486", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { @@ -901,16 +1109,17 @@ "treefmt-nix_3": { "inputs": { "nixpkgs": [ - "poetry2nix", + "nether", + "data-mesher", "nixpkgs" ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": { @@ -920,6 +1129,48 @@ } }, "treefmt-nix_4": { + "inputs": { + "nixpkgs": [ + "nether", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_5": { + "inputs": { + "nixpkgs": [ + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_6": { "inputs": { "nixpkgs": [ "stockholm", @@ -928,11 +1179,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1725271838, + "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd", "type": "github" }, "original": { @@ -959,34 +1210,19 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1713958148, - "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=", + "lastModified": 1729422940, + "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=", "owner": "nix-community", "repo": "nixos-vscode-server", - "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc", + "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7aa3edd..aff6968 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ inventory4ce.inputs.nixpkgs.follows = "nixpkgs"; inventory4ce.inputs.poetry2nix.follows = "poetry2nix"; - lanzaboote.url = "github:nix-community/lanzaboote/v0.3.0"; + lanzaboote.url = "github:nix-community/lanzaboote"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; lanzaboote.inputs.flake-parts.follows = "flake-parts"; #lanzaboote.inputs.pre-commit-hooks-nix.follows = ""; diff --git a/machines/cake/config.nix b/machines/cake/config.nix index 3b7f409..5f8fea9 100644 --- a/machines/cake/config.nix +++ b/machines/cake/config.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: let - primaryInterface = "eth0"; + primaryInterface = "end0"; in { imports = [ ./hardware-config.nix ../../2configs ../../2configs/home-manager - ../../2configs/home/3dprint + ../../2configs/home/zigbee/cake.nix #./hardware-config.nix { environment.systemPackages = with pkgs;[ rsync screen curl git tmux picocom mosh ];} # ../../2configs/tools/core.nix @@ -14,7 +14,7 @@ in { #../../2configs/support-nixos.nix # ../../2configs/homeautomation/default.nix # ../../2configs/homeautomation/google-muell.nix - ../../2configs/hw/pseyecam.nix + #../../2configs/hw/pseyecam.nix # configure your hw: # ../../2configs/save-diskspace.nix diff --git a/machines/gum/config.nix b/machines/gum/config.nix index ea890ed..a7a7ab0 100644 --- a/machines/gum/config.nix +++ b/machines/gum/config.nix @@ -16,18 +16,18 @@ in { # systemd.services.phpfpm-nextcloud.wantedBy = lib.mkForce []; systemd.services.samba-smbd.wantedBy = lib.mkForce []; } - { - users.users.lass = { - uid = 19002; - isNormalUser = true; - createHome = true; - useDefaultShell = true; - openssh.authorizedKeys.keys = with config.krebs.users; [ - lass.pubkey - makefu.pubkey - ]; - }; - } + #{ + # users.users.lass = { + # uid = 19002; + # isNormalUser = true; + # createHome = true; + # useDefaultShell = true; + # openssh.authorizedKeys.keys = with config.krebs.users; [ + # lass.pubkey + # makefu.pubkey + # ]; + # }; + #} ../../2configs ../../2configs/nur.nix @@ -49,10 +49,10 @@ in { # ../../2configs/tools/sec.nix # ../../2configs/tools/desktop.nix - ../../2configs/zsh-user.nix + ../../2configs/zsh ../../2configs/mosh.nix # ../../2configs/disable_v6.nix - ../../2configs/storj/forward-port.nix + # ../../2configs/storj/forward-port.nix # ../../2configs/gui/xpra.nix # networking @@ -92,17 +92,19 @@ in { # ci # ../../2configs/exim-retiolum.nix - ../../2configs/git/cgit-retiolum.nix + # ../../2configs/git/cgit-retiolum.nix + ../../2configs/git/forgejo.nix - ### systemdUltras ### - ../../2configs/systemdultras/ircbot.nix ###### Shack ##### # ../../2configs/shack/events-publisher # ../../2configs/shack/gitlab-runner - ../../2configs/remote-build/slave.nix + # ../../2configs/deployment/buildbot/master.nix + ../../2configs/deployment/atuin.nix + + # ../../2configs/remote-build/slave.nix # ../../2configs/remote-build/aarch64-community.nix ../../2configs/taskd.nix @@ -130,7 +132,7 @@ in { ## network # ../../2configs/vpn/openvpn-server.nix # ../../2configs/vpn/vpnws/server.nix - ../../2configs/binary-cache/server.nix + # ../../2configs/binary-cache/server.nix { makefu.backup.server.repo = "/var/backup/borg"; } ../../2configs/backup/server.nix ../../2configs/backup/state.nix @@ -149,11 +151,10 @@ in { ../../2configs/deployment/rss/rss.euer.krebsco.de.nix # postgres backend ../../2configs/deployment/rss/ratt.nix - ../../2configs/deployment/ntfysh.nix + # ../../2configs/deployment/ntfysh.nix ../../2configs/deployment/nextcloud #postgres backend - ../../2configs/deployment/nextcloud/screeenly.nix + # ../../2configs/deployment/nextcloud/screeenly.nix - ../../2configs/deployment/buildbot/master.nix # ../../2configs/deployment/buildbot/worker.nix ### Moving owncloud data dir to /media/cloud/nextcloud-data { @@ -191,7 +192,7 @@ in { #../../2configs/deployment/owncloud.nix # ../../2configs/deployment/board.euer.krebsco.de.nix #../../2configs/deployment/feed.euer.krebsco.de - ../../2configs/deployment/boot-euer.nix + # ../../2configs/deployment/boot-euer.nix ../../2configs/deployment/gecloudpad #../../2configs/deployment/docker/archiveteam-warrior.nix ../../2configs/deployment/mediengewitter.de.nix @@ -200,7 +201,7 @@ in { ../../2configs/deployment/wiki.euer.nix - ../../2configs/shiori.nix + # ../../2configs/shiori.nix #../../2configs/workadventure ../../2configs/bgt/download.binaergewitter.de.nix @@ -227,25 +228,11 @@ in { # krebs infrastructure services # ../../2configs/stats/server.nix ]; - + nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; # makefu.dl-dir = "/var/download"; makefu.dl-dir = "/media/cloud/download/finished"; ###### stable - security.acme.certs."cgit.euer.krebsco.de" = { - email = "letsencrypt@syntax-fehler.de"; - webroot = "/var/lib/acme/acme-challenge"; - group = "nginx"; - }; - services.nginx.virtualHosts."cgit" = { - serverAliases = [ "cgit.euer.krebsco.de" ]; - addSSL = true; - sslCertificate = "/var/lib/acme/cgit.euer.krebsco.de/fullchain.pem"; - sslCertificateKey = "/var/lib/acme/cgit.euer.krebsco.de/key.pem"; - locations."/.well-known/acme-challenge".extraConfig = '' - root /var/lib/acme/acme-challenge; - ''; - }; krebs.build.host = config.krebs.hosts.gum; @@ -254,7 +241,7 @@ in { firewall = { allowedTCPPorts = [ 80 443 - 28967 # storj + # 28967 # storj ]; allowPing = true; logRefusedConnections = false; @@ -263,4 +250,5 @@ in { }; users.users.makefu.extraGroups = [ "download" "nginx" ]; state = [ "/home/makefu/.weechat" ]; + clan.networking.targetHost = "root@gum.i"; } diff --git a/machines/gum/hetznercloud/default.nix b/machines/gum/hetznercloud/default.nix index 4aa0111..b83a765 100644 --- a/machines/gum/hetznercloud/default.nix +++ b/machines/gum/hetznercloud/default.nix @@ -2,10 +2,14 @@ { imports = - [ ./network.nix + [ + ./network.nix (modulesPath + "/profiles/qemu-guest.nix") + ./single-disk-ext4.nix + ]; - + zramSwap.enable = true; + zramSwap.memoryPercent = 75; # Disk boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sd_mod" "sr_mod" ]; boot.uki.tries = 3; @@ -13,39 +17,7 @@ boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "rpool/root"; - fsType = "zfs"; - }; - - fileSystems."/home" = - { device = "rpool/home"; - fsType = "zfs"; - }; - - fileSystems."/nix" = - { device = "rpool/nix"; - fsType = "zfs"; - }; - - fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - zramSwap.enable = true; - boot.loader.grub.device = "/dev/sda"; - - networking.hostId = "3150697b"; # required for zfs use - boot.tmp.useTmpfs = true; - boot.supportedFilesystems = [ "zfs" ]; - - boot.loader.grub.enable = true; - boot.loader.grub.copyKernels = true; - boot.zfs.devNodes = "/dev"; # fixes some virtualmachine issues boot.kernelParams = [ - "zfs.zfs_arc_max=1073741824" "boot.shell_on_fail" "panic=30" "boot.panic_on_fail" # reboot the machine upon fatal boot issues ]; diff --git a/machines/gum/hetznercloud/olddefault.nix b/machines/gum/hetznercloud/olddefault.nix new file mode 100644 index 0000000..39808d3 --- /dev/null +++ b/machines/gum/hetznercloud/olddefault.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, modulesPath, ... }: +{ + + imports = + [ ./network.nix + (modulesPath + "/profiles/qemu-guest.nix") + ]; + + # Disk + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sd_mod" "sr_mod" ]; + boot.uki.tries = 3; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "rpool/root"; + fsType = "zfs"; + }; + + fileSystems."/home" = + { device = "rpool/home"; + fsType = "zfs"; + }; + + fileSystems."/nix" = + { device = "rpool/nix"; + fsType = "zfs"; + }; + + fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + # zramSwap.enable = true; + boot.loader.grub.device = "/dev/sda"; + + networking.hostId = "3150697b"; # required for zfs use + # boot.tmp.useTmpfs = true; + boot.supportedFilesystems = [ "zfs" ]; + + boot.loader.grub.enable = true; + boot.loader.grub.copyKernels = true; + boot.zfs.devNodes = "/dev"; # fixes some virtualmachine issues + boot.kernelParams = [ + #"zfs.zfs_arc_max=1073741824" # 1gb + "zfs.zfs_arc_max=134217728" # 128mb + "boot.shell_on_fail" + "panic=30" "boot.panic_on_fail" # reboot the machine upon fatal boot issues + ]; +} diff --git a/machines/gum/hetznercloud/single-disk-ext4.nix b/machines/gum/hetznercloud/single-disk-ext4.nix index 86deade..f65a788 100644 --- a/machines/gum/hetznercloud/single-disk-ext4.nix +++ b/machines/gum/hetznercloud/single-disk-ext4.nix @@ -1,25 +1,33 @@ -{ disk ? "/dev/sda", ... }: { - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.enable = true; +{ ... }: { + #boot.loader.efi.canTouchEfiVariables = true; + #boot.loader.systemd-boot.enable = true; + #boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.enable = true; + boot.loader.grub.copyKernels = true; + boot.loader.grub.efiSupport = true; + boot.loader.grub.efiInstallAsRemovable = true; + disko.devices = { disk = { - disk1 = { - device = disk; + main = { type = "disk"; + # device = disk; + device = "/dev/sda"; content = { - type = "table"; - format = "gpt"; - partitions ={ - boot = { + type = "gpt"; + partitions = { + boot = { # required for embedding grub size = "1M"; type = "EF02"; + priority = 1; }; ESP = { name = "ESP"; - start = "1MiB"; + #start = "1M"; type = "EF00"; - end = "1G"; - bootable = true; + priority = 2; + size = "1G"; + # bootable = true; content = { type = "filesystem"; format = "vfat"; @@ -27,24 +35,28 @@ mountOptions = [ "umask=0077" ]; }; }; + swap = { + size = "4G"; + #size = "100%"; + #end = "-4G"; + priority = 3; + content = { + type = "swap"; + priority = 1; # lowest prio + }; + }; root = { name = "root"; - start = "500MiB"; - end = "-4G"; - part-type = "primary"; + priority = 4; + #start = "1G"; + #end = "-4G"; + size = "100%"; content = { type = "filesystem"; format = "ext4"; mountpoint = "/"; }; }; - swap = { - size = "4G"; - content = { - type = "swap"; - priority = 1; # lowest prio - }; - }; }; }; }; diff --git a/machines/liveiso/config.nix b/machines/liveiso/config.nix index 3b8ece8..4e13055 100644 --- a/machines/liveiso/config.nix +++ b/machines/liveiso/config.nix @@ -1,11 +1,11 @@ { pkgs, modulesPath, ... }: { imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") - ../../2configs + ../../2configs/core.nix ]; # start sshd in any case systemd.services.sshd.wantedBy = pkgs.lib.mkForce [ "multi-user.target" ]; isoImage.squashfsCompression = "gzip -Xcompression-level 1"; - + krebs.build.host.name = "liveiso"; } diff --git a/machines/liveiso/configuration.nix b/machines/liveiso/configuration.nix deleted file mode 100644 index 090666a..0000000 --- a/machines/liveiso/configuration.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - - ]; - - # New machine! -} diff --git a/machines/omo/config.nix b/machines/omo/config.nix index d5aa47c..486342e 100644 --- a/machines/omo/config.nix +++ b/machines/omo/config.nix @@ -13,6 +13,12 @@ in { ../../2configs/default.nix ../../2configs/support-nixos.nix ../../2configs/nur.nix + { + systemd.coredump.extraConfig = '' + Storage=none + ProcessSizeMax=0 + ''; + } { services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; @@ -34,7 +40,7 @@ in { ### systemdUltras ### ../../2configs/systemdultras/ircbot.nix - ../../2configs/zsh-user.nix + ../../2configs/zsh ../../2configs/home-manager ../../2configs/home-manager/cli.nix ../../2configs/editor/neovim @@ -49,7 +55,7 @@ in { # ../../2configs/smart-monitor.nix ../../2configs/mail-client.nix ../../2configs/mosh.nix - ../../2configs/nix-ld.nix + #../../2configs/nix-ld.nix ../../2configs/tools/core.nix ../../2configs/tools/dev.nix ../../2configs/tools/desktop.nix @@ -63,8 +69,10 @@ in { ../../2configs/share ../../2configs/share/omo.nix - ../../2configs/share/gum-client.nix + ../../2configs/share/hetzner-client.nix + #../../2configs/share/gum-client.nix ../../2configs/sync + ../../2configs/sync/omo-download-sync.nix ../../2configs/sync/share/omo.nix ../../2configs/wireguard/wiregrill-client.nix @@ -123,7 +131,7 @@ in { ../../2configs/home/metube.nix # ../../2configs/home/ham ../../2configs/home/ham/docker.nix - ../../2configs/home/zigbee2mqtt + ../../2configs/home/zigbee/omo.nix ../../2configs/home/streams.nix ../../2configs/home/esphome.nix ../../2configs/home/audio-dl.nix diff --git a/machines/omo/hw/vaapi.nix b/machines/omo/hw/vaapi.nix index 78c98c1..11fcbd7 100644 --- a/machines/omo/hw/vaapi.nix +++ b/machines/omo/hw/vaapi.nix @@ -1,17 +1,19 @@ { pkgs, ... }: -let - vaapi = pkgs.vaapiIntel.override { enableHybridCodec = true; }; -in { - hardware.opengl = { + # 2024-08-18: https://wiki.nixos.org/wiki/Jellyfin + nixpkgs.config.packageOverrides = pkgs: { + vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + }; + hardware.graphics = { # hardware.opengl in 24.05 enable = true; extraPackages = with pkgs; [ - intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapi # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + intel-media-driver + intel-vaapi-driver # previously vaapiIntel vaapiVdpau - libvdpau-va-gl + intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) + vpl-gpu-rt # QSV on 11th gen or newer + intel-media-sdk # QSV up to 11th gen ]; }; - hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ vaapi ]; - environment.systemPackages = [ pkgs.libva-utils ]; + } diff --git a/machines/savarcast/config.nix b/machines/savarcast/config.nix index 4d38513..1af85d3 100644 --- a/machines/savarcast/config.nix +++ b/machines/savarcast/config.nix @@ -24,7 +24,7 @@ # Tools ../../2configs/tools/core.nix - ../../2configs/zsh-user.nix + ../../2configs/zsh ../../2configs/mosh.nix # Networking ../../2configs/tinc/retiolum.nix diff --git a/machines/tsp/config.nix b/machines/tsp/config.nix index 91fdea0..a261ae6 100644 --- a/machines/tsp/config.nix +++ b/machines/tsp/config.nix @@ -22,7 +22,7 @@ # ../../2configs/rad1o.nix - ../../2configs/zsh-user.nix + ../../2configs/zsh ../../2configs/home-manager ../../2configs/home-manager/desktop.nix ../../2configs/home-manager/cli.nix diff --git a/machines/wbob/config.nix b/machines/wbob/config.nix index f5b479c..0d8e457 100644 --- a/machines/wbob/config.nix +++ b/machines/wbob/config.nix @@ -14,7 +14,7 @@ in { ../../2configs/networking/zerotier.nix ../../2configs/home-manager ../../2configs/support-nixos.nix - ../../2configs/zsh-user.nix + ../../2configs/zsh ../../2configs/tools/core.nix # ../../2configs/disable_v6.nix ../../2configs/tools/core-gui.nix diff --git a/machines/x/config.nix b/machines/x/config.nix index 66896c1..002dc86 100644 --- a/machines/x/config.nix +++ b/machines/x/config.nix @@ -2,10 +2,14 @@ { imports = [ - - # ./x230 + # ./x230 ./x13 + { + nixpkgs.config.permittedInsecurePackages = [ + "jitsi-meet-1.0.8043" + ]; + } # do not build in tmpfs { systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";} @@ -37,6 +41,7 @@ ../../2configs/home-manager/taskwarrior.nix ../../2configs/main-laptop.nix + ../../2configs/zsh/atuin.nix ../../2configs/kdeconnect.nix ../../2configs/extra-fonts.nix ../../2configs/editor/neovim @@ -264,6 +269,7 @@ "aarch64-linux" ]; + # services.syncthing.user = lib.mkForce "makefu"; # services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/"; } diff --git a/machines/x/x13/amdgpu.nix b/machines/x/x13/amdgpu.nix index 01d29fa..55f8cef 100644 --- a/machines/x/x13/amdgpu.nix +++ b/machines/x/x13/amdgpu.nix @@ -3,7 +3,7 @@ services.xserver.videoDrivers = [ "amdgpu" ]; #boot.initrd.kernelModules = [ "amdgpu" ]; #hardware.opengl.driSupport = true; - hardware.graphics.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime ]; + hardware.graphics.extraPackages = with pkgs; [ amdvlk rocmPackages.clr.icd rocmPackages.clr ]; # For 32 bit applications hardware.graphics.enable32Bit = true; hardware.graphics.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];