Skip to content

Commit b5faa1e

Browse files
2025_07_25
1 parent 6b33528 commit b5faa1e

15 files changed

+339
-79
lines changed

desktop/l/configuration.nix

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
./docker-daemon.nix
4141
#./smokeping.nix
4242
./distributed-builds.nix
43-
./hyprland.nix
43+
#./hyprland.nix
4444
];
4545

4646
boot = {
@@ -147,6 +147,16 @@
147147
wireplumber.enable = true;
148148
};
149149

150+
# Enable PipeWire screen capture
151+
environment.sessionVariables = {
152+
TERM = "xterm-256color";
153+
# PipeWire screen capture
154+
PIPEWIRE_SCREEN_CAPTURE = "1";
155+
# Force Flameshot to use Wayland
156+
QT_QPA_PLATFORM = "wayland";
157+
#MY_VARIABLE = "my-value";
158+
};
159+
150160
services.openssh.enable = true;
151161
programs.ssh.extraConfig = ''
152162
Host hp4.home
@@ -173,6 +183,7 @@
173183
# https://nixos.wiki/wiki/Printing
174184
services.printing.enable = true;
175185

186+
# flameshot now in home.nix
176187
# https://wiki.nixos.org/wiki/Flameshot
177188
# services.flameshot = {
178189
# enable = true;
@@ -188,15 +199,15 @@
188199
services.clickhouse.enable = false;
189200

190201
# environment.variables defined in hardware-graphics.nix
191-
environment.sessionVariables = {
192-
TERM = "xterm-256color";
193-
#MY_VARIABLE = "my-value";
194-
};
202+
# environment.sessionVariables = {
203+
# TERM = "xterm-256color";
204+
# #MY_VARIABLE = "my-value";
205+
# };
195206

196207
users.users.das = {
197208
isNormalUser = true;
198209
description = "das";
199-
extraGroups = [ "wheel" "networkmanager" "kvm" "libvirtd" "docker" "video" ];
210+
extraGroups = [ "wheel" "networkmanager" "kvm" "libvirtd" "docker" "video" "pipewire" ];
200211
packages = with pkgs; [
201212
];
202213
# https://nixos.wiki/wiki/SSH_public_key_authentication
@@ -247,8 +258,11 @@
247258

248259
xdg.portal = {
249260
enable = true;
250-
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
251-
config.common.default = "gtk";
261+
extraPortals = with pkgs; [
262+
xdg-desktop-portal-gnome
263+
];
264+
config.common.default = "gnome";
265+
config.gnome.default = "gnome";
252266
};
253267

254268
services.dbus.packages = with pkgs; [

desktop/l/flake.lock

Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

desktop/l/home.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,6 @@
611611

612612
# Screenshots/Screen Recording
613613
# https://wiki.nixos.org/wiki/Flameshot
614-
flameshot
615-
#(flameshot.override { enableWlrSupport = true; })
616614
grim # screenshot functionality
617615
slurp # screenshot functionality
618616
simplescreenrecorder
@@ -684,6 +682,9 @@
684682
# v4l2-ctl --list-devices
685683
v4l-utils
686684
libsForQt5.kdenlive
685+
686+
# Screenshot tool with Wayland support
687+
(flameshot.override { enableWlrSupport = true; })
687688
];
688689

689690
# vscode

desktop/l/hyprland.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,4 @@
55
enable = true;
66
xwayland.enable = true;
77
};
8-
9-
# Enable XDG portal for Wayland
10-
xdg.portal = {
11-
enable = true;
12-
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
13-
config.common.default = "gtk";
14-
};
158
}

desktop/l/systemPackages.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@
3636
wayland-utils
3737
wl-clipboard
3838

39+
# Screen capture and PipeWire debugging
40+
grim
41+
slurp
42+
wf-recorder
43+
pipewire
44+
xdg-desktop-portal-gnome
45+
3946
xscreensaver
4047

4148
clinfo

hp/hp1/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ rebuild:
2222
#sudo nixos-rebuild switch
2323
#sudo nix-channel --update;
2424
sudo nixos-rebuild switch --flake .
25-
sudo systemctl restart ffmpeg-stream
25+
#sudo systemctl restart ffmpeg-stream
26+
27+
upgrade:
28+
nixos-rebuild boot --flake . --upgrade
2629

2730
rebuild_trace:
2831
sudo nixos-rebuild switch --show-trace --flake .

hp/hp1/configuration.nix

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929
./nodeExporter.nix
3030
./prometheus.nix
3131
./grafana.nix
32-
./docker-daemon.nix
32+
#./docker-daemon.nix
3333
#./k8s_master.nix
3434
#./k8s_node.nix
35-
./k3s_master.nix
35+
#./k3s_master.nix
3636
#./k3s_node.nix
37-
./systemd.services.ethtool-enp3s0f0.nix
38-
./systemd.services.ethtool-enp3s0f1.nix
39-
./ffmpeg_systemd_service.nix
37+
./systemd.services.ethtool-enp4s0f0.nix
38+
./systemd.services.ethtool-enp4s0f1.nix
39+
#./ffmpeg_systemd_service.nix
40+
#./firewall-test-phase1.nix
4041
];
4142

4243
# https://nixos.wiki/wiki/Kubernetes#reset_to_a_clean_state
@@ -105,6 +106,10 @@
105106
# https://nlewo.github.io/nixos-manual-sphinx/configuration/ipv4-config.xml.html
106107
networking.hostName = "hp1";
107108

109+
# Disable DHCP on specific interfaces
110+
networking.interfaces.enp4s0f0.useDHCP = false;
111+
networking.interfaces.enp4s0f1.useDHCP = false;
112+
108113
services.lldpd.enable = true;
109114

110115
# Configure network proxy if necessary

0 commit comments

Comments
 (0)