From 6999e39aa6012c91b8a74ed45b8c78a3f1db7299 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sun, 14 Jun 2026 20:34:31 +0200 Subject: [PATCH] fa-t14-2025: update to nixos 26.05 Includes corresponding updates to home/hypr and home/waybar --- home/hypr/hyprland.nix | 62 ++++++++++++++++++++++------- home/waybar.nix | 1 + hosts/fa-t14-2025/configuration.nix | 27 ++++++++----- hosts/fa-t14-2025/desktop.nix | 9 ++++- hosts/fa-t14-2025/home.nix | 54 ++++++++++++++----------- 5 files changed, 104 insertions(+), 49 deletions(-) diff --git a/home/hypr/hyprland.nix b/home/hypr/hyprland.nix index 42e7737..8c67f22 100644 --- a/home/hypr/hyprland.nix +++ b/home/hypr/hyprland.nix @@ -1,4 +1,9 @@ -{ lib, config, ... }: +{ + lib, + config, + osConfig, + ... +}: { wayland.windowManager.hyprland = { systemd.enable = false; # Required for UWSM @@ -18,16 +23,27 @@ '' + - lib.concatMapStringsSep "\n" (cmd: ''hl.exec_cmd("${cmd}")'') [ - "swaync" - "hyprswitch init --size-factor 5 &" - "wl-paste --type text --watch cliphist store #Stores only text data" - "wl-paste --type image --watch cliphist store #Stores only image data" - # TODO: the hyprpaper hm-module still generates the old config format, use ipc temporarily - "hyprctl hyprpaper wallpaper 'DP-1, ${wpDir}/Ultrawide_Stray_City.png'" - "hyprctl hyprpaper wallpaper 'DP-2, ${wpDir}/cyberpunk-gas-station-1.jpg'" - ] - + lib.concatMapStringsSep "\n" (cmd: ''hl.exec_cmd("${cmd}")'') ( + [ + "swaync" + "hyprswitch init --size-factor 5 &" + "wl-paste --type text --watch cliphist store #Stores only text data" + "wl-paste --type image --watch cliphist store #Stores only image data" + ] + ++ ( + { + # TODO: the hyprpaper hm-module still generates the old config format, use ipc temporarily + "sisko" = [ + "hyprctl hyprpaper wallpaper 'DP-1, ${wpDir}/Ultrawide_Stray_City.png'" + "hyprctl hyprpaper wallpaper 'DP-2, ${wpDir}/cyberpunk-gas-station-1.jpg'" + ]; + "fa-t14-2025" = [ + "hyprctl hyprpaper wallpaper ', ${wpDir}/mktv-wallpaper-01.png'" + ]; + } + ."${osConfig.networking.hostName}" + ) + ) + '' end '' @@ -52,7 +68,25 @@ } # fa-t14-2025 - # TODO + { + output = "desc:Lenovo Group Limited 0x403D"; + mode = "highres@highrr"; + position = "0x0"; + scale = "1"; + supports_hdr = 1; + } + { + output = "desc:Samsung Electric Company LS32D70xE HK2XC00156"; + mode = "3840x2160@30.00"; + position = "-3840x0"; + scale = "1"; + } + { + output = "desc:Samsung Electric Company C24F390 H4ZM501656"; + mode = "1920x1080@60.00"; + position = "-5760x0"; + scale = "1"; + } # Other { @@ -126,8 +160,8 @@ }; input = { - kb_layout = "us"; - kb_variant = "intl"; + kb_layout = lib.mkDefault "us"; + kb_variant = lib.mkDefault "intl"; kb_model = ""; kb_options = "ctrl:nocaps"; kb_rules = ""; diff --git a/home/waybar.nix b/home/waybar.nix index 28b05a2..15dac7b 100644 --- a/home/waybar.nix +++ b/home/waybar.nix @@ -19,6 +19,7 @@ in "tray" "network" "pulseaudio" + "battery" "clock#date" "clock" ]; diff --git a/hosts/fa-t14-2025/configuration.nix b/hosts/fa-t14-2025/configuration.nix index 72dd41e..5274433 100644 --- a/hosts/fa-t14-2025/configuration.nix +++ b/hosts/fa-t14-2025/configuration.nix @@ -1,12 +1,16 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { - imports = - [ - ../../base.nix - ./hardware-configuration.nix + imports = [ + ../../base.nix + ./hardware-configuration.nix - ./desktop.nix + ./desktop.nix ]; networking = { @@ -49,10 +53,13 @@ console.keyMap = "no"; nixpkgs.config = { - allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "securecrt" - "securefx" - ]; + allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "microsoft-edge" + "securecrt" + "securefx" + ]; }; system.stateVersion = "25.05"; diff --git a/hosts/fa-t14-2025/desktop.nix b/hosts/fa-t14-2025/desktop.nix index 69ed1d4..2922aec 100644 --- a/hosts/fa-t14-2025/desktop.nix +++ b/hosts/fa-t14-2025/desktop.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { hardware.graphics.enable = true; services.xserver = { @@ -12,7 +17,9 @@ services.gnome.gnome-keyring.enable = true; programs.hyprland = { + # See configuration (through home-manager) in home/hypr enable = true; + withUWSM = true; xwayland.enable = true; }; diff --git a/hosts/fa-t14-2025/home.nix b/hosts/fa-t14-2025/home.nix index 703d79e..89b9b85 100644 --- a/hosts/fa-t14-2025/home.nix +++ b/hosts/fa-t14-2025/home.nix @@ -1,10 +1,13 @@ { pkgs, lib, ... }: let emailAddress = "felix.albrigtsen@mktv.no"; -in { +in +{ imports = [ ./../../home/base.nix ./../../home/alacritty.nix + ./../../home/waybar.nix + ./../../home/hypr ]; home.packages = with pkgs; [ @@ -19,7 +22,9 @@ in { iperf3 jq libreoffice + microsoft-edge mpv + nixpkgs-2211.remmina oauth2ms oldssh openssl @@ -29,43 +34,42 @@ in { traceroute virt-manager w3m - nixpkgs-2211.remmina - - unstable.microsoft-edge - # (unstable.microsoft-edge.overrideAttrs ({ installPhase ? "", ... }: { - # installPhase = installPhase + '' - # ln -s $out/bin/microsoft-edge $out/bin/microsoft-edge-stable - # ''; - # })) # Window Manager Extras - bibata-cursors brightnessctl cliphist - hyprcursor - hypridle - hyprlock - hyprpaper - hyprshot nautilus rofi-rbw-wayland swaynotificationcenter - waybar wl-clipboard - (python312.withPackages (ps: with ps; [ - numpy - pycryptodome - requests - ])) + (python312.withPackages ( + ps: with ps; [ + numpy + pycryptodome + requests + ] + )) ]; + wayland.windowManager.hyprland = { + enable = true; + # Override settings from home/hypr/hyprland.nix + settings.config.input = { + kb_layout = "no"; + kb_variant = ""; + }; + }; + programs = { aerc = { enable = true; package = pkgs.aerc; }; - firefox.enable = true; + firefox = { + enable = true; + configPath = ".mozilla/firefox"; # Old default before 26.05 + }; git.settings.user.email = emailAddress; rbw = { enable = true; @@ -73,7 +77,7 @@ in { base_url = "https://vault.mktv.no"; email = emailAddress; pinentry = pkgs.pinentry-rofi; - lock_timeout = 60*60*8; + lock_timeout = 60 * 60 * 8; }; }; rofi = { @@ -81,10 +85,12 @@ in { # theme = "iggy"; theme = "Arc-Dark"; }; + waybar.enable = true; zsh = { shellAliases = { "kssh" = "ssh -t controlnode ssh"; - "ossh" = "oldssh -oHostKeyAlgorithms=+ssh-dss -oCiphers=+aes256-cbc -oKexAlgorithms=+diffie-hellman-group14-sha1"; + "ossh" = + "oldssh -oHostKeyAlgorithms=+ssh-dss -oCiphers=+aes256-cbc -oKexAlgorithms=+diffie-hellman-group14-sha1"; "rebuild" = "sudo nixos-rebuild switch --flake /config"; }; prezto.pmodules = [ "ssh" ];