Latest changes

This commit is contained in:
ari committed 2024-10-01 15:02:36 -04:00
1 parent 63d8298e17
commit 6195a9e93f
12 files changed
+201 -116

No files matched your search

+12 -18
View File
@@ -1,11 +1,17 @@
#!/bin/sh
# Bootstrap
set -e
ROOT_FOLDER=$(realpath $0 | xargs dirname)
. $ROOT_FOLDER/common.sh
# Bootstrap
export NIX_SSHOPTS="-o RequestTTY=force"
target=${1}
target_host=root@$target.lab.internal
profile=hl-$target
valid_profiles=$(nix flake show --json | jq -r -c '.nixosConfigurations | keys[]' | grep "hl")
valid_profiles=$(nix flake show --json 2> /dev/null | jq -r -c '.nixosConfigurations | keys[]' | grep "hl")
function print_valid_targets {
echo "valid targets:"
@@ -30,27 +36,15 @@ fi
function run {
cmd=${1}
echo "$cmd on $target_host with $profile through $build_host"
nixos-rebuild \
--target-host $target_host \
--use-remote-sudo \
$cmd \
--flake \
.#$profile
echo -e "$BOLD$cmd$NC on $YELLOW$target_host with $profile through $build_host$NC"
runcmd="nixos-rebuild --target-host $target_host --use-remote-sudo $cmd --flake .#$profile"
echo -e "$BLUE$runcmd$NC"
$runcmd
}
valid_cmds=( build switch test dry-activate )
cmd=${2}
case $cmd in
"test" | "dry-activate" | "run" | "switch") run $cmd;;
"build")
output=$(run $cmd)
echo $output
echo "_"
echo $output | grep "nixos"
echo "_"
;;
"test" | "dry-activate" | "run" | "switch" | "build") run $cmd;;
*)
echo "invalid command"
exit 1
+9
View File
@@ -0,0 +1,9 @@
#!/bin/sh
## Colors
YELLOW='\033[0;33m'
BLUE='\033[0;34m'
NC='\033[0m'
BOLD='\033[1m'
BLUE_BOLD='\033[1;34m'
YELLOW_BOLD='\033[1;33m'
+1 -8
View File
@@ -3,16 +3,9 @@ set -e
# Bootstrap
## Folder handlings
set -e
ROOT_FOLDER=$(realpath $0 | xargs dirname | xargs dirname)
## Colors
YELLOW='\033[0;33m'
BLUE='\033[0;34m'
NC='\033[0m'
BOLD='\033[1m'
BLUE_BOLD='\033[1;34m'
YELLOW_BOLD='\033[1;33m'
. $ROOT_FOLDER/bin/extra/common.sh
# Bootstrap
MENAME=$(basename $0)
@@ -2,6 +2,7 @@
windowrulev2 = float,class:(nwg-.*)
windowrulev2 = float,class:(org\.kde\..*)
windowrulev2 = float,class:(.*blueman.*)
windowrulev2 = float,class:(firefox)
# Vscode
windowrulev2 = fakefullscreen,class:(Code)
+4
View File
@@ -0,0 +1,4 @@
gesture swipe up xdotool key Super+Tab
gesture swipe left xdotool key Super+Right
gesture swipe down xdotool key Super+Escape
gesture swipe right xdotool key Super+Left
Generated
+9 -77
View File
@@ -49,28 +49,6 @@
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixos-cosmic",
"nix-update",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -278,33 +256,9 @@
"type": "github"
}
},
"nix-update": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": [
"nixos-cosmic",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1726334963,
"narHash": "sha256-L8ICz9iELkvQl/ufdSWy9lRm8DLNpKDFxoeHQfPu4E8=",
"owner": "Mic92",
"repo": "nix-update",
"rev": "84d7535d076c5e06fba272738448c80698eb3d40",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-update",
"type": "github"
}
},
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat",
"nix-update": "nix-update",
"nixpkgs": [
"nixpkgs"
],
@@ -312,11 +266,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1726453173,
"narHash": "sha256-GnFxniWjQYqg9cAqHj7E+EEip1nZdvcUOH/StIod++c=",
"lastModified": 1727393223,
"narHash": "sha256-1jKdnW3CvFbz6m/neIr48XGqMY7eQYDHei9WNvQ+JLA=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "9907e5b7f5cbe92c97fd922b562dba691d3d8585",
"rev": "89657e8162b3f453a6e1c7c0ce598cc77ab61e96",
"type": "github"
},
"original": {
@@ -359,11 +313,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1726320982,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
"lastModified": 1727129439,
"narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
"rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a",
"type": "github"
},
"original": {
@@ -394,11 +348,11 @@
]
},
"locked": {
"lastModified": 1726382494,
"narHash": "sha256-T7W+ohiXe1IY0yf/PpS4wQItZ0SyRO+/v8kqNpMXlI4=",
"lastModified": 1727231386,
"narHash": "sha256-XLloPtQHKk/Tdt8t8zIb+JhmunlH3YB9Jz8RTlQ3N/4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ff13821613ffe5dbfeb4fe353b1f4bf291d831db",
"rev": "b5f76c3b09a8194889f5328a480fbea1a9115518",
"type": "github"
},
"original": {
@@ -422,28 +376,6 @@
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixos-cosmic",
"nix-update",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719887753,
"narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"unstable": {
"locked": {
"lastModified": 1727275485,
-9
View File
@@ -75,15 +75,6 @@ in
krita
gimp-with-plugins
];
# programs.chromium = {
# enable = true;
# enablePlasmaBrowserIntegration = true;
# extensions = [
# "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
# "nngceckbapebfimnlniiiahkandclblb" # bitwarden
# ];
# };
# # Opengl
hardware.opengl = {
driSupport = true;
+9
View File
@@ -40,5 +40,14 @@ in
/mnt/Data/apps 10.0.0.0/16(rw,wdelay,insecure,no_root_squash,no_subtree_check,sec=sys,rw,insecure,no_root_squash,no_all_squash)
'';
};
# Services
skg.nixos.server.services.prowlarr = {
enable = true;
user = config.skyg.user.name;
group = "users";
openFirewall = true;
dataDir = "/mnt/Data/apps/prowlarr";
port = 8080;
};
}
+13 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
let
cfg = config.skyg.nixos.desktop;
in
@@ -9,5 +9,17 @@ in
xkb.layout = "us";
xkb.variant = "";
};
environment.systemPackages = with pkgs; [
# These are used to handle touchpad gestures
libinput-gestures
wmctrl
xdotool
];
system.userActivationScripts.hyprlandMineConfig.text = ''
rm -f "$HOME/.config/libinput-gestures.conf"
if [[ ! -h "$HOME/.config/libinput-gestures.conf" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/libinput-gestures.conf" "$HOME/.config/libinput-gestures.conf"
fi
'';
};
}
+24
View File
@@ -0,0 +1,24 @@
{ config, lib, ... }:
let
cfg = config.skyg.server.db;
dbPort = 5432;
in
{
options = {
skyg.server.db = {
enable = lib.mkEnableOption
"Enable DB Store";
openFirewall = lib.mkEnableOption
"Open Firewall ports for db port";lib.mkIf cfg.openFirewall
};
};
config = lib.mkIf cfg.enable {
networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ dbPort ];
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ dbPort ];
services.postgresql = {
enable = true;
settings.port = dbPort;
dataDir = "";
};
};
}
+23 -3
View File
@@ -1,17 +1,34 @@
{ config, lib, ... }:
{ config, pkgs, lib, ... }:
let
cfg = config.services.prowlarr;
cfg = config.skg.nixos.server.services.prowlarr;
in
{
options = {
services.prowlarr = {
skg.nixos.server.services.prowlarr = {
enable = lib.mkEnableOption "Prowlarr, an indexer manager/proxy for Torrent trackers and Usenet indexers";
package = lib.mkPackageOption pkgs "prowlarr" { };
openFirewall = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Open ports in the firewall for the Prowlarr web interface.";
};
dataDir = lib.mkOption {
type = lib.types.str;
default = "/var/lib/prowlarr";
description = "data directory for prowlarr";
};
user = lib.mkOption {
type = lib.types.str;
default = "prowlarr";
};
group = lib.mkOption {
type = lib.types.str;
default = "prowlarr";
};
port = lib.mkOption {
type = lib.types.int;
default = 9096;
@@ -27,6 +44,9 @@ in
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.dataDir;
Type = "simple";
DynamicUser = true;
StateDirectory = "prowlarr";
+96
View File
@@ -0,0 +1,96 @@
diff '--color=always' -r /run/current-system/activate result/activate
5c5
< systemConfig='/nix/store/cilxfb2s6xyki06whj45hzghm8qmn67z-nixos-system-fwbook-24.05.20240914.8f7492c'
---
> systemConfig='/nix/store/pg5am1jq40rby8sxzdbdzxg4h0d6iiyx-nixos-system-fwbook-24.05.20240914.8f7492c'
65c65
< /nix/store/6fiakmilx167vnxcypacn6gdmivb55i8-perl-5.38.2-env/bin/perl /nix/store/rg5rf512szdxmnj9qal3wfdnpfsx38qi-setup-etc.pl /nix/store/484aiayr4fs1a0gvjvbvv0v03c9kb73m-etc/etc
---
> /nix/store/6fiakmilx167vnxcypacn6gdmivb55i8-perl-5.38.2-env/bin/perl /nix/store/rg5rf512szdxmnj9qal3wfdnpfsx38qi-setup-etc.pl /nix/store/rdl7x5a36n4jlkybqjwswra4wa8wcnls-etc/etc
diff '--color=always' -r /run/current-system/bin/switch-to-configuration result/bin/switch-to-configuration
36c36
< my $out = "/nix/store/cilxfb2s6xyki06whj45hzghm8qmn67z-nixos-system-fwbook-24.05.20240914.8f7492c";
---
> my $out = "/nix/store/pg5am1jq40rby8sxzdbdzxg4h0d6iiyx-nixos-system-fwbook-24.05.20240914.8f7492c";
38c38
< my $toplevel = "/nix/store/cilxfb2s6xyki06whj45hzghm8qmn67z-nixos-system-fwbook-24.05.20240914.8f7492c";
---
> my $toplevel = "/nix/store/pg5am1jq40rby8sxzdbdzxg4h0d6iiyx-nixos-system-fwbook-24.05.20240914.8f7492c";
diff '--color=always' -r /run/current-system/boot.json result/boot.json
3c3
< "init": "/nix/store/cilxfb2s6xyki06whj45hzghm8qmn67z-nixos-system-fwbook-24.05.20240914.8f7492c/init",
---
> "init": "/nix/store/pg5am1jq40rby8sxzdbdzxg4h0d6iiyx-nixos-system-fwbook-24.05.20240914.8f7492c/init",
12c12
< "toplevel": "/nix/store/cilxfb2s6xyki06whj45hzghm8qmn67z-nixos-system-fwbook-24.05.20240914.8f7492c"
---
> "toplevel": "/nix/store/pg5am1jq40rby8sxzdbdzxg4h0d6iiyx-nixos-system-fwbook-24.05.20240914.8f7492c"
diff '--color=always' -r /run/current-system/dry-activate result/dry-activate
5c5
< systemConfig='/nix/store/cilxfb2s6xyki06whj45hzghm8qmn67z-nixos-system-fwbook-24.05.20240914.8f7492c'
---
> systemConfig='/nix/store/pg5am1jq40rby8sxzdbdzxg4h0d6iiyx-nixos-system-fwbook-24.05.20240914.8f7492c'
diff '--color=always' -r /run/current-system/etc/crontab result/etc/crontab
2c2
< PATH=/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/bin:/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/sbin
---
> PATH=/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/bin:/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/sbin
diff '--color=always' -r /run/current-system/etc/dbus-1/session.conf result/etc/dbus-1/session.conf
76c76
< <apparmor mode="disabled"/><servicedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/share/dbus-1/services</servicedir><includedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/etc/dbus-1/session.d</includedir><includedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/share/dbus-1/session.d</includedir><servicedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/share/dbus-1/services</servicedir><includedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/etc/dbus-1/session.d</includedir><includedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/share/dbus-1/session.d</includedir><servicedir>/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/share/dbus-1/services</servicedir><includedir>/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/etc/dbus-1/session.d</includedir><includedir>/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/share/dbus-1/session.d</includedir><servicedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/share/dbus-1/services</servicedir><includedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/etc/dbus-1/session.d</includedir><includedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/share/dbus-1/session.d</includedir><servicedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/share/dbus-1/services</servicedir><includedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/etc/dbus-1/session.d</includedir><includedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/share/dbus-1/session.d</includedir><servicedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/share/dbus-1/services</servicedir><includedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/etc/dbus-1/session.d</includedir><includedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/share/dbus-1/session.d</includedir><servicedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/share/dbus-1/services</servicedir><includedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/etc/dbus-1/session.d</includedir><includedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/share/dbus-1/session.d</includedir><servicedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/share/dbus-1/services</servicedir><includedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/etc/dbus-1/session.d</includedir><includedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/share/dbus-1/session.d</includedir><servicedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/share/dbus-1/services</servicedir><includedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/etc/dbus-1/session.d</includedir><includedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/share/dbus-1/session.d</includedir><servicedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/share/dbus-1/services</servicedir><includedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/etc/dbus-1/session.d</includedir><includedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/share/dbus-1/session.d</includedir><servicedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/share/dbus-1/services</servicedir><includedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/etc/dbus-1/session.d</includedir><includedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/share/dbus-1/session.d</includedir><servicedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/share/dbus-1/services</servicedir><includedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/etc/dbus-1/session.d</includedir><includedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/share/dbus-1/session.d</includedir><servicedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/share/dbus-1/services</servicedir><includedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/etc/dbus-1/session.d</includedir><includedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/share/dbus-1/session.d</includedir><servicedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/share/dbus-1/services</servicedir><includedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/etc/dbus-1/session.d</includedir><includedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/share/dbus-1/session.d</includedir><servicedir>/nix/store/fsx2byarphxhr99inyjifizpj1yap07r-NetworkManager-sstp-gnome-1.3.2/share/dbus-1/services</servicedir><includedir>/nix/store/fsx2byarphxhr99inyjifizpj1yap07r-Netwo Line truncated
---
> <apparmor mode="disabled"/><servicedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/share/dbus-1/services</servicedir><includedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/etc/dbus-1/session.d</includedir><includedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/share/dbus-1/session.d</includedir><servicedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/share/dbus-1/services</servicedir><includedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/etc/dbus-1/session.d</includedir><includedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/share/dbus-1/session.d</includedir><servicedir>/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/share/dbus-1/services</servicedir><includedir>/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/etc/dbus-1/session.d</includedir><includedir>/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/share/dbus-1/session.d</includedir><servicedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/share/dbus-1/services</servicedir><includedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/etc/dbus-1/session.d</includedir><includedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/share/dbus-1/session.d</includedir><servicedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/share/dbus-1/services</servicedir><includedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/etc/dbus-1/session.d</includedir><includedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/share/dbus-1/session.d</includedir><servicedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/share/dbus-1/services</servicedir><includedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/etc/dbus-1/session.d</includedir><includedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/share/dbus-1/session.d</includedir><servicedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/share/dbus-1/services</servicedir><includedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/etc/dbus-1/session.d</includedir><includedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/share/dbus-1/session.d</includedir><servicedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/share/dbus-1/services</servicedir><includedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/etc/dbus-1/session.d</includedir><includedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/share/dbus-1/session.d</includedir><servicedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/share/dbus-1/services</servicedir><includedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/etc/dbus-1/session.d</includedir><includedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/share/dbus-1/session.d</includedir><servicedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/share/dbus-1/services</servicedir><includedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/etc/dbus-1/session.d</includedir><includedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/share/dbus-1/session.d</includedir><servicedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/share/dbus-1/services</servicedir><includedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/etc/dbus-1/session.d</includedir><includedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/share/dbus-1/session.d</includedir><servicedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/share/dbus-1/services</servicedir><includedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/etc/dbus-1/session.d</includedir><includedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/share/dbus-1/session.d</includedir><servicedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/share/dbus-1/services</servicedir><includedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/etc/dbus-1/session.d</includedir><includedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/share/dbus-1/session.d</includedir><servicedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/share/dbus-1/services</servicedir><includedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/etc/dbus-1/session.d</includedir><includedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/share/dbus-1/session.d</includedir><servicedir>/nix/store/fsx2byarphxhr99inyjifizpj1yap07r-NetworkManager-sstp-gnome-1.3.2/share/dbus-1/services</servicedir><includedir>/nix/store/fsx2byarphxhr99inyjifizpj1yap07r-Netwo Line truncated
diff '--color=always' -r /run/current-system/etc/dbus-1/system.conf result/etc/dbus-1/system.conf
122c122
< <apparmor mode="disabled"/><servicehelper>/run/wrappers/bin/dbus-daemon-launch-helper</servicehelper><servicedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/share/dbus-1/system-services</servicedir><includedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/etc/dbus-1/system.d</includedir><includedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/share/dbus-1/system.d</includedir><servicedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/share/dbus-1/system-services</servicedir><includedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/etc/dbus-1/system.d</includedir><includedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/share/dbus-1/system.d</includedir><servicedir>/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/share/dbus-1/system-services</servicedir><includedir>/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/etc/dbus-1/system.d</includedir><includedir>/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/share/dbus-1/system.d</includedir><servicedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/share/dbus-1/system-services</servicedir><includedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/etc/dbus-1/system.d</includedir><includedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/share/dbus-1/system.d</includedir><servicedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/share/dbus-1/system-services</servicedir><includedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/etc/dbus-1/system.d</includedir><includedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/share/dbus-1/system.d</includedir><servicedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/share/dbus-1/system-services</servicedir><includedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/etc/dbus-1/system.d</includedir><includedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/share/dbus-1/system.d</includedir><servicedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/share/dbus-1/system-services</servicedir><includedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/etc/dbus-1/system.d</includedir><includedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/share/dbus-1/system.d</includedir><servicedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/share/dbus-1/system-services</servicedir><includedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/etc/dbus-1/system.d</includedir><includedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/share/dbus-1/system.d</includedir><servicedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/share/dbus-1/system-services</servicedir><includedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/etc/dbus-1/system.d</includedir><includedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/share/dbus-1/system.d</includedir><servicedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/share/dbus-1/system-services</servicedir><includedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/etc/dbus-1/system.d</includedir><includedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/share/dbus-1/system.d</includedir><servicedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/share/dbus-1/system-services</servicedir><includedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/etc/dbus-1/system.d</includedir><includedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/share/dbus-1/system.d</includedir><servicedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/share/dbus-1/system-services</servicedir><includedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/etc/dbus-1/system.d</includedir><includedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/share/dbus-1/system.d</includedir><servicedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/share/dbus-1/system-services</servicedir><includedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/etc/dbus-1/system.d</includedir><includedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/share/dbus-1/system.d</includedir><servicedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/share/dbus-1/system-services</servicedir><includedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/etc/dbus-1/system.d</includedir><includedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/share/dbus-1/system.d</includedir><servicedir>/nix/store/fsx2byarphxhr99i Line truncated
---
> <apparmor mode="disabled"/><servicehelper>/run/wrappers/bin/dbus-daemon-launch-helper</servicehelper><servicedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/share/dbus-1/system-services</servicedir><includedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/etc/dbus-1/system.d</includedir><includedir>/nix/store/bsd1b6hggr45fg06lcsq1rjv2ljaxmkl-gdm-46.2/share/dbus-1/system.d</includedir><servicedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/share/dbus-1/system-services</servicedir><includedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/etc/dbus-1/system.d</includedir><includedir>/nix/store/rvr416z148cjcxh2bmf5anxpsdvmcvrk-dbus-1.14.10/share/dbus-1/system.d</includedir><servicedir>/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/share/dbus-1/system-services</servicedir><includedir>/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/etc/dbus-1/system.d</includedir><includedir>/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/share/dbus-1/system.d</includedir><servicedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/share/dbus-1/system-services</servicedir><includedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/etc/dbus-1/system.d</includedir><includedir>/nix/store/md9pndg4nyb5rj90q6pr34f5lgdx0sfd-fprintd-1.94.2/share/dbus-1/system.d</includedir><servicedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/share/dbus-1/system-services</servicedir><includedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/etc/dbus-1/system.d</includedir><includedir>/nix/store/s5k8kd2ndp93a0k2rkny97gx82kqaww9-cups-2.4.8/share/dbus-1/system.d</includedir><servicedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/share/dbus-1/system-services</servicedir><includedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/etc/dbus-1/system.d</includedir><includedir>/nix/store/y0bjr4a6ldl8vf13fmvz4srqwjwxs8gn-cups-pk-helper-0.2.6/share/dbus-1/system.d</includedir><servicedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/share/dbus-1/system-services</servicedir><includedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/etc/dbus-1/system.d</includedir><includedir>/nix/store/89dzqd48rziln4c1v3gqki04lk1snybv-modemmanager-1.22.0/share/dbus-1/system.d</includedir><servicedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/share/dbus-1/system-services</servicedir><includedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/etc/dbus-1/system.d</includedir><includedir>/nix/store/ac3g4x3pg5x2wgwdcq6xy9lcynk3mns2-networkmanager-1.46.2/share/dbus-1/system.d</includedir><servicedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/share/dbus-1/system-services</servicedir><includedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/etc/dbus-1/system.d</includedir><includedir>/nix/store/j7maaynnrsps0s5nkyjaby9xfignlcal-NetworkManager-fortisslvpn-gnome-1.4.0/share/dbus-1/system.d</includedir><servicedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/share/dbus-1/system-services</servicedir><includedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/etc/dbus-1/system.d</includedir><includedir>/nix/store/3spjvpmd9h2q3hrvnv6nj8af12ijcq13-NetworkManager-iodine-gnome-unstable-2019-11-05/share/dbus-1/system.d</includedir><servicedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/share/dbus-1/system-services</servicedir><includedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/etc/dbus-1/system.d</includedir><includedir>/nix/store/x7vi9qjvblk177mx2kjkm8vxqhh4g2sa-NetworkManager-l2tp-gnome-1.20.16/share/dbus-1/system.d</includedir><servicedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/share/dbus-1/system-services</servicedir><includedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/etc/dbus-1/system.d</includedir><includedir>/nix/store/zqw9nmk201cx5q73lghlxf6amfiqmbnd-NetworkManager-openconnect-1.2.10/share/dbus-1/system.d</includedir><servicedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/share/dbus-1/system-services</servicedir><includedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/etc/dbus-1/system.d</includedir><includedir>/nix/store/f1wgzxx4zf6plhy41rn3a2g3lb49prcs-NetworkManager-openvpn-1.12.0/share/dbus-1/system.d</includedir><servicedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/share/dbus-1/system-services</servicedir><includedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/etc/dbus-1/system.d</includedir><includedir>/nix/store/yyr04ay61mwafbfax761s3g6z5jc0km7-NetworkManager-vpnc-1.2.8/share/dbus-1/system.d</includedir><servicedir>/nix/store/fsx2byarphxhr99i Line truncated
diff '--color=always' -r /run/current-system/etc/systemd/system/accounts-daemon.service.d/overrides.conf result/etc/systemd/system/accounts-daemon.service.d/overrides.conf
7c7
< Environment="XDG_DATA_DIRS=/nix/store/rm5gljsklnmpcfsxv1iz1f9vpbmc869g-system-path/share"
---
> Environment="XDG_DATA_DIRS=/nix/store/j9r075ki28r6g1cqvyki95vxn40ddz00-system-path/share"
diff '--color=always' -r /run/current-system/etc/systemd/system/dbus.service.d/overrides.conf result/etc/systemd/system/dbus.service.d/overrides.conf
2c2
< X-Restart-Triggers=/nix/store/cwrgyjwj9ma6vr4hsrpdvzslwv4xzlpy-X-Restart-Triggers-dbus
---
> X-Restart-Triggers=/nix/store/cmaryg3vr13s20qrnvm8laaz34qnrlap-X-Restart-Triggers-dbus
diff '--color=always' -r /run/current-system/etc/systemd/system/polkit.service.d/overrides.conf result/etc/systemd/system/polkit.service.d/overrides.conf
2c2
< X-Restart-Triggers=/nix/store/cpvpjw7kxnw1i3fz7h40xbll7lqx44nb-X-Restart-Triggers-polkit
---
> X-Restart-Triggers=/nix/store/0xzsvpc92c607qp7d4410pnwmbbamip2-X-Restart-Triggers-polkit
diff '--color=always' -r /run/current-system/etc/systemd/user/dbus.service.d/overrides.conf result/etc/systemd/user/dbus.service.d/overrides.conf
2c2
< X-Restart-Triggers=/nix/store/cwrgyjwj9ma6vr4hsrpdvzslwv4xzlpy-X-Restart-Triggers-dbus
---
> X-Restart-Triggers=/nix/store/cmaryg3vr13s20qrnvm8laaz34qnrlap-X-Restart-Triggers-dbus
diff '--color=always' -r /run/current-system/etc/systemd/user/default.target.wants/nixos-activation.service result/etc/systemd/user/default.target.wants/nixos-activation.service
9c9
< ExecStart=/nix/store/hm5428i10l9532whwfzzfs26j19ybb03-unit-script-nixos-activation-start/bin/nixos-activation-start 
---
> ExecStart=/nix/store/i8r6ayv3sy24a6l85x6xfa6rgrcanh9b-unit-script-nixos-activation-start/bin/nixos-activation-start 
diff '--color=always' -r /run/current-system/etc/systemd/user/nixos-activation.service result/etc/systemd/user/nixos-activation.service
9c9
< ExecStart=/nix/store/hm5428i10l9532whwfzzfs26j19ybb03-unit-script-nixos-activation-start/bin/nixos-activation-start 
---
> ExecStart=/nix/store/i8r6ayv3sy24a6l85x6xfa6rgrcanh9b-unit-script-nixos-activation-start/bin/nixos-activation-start 
diff '--color=always' -r /run/current-system/init result/init
3c3
< systemConfig=/nix/store/cilxfb2s6xyki06whj45hzghm8qmn67z-nixos-system-fwbook-24.05.20240914.8f7492c
---
> systemConfig=/nix/store/pg5am1jq40rby8sxzdbdzxg4h0d6iiyx-nixos-system-fwbook-24.05.20240914.8f7492c
Only in result/sw/bin: libinput-gestures
Only in result/sw/bin: wmctrl
Only in result/sw/bin: xdotool
Only in result/sw/lib: libxdo.so
Only in result/sw/lib: libxdo.so.3
Only in result/sw/lib/pkgconfig: libxdo.pc
Only in result/sw/lib/systemd/user: libinput-gestures.service
Only in result/sw/share/applications: libinput-gestures.desktop
Only in result/sw/share/doc: libinput-gestures
Only in result/sw/share/icons/hicolor/128x128/apps: libinput-gestures.svg
Binary files /run/current-system/sw/share/icons/hicolor/icon-theme.cache and result/sw/share/icons/hicolor/icon-theme.cache differ
Only in result/sw/share/man/man1: wmctrl.1.gz
Only in result/sw/share/man/man1: xdotool.1.gz
Only in result/sw/share/systemd/user: libinput-gestures.service