swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: small env related inaccuracies
Some checks failed
Flake check / Check flake (push) Has been cancelled
Details

Browse source
This commit is contained in:
Leon Schwarzäugl 2025-08-10 21:37:34 +02:00
parent 5229a4c480
commit 6ea3851e72
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
18 changed files with 1415 additions and 1310 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.sops.yaml
View file

@ -49,7 +49,7 @@ creation_rules:
- *surface - *surface
- *winters - *winters
- *moonside - *moonside
- path_regex: secrets/nbl-imba-2/[^/]+\.(yaml|json|env|ini)$ - path_regex: secrets/pyramid/[^/]+\.(yaml|json|env|ini)$
key_groups: key_groups:
- pgp: - pgp:
- *swarsel - *swarsel
@ -85,7 +85,7 @@ creation_rules:
- *swarsel - *swarsel
age: age:
- *milkywell - *milkywell
- path_regex: hosts/nixos/nbl-imba-2/secrets/pii.nix.enc - path_regex: hosts/nixos/pyramid/secrets/pii.nix.enc
key_groups: key_groups:
- pgp: - pgp:
- *swarsel - *swarsel

192
SwarselSystems.org
View file

@ -4645,6 +4645,8 @@ Next, we will setup some environment variables that need to be set on the system
wordlist.enable = true; wordlist.enable = true;
sessionVariables = { sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
SWARSEL_LO_RES = config.swarselsystems.lowResolution;
SWARSEL_HI_RES = config.swarselsystems.highResolution;
GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1; [ GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1; [
gst-plugins-good gst-plugins-good
gst-plugins-bad gst-plugins-bad
@ -4652,7 +4654,6 @@ Next, we will setup some environment variables that need to be set on the system
gst-libav gst-libav
]); ]);
} // (lib.optionalAttrs (!config.swarselsystems.isPublic) { } // (lib.optionalAttrs (!config.swarselsystems.isPublic) {
GITHUB_NOTIFICATION_TOKEN_PATH = config.sops.secrets.github-notifications-token.path;
}); });
}; };
}; };
@ -4890,9 +4891,9 @@ Here I only enable =networkmanager= and a few default networks. The rest of the
Settings = { Settings = {
AutoConnect = true; AutoConnect = true;
}; };
DriverQuirks = { # DriverQuirks = {
UseDefaultInterface = true; # UseDefaultInterface = true;
}; # };
}; };
}; };
nftables.enable = lib.mkDefault true; nftables.enable = lib.mkDefault true;
@ -5593,7 +5594,7 @@ This loads some udev rules that I need for my split keyboards.
} }
#+end_src #+end_src
**** System Login **** System Login (greetd)
:PROPERTIES: :PROPERTIES:
:CUSTOM_ID: h:eae45839-223a-4027-bce3-e26e092c9096 :CUSTOM_ID: h:eae45839-223a-4027-bce3-e26e092c9096
:END: :END:
@ -5608,7 +5609,8 @@ This section houses the greetd related settings. I do not really want to use a d
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {
initial_session.command = "sway"; # initial_session.command = "sway";
initial_session.command = "uwsm start -- sway-uwsm.desktop";
default_session.command = '' default_session.command = ''
${pkgs.tuigreet}/bin/tuigreet \ ${pkgs.tuigreet}/bin/tuigreet \
--time \ --time \
@ -5619,9 +5621,9 @@ This section houses the greetd related settings. I do not really want to use a d
}; };
}; };
environment.etc."greetd/environments".text = '' # environment.etc."greetd/environments".text = ''
sway # sway
''; # '';
}; };
} }
#+end_src #+end_src
@ -5811,6 +5813,9 @@ This is used to better integrate Sway into the system on NixOS hosts. On the hom
#+begin_src nix-ts :tangle modules/nixos/client/sway.nix #+begin_src nix-ts :tangle modules/nixos/client/sway.nix
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
let
inherit (config.swarselsystems) mainUser;
in
{ {
options.swarselmodules.sway = lib.mkEnableOption "sway config"; options.swarselmodules.sway = lib.mkEnableOption "sway config";
config = lib.mkIf config.swarselmodules.sway { config = lib.mkIf config.swarselmodules.sway {
@ -5822,15 +5827,7 @@ This is used to better integrate Sway into the system on NixOS hosts. On the hom
gtk = true; gtk = true;
}; };
extraSessionCommands = '' inherit (config.home-manager.users.${mainUser}.wayland.windowManager.sway) extraSessionCommands;
export XDG_SESSION_DESKTOP=sway
export SDL_VIDEODRIVER=wayland
export QT_QPA_PLATFORM=wayland-egl
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export QT_QPA_PLATFORM_PLUGIN_PATH="${pkgs.libsForQt5.qt5.qtbase.bin}/lib/qt-${pkgs.libsForQt5.qt5.qtbase.version}/plugins";
export MOZ_ENABLE_WAYLAND=1
export MOZ_DISABLE_RDD_SANDBOX=1
'';
}; };
}; };
} }
@ -6021,6 +6018,32 @@ Auto login for the initial session.
} }
#+end_src #+end_src
**** UWSM
Auto login for the initial session.
#+begin_src nix-ts :tangle modules/nixos/client/uwsm.nix
{ lib, config, ... }:
let
moduleName = "uwsm";
in
{
options.swarselmodules.${moduleName} = lib.mkEnableOption "${moduleName} settings";
config = lib.mkIf config.swarselmodules.${moduleName} {
programs.uwsm = {
enable = true;
waylandCompositors = {
sway = {
prettyName = "Sway";
comment = "Sway compositor managed by UWSM";
binPath = "/run/current-system/sw/bin/sway";
};
};
};
};
}
#+end_src
*** Server *** Server
:PROPERTIES: :PROPERTIES:
:CUSTOM_ID: h:e492c24a-83a0-4bcb-a084-706f49318651 :CUSTOM_ID: h:e492c24a-83a0-4bcb-a084-706f49318651
@ -10277,18 +10300,6 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9
}; };
programs = { programs = {
zsh.shellInit = ''
export VSPHERE_USER="$(cat ${config.sops.secrets.vcuser.path})"
export VSPHERE_PW="$(cat ${config.sops.secrets.vcpw.path})"
export GOVC_USERNAME="$(cat ${config.sops.secrets.govcuser.path})"
export GOVC_PASSWORD="$(cat ${config.sops.secrets.govcpw.path})"
export GOVC_URL="$(cat ${config.sops.secrets.govcurl.path})"
export GOVC_DATACENTER="$(cat ${config.sops.secrets.govcdc.path})"
export GOVC_DATASTORE="$(cat ${config.sops.secrets.govcds.path})"
export GOVC_HOST="$(cat ${config.sops.secrets.govchost.path})"
export GOVC_RESOURCE_POOL="$(cat ${config.sops.secrets.govcpool.path})"
export GOVC_NETWORK="$(cat ${config.sops.secrets.govcnetwork.path})"
'';
browserpass.enable = true; browserpass.enable = true;
_1password.enable = true; _1password.enable = true;
@ -11200,27 +11211,26 @@ Also in firefox `about:config > toolkit.legacyUserProfileCustomizations.styleshe
Sets environment variables. Here I am only setting the EDITOR variable, most variables are set in the [[#h:02df9dfc-d1af-4a37-a7a0-d8da0af96a20][Sway]] section. Sets environment variables. Here I am only setting the EDITOR variable, most variables are set in the [[#h:02df9dfc-d1af-4a37-a7a0-d8da0af96a20][Sway]] section.
#+begin_src nix-ts :tangle modules/home/common/env.nix #+begin_src nix-ts :tangle modules/home/common/env.nix
{ lib, config, globals, nixosConfig ? config, ... }: { lib, config, nixosConfig ? config, ... }:
let let
inherit (nixosConfig.repo.secrets.common.mail) address1 address2 address3 address4 allMailAddresses; inherit (nixosConfig.repo.secrets.common.mail) address1 address2 address3 address4 allMailAddresses;
inherit (nixosConfig.repo.secrets.common.calendar) source1 source1-name source2 source2-name source3 source3-name; inherit (nixosConfig.repo.secrets.common.calendar) source1 source1-name source2 source2-name source3 source3-name;
inherit (nixosConfig.repo.secrets.common) fullName; inherit (nixosConfig.repo.secrets.common) fullName;
inherit (config.swarselsystems) isPublic; inherit (config.swarselsystems) isPublic homeDir;
crocDomain = globals.services.croc.domain;
DISPLAY = ":0";
in in
{ {
options.swarselmodules.env = lib.mkEnableOption "env settings"; options.swarselmodules.env = lib.mkEnableOption "env settings";
config = lib.mkIf config.swarselmodules.env { config = lib.mkIf config.swarselmodules.env {
home.sessionVariables = { home.sessionVariables = {
inherit DISPLAY;
EDITOR = "e -w"; EDITOR = "e -w";
DISPLAY = ":0";
SWARSEL_LO_RES = config.swarselsystems.lowResolution;
SWARSEL_HI_RES = config.swarselsystems.highResolution;
} // (lib.optionalAttrs (!isPublic) { } // (lib.optionalAttrs (!isPublic) {
CROC_RELAY = crocDomain;
GITHUB_NOTIFICATION_TOKEN_PATH = nixosConfig.sops.secrets.github-notifications-token.path;
}); });
systemd.user.sessionVariables = lib.mkIf (!isPublic) { systemd.user.sessionVariables = {
DOCUMENT_DIR_PRIV = lib.mkForce "${homeDir}/Documents/Private";
} // lib.optionalAttrs (!isPublic) {
SWARSEL_MAIL1 = address1; SWARSEL_MAIL1 = address1;
SWARSEL_MAIL2 = address2; SWARSEL_MAIL2 = address2;
SWARSEL_MAIL3 = address3; SWARSEL_MAIL3 = address3;
@ -11688,9 +11698,10 @@ lib.mkMerge [ zshConfigEarlyInit zshConfig ];
Currently I only use it as before with =initExtra= though. Currently I only use it as before with =initExtra= though.
#+begin_src nix-ts :tangle modules/home/common/zsh.nix #+begin_src nix-ts :tangle modules/home/common/zsh.nix
{ config, lib, minimal, nixosConfig ? config, ... }: { config, pkgs, lib, minimal, globals, nixosConfig ? config, ... }:
let let
inherit (config.swarselsystems) flakePath; inherit (config.swarselsystems) flakePath;
crocDomain = globals.services.croc.domain;
in in
{ {
options.swarselmodules.zsh = lib.mkEnableOption "zsh settings"; options.swarselmodules.zsh = lib.mkEnableOption "zsh settings";
@ -11776,7 +11787,7 @@ Currently I only use it as before with =initExtra= though.
# src = pkgs.zsh-fzf-tab; # src = pkgs.zsh-fzf-tab;
# } # }
]; ];
initContent = lib.mkIf (!config.swarselsystems.isPublic) '' initContent = ''
my-forward-word() { my-forward-word() {
local WORDCHARS=$WORDCHARS local WORDCHARS=$WORDCHARS
WORDCHARS="''${WORDCHARS//:}" WORDCHARS="''${WORDCHARS//:}"
@ -11815,10 +11826,14 @@ Currently I only use it as before with =initExtra= though.
zle -N my-backward-delete-word zle -N my-backward-delete-word
# ctrl + del # ctrl + del
bindkey '^H' my-backward-delete-word bindkey '^H' my-backward-delete-word
export CROC_PASS="$(cat ${nixosConfig.sops.secrets.croc-password.path})"
export GITHUB_TOKEN="$(cat ${nixosConfig.sops.secrets.github-nixpkgs-review-token.path})"
''; '';
sessionVariables = lib.mkIf (!config.swarselsystems.isPublic) {
CROC_RELAY = crocDomain;
CROC_PASS = "$(cat ${nixosConfig.sops.secrets.croc-password.path})";
GITHUB_TOKEN = "$(cat ${nixosConfig.sops.secrets.github-nixpkgs-review-token.path})";
QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.libsForQt5.qt5.qtbase.bin}/lib/qt-${pkgs.libsForQt5.qt5.qtbase.version}/plugins";
# QTWEBENGINE_CHROMIUM_FLAGS = "--no-sandbox";
};
}; };
}; };
} }
@ -12344,11 +12359,13 @@ The rest of the related configuration is found here:
github-notifications-token = { path = "${xdgDir}/secrets/github-notifications-token"; }; github-notifications-token = { path = "${xdgDir}/secrets/github-notifications-token"; };
}; };
services.playerctld.enable = true;
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd = { systemd = {
enable = true; enable = true;
target = "sway-sessions.target"; target = "sway-session.target";
}; };
settings = { settings = {
mainBar = { mainBar = {
@ -12615,6 +12632,11 @@ I used to build the firefox addon =bypass-paywalls-clean= myself here, but the m
{ {
options.swarselmodules.firefox = lib.mkEnableOption "firefox settings"; options.swarselmodules.firefox = lib.mkEnableOption "firefox settings";
config = lib.mkIf config.swarselmodules.firefox { config = lib.mkIf config.swarselmodules.firefox {
programs.zsh.sessionVariables = {
MOZ_DISABLE_RDD_SANDBOX = "1";
};
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox; # uses overrides package = pkgs.firefox; # uses overrides
@ -12926,7 +12948,7 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded
Currently, I am too lazy to explain every option here, but most of it is very self-explaining in any case. Currently, I am too lazy to explain every option here, but most of it is very self-explaining in any case.
#+begin_src nix-ts :tangle modules/home/common/sway.nix #+begin_src nix-ts :tangle modules/home/common/sway.nix
{ self, config, lib, ... }: { self, config, lib, vars, ... }:
let let
eachOutput = _: monitor: { eachOutput = _: monitor: {
inherit (monitor) name; inherit (monitor) name;
@ -12955,8 +12977,8 @@ Currently, I am too lazy to explain every option here, but most of it is very se
# { command = "nextcloud --background"; } # { command = "nextcloud --background"; }
{ command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; }
{ command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; }
{ command = "ANKI_WAYLAND=1 anki"; } { command = "anki"; }
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian"; } { command = "obsidian"; }
{ command = "nm-applet"; } { command = "nm-applet"; }
# { command = "feishin"; } # { command = "feishin"; }
]; ];
@ -12987,7 +13009,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
}; };
swayfxConfig = lib.mkOption { swayfxConfig = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = " default = ''
blur enable blur enable
blur_xray disable blur_xray disable
blur_passes 1 blur_passes 1
@ -12996,7 +13018,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
corner_radius 2 corner_radius 2
titlebar_separator disable titlebar_separator disable
default_dim_inactive 0.02 default_dim_inactive 0.02
"; '';
internal = true; internal = true;
}; };
}; };
@ -13013,15 +13035,29 @@ Currently, I am too lazy to explain every option here, but most of it is very se
}; };
swayfxConfig = lib.mkIf (!config.swarselsystems.isNixos) " "; swayfxConfig = lib.mkIf (!config.swarselsystems.isNixos) " ";
}; };
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
checkConfig = false; # delete this line once SwayFX is fixed upstream # checkConfig = false; # delete this line once SwayFX is fixed upstream
package = lib.mkIf config.swarselsystems.isNixos null; package = lib.mkIf config.swarselsystems.isNixos null;
systemd = { systemd = {
enable = true; enable = true;
xdgAutostart = true; xdgAutostart = true;
variables = [
"DISPLAY"
"WAYLAND_DISPLAY"
"SWAYSOCK"
"XDG_CURRENT_DESKTOP"
"XDG_SESSION_TYPE"
"NIXOS_OZONE_WL"
"XCURSOR_THEME"
"XCURSOR_SIZE"
];
};
wrapperFeatures = {
base = true;
gtk = true;
}; };
wrapperFeatures.gtk = true;
config = rec { config = rec {
modifier = "Mod4"; modifier = "Mod4";
# terminal = "kitty"; # terminal = "kitty";
@ -13299,16 +13335,10 @@ Currently, I am too lazy to explain every option here, but most of it is very se
}; };
}; };
extraSessionCommands = '' extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland export XDG_CURRENT_DESKTOP=sway;
export QT_QPA_PLATFORM=wayland export XDG_SESSION_DESKTOP=sway;
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" export _JAVA_AWT_WM_NONREPARENTING=1;
export _JAVA_AWT_WM_NONREPARENTING=1 '' + vars.waylandExports;
export XDG_CURRENT_DESKTOP=sway
export XDG_SESSION_DESKTOP=sway
export QTWEBENGINE_CHROMIUM_FLAGS="--no-sandbox";
export ANKI_WAYLAND=1;
export OBSIDIAN_USE_WAYLAND=1;
'';
# extraConfigEarly = " # extraConfigEarly = "
# exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK # exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
# exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK # exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
@ -13732,8 +13762,7 @@ The rest of the settings is at [[#h:bbf2ecb6-c8ff-4462-b5d5-d45b28604ddf][work]]
openstackclient openstackclient
]; ];
home.sessionVariables = { systemd.user.sessionVariables = {
DOCUMENT_DIR_PRIV = lib.mkForce "${homeDir}/Documents/Private";
DOCUMENT_DIR_WORK = lib.mkForce "${homeDir}/Documents/Work"; DOCUMENT_DIR_WORK = lib.mkForce "${homeDir}/Documents/Work";
}; };
@ -13848,6 +13877,19 @@ The rest of the settings is at [[#h:bbf2ecb6-c8ff-4462-b5d5-d45b28604ddf][work]]
pr = "$HOME/Documents/Private"; pr = "$HOME/Documents/Private";
ac = path1; ac = path1;
}; };
sessionVariables = {
VSPHERE_USER = "$(cat ${nixosConfig.sops.secrets.vcuser.path})";
VSPHERE_PW = "$(cat ${nixosConfig.sops.secrets.vcpw.path})";
GOVC_USERNAME = "$(cat ${nixosConfig.sops.secrets.govcuser.path})";
GOVC_PASSWORD = "$(cat ${nixosConfig.sops.secrets.govcpw.path})";
GOVC_URL = "$(cat ${nixosConfig.sops.secrets.govcurl.path})";
GOVC_DATACENTER = "$(cat ${nixosConfig.sops.secrets.govcdc.path})";
GOVC_DATASTORE = "$(cat ${nixosConfig.sops.secrets.govcds.path})";
GOVC_HOST = "$(cat ${nixosConfig.sops.secrets.govchost.path})";
GOVC_RESOURCE_POOL = "$(cat ${nixosConfig.sops.secrets.govcpool.path})";
GOVC_NETWORK = "$(cat ${nixosConfig.sops.secrets.govcnetwork.path})";
};
}; };
ssh = { ssh = {
@ -14136,8 +14178,8 @@ The rest of the settings is at [[#h:bbf2ecb6-c8ff-4462-b5d5-d45b28604ddf][work]]
# { command = "nextcloud --background"; } # { command = "nextcloud --background"; }
{ command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; }
{ command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; }
{ command = "ANKI_WAYLAND=1 anki"; } { command = "anki"; }
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian"; } { command = "obsidian"; }
{ command = "nm-applet"; } { command = "nm-applet"; }
# { command = "feishin"; } # { command = "feishin"; }
{ command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; } { command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; }
@ -14404,7 +14446,20 @@ In short, the options defined here are passed to the modules systems using =_mod
{ self, lib, pkgs, ... }: { self, lib, pkgs, ... }:
{ {
_module.args = { _module.args = {
vars = { vars = rec {
waylandSessionVariables = {
SDL_VIDEODRIVER = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_QPA_PLATFORM = "wayland-egl";
ANKI_WAYLAND = "1";
OBSIDIAN_USE_WAYLAND = "1";
MOZ_ENABLE_WAYLAND = "1";
};
waylandExports = let
renderedWaylandExports = map (key: "export ${key}=${waylandSessionVariables.${key}};") (builtins.attrNames waylandSessionVariables);
in builtins.concatStringsSep "\n" renderedWaylandExports;
stylix = { stylix = {
polarity = "dark"; polarity = "dark";
opacity.popups = 0.5; opacity.popups = 0.5;
@ -16569,6 +16624,7 @@ Modules that need to be loaded on the NixOS level. Note that these will not be a
impermanence = lib.mkDefault true; impermanence = lib.mkDefault true;
nvd = lib.mkDefault true; nvd = lib.mkDefault true;
gnome-keyring = lib.mkDefault true; gnome-keyring = lib.mkDefault true;
uwsm = lib.mkDefault true;
sway = lib.mkDefault true; sway = lib.mkDefault true;
xdg-portal = lib.mkDefault true; xdg-portal = lib.mkDefault true;
distrobox = lib.mkDefault true; distrobox = lib.mkDefault true;
@ -18218,7 +18274,7 @@ Here I set up some things that are too minor to put under other categories.
password-cache-expiry nil password-cache-expiry nil
) )
(setq browse-url-browser-function 'browse-url-firefox) (setq browse-url-browser-function 'browse-url-firefox)
(setenv "DISPLAY" ":0") ;; (setenv "DISPLAY" ":0") ;; needed for firefox
;; disable a keybind that does more harm than good ;; disable a keybind that does more harm than good
(global-set-key [remap suspend-frame] (global-set-key [remap suspend-frame]
(lambda () (lambda ()

2
files/emacs/init.el
View file

@ -402,7 +402,7 @@ create a new one."
password-cache-expiry nil password-cache-expiry nil
) )
(setq browse-url-browser-function 'browse-url-firefox) (setq browse-url-browser-function 'browse-url-firefox)
(setenv "DISPLAY" ":0") ;; (setenv "DISPLAY" ":0") ;; needed for firefox
;; disable a keybind that does more harm than good ;; disable a keybind that does more harm than good
(global-set-key [remap suspend-frame] (global-set-key [remap suspend-frame]
(lambda () (lambda ()

12
flake.lock generated
View file

@ -3232,11 +3232,11 @@
}, },
"nixpkgs_27": { "nixpkgs_27": {
"locked": { "locked": {
"lastModified": 1754498491, "lastModified": 1754725699,
"narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -4416,11 +4416,11 @@
"systems": "systems_17" "systems": "systems_17"
}, },
"locked": { "locked": {
"lastModified": 1754778610, "lastModified": 1754846369,
"narHash": "sha256-XFv8P39Lps5bbjFdA3GWkY8ibpgdekFd10LsAFUVQhA=", "narHash": "sha256-yT9Z1VS/i9ZkqdeMYjACd0xPmF/X0ZILt7YTlHfBD8k=",
"owner": "Swarsel", "owner": "Swarsel",
"repo": "swarsel-modules", "repo": "swarsel-modules",
"rev": "7ecf2230e28e64097ca1208aa4bf4f242ec2bc3b", "rev": "60a2c35486f458e9ae95883801d8509840096d21",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
modules/home/common/env.nix
View file

@ -1,24 +1,22 @@
{ lib, config, globals, nixosConfig ? config, ... }: { lib, config, nixosConfig ? config, ... }:
let let
inherit (nixosConfig.repo.secrets.common.mail) address1 address2 address3 address4 allMailAddresses; inherit (nixosConfig.repo.secrets.common.mail) address1 address2 address3 address4 allMailAddresses;
inherit (nixosConfig.repo.secrets.common.calendar) source1 source1-name source2 source2-name source3 source3-name; inherit (nixosConfig.repo.secrets.common.calendar) source1 source1-name source2 source2-name source3 source3-name;
inherit (nixosConfig.repo.secrets.common) fullName; inherit (nixosConfig.repo.secrets.common) fullName;
inherit (config.swarselsystems) isPublic; inherit (config.swarselsystems) isPublic homeDir;
crocDomain = globals.services.croc.domain;
DISPLAY = ":0";
in in
{ {
options.swarselmodules.env = lib.mkEnableOption "env settings"; options.swarselmodules.env = lib.mkEnableOption "env settings";
config = lib.mkIf config.swarselmodules.env { config = lib.mkIf config.swarselmodules.env {
home.sessionVariables = { home.sessionVariables = {
inherit DISPLAY;
EDITOR = "e -w"; EDITOR = "e -w";
DISPLAY = ":0"; } // (lib.optionalAttrs (!isPublic) { });
SWARSEL_LO_RES = config.swarselsystems.lowResolution; systemd.user.sessionVariables = {
SWARSEL_HI_RES = config.swarselsystems.highResolution; DOCUMENT_DIR_PRIV = lib.mkForce "${homeDir}/Documents/Private";
} // (lib.optionalAttrs (!isPublic) { } // lib.optionalAttrs (!isPublic) {
CROC_RELAY = crocDomain;
GITHUB_NOTIFICATION_TOKEN_PATH = nixosConfig.sops.secrets.github-notifications-token.path;
});
systemd.user.sessionVariables = lib.mkIf (!isPublic) {
SWARSEL_MAIL1 = address1; SWARSEL_MAIL1 = address1;
SWARSEL_MAIL2 = address2; SWARSEL_MAIL2 = address2;
SWARSEL_MAIL3 = address3; SWARSEL_MAIL3 = address3;

5
modules/home/common/firefox.nix
View file

@ -2,6 +2,11 @@
{ {
options.swarselmodules.firefox = lib.mkEnableOption "firefox settings"; options.swarselmodules.firefox = lib.mkEnableOption "firefox settings";
config = lib.mkIf config.swarselmodules.firefox { config = lib.mkIf config.swarselmodules.firefox {
programs.zsh.sessionVariables = {
MOZ_DISABLE_RDD_SANDBOX = "1";
};
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox; # uses overrides package = pkgs.firefox; # uses overrides

44
modules/home/common/sway.nix
View file

@ -1,4 +1,4 @@
{ self, config, lib, ... }: { self, config, lib, vars, ... }:
let let
eachOutput = _: monitor: { eachOutput = _: monitor: {
inherit (monitor) name; inherit (monitor) name;
@ -27,8 +27,8 @@ in
# { command = "nextcloud --background"; } # { command = "nextcloud --background"; }
{ command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; }
{ command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; }
{ command = "ANKI_WAYLAND=1 anki"; } { command = "anki"; }
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian"; } { command = "obsidian"; }
{ command = "nm-applet"; } { command = "nm-applet"; }
# { command = "feishin"; } # { command = "feishin"; }
]; ];
@ -59,7 +59,7 @@ in
}; };
swayfxConfig = lib.mkOption { swayfxConfig = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = " default = ''
blur enable blur enable
blur_xray disable blur_xray disable
blur_passes 1 blur_passes 1
@ -68,7 +68,7 @@ in
corner_radius 2 corner_radius 2
titlebar_separator disable titlebar_separator disable
default_dim_inactive 0.02 default_dim_inactive 0.02
"; '';
internal = true; internal = true;
}; };
}; };
@ -85,15 +85,29 @@ in
}; };
swayfxConfig = lib.mkIf (!config.swarselsystems.isNixos) " "; swayfxConfig = lib.mkIf (!config.swarselsystems.isNixos) " ";
}; };
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
checkConfig = false; # delete this line once SwayFX is fixed upstream # checkConfig = false; # delete this line once SwayFX is fixed upstream
package = lib.mkIf config.swarselsystems.isNixos null; package = lib.mkIf config.swarselsystems.isNixos null;
systemd = { systemd = {
enable = true; enable = true;
xdgAutostart = true; xdgAutostart = true;
variables = [
"DISPLAY"
"WAYLAND_DISPLAY"
"SWAYSOCK"
"XDG_CURRENT_DESKTOP"
"XDG_SESSION_TYPE"
"NIXOS_OZONE_WL"
"XCURSOR_THEME"
"XCURSOR_SIZE"
];
};
wrapperFeatures = {
base = true;
gtk = true;
}; };
wrapperFeatures.gtk = true;
config = rec { config = rec {
modifier = "Mod4"; modifier = "Mod4";
# terminal = "kitty"; # terminal = "kitty";
@ -371,16 +385,10 @@ in
}; };
}; };
extraSessionCommands = '' extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland export XDG_CURRENT_DESKTOP=sway;
export QT_QPA_PLATFORM=wayland export XDG_SESSION_DESKTOP=sway;
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" export _JAVA_AWT_WM_NONREPARENTING=1;
export _JAVA_AWT_WM_NONREPARENTING=1 '' + vars.waylandExports;
export XDG_CURRENT_DESKTOP=sway
export XDG_SESSION_DESKTOP=sway
export QTWEBENGINE_CHROMIUM_FLAGS="--no-sandbox";
export ANKI_WAYLAND=1;
export OBSIDIAN_USE_WAYLAND=1;
'';
# extraConfigEarly = " # extraConfigEarly = "
# exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK # exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
# exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK # exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
@ -391,7 +399,7 @@ in
swayfxSettings = config.swarselsystems.swayfxConfig; swayfxSettings = config.swarselsystems.swayfxConfig;
in in
" "
exec_always autotiling exec_always autotiling
set $exit \"exit: [s]leep, [l]ock, [p]oweroff, [r]eboot, [u]ser logout\" set $exit \"exit: [s]leep, [l]ock, [p]oweroff, [r]eboot, [u]ser logout\"
mode $exit { mode $exit {

4
modules/home/common/waybar.nix
View file

@ -64,11 +64,13 @@ in
github-notifications-token = { path = "${xdgDir}/secrets/github-notifications-token"; }; github-notifications-token = { path = "${xdgDir}/secrets/github-notifications-token"; };
}; };
services.playerctld.enable = true;
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd = { systemd = {
enable = true; enable = true;
target = "sway-sessions.target"; target = "sway-session.target";
}; };
settings = { settings = {
mainBar = { mainBar = {

15
modules/home/common/zsh.nix
View file

@ -1,6 +1,7 @@
{ config, lib, minimal, nixosConfig ? config, ... }: { config, pkgs, lib, minimal, globals, nixosConfig ? config, ... }:
let let
inherit (config.swarselsystems) flakePath; inherit (config.swarselsystems) flakePath;
crocDomain = globals.services.croc.domain;
in in
{ {
options.swarselmodules.zsh = lib.mkEnableOption "zsh settings"; options.swarselmodules.zsh = lib.mkEnableOption "zsh settings";
@ -86,7 +87,7 @@ in
# src = pkgs.zsh-fzf-tab; # src = pkgs.zsh-fzf-tab;
# } # }
]; ];
initContent = lib.mkIf (!config.swarselsystems.isPublic) '' initContent = ''
my-forward-word() { my-forward-word() {
local WORDCHARS=$WORDCHARS local WORDCHARS=$WORDCHARS
WORDCHARS="''${WORDCHARS//:}" WORDCHARS="''${WORDCHARS//:}"
@ -125,10 +126,14 @@ in
zle -N my-backward-delete-word zle -N my-backward-delete-word
# ctrl + del # ctrl + del
bindkey '^H' my-backward-delete-word bindkey '^H' my-backward-delete-word
export CROC_PASS="$(cat ${nixosConfig.sops.secrets.croc-password.path})"
export GITHUB_TOKEN="$(cat ${nixosConfig.sops.secrets.github-nixpkgs-review-token.path})"
''; '';
sessionVariables = lib.mkIf (!config.swarselsystems.isPublic) {
CROC_RELAY = crocDomain;
CROC_PASS = "$(cat ${nixosConfig.sops.secrets.croc-password.path})";
GITHUB_TOKEN = "$(cat ${nixosConfig.sops.secrets.github-nixpkgs-review-token.path})";
QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.libsForQt5.qt5.qtbase.bin}/lib/qt-${pkgs.libsForQt5.qt5.qtbase.version}/plugins";
# QTWEBENGINE_CHROMIUM_FLAGS = "--no-sandbox";
};
}; };
}; };
} }

20
modules/home/optional/work.nix
View file

@ -20,8 +20,7 @@ in
openstackclient openstackclient
]; ];
home.sessionVariables = { systemd.user.sessionVariables = {
DOCUMENT_DIR_PRIV = lib.mkForce "${homeDir}/Documents/Private";
DOCUMENT_DIR_WORK = lib.mkForce "${homeDir}/Documents/Work"; DOCUMENT_DIR_WORK = lib.mkForce "${homeDir}/Documents/Work";
}; };
@ -136,6 +135,19 @@ in
pr = "$HOME/Documents/Private"; pr = "$HOME/Documents/Private";
ac = path1; ac = path1;
}; };
sessionVariables = {
VSPHERE_USER = "$(cat ${nixosConfig.sops.secrets.vcuser.path})";
VSPHERE_PW = "$(cat ${nixosConfig.sops.secrets.vcpw.path})";
GOVC_USERNAME = "$(cat ${nixosConfig.sops.secrets.govcuser.path})";
GOVC_PASSWORD = "$(cat ${nixosConfig.sops.secrets.govcpw.path})";
GOVC_URL = "$(cat ${nixosConfig.sops.secrets.govcurl.path})";
GOVC_DATACENTER = "$(cat ${nixosConfig.sops.secrets.govcdc.path})";
GOVC_DATASTORE = "$(cat ${nixosConfig.sops.secrets.govcds.path})";
GOVC_HOST = "$(cat ${nixosConfig.sops.secrets.govchost.path})";
GOVC_RESOURCE_POOL = "$(cat ${nixosConfig.sops.secrets.govcpool.path})";
GOVC_NETWORK = "$(cat ${nixosConfig.sops.secrets.govcnetwork.path})";
};
}; };
ssh = { ssh = {
@ -424,8 +436,8 @@ in
# { command = "nextcloud --background"; } # { command = "nextcloud --background"; }
{ command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; }
{ command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; }
{ command = "ANKI_WAYLAND=1 anki"; } { command = "anki"; }
{ command = "OBSIDIAN_USE_WAYLAND=1 obsidian"; } { command = "obsidian"; }
{ command = "nm-applet"; } { command = "nm-applet"; }
# { command = "feishin"; } # { command = "feishin"; }
{ command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; } { command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; }

6
modules/nixos/client/env.nix
View file

@ -7,15 +7,15 @@
wordlist.enable = true; wordlist.enable = true;
sessionVariables = { sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
SWARSEL_LO_RES = config.swarselsystems.lowResolution;
SWARSEL_HI_RES = config.swarselsystems.highResolution;
GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1; [ GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1; [
gst-plugins-good gst-plugins-good
gst-plugins-bad gst-plugins-bad
gst-plugins-ugly gst-plugins-ugly
gst-libav gst-libav
]); ]);
} // (lib.optionalAttrs (!config.swarselsystems.isPublic) { } // (lib.optionalAttrs (!config.swarselsystems.isPublic) { });
GITHUB_NOTIFICATION_TOKEN_PATH = config.sops.secrets.github-notifications-token.path;
});
}; };
}; };
} }

9
modules/nixos/client/login.nix
View file

@ -5,7 +5,8 @@
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {
initial_session.command = "sway"; # initial_session.command = "sway";
initial_session.command = "uwsm start -- sway-uwsm.desktop";
default_session.command = '' default_session.command = ''
${pkgs.tuigreet}/bin/tuigreet \ ${pkgs.tuigreet}/bin/tuigreet \
--time \ --time \
@ -16,8 +17,8 @@
}; };
}; };
environment.etc."greetd/environments".text = '' # environment.etc."greetd/environments".text = ''
sway # sway
''; # '';
}; };
} }

6
modules/nixos/client/network.nix
View file

@ -59,9 +59,9 @@ in
Settings = { Settings = {
AutoConnect = true; AutoConnect = true;
}; };
DriverQuirks = { # DriverQuirks = {
UseDefaultInterface = true; # UseDefaultInterface = true;
}; # };
}; };
}; };
nftables.enable = lib.mkDefault true; nftables.enable = lib.mkDefault true;

13
modules/nixos/client/sway.nix
View file

@ -1,4 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
let
inherit (config.swarselsystems) mainUser;
in
{ {
options.swarselmodules.sway = lib.mkEnableOption "sway config"; options.swarselmodules.sway = lib.mkEnableOption "sway config";
config = lib.mkIf config.swarselmodules.sway { config = lib.mkIf config.swarselmodules.sway {
@ -10,15 +13,7 @@
gtk = true; gtk = true;
}; };
extraSessionCommands = '' inherit (config.home-manager.users.${mainUser}.wayland.windowManager.sway) extraSessionCommands;
export XDG_SESSION_DESKTOP=sway
export SDL_VIDEODRIVER=wayland
export QT_QPA_PLATFORM=wayland-egl
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export QT_QPA_PLATFORM_PLUGIN_PATH="${pkgs.libsForQt5.qt5.qtbase.bin}/lib/qt-${pkgs.libsForQt5.qt5.qtbase.version}/plugins";
export MOZ_ENABLE_WAYLAND=1
export MOZ_DISABLE_RDD_SANDBOX=1
'';
}; };
}; };
} }

19
modules/nixos/client/uwsm.nix Normal file
View file

@ -0,0 +1,19 @@
{ lib, config, ... }:
let
moduleName = "uwsm";
in
{
options.swarselmodules.${moduleName} = lib.mkEnableOption "${moduleName} settings";
config = lib.mkIf config.swarselmodules.${moduleName} {
programs.uwsm = {
enable = true;
waylandCompositors = {
sway = {
prettyName = "Sway";
comment = "Sway compositor managed by UWSM";
binPath = "/run/current-system/sw/bin/sway";
};
};
};
};
}

12
modules/nixos/optional/work.nix
View file

@ -83,18 +83,6 @@ in
}; };
programs = { programs = {
zsh.shellInit = ''
export VSPHERE_USER="$(cat ${config.sops.secrets.vcuser.path})"
export VSPHERE_PW="$(cat ${config.sops.secrets.vcpw.path})"
export GOVC_USERNAME="$(cat ${config.sops.secrets.govcuser.path})"
export GOVC_PASSWORD="$(cat ${config.sops.secrets.govcpw.path})"
export GOVC_URL="$(cat ${config.sops.secrets.govcurl.path})"
export GOVC_DATACENTER="$(cat ${config.sops.secrets.govcdc.path})"
export GOVC_DATASTORE="$(cat ${config.sops.secrets.govcds.path})"
export GOVC_HOST="$(cat ${config.sops.secrets.govchost.path})"
export GOVC_RESOURCE_POOL="$(cat ${config.sops.secrets.govcpool.path})"
export GOVC_NETWORK="$(cat ${config.sops.secrets.govcnetwork.path})"
'';
browserpass.enable = true; browserpass.enable = true;
_1password.enable = true; _1password.enable = true;

17
modules/shared/vars.nix
View file

@ -1,7 +1,22 @@
{ self, lib, pkgs, ... }: { self, lib, pkgs, ... }:
{ {
_module.args = { _module.args = {
vars = { vars = rec {
waylandSessionVariables = {
SDL_VIDEODRIVER = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_QPA_PLATFORM = "wayland-egl";
ANKI_WAYLAND = "1";
OBSIDIAN_USE_WAYLAND = "1";
MOZ_ENABLE_WAYLAND = "1";
};
waylandExports =
let
renderedWaylandExports = map (key: "export ${key}=${waylandSessionVariables.${key}};") (builtins.attrNames waylandSessionVariables);
in
builtins.concatStringsSep "\n" renderedWaylandExports;
stylix = { stylix = {
polarity = "dark"; polarity = "dark";
opacity.popups = 0.5; opacity.popups = 0.5;

1
profiles/nixos/personal/default.nix
View file

@ -36,6 +36,7 @@
impermanence = lib.mkDefault true; impermanence = lib.mkDefault true;
nvd = lib.mkDefault true; nvd = lib.mkDefault true;
gnome-keyring = lib.mkDefault true; gnome-keyring = lib.mkDefault true;
uwsm = lib.mkDefault true;
sway = lib.mkDefault true; sway = lib.mkDefault true;
xdg-portal = lib.mkDefault true; xdg-portal = lib.mkDefault true;
distrobox = lib.mkDefault true; distrobox = lib.mkDefault true;