swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2026-04-14 13:19:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: overhaul overlays

Browse source
This commit is contained in:
Leon Schwarzäugl 2026-03-05 23:01:13 +01:00
parent 91f4393800
commit 130444f5d7
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
23 changed files with 406 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/home/common/anki.nix
View file

@ -10,7 +10,7 @@ in
programs.anki = {
enable = true;
# # package = pkgs.anki;
package = pkgs.anki;
hideBottomBar = true;
hideBottomBarMode = "always";
hideTopBar = true;

11
modules/home/common/packages.nix
View file

@ -14,7 +14,6 @@
picard-tools
audacity
sox
# stable.feishin # does not work with oauth2-proxy
calibre
# printing
@ -32,7 +31,7 @@
(aspellWithDicts (dicts: with dicts; [ de en en-computers en-science ]))
# browser
stable24_11.vieb
vieb
mgba
# utilities
@ -89,7 +88,7 @@
# element-desktop
nicotine-plus
stable25_05.transmission_3
transmission_3
mktorrent
hugo
@ -150,13 +149,7 @@
slurp
# the following packages are used (in some way) by waybar
# playerctl
pavucontrol
# stable.pamixer
# gnome.gnome-clocks
# wlogout
# jdiskreport
# monitor
#keychain
qalculate-gtk

3
modules/home/common/programs.nix
View file

@ -9,8 +9,7 @@
pkgs.bat-extras.batdiff
pkgs.bat-extras.batman
pkgs.bat-extras.batwatch
] ++ [
pkgs.stable.bat-extras.batgrep
pkgs.bat-extras.batgrep
];
# extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
};

2
modules/home/common/settings.nix
View file

@ -61,6 +61,8 @@ in
nixpkgs = lib.mkIf (!isNixos) {
overlays = [
outputs.overlays.default
outputs.overlays.stables
outputs.overlays.modifications
(final: prev:
let
additions = final: _: import "${self}/pkgs/config" {

2
modules/home/common/swayosd.nix
View file

@ -5,7 +5,7 @@
systemd.user.services.swayosd = confLib.overrideTarget "sway-session.target";
services.swayosd = {
enable = true;
package = pkgs.dev.swayosd;
package = pkgs.swayosd;
topMargin = 0.5;
};
};

2
modules/home/common/vesktop.nix
View file

@ -7,7 +7,7 @@ in
config = lib.mkIf config.swarselmodules.${moduleName} {
programs.${moduleName} = {
enable = true;
package = pkgs.stable.vesktop;
package = pkgs.vesktop;
settings = {
appBadge = false;
arRPC = false;

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

@ -11,7 +11,7 @@ in
config = {
home = {
packages = with pkgs; [
stable.teams-for-linux
teams-for-linux
shellcheck
dig
docker
@ -21,9 +21,9 @@ in
prometheus.cli
tigervnc
# openstackclient
vscode-fhs
antigravity
vscode
dev.antigravity
rustdesk-vbc
];
@ -154,7 +154,7 @@ in
};
awscli = {
enable = true;
package = pkgs.stable24_05.awscli2;
package = pkgs.awscli2;
# settings = {
# "default" = { };
# "profile s3-imagebuilder-prod" = { };
@ -552,7 +552,7 @@ in
};
Service = {
ExecStart = "${pkgs.stable.teams-for-linux}/bin/teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true";
ExecStart = "${pkgs.teams-for-linux}/bin/teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true";
};
};

2
modules/nixos/client/distrobox.nix
View file

@ -10,7 +10,7 @@
virtualisation.podman = {
enable = true;
dockerCompat = true;
package = pkgs.stable.podman;
package = pkgs.podman;
};
};
}

2
modules/nixos/client/hardware.nix
View file

@ -33,7 +33,7 @@
bluetooth = lib.mkIf config.swarselsystems.hasBluetooth {
enable = true;
package = pkgs.stable.bluez;
package = pkgs.bluez;
powerOnBoot = true;
settings = {
General = {

3
modules/nixos/client/nix-ld.nix
View file

@ -82,8 +82,7 @@
pipewire
pixman
speex
# stable.cc.cc
stable25_05.steam-fhsenv-without-steam
steam-fhsenv-without-steam
systemd
tbb
vulkan-loader

2
modules/nixos/client/pipewire.nix
View file

@ -6,7 +6,7 @@
services.pipewire = {
enable = true;
package = pkgs.stable.pipewire;
package = pkgs.pipewire;
pulse.enable = true;
jack.enable = true;
audio.enable = true;

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

@ -2,8 +2,8 @@
{
options.swarselmodules.swayosd = lib.mkEnableOption "swayosd settings";
config = lib.mkIf config.swarselmodules.swayosd {
environment.systemPackages = [ pkgs.dev.swayosd ];
services.udev.packages = [ pkgs.dev.swayosd ];
environment.systemPackages = [ pkgs.swayosd ];
services.udev.packages = [ pkgs.swayosd ];
systemd.services.swayosd-libinput-backend = {
description = "SwayOSD LibInput backend for listening to certain keys like CapsLock, ScrollLock, VolumeUp, etc.";
documentation = [ "https://github.com/ErikReider/SwayOSD" ];
@ -14,7 +14,7 @@
serviceConfig = {
Type = "dbus";
BusName = "org.erikreider.swayosd";
ExecStart = "${pkgs.dev.swayosd}/bin/swayosd-libinput-backend";
ExecStart = "${pkgs.swayosd}/bin/swayosd-libinput-backend";
Restart = "on-failure";
};
};

2
modules/nixos/common/settings.nix
View file

@ -122,6 +122,8 @@ in
nixpkgs = {
overlays = [
outputs.overlays.default
outputs.overlays.stables
outputs.overlays.modifications
] ++ lib.optionals withHomeManager [
(final: prev:
let

6
modules/nixos/darwin/default.nix
View file

@ -12,7 +12,11 @@ in
nix.settings.experimental-features = "nix-command flakes";
nixpkgs = {
hostPlatform = "x86_64-darwin";
overlays = [ outputs.overlays.default ];
overlays = [
outputs.overlays.default
outputs.overlays.stables
outputs.overlays.modifications
];
config = {
allowUnfree = true;
};

2
modules/nixos/optional/virtualbox.nix
View file

@ -8,7 +8,7 @@
enable = true;
enableKvm = true;
addNetworkInterface = lib.mkIf config.virtualisation.virtualbox.host.enableKvm false;
package = pkgs.stable.virtualbox;
package = pkgs.virtualbox;
enableExtensionPack = true;
};
# leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch

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

@ -160,7 +160,7 @@ in
environment.systemPackages = with pkgs; [
remmina
# gp-onsaml-gui
stable24_11.python39
python39
qemu
packer
gnumake

8
modules/nixos/server/firezone.nix
View file

@ -174,19 +174,19 @@ in
domain = {
settings.ERLANG_DISTRIBUTION_PORT = domainPort;
package = pkgs.dev.firezone-server-domain;
package = pkgs.firezone-server-domain;
};
api = {
externalUrl = "https://${serviceDomain}/api/";
address = "0.0.0.0";
port = apiPort;
package = pkgs.dev.firezone-server-api;
package = pkgs.firezone-server-api;
};
web = {
externalUrl = "https://${serviceDomain}/";
address = "0.0.0.0";
port = webPort;
package = pkgs.dev.firezone-server-web;
package = pkgs.firezone-server-web;
};
};
@ -199,7 +199,7 @@ in
publicIpv4 = proxyAddress4;
publicIpv6 = proxyAddress6;
openFirewall = lib.mkIf (!isProxied) true;
package = pkgs.dev.firezone-relay;
package = pkgs.firezone-relay;
};
};
# systemd.services.firezone-initialize =

6
modules/nixos/server/oauth2-proxy.nix
View file

@ -165,14 +165,14 @@ in
services = {
${serviceName} = {
enable = true;
package = pkgs.dev.oauth2-proxy;
package = pkgs.update.oauth2-proxy;
cookie = {
domain = ".${mainDomain}";
secure = true;
expire = "900m";
secret = null; # set by service EnvironmentFile
secretFile = null;
};
clientSecret = null; # set by service EnvironmentFile
clientSecretFile = null;
reverseProxy = true;
httpAddress = "0.0.0.0:${builtins.toString servicePort}";
redirectURL = "https://${serviceDomain}/oauth2/callback";

4
modules/nixos/server/paperless.nix
View file

@ -103,11 +103,11 @@ in
gotenberg = {
enable = true;
package = pkgs.stable.gotenberg;
package = pkgs.gotenberg;
port = gotenbergPort;
bindIP = "127.0.0.1";
timeout = "600s";
chromium.package = pkgs.stable.chromium;
chromium.package = pkgs.chromium;
};
};