-This file has 93926 words spanning 24087 lines and was last revised on 2025-08-25 22:51:17 +0200. +This file has 94377 words spanning 24139 lines and was last revised on 2025-09-15 15:55:25 +0200.
@@ -891,7 +891,7 @@ This section defines my Emacs configuration. For a while, I considered to use ry
-My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-08-25 22:51:17 +0200) +My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-09-15 15:55:25 +0200)
@@ -903,7 +903,7 @@ system-configuration-options---prefix=/nix/store/6gy60bnwvzbvvmg10vqcnhrjnnrpi4y8-emacs-git-pgtk-20250808.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets --with-dbus --with-selinux +--prefix=/nix/store/4gbb3sfa5p6l3lhhnf0khvfj6w7qbqk5-emacs-git-pgtk-20250914.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets --with-dbus --with-selinux@@ -1380,7 +1380,8 @@ This provides devshell support for flake-parts url = "github:dj95/zjstatus"; }; fw-fanctrl = { - url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + # url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + url = "github:Swarsel/fw-fanctrl/packaging/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { @@ -2209,7 +2210,7 @@ Lastly, in the
perSystem attribute set, we see that it is actually
devshells.default = {
packages = [
- (builtins.trace "alarm: we pinned nix_2_24 because of https://github.com/shlevy/nix-plugins/issues/20" pkgs.nixVersions.nix_2_24) # Always use the nix version from this flake's nixpkgs version, so that nix-plugins (below) doesn't fail because of different nix versions.
+ # (builtins.trace "alarm: we pinned nix_2_24 because of https://github.com/shlevy/nix-plugins/issues/20" pkgs.nixVersions.nix_2_24) # Always use the nix version from this flake's nixpkgs version, so that nix-plugins (below) doesn't fail because of different nix versions.
pkgs.git
pkgs.just
pkgs.age
@@ -2518,7 +2519,7 @@ in
nativeMessagingHosts = [
prev.tridactyl-native
prev.browserpass
- prev.plasma5Packages.plasma-browser-integration
+ # prev.plasma5Packages.plasma-browser-integration
];
};
@@ -2931,7 +2932,7 @@ My work machine. Built for more security, this is the gold standard of my config
{ self, config, inputs, lib, minimal, ... }:
+{ self, config, inputs, lib, minimal, ... }:
let
primaryUser = config.swarselsystems.mainUser;
in
@@ -2945,6 +2946,16 @@ in
];
+ # swarselservices.homebox = {
+ # enable = true;
+ # package = pkgs.dev.homebox;
+ # settings = {
+ # HBOX_OPTIONS_ALLOW_REGISTRATION = "false";
+ # # HBOX_STORAGE_DATA = "/test";
+ # # HBOX_STORAGE_CONN_STRING = "file:///lolna";
+ # HBOX_STORAGE_PREFIX_PATH = null;
+ # };
+ # };
swarselprofiles = {
personal = lib.mkIf (!minimal) true;
@@ -4429,12 +4440,16 @@ in
channel.enable = false;
package = pkgs.nixVersions.nix_2_28;
extraOptions = ''
- plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
- buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
- patches = (o.patches or []) ++ [ ../nix/nix-plugins.patch ];
- })}/lib/nix/plugins
+ plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
extra-builtins-file = ${../nix/extra-builtins.nix}
'';
+ # extraOptions = ''
+ # plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
+ # buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
+ # patches = (o.patches or []) ++ [ ../nix/nix-plugins.patch ];
+ # })}/lib/nix/plugins
+ # extra-builtins-file = ${../nix/extra-builtins.nix}
+ # '';
settings.experimental-features = [ "nix-command" "flakes" ];
};
@@ -5229,7 +5244,7 @@ in
};
nix = {
- package = pkgs.nixVersions.nix_2_28;
+ package = pkgs.nixVersions.nix_2_30;
settings = {
experimental-features = [
"nix-command"
@@ -5240,19 +5255,21 @@ in
];
trusted-users = [ "@wheel" "${config.swarselsystems.mainUser}" ];
};
- # extraOptions = ''
- # plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
- # extra-builtins-file = ${self + /nix/extra-builtins.nix}
- # '';
extraOptions = ''
- plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
- buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
- patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
- })}/lib/nix/plugins
+ plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
extra-builtins-file = ${self + /nix/extra-builtins.nix}
'' + lib.optionalString (!minimal) ''
!include ${config.sops.secrets.github-api-token.path}
'';
+ # extraOptions = ''
+ # plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
+ # buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
+ # patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
+ # })}/lib/nix/plugins
+ # extra-builtins-file = ${self + /nix/extra-builtins.nix}
+ # '' + lib.optionalString (!minimal) ''
+ # !include ${config.sops.secrets.github-api-token.path}
+ # '';
};
system.stateVersion = lib.mkDefault "23.05";
@@ -7060,13 +7077,13 @@ This snipped is added to the activation script that is run after every rebuild a
pkgs.nvd
];
- system.activationScripts.diff = {
- supportsDryActivation = true;
- text = ''
- ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \
- /run/current-system "$systemConfig"
- '';
- };
+ # system.activationScripts.diff = {
+ # supportsDryActivation = true;
+ # text = ''
+ # ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \
+ # /run/current-system "$systemConfig"
+ # '';
+ # };
};
}
@@ -7141,11 +7158,11 @@ This allows me to use screen sharing on Wayland. The implementation is a bit cru
config = lib.mkIf config.swarselmodules.xdg-portal {
xdg.portal = {
enable = true;
- # config = {
- # common = {
- # default = "wlr";
- # };
- # };
+ config = {
+ common = {
+ default = "wlr";
+ };
+ };
wlr.enable = true;
wlr.settings.screencast = {
output_name = "eDP-1";
@@ -7222,9 +7239,9 @@ This turns off the display when the lid is closed.
{
options.swarselmodules.lid = lib.mkEnableOption "lid config";
config = lib.mkIf config.swarselmodules.lid {
- services.logind = {
- lidSwitch = "suspend";
- lidSwitchDocked = "ignore";
+ services.logind.settings.Login = {
+ HandleLidSwitch = "suspend";
+ HandleLidSwitchDocked = "ignore";
};
services.acpid = {
enable = true;
@@ -12101,14 +12118,18 @@ in
options.swarselmodules.general = lib.mkEnableOption "general nix settings";
config = lib.mkIf config.swarselmodules.general {
nix = lib.mkIf (!config.swarselsystems.isNixos) {
- package = lib.mkForce pkgs.nixVersions.nix_2_28;
+ package = lib.mkForce pkgs.nixVersions.nix_2_30;
extraOptions = ''
- plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
- buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
- patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
- })}/lib/nix/plugins
+ plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
extra-builtins-file = ${self + /nix/extra-builtins.nix}
'';
+ # extraOptions = ''
+ # plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
+ # buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
+ # patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
+ # })}/lib/nix/plugins
+ # extra-builtins-file = ${self + /nix/extra-builtins.nix}
+ # '';
settings = {
experimental-features = [
"nix-command"
@@ -12307,7 +12328,7 @@ This holds packages that I can use as provided, or with small modifications (as
# spotify
vesktop # discord client
# nextcloud-client # enables a systemd service that I do not want
- stable.spotify-player
+ spotify-player
element-desktop
nicotine-plus
stable.transmission_3
@@ -12546,12 +12567,24 @@ It is very convenient to have SSH aliases in place for machines that I use. This
config = lib.mkIf config.swarselmodules.ssh {
programs.ssh = {
enable = true;
- forwardAgent = true;
+ enableDefaultConfig = false;
extraConfig = ''
SetEnv TERM=xterm-256color
ServerAliveInterval 20
'';
matchBlocks = {
+ "*" = {
+ forwardAgent = true;
+ addKeysToAgent = "no";
+ compression = false;
+ serverAliveInterval = 0;
+ serverAliveCountMax = 3;
+ hashKnownHosts = false;
+ userKnownHostsFile = "~/.ssh/known_hosts";
+ controlMaster = "no";
+ controlPath = "~/.ssh/master-%r@%n:%p";
+ controlPersist = "no";
+ };
"pfsense" = {
hostname = "192.168.1.1";
user = "root";
@@ -14893,7 +14926,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
{ app_id = "pavucontrol"; }
{ app_id = "syncthingtray"; }
{ app_id = "Element"; }
- { class = "1Password"; }
+ { app_id = "1Password"; }
{ app_id = "com.nextcloud.desktopclient.nextcloud"; }
{ title = "(?:Open|Save) (?:File|Folder|As)"; }
{ title = "^Add$"; }
@@ -15475,7 +15508,8 @@ in
config = lib.mkIf config.swarselmodules.${moduleName} {
programs.spicetify = {
enable = true;
- spotifyPackage = pkgs.stable24_11.spotify;
+ # spotifyPackage = pkgs.stable24_11.spotify;
+ spotifyPackage = pkgs.spotify;
enabledExtensions = with spicePkgs.extensions; [
fullAppDisplay
shuffle
@@ -16474,7 +16508,7 @@ In short, the options defined here are passed to the modules systems using
diff --git a/install/installer-config.nix b/install/installer-config.nix
index f720a1c..1ac1941 100644
--- a/install/installer-config.nix
+++ b/install/installer-config.nix
@@ -49,12 +49,16 @@ in
channel.enable = false;
package = pkgs.nixVersions.nix_2_28;
extraOptions = ''
- plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
- buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
- patches = (o.patches or []) ++ [ ../nix/nix-plugins.patch ];
- })}/lib/nix/plugins
+ plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
extra-builtins-file = ${../nix/extra-builtins.nix}
'';
+ # extraOptions = ''
+ # plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
+ # buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
+ # patches = (o.patches or []) ++ [ ../nix/nix-plugins.patch ];
+ # })}/lib/nix/plugins
+ # extra-builtins-file = ${../nix/extra-builtins.nix}
+ # '';
settings.experimental-features = [ "nix-command" "flakes" ];
};
diff --git a/modules/home/common/packages.nix b/modules/home/common/packages.nix
index f39bb61..72ada06 100644
--- a/modules/home/common/packages.nix
+++ b/modules/home/common/packages.nix
@@ -81,7 +81,7 @@
# spotify
vesktop # discord client
# nextcloud-client # enables a systemd service that I do not want
- stable.spotify-player
+ spotify-player
element-desktop
nicotine-plus
stable.transmission_3
diff --git a/modules/home/common/settings.nix b/modules/home/common/settings.nix
index 3a349f7..e797c70 100644
--- a/modules/home/common/settings.nix
+++ b/modules/home/common/settings.nix
@@ -6,14 +6,18 @@ in
options.swarselmodules.general = lib.mkEnableOption "general nix settings";
config = lib.mkIf config.swarselmodules.general {
nix = lib.mkIf (!config.swarselsystems.isNixos) {
- package = lib.mkForce pkgs.nixVersions.nix_2_28;
+ package = lib.mkForce pkgs.nixVersions.nix_2_30;
extraOptions = ''
- plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
- buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
- patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
- })}/lib/nix/plugins
+ plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
extra-builtins-file = ${self + /nix/extra-builtins.nix}
'';
+ # extraOptions = ''
+ # plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
+ # buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
+ # patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
+ # })}/lib/nix/plugins
+ # extra-builtins-file = ${self + /nix/extra-builtins.nix}
+ # '';
settings = {
experimental-features = [
"nix-command"
diff --git a/modules/home/common/spicetify.nix b/modules/home/common/spicetify.nix
index d8a9864..e043344 100644
--- a/modules/home/common/spicetify.nix
+++ b/modules/home/common/spicetify.nix
@@ -8,7 +8,8 @@ in
config = lib.mkIf config.swarselmodules.${moduleName} {
programs.spicetify = {
enable = true;
- spotifyPackage = pkgs.stable24_11.spotify;
+ # spotifyPackage = pkgs.stable24_11.spotify;
+ spotifyPackage = pkgs.spotify;
enabledExtensions = with spicePkgs.extensions; [
fullAppDisplay
shuffle
diff --git a/modules/home/common/ssh.nix b/modules/home/common/ssh.nix
index 0124c15..24c95eb 100644
--- a/modules/home/common/ssh.nix
+++ b/modules/home/common/ssh.nix
@@ -4,12 +4,24 @@
config = lib.mkIf config.swarselmodules.ssh {
programs.ssh = {
enable = true;
- forwardAgent = true;
+ enableDefaultConfig = false;
extraConfig = ''
SetEnv TERM=xterm-256color
ServerAliveInterval 20
'';
matchBlocks = {
+ "*" = {
+ forwardAgent = true;
+ addKeysToAgent = "no";
+ compression = false;
+ serverAliveInterval = 0;
+ serverAliveCountMax = 3;
+ hashKnownHosts = false;
+ userKnownHostsFile = "~/.ssh/known_hosts";
+ controlMaster = "no";
+ controlPath = "~/.ssh/master-%r@%n:%p";
+ controlPersist = "no";
+ };
"pfsense" = {
hostname = "192.168.1.1";
user = "root";
diff --git a/modules/home/common/sway.nix b/modules/home/common/sway.nix
index f4e13de..a903b0a 100644
--- a/modules/home/common/sway.nix
+++ b/modules/home/common/sway.nix
@@ -262,7 +262,7 @@ in
{ app_id = "pavucontrol"; }
{ app_id = "syncthingtray"; }
{ app_id = "Element"; }
- { class = "1Password"; }
+ { app_id = "1Password"; }
{ app_id = "com.nextcloud.desktopclient.nextcloud"; }
{ title = "(?:Open|Save) (?:File|Folder|As)"; }
{ title = "^Add$"; }
diff --git a/modules/nixos/client/lid.nix b/modules/nixos/client/lid.nix
index faf1a84..c426e24 100644
--- a/modules/nixos/client/lid.nix
+++ b/modules/nixos/client/lid.nix
@@ -2,9 +2,9 @@
{
options.swarselmodules.lid = lib.mkEnableOption "lid config";
config = lib.mkIf config.swarselmodules.lid {
- services.logind = {
- lidSwitch = "suspend";
- lidSwitchDocked = "ignore";
+ services.logind.settings.Login = {
+ HandleLidSwitch = "suspend";
+ HandleLidSwitchDocked = "ignore";
};
services.acpid = {
enable = true;
diff --git a/modules/nixos/client/nvd-rebuild.nix b/modules/nixos/client/nvd-rebuild.nix
index 731ca3a..0f936e0 100644
--- a/modules/nixos/client/nvd-rebuild.nix
+++ b/modules/nixos/client/nvd-rebuild.nix
@@ -7,12 +7,12 @@
pkgs.nvd
];
- system.activationScripts.diff = {
- supportsDryActivation = true;
- text = ''
- ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \
- /run/current-system "$systemConfig"
- '';
- };
+ # system.activationScripts.diff = {
+ # supportsDryActivation = true;
+ # text = ''
+ # ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \
+ # /run/current-system "$systemConfig"
+ # '';
+ # };
};
}
diff --git a/modules/nixos/client/xdg-portal.nix b/modules/nixos/client/xdg-portal.nix
index da04970..9da6946 100644
--- a/modules/nixos/client/xdg-portal.nix
+++ b/modules/nixos/client/xdg-portal.nix
@@ -4,11 +4,11 @@
config = lib.mkIf config.swarselmodules.xdg-portal {
xdg.portal = {
enable = true;
- # config = {
- # common = {
- # default = "wlr";
- # };
- # };
+ config = {
+ common = {
+ default = "wlr";
+ };
+ };
wlr.enable = true;
wlr.settings.screencast = {
output_name = "eDP-1";
diff --git a/modules/nixos/common/settings.nix b/modules/nixos/common/settings.nix
index 57625c1..e92ba9f 100644
--- a/modules/nixos/common/settings.nix
+++ b/modules/nixos/common/settings.nix
@@ -61,7 +61,7 @@ in
};
nix = {
- package = pkgs.nixVersions.nix_2_28;
+ package = pkgs.nixVersions.nix_2_30;
settings = {
experimental-features = [
"nix-command"
@@ -72,19 +72,21 @@ in
];
trusted-users = [ "@wheel" "${config.swarselsystems.mainUser}" ];
};
- # extraOptions = ''
- # plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
- # extra-builtins-file = ${self + /nix/extra-builtins.nix}
- # '';
extraOptions = ''
- plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
- buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
- patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
- })}/lib/nix/plugins
+ plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
extra-builtins-file = ${self + /nix/extra-builtins.nix}
'' + lib.optionalString (!minimal) ''
!include ${config.sops.secrets.github-api-token.path}
'';
+ # extraOptions = ''
+ # plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
+ # buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost];
+ # patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
+ # })}/lib/nix/plugins
+ # extra-builtins-file = ${self + /nix/extra-builtins.nix}
+ # '' + lib.optionalString (!minimal) ''
+ # !include ${config.sops.secrets.github-api-token.path}
+ # '';
};
system.stateVersion = lib.mkDefault "23.05";
diff --git a/modules/shared/vars.nix b/modules/shared/vars.nix
index 053232b..d140bc2 100644
--- a/modules/shared/vars.nix
+++ b/modules/shared/vars.nix
@@ -77,7 +77,7 @@
browserpass
clearurls
darkreader
- enhancer-for-youtube
+ # enhancer-for-youtube
istilldontcareaboutcookies
translate-web-pages
ublock-origin
@@ -90,7 +90,7 @@
enhanced-github
unpaywall
don-t-fuck-with-paste
- plasma-integration
+ # plasma-integration
noscript
# configure a shortcut 'ctrl+shift+c' with behaviour 'do nothing' in order to disable the dev console shortcut
diff --git a/nix/devshell.nix b/nix/devshell.nix
index 3a1fd9c..1135a1b 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -48,7 +48,7 @@
devshells.default = {
packages = [
- (builtins.trace "alarm: we pinned nix_2_24 because of https://github.com/shlevy/nix-plugins/issues/20" pkgs.nixVersions.nix_2_24) # Always use the nix version from this flake's nixpkgs version, so that nix-plugins (below) doesn't fail because of different nix versions.
+ # (builtins.trace "alarm: we pinned nix_2_24 because of https://github.com/shlevy/nix-plugins/issues/20" pkgs.nixVersions.nix_2_24) # Always use the nix version from this flake's nixpkgs version, so that nix-plugins (below) doesn't fail because of different nix versions.
pkgs.git
pkgs.just
pkgs.age
diff --git a/nix/overlays.nix b/nix/overlays.nix
index 5a0fbc4..140c9ca 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -20,7 +20,7 @@ in
nativeMessagingHosts = [
prev.tridactyl-native
prev.browserpass
- prev.plasma5Packages.plasma-browser-integration
+ # prev.plasma5Packages.plasma-browser-integration
];
};