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

Compare commits

base: swarsel:a1617e71bdb18d568649f501a7249fb446550838
Branches Tags
swarsel:main
swarsel:feat/router
swarsel:feat/nixos-dns
swarsel:test-extra-modules
swarsel:feat/microvm-preparation
swarsel:v1.1.4
swarsel:v1.1.3
swarsel:v1.1.2
swarsel:v1.1.1
swarsel:v1.1.0
swarsel:v1.0.0
swarsel:v0.1.0
swarsel:v1.0.0-1
...
compare: swarsel:b73978ad19bc0c6e2ac14b37262da6cab078699a
Branches Tags
swarsel:feat/router
swarsel:main
swarsel:feat/nixos-dns
swarsel:test-extra-modules
swarsel:feat/microvm-preparation
swarsel:v1.1.4
swarsel:v1.1.3
swarsel:v1.1.2
swarsel:v1.1.1
swarsel:v1.1.0
swarsel:v1.0.0
swarsel:v0.1.0
swarsel:v1.0.0-1

2 commits
a1617e71bd ... b73978ad19

Author SHA1 Message Date
Leon Schwarzäugl
b73978ad19
feat: make nixosConfig work on home-manager 2025-07-17 03:33:27 +02:00
Leon Schwarzäugl
302c488569
WIP share configuraton between nixos / homemanager 2025-07-17 03:18:37 +02:00
167 changed files with 1043 additions and 1045 deletions
Download patch file Download diff file Expand all files Collapse all files

914
SwarselSystems.org
View file

File diff suppressed because it is too large Load diff

2
hosts/home/treehouse/default.nix
View file

@ -6,6 +6,8 @@
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
"${self}/modules/home" "${self}/modules/home"
"${self}/modules/nixos/common/pii.nix"
"${self}/modules/nixos/common/meta.nix"
]; ];
nixpkgs = { nixpkgs = {

16
hosts/nixos/bakery/default.nix
View file

@ -7,10 +7,6 @@ let
isBtrfs = true; isBtrfs = true;
isLinux = true; isLinux = true;
sharescreen = "eDP-1"; sharescreen = "eDP-1";
profiles = {
reduced = lib.mkIf (!minimal) true;
minimal = lib.mkIf minimal true;
};
}; };
in in
{ {
@ -23,6 +19,11 @@ in
]; ];
swarselprofiles = {
reduced = lib.mkIf (!minimal) true;
minimal = lib.mkIf minimal true;
btrfs = true;
};
swarselsystems = lib.recursiveUpdate swarselsystems = lib.recursiveUpdate
{ {
@ -38,13 +39,14 @@ in
rootDisk = "/dev/nvme0n1"; rootDisk = "/dev/nvme0n1";
swapSize = "4G"; swapSize = "4G";
hostName = config.node.name; hostName = config.node.name;
profiles = {
btrfs = true;
};
} }
sharedOptions; sharedOptions;
home-manager.users."${primaryUser}" = { home-manager.users."${primaryUser}" = {
swarselprofiles = {
reduced = lib.mkIf (!minimal) true;
minimal = lib.mkIf minimal true;
};
# home.stateVersion = lib.mkForce "23.05"; # home.stateVersion = lib.mkForce "23.05";
swarselsystems = lib.recursiveUpdate swarselsystems = lib.recursiveUpdate
{ {

10
hosts/nixos/chaostheatre/default.nix
View file

@ -6,10 +6,6 @@ let
isBtrfs = false; isBtrfs = false;
isLinux = true; isLinux = true;
isPublic = true; isPublic = true;
profiles = {
chaostheatre = lib.mkIf (!minimal) true;
minimal = lib.mkIf minimal true;
};
}; };
in in
{ {
@ -39,6 +35,11 @@ in
firewall.enable = true; firewall.enable = true;
}; };
swarselprofiles = {
chaostheatre = lib.mkIf (!minimal) true;
minimal = lib.mkIf minimal true;
btrfs = true;
};
swarselsystems = lib.recursiveUpdate swarselsystems = lib.recursiveUpdate
{ {
info = "~SwarselSystems~ demo host"; info = "~SwarselSystems~ demo host";
@ -49,7 +50,6 @@ in
isSwap = true; isSwap = true;
swapSize = "4G"; swapSize = "4G";
rootDisk = "/dev/vda"; rootDisk = "/dev/vda";
profiles.btrfs = true;
} }
sharedOptions; sharedOptions;

10
hosts/nixos/milkywell/default.nix
View file

@ -6,9 +6,6 @@ let
isLinux = true; isLinux = true;
isNixos = true; isNixos = true;
}; };
profiles = {
minimal = lib.mkIf minimal true;
};
in in
{ {
imports = [ imports = [
@ -32,6 +29,10 @@ in
enableAllFirmware = lib.mkForce false; enableAllFirmware = lib.mkForce false;
}; };
swarselprofiles = {
minimal = lib.mkIf minimal true;
server.syncserver = true;
};
swarselsystems = lib.recursiveUpdate swarselsystems = lib.recursiveUpdate
{ {
info = "VM.Standard.E2.1.Micro"; info = "VM.Standard.E2.1.Micro";
@ -41,9 +42,6 @@ in
isSwap = true; isSwap = true;
rootDisk = "/dev/sda"; rootDisk = "/dev/sda";
swapSize = "4G"; swapSize = "4G";
profiles = {
server.syncserver = true;
};
} }
sharedOptions; sharedOptions;

6
hosts/nixos/moonside/default.nix
View file

@ -209,6 +209,9 @@ in
}; };
}; };
swarselprofiles = {
server.moonside = true;
};
swarselsystems = lib.recursiveUpdate swarselsystems = lib.recursiveUpdate
{ {
info = "VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM"; info = "VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM";
@ -217,9 +220,6 @@ in
isCrypted = false; isCrypted = false;
isSwap = false; isSwap = false;
rootDisk = "/dev/sda"; rootDisk = "/dev/sda";
profiles = {
server.moonside = true;
};
} }
sharedOptions; sharedOptions;

48
hosts/nixos/pyramid/default.nix
View file

@ -1,19 +1,6 @@
{ self, config, inputs, lib, minimal, ... }: { self, config, inputs, lib, minimal, ... }:
let let
primaryUser = config.swarselsystems.mainUser; primaryUser = config.swarselsystems.mainUser;
sharedOptions = {
isLaptop = true;
isNixos = true;
isBtrfs = true;
isLinux = true;
sharescreen = "eDP-2";
profiles = {
personal = lib.mkIf (!minimal) true;
minimal = lib.mkIf minimal true;
work = lib.mkIf (!minimal) true;
framework = lib.mkIf (!minimal) true;
};
};
in in
{ {
@ -26,8 +13,23 @@ in
]; ];
swarselsystems = lib.recursiveUpdate swarselprofiles = {
{ personal = lib.mkIf (!minimal) true;
work = lib.mkIf (!minimal) true;
framework = lib.mkIf (!minimal) true;
amdcpu = true;
amdgpu = true;
hibernation = true;
btrfs = true;
};
swarselsystems = {
lowResolution = "1280x800";
highResolution = "2560x1600";
isLaptop = true;
isNixos = true;
isBtrfs = true;
isLinux = true;
sharescreen = "eDP-2";
info = "Framework Laptop 16, 7940HS, RX7700S, 64GB RAM"; info = "Framework Laptop 16, 7940HS, RX7700S, 64GB RAM";
firewall = lib.mkForce true; firewall = lib.mkForce true;
wallpaper = self + /files/wallpaper/lenovowp.png; wallpaper = self + /files/wallpaper/lenovowp.png;
@ -39,19 +41,10 @@ in
inherit (config.repo.secrets.local) hostName; inherit (config.repo.secrets.local) hostName;
inherit (config.repo.secrets.local) fqdn; inherit (config.repo.secrets.local) fqdn;
hibernation.offset = 533760; hibernation.offset = 533760;
profiles = {
amdcpu = true;
amdgpu = true;
hibernation = true;
btrfs = true;
}; };
}
sharedOptions;
home-manager.users."${primaryUser}" = { home-manager.users."${primaryUser}" = {
# home.stateVersion = lib.mkForce "23.05"; swarselsystems = {
swarselsystems = lib.recursiveUpdate
{
isSecondaryGpu = true; isSecondaryGpu = true;
SecondaryGpuCard = "pci-0000_03_00_0"; SecondaryGpuCard = "pci-0000_03_00_0";
cpuCount = 16; cpuCount = 16;
@ -60,8 +53,6 @@ in
path = "/sys/devices/virtual/thermal/thermal_zone0/"; path = "/sys/devices/virtual/thermal/thermal_zone0/";
input-filename = "temp4_input"; input-filename = "temp4_input";
}; };
lowResolution = "1280x800";
highResolution = "2560x1600";
monitors = { monitors = {
main = { main = {
name = "BOE 0x0BC9 Unknown"; name = "BOE 0x0BC9 Unknown";
@ -72,7 +63,6 @@ in
output = "eDP-2"; output = "eDP-2";
}; };
}; };
} };
sharedOptions;
}; };
} }

10
hosts/nixos/toto/default.nix
View file

@ -4,10 +4,6 @@ let
sharedOptions = { sharedOptions = {
isBtrfs = true; isBtrfs = true;
isLinux = true; isLinux = true;
profiles = {
toto = lib.mkIf (!minimal) true;
minimal = lib.mkIf minimal true;
};
}; };
in in
{ {
@ -24,6 +20,11 @@ in
firewall.enable = false; firewall.enable = false;
}; };
swarselprofiles = {
toto = lib.mkIf (!minimal) true;
minimal = lib.mkIf minimal true;
btrfs = true;
};
swarselsystems = lib.recursiveUpdate swarselsystems = lib.recursiveUpdate
{ {
info = "~SwarselSystems~ remote install helper"; info = "~SwarselSystems~ remote install helper";
@ -35,7 +36,6 @@ in
swapSize = "2G"; swapSize = "2G";
# rootDisk = "/dev/nvme0n1"; # rootDisk = "/dev/nvme0n1";
rootDisk = "/dev/vda"; rootDisk = "/dev/vda";
profiles.btrfs = true;
# rootDisk = "/dev/vda"; # rootDisk = "/dev/vda";
} }
sharedOptions; sharedOptions;

6
hosts/nixos/winters/default.nix
View file

@ -5,9 +5,6 @@ let
isBtrfs = false; isBtrfs = false;
isLinux = true; isLinux = true;
isNixos = true; isNixos = true;
profiles = {
server.local = true;
};
}; };
in in
{ {
@ -30,6 +27,9 @@ in
}; };
swarselprofiles = {
server.local = true;
};
swarselsystems = lib.recursiveUpdate swarselsystems = lib.recursiveUpdate
{ {
info = "ASRock J4105-ITX, 32GB RAM"; info = "ASRock J4105-ITX, 32GB RAM";

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

@ -3,8 +3,8 @@ let
atuinDomain = globals.services.atuin.domain; atuinDomain = globals.services.atuin.domain;
in in
{ {
options.swarselsystems.modules.atuin = lib.mkEnableOption "atuin settings"; options.swarselmodules.atuin = lib.mkEnableOption "atuin settings";
config = lib.mkIf config.swarselsystems.modules.atuin { config = lib.mkIf config.swarselmodules.atuin {
programs.atuin = { programs.atuin = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

4
modules/home/common/custom-packages.nix
View file

@ -1,8 +1,8 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.ownpackages = lib.mkEnableOption "own packages settings"; options.swarselmodules.ownpackages = lib.mkEnableOption "own packages settings";
config = lib.mkIf config.swarselsystems.modules.ownpackages { config = lib.mkIf config.swarselmodules.ownpackages {
home.packages = with pkgs; lib.mkIf (!config.swarselsystems.isPublic) [ home.packages = with pkgs; lib.mkIf (!config.swarselsystems.isPublic) [
pass-fuzzel pass-fuzzel
cdw cdw

6
modules/home/common/default.nix
View file

@ -1,7 +1,9 @@
{ lib, ... }: { self, lib, ... }:
let let
importNames = lib.swarselsystems.readNix "modules/home/common"; importNames = lib.swarselsystems.readNix "modules/home/common";
in in
{ {
imports = lib.swarselsystems.mkImports importNames "modules/home/common"; imports = lib.swarselsystems.mkImports importNames "modules/home/common" ++ [
"${self}/modules/shared/sharedsetup.nix"
];
} }

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.desktop = lib.mkEnableOption "desktop settings"; options.swarselmodules.desktop = lib.mkEnableOption "desktop settings";
config = lib.mkIf config.swarselsystems.modules.desktop { config = lib.mkIf config.swarselmodules.desktop {
xdg.desktopEntries = { xdg.desktopEntries = {
cura = { cura = {

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.direnv = lib.mkEnableOption "direnv settings"; options.swarselmodules.direnv = lib.mkEnableOption "direnv settings";
config = lib.mkIf config.swarselsystems.modules.direnv { config = lib.mkIf config.swarselmodules.direnv {
programs.direnv = { programs.direnv = {
enable = true; enable = true;
silent = true; silent = true;

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

@ -3,8 +3,8 @@ let
inherit (config.swarselsystems) homeDir isPublic; inherit (config.swarselsystems) homeDir isPublic;
in in
{ {
options.swarselsystems.modules.emacs = lib.mkEnableOption "emacs settings"; options.swarselmodules.emacs = lib.mkEnableOption "emacs settings";
config = lib.mkIf config.swarselsystems.modules.emacs { config = lib.mkIf config.swarselmodules.emacs {
# needed for elfeed # needed for elfeed
sops.secrets.fever-pw = lib.mkIf (!isPublic) { path = "${homeDir}/.emacs.d/.fever"; }; sops.secrets.fever-pw = lib.mkIf (!isPublic) { path = "${homeDir}/.emacs.d/.fever"; };

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

@ -1,12 +1,12 @@
{ lib, config, globals, nixosConfig, ... }: { lib, config, globals, 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) fullName; inherit (nixosConfig.repo.secrets.common) fullName;
crocDomain = globals.services.croc.domain; crocDomain = globals.services.croc.domain;
in in
{ {
options.swarselsystems.modules.env = lib.mkEnableOption "env settings"; options.swarselmodules.env = lib.mkEnableOption "env settings";
config = lib.mkIf config.swarselsystems.modules.env { config = lib.mkIf config.swarselmodules.env {
home.sessionVariables = { home.sessionVariables = {
EDITOR = "e -w"; EDITOR = "e -w";
DISPLAY = ":0"; DISPLAY = ":0";

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.eza = lib.mkEnableOption "eza settings"; options.swarselmodules.eza = lib.mkEnableOption "eza settings";
config = lib.mkIf config.swarselsystems.modules.eza { config = lib.mkIf config.swarselmodules.eza {
programs.eza = { programs.eza = {
enable = true; enable = true;
icons = "auto"; icons = "auto";

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

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
options.swarselsystems.modules.firefox = lib.mkEnableOption "firefox settings"; options.swarselmodules.firefox = lib.mkEnableOption "firefox settings";
config = lib.mkIf config.swarselsystems.modules.firefox { config = lib.mkIf config.swarselmodules.firefox {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.firefox; # uses overrides package = pkgs.firefox; # uses overrides

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.fuzzel = lib.mkEnableOption "fuzzel settings"; options.swarselmodules.fuzzel = lib.mkEnableOption "fuzzel settings";
config = lib.mkIf config.swarselsystems.modules.fuzzel { config = lib.mkIf config.swarselmodules.fuzzel {
programs.fuzzel = { programs.fuzzel = {
enable = true; enable = true;
settings = { settings = {

6
modules/home/common/gammastep.nix
View file

@ -1,10 +1,10 @@
{ lib, config, nixosConfig, ... }: { lib, config, nixosConfig ? config, ... }:
let let
inherit (nixosConfig.repo.secrets.common.location) latitude longitude; inherit (nixosConfig.repo.secrets.common.location) latitude longitude;
in in
{ {
options.swarselsystems.modules.gammastep = lib.mkEnableOption "gammastep settings"; options.swarselmodules.gammastep = lib.mkEnableOption "gammastep settings";
config = lib.mkIf config.swarselsystems.modules.gammastep { config = lib.mkIf config.swarselmodules.gammastep {
services.gammastep = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) { services.gammastep = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) {
enable = true; enable = true;
provider = "manual"; provider = "manual";

6
modules/home/common/git.nix
View file

@ -1,4 +1,4 @@
{ lib, config, globals, minimal, nixosConfig, ... }: { lib, config, globals, minimal, nixosConfig ? config, ... }:
let let
inherit (nixosConfig.repo.secrets.common.mail) address1; inherit (nixosConfig.repo.secrets.common.mail) address1;
inherit (nixosConfig.repo.secrets.common) fullName; inherit (nixosConfig.repo.secrets.common) fullName;
@ -6,8 +6,8 @@ let
gitUser = globals.user.name; gitUser = globals.user.name;
in in
{ {
options.swarselsystems.modules.git = lib.mkEnableOption "git settings"; options.swarselmodules.git = lib.mkEnableOption "git settings";
config = lib.mkIf config.swarselsystems.modules.git { config = lib.mkIf config.swarselmodules.git {
programs.git = { programs.git = {
enable = true; enable = true;
} // lib.optionalAttrs (!minimal) { } // lib.optionalAttrs (!minimal) {

4
modules/home/common/gnome-keyring.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.gnome-keyring = lib.mkEnableOption "gnome keyring settings"; options.swarselmodules.gnome-keyring = lib.mkEnableOption "gnome keyring settings";
config = lib.mkIf config.swarselsystems.modules.gnome-keyring { config = lib.mkIf config.swarselmodules.gnome-keyring {
services.gnome-keyring = lib.mkIf (!config.swarselsystems.isNixos) { services.gnome-keyring = lib.mkIf (!config.swarselsystems.isNixos) {
enable = true; enable = true;
}; };

4
modules/home/common/gpg-agent.nix
View file

@ -3,8 +3,8 @@ let
inherit (config.swarselsystems) mainUser homeDir; inherit (config.swarselsystems) mainUser homeDir;
in in
{ {
options.swarselsystems.modules.gpgagent = lib.mkEnableOption "gpg agent settings"; options.swarselmodules.gpgagent = lib.mkEnableOption "gpg agent settings";
config = lib.mkIf config.swarselsystems.modules.gpgagent { config = lib.mkIf config.swarselmodules.gpgagent {
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.kanshi = lib.mkEnableOption "kanshi settings"; options.swarselmodules.kanshi = lib.mkEnableOption "kanshi settings";
config = lib.mkIf config.swarselsystems.modules.kanshi { config = lib.mkIf config.swarselmodules.kanshi {
swarselsystems = { swarselsystems = {
monitors = { monitors = {
homedesktop = { homedesktop = {

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.kdeconnect = lib.mkEnableOption "kdeconnect settings"; options.swarselmodules.kdeconnect = lib.mkEnableOption "kdeconnect settings";
config = lib.mkIf config.swarselsystems.modules.kdeconnect { config = lib.mkIf config.swarselmodules.kdeconnect {
services.kdeconnect = { services.kdeconnect = {
enable = true; enable = true;
indicator = true; indicator = true;

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.kitty = lib.mkEnableOption "kitty settings"; options.swarselmodules.kitty = lib.mkEnableOption "kitty settings";
config = lib.mkIf config.swarselsystems.modules.kitty { config = lib.mkIf config.swarselmodules.kitty {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
keybindings = { }; keybindings = { };

6
modules/home/common/mail.nix
View file

@ -1,12 +1,12 @@
{ lib, config, nixosConfig, ... }: { lib, config, nixosConfig ? config, ... }:
let let
inherit (nixosConfig.repo.secrets.common.mail) address1 address2 address2-name address3 address3-name address4 address4-user address4-host; inherit (nixosConfig.repo.secrets.common.mail) address1 address2 address2-name address3 address3-name address4 address4-user address4-host;
inherit (nixosConfig.repo.secrets.common) fullName; inherit (nixosConfig.repo.secrets.common) fullName;
inherit (config.swarselsystems) xdgDir; inherit (config.swarselsystems) xdgDir;
in in
{ {
options.swarselsystems.modules.mail = lib.mkEnableOption "mail settings"; options.swarselmodules.mail = lib.mkEnableOption "mail settings";
config = lib.mkIf config.swarselsystems.modules.mail { config = lib.mkIf config.swarselmodules.mail {
sops.secrets = lib.mkIf (!config.swarselsystems.isPublic) { sops.secrets = lib.mkIf (!config.swarselsystems.isPublic) {
address1-token = { path = "${xdgDir}/secrets/address1-token"; }; address1-token = { path = "${xdgDir}/secrets/address1-token"; };

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.mako = lib.mkEnableOption "mako settings"; options.swarselmodules.mako = lib.mkEnableOption "mako settings";
config = lib.mkIf config.swarselsystems.modules.mako { config = lib.mkIf config.swarselmodules.mako {
services.mako = { services.mako = {
enable = true; enable = true;
settings = { settings = {

4
modules/home/common/nix-index.nix
View file

@ -1,7 +1,7 @@
{ self, lib, config, pkgs, ... }: { self, lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.nix-index = lib.mkEnableOption "nix-index settings"; options.swarselmodules.nix-index = lib.mkEnableOption "nix-index settings";
config = lib.mkIf config.swarselsystems.modules.nix-index { config = lib.mkIf config.swarselmodules.nix-index {
programs.nix-index = programs.nix-index =
let let
commandNotFound = pkgs.runCommandLocal "command-not-found.sh" { } '' commandNotFound = pkgs.runCommandLocal "command-not-found.sh" { } ''

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

@ -1,14 +1,14 @@
{ lib, config, nixgl, ... }: { lib, config, nixgl, ... }:
{ {
options.swarselmodules.nixgl = lib.mkEnableOption "nixgl settings";
options.swarselsystems = { options.swarselsystems = {
modules.nixgl = lib.mkEnableOption "nixgl settings";
isSecondaryGpu = lib.mkEnableOption "device has a secondary GPU"; isSecondaryGpu = lib.mkEnableOption "device has a secondary GPU";
SecondaryGpuCard = lib.mkOption { SecondaryGpuCard = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = ""; default = "";
}; };
}; };
config = lib.mkIf config.swarselsystems.modules.nixgl { config = lib.mkIf config.swarselmodules.nixgl {
nixGL = lib.mkIf (!config.swarselsystems.isNixos) { nixGL = lib.mkIf (!config.swarselsystems.isNixos) {
inherit (nixgl) packages; inherit (nixgl) packages;
defaultWrapper = lib.mkDefault "mesa"; defaultWrapper = lib.mkDefault "mesa";

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

@ -1,8 +1,8 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.packages = lib.mkEnableOption "packages settings"; options.swarselmodules.packages = lib.mkEnableOption "packages settings";
config = lib.mkIf config.swarselsystems.modules.packages { config = lib.mkIf config.swarselmodules.packages {
home.packages = with pkgs; [ home.packages = with pkgs; [
# audio stuff # audio stuff

4
modules/home/common/password-store.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.passwordstore = lib.mkEnableOption "passwordstore settings"; options.swarselmodules.passwordstore = lib.mkEnableOption "passwordstore settings";
config = lib.mkIf config.swarselsystems.modules.passwordstore { config = lib.mkIf config.swarselmodules.passwordstore {
programs.password-store = { programs.password-store = {
enable = true; enable = true;
settings = { settings = {

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

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.programs = lib.mkEnableOption "programs settings"; options.swarselmodules.programs = lib.mkEnableOption "programs settings";
config = lib.mkIf config.swarselsystems.modules.programs { config = lib.mkIf config.swarselmodules.programs {
programs = { programs = {
bottom.enable = true; bottom.enable = true;
imv.enable = true; imv.enable = true;

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

@ -3,8 +3,8 @@ let
inherit (config.swarselsystems) mainUser; inherit (config.swarselsystems) mainUser;
in in
{ {
options.swarselsystems.modules.general = lib.mkEnableOption "general nix settings"; options.swarselmodules.general = lib.mkEnableOption "general nix settings";
config = lib.mkIf config.swarselsystems.modules.general { config = lib.mkIf config.swarselmodules.general {
nix = lib.mkIf (!config.swarselsystems.isNixos) { nix = lib.mkIf (!config.swarselsystems.isNixos) {
package = lib.mkForce pkgs.nixVersions.nix_2_28; package = lib.mkForce pkgs.nixVersions.nix_2_28;
extraOptions = '' extraOptions = ''

12
modules/home/common/sharedoptions.nix Normal file
View file

@ -0,0 +1,12 @@
{ lib, config, nixosConfig ? null, ... }:
let
# mirrorAttrs = lib.mapAttrs (_: v: lib.mkDefault v) nixosConfig.swarselsystems;
inherit (lib) mkDefault mapAttrs filterAttrs;
mkDefaultCommonAttrs = base: defaults:
lib.mapAttrs (_: v: lib.mkDefault v)
(lib.filterAttrs (k: _: base ? ${k}) defaults);
in
{
# config.swarselsystems = mirrorAttrs;
config.swarselsystems = lib.mkIf (nixosConfig != null) (mkDefaultCommonAttrs config.swarselsystems nixosConfig.swarselsystems);
}

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

@ -3,8 +3,8 @@ let
inherit (config.swarselsystems) homeDir; inherit (config.swarselsystems) homeDir;
in in
{ {
options.swarselsystems.modules.sops = lib.mkEnableOption "sops settings"; options.swarselmodules.sops = lib.mkEnableOption "sops settings";
config = lib.mkIf config.swarselsystems.modules.sops { config = lib.mkIf config.swarselmodules.sops {
sops = { sops = {
age.sshKeyPaths = [ "${homeDir}/.ssh/sops" "${homeDir}/.ssh/ssh_host_ed25519_key" ]; age.sshKeyPaths = [ "${homeDir}/.ssh/sops" "${homeDir}/.ssh/ssh_host_ed25519_key" ];
defaultSopsFile = "${homeDir}/.dotfiles/secrets/general/secrets.yaml"; defaultSopsFile = "${homeDir}/.dotfiles/secrets/general/secrets.yaml";

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.ssh = lib.mkEnableOption "ssh settings"; options.swarselmodules.ssh = lib.mkEnableOption "ssh settings";
config = lib.mkIf config.swarselsystems.modules.ssh { config = lib.mkIf config.swarselmodules.ssh {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
forwardAgent = true; forwardAgent = true;

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.starship = lib.mkEnableOption "starship settings"; options.swarselmodules.starship = lib.mkEnableOption "starship settings";
config = lib.mkIf config.swarselsystems.modules.starship { config = lib.mkIf config.swarselmodules.starship {
programs.starship = { programs.starship = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

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

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.stylix = lib.mkEnableOption "stylix settings"; options.swarselmodules.stylix = lib.mkEnableOption "stylix settings";
config = lib.mkIf config.swarselsystems.modules.stylix { config = lib.mkIf config.swarselmodules.stylix {
stylix = lib.mkIf (!config.swarselsystems.isNixos) (lib.recursiveUpdate stylix = lib.mkIf (!config.swarselsystems.isNixos) (lib.recursiveUpdate
{ {
image = config.swarselsystems.wallpaper; image = config.swarselsystems.wallpaper;

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

@ -6,8 +6,8 @@ let
}; };
in in
{ {
options.swarselmodules.sway = lib.mkEnableOption "sway settings";
options.swarselsystems = { options.swarselsystems = {
modules.sway = lib.mkEnableOption "sway settings";
inputs = lib.mkOption { inputs = lib.mkOption {
type = lib.types.attrsOf (lib.types.attrsOf lib.types.str); type = lib.types.attrsOf (lib.types.attrsOf lib.types.str);
default = { }; default = { };
@ -72,7 +72,7 @@ in
internal = true; internal = true;
}; };
}; };
config = lib.mkIf config.swarselsystems.modules.sway { config = lib.mkIf config.swarselmodules.sway {
swarselsystems = { swarselsystems = {
touchpad = lib.mkIf config.swarselsystems.isLaptop { touchpad = lib.mkIf config.swarselsystems.isLaptop {
"type:touchpad" = { "type:touchpad" = {

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

@ -1,7 +1,7 @@
{ lib, pkgs, config, ... }: { lib, pkgs, config, ... }:
{ {
options.swarselsystems.modules.swayosd = lib.mkEnableOption "swayosd settings"; options.swarselmodules.swayosd = lib.mkEnableOption "swayosd settings";
config = lib.mkIf config.swarselsystems.modules.swayosd { config = lib.mkIf config.swarselmodules.swayosd {
services.swayosd = { services.swayosd = {
enable = true; enable = true;
package = pkgs.dev.swayosd; package = pkgs.dev.swayosd;

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

@ -1,7 +1,7 @@
{ self, lib, config, ... }: { self, lib, config, ... }:
{ {
options.swarselsystems.modules.symlink = lib.mkEnableOption "symlink settings"; options.swarselmodules.symlink = lib.mkEnableOption "symlink settings";
config = lib.mkIf config.swarselsystems.modules.symlink { config = lib.mkIf config.swarselmodules.symlink {
home.file = { home.file = {
"init.el" = lib.mkDefault { "init.el" = lib.mkDefault {
source = self + /files/emacs/init.el; source = self + /files/emacs/init.el;

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

@ -13,8 +13,8 @@ let
}; };
in in
{ {
options.swarselsystems.modules.tmux = lib.mkEnableOption "tmux settings"; options.swarselmodules.tmux = lib.mkEnableOption "tmux settings";
config = lib.mkIf config.swarselsystems.modules.tmux { config = lib.mkIf config.swarselmodules.tmux {
home.packages = with pkgs; [ home.packages = with pkgs; [
lsof lsof
sesh sesh

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

@ -22,8 +22,8 @@ let
]; ];
in in
{ {
options.swarselmodules.waybar = lib.mkEnableOption "waybar settings";
options.swarselsystems = { options.swarselsystems = {
modules.waybar = lib.mkEnableOption "waybar settings";
cpuCount = lib.mkOption { cpuCount = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = 8; default = 8;
@ -52,7 +52,7 @@ in
internal = true; internal = true;
}; };
}; };
config = lib.mkIf config.swarselsystems.modules.waybar { config = lib.mkIf config.swarselmodules.waybar {
swarselsystems = { swarselsystems = {
waybarModules = lib.mkIf config.swarselsystems.isLaptop (modulesLeft ++ [ waybarModules = lib.mkIf config.swarselsystems.isLaptop (modulesLeft ++ [

4
modules/home/common/yubikey-touch-detector.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.yubikeytouch = lib.mkEnableOption "yubikey touch detector service settings"; options.swarselmodules.yubikeytouch = lib.mkEnableOption "yubikey touch detector service settings";
config = lib.mkIf config.swarselsystems.modules.yubikeytouch { config = lib.mkIf config.swarselmodules.yubikeytouch {
systemd.user.services.yubikey-touch-detector = { systemd.user.services.yubikey-touch-detector = {
Unit = { Unit = {
Description = "Detects when your YubiKey is waiting for a touch"; Description = "Detects when your YubiKey is waiting for a touch";

6
modules/home/common/yubikey.nix
View file

@ -1,11 +1,11 @@
{ lib, config, nixosConfig, ... }: { lib, config, nixosConfig ? config, ... }:
let let
inherit (config.swarselsystems) homeDir; inherit (config.swarselsystems) homeDir;
in in
{ {
options.swarselsystems.modules.yubikey = lib.mkEnableOption "yubikey settings"; options.swarselmodules.yubikey = lib.mkEnableOption "yubikey settings";
config = lib.mkIf config.swarselsystems.modules.yubikey { config = lib.mkIf config.swarselmodules.yubikey {
sops.secrets = lib.mkIf (!config.swarselsystems.isPublic) { sops.secrets = lib.mkIf (!config.swarselsystems.isPublic) {
u2f-keys = { path = "${homeDir}/.config/Yubico/u2f_keys"; }; u2f-keys = { path = "${homeDir}/.config/Yubico/u2f_keys"; };

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

@ -1,7 +1,7 @@
{ self, lib, config, pkgs, ... }: { self, lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.zellij = lib.mkEnableOption "zellij settings"; options.swarselmodules.zellij = lib.mkEnableOption "zellij settings";
config = lib.mkIf config.swarselsystems.modules.zellij { config = lib.mkIf config.swarselmodules.zellij {
programs.zellij = { programs.zellij = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

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

@ -3,14 +3,14 @@ let
inherit (config.swarselsystems) flakePath; inherit (config.swarselsystems) flakePath;
in in
{ {
options.swarselmodules.zsh = lib.mkEnableOption "zsh settings";
options.swarselsystems = { options.swarselsystems = {
modules.zsh = lib.mkEnableOption "zsh settings";
shellAliases = lib.mkOption { shellAliases = lib.mkOption {
type = lib.types.attrsOf lib.types.str; type = lib.types.attrsOf lib.types.str;
default = { }; default = { };
}; };
}; };
config = lib.mkIf config.swarselsystems.modules.zsh config = lib.mkIf config.swarselmodules.zsh
{ {
sops.secrets = { sops.secrets = {

3
modules/home/darwin/default.nix
View file

@ -1,7 +1,8 @@
{ self, ... }: { self, ... }:
{ {
home.stateVersion = "23.05";
imports = [ imports = [
"${self}/modules/home/common/settings.nix" "${self}/modules/home/common/settings.nix"
"${self}/modules/home/common/sharedsetup.nix" "${self}/modules/shared/sharedsetup.nix"
]; ];
} }

4
modules/home/optional/framework.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.optional.framework = lib.mkEnableOption "optional framework machine settings"; options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings";
config = lib.mkIf config.swarselsystems.modules.optional.framework { config = lib.mkIf config.swarselmodules.optional.framework {
swarselsystems = { swarselsystems = {
inputs = { inputs = {
"12972:18:Framework_Laptop_16_Keyboard_Module_-_ANSI_Keyboard" = { "12972:18:Framework_Laptop_16_Keyboard_Module_-_ANSI_Keyboard" = {

4
modules/home/optional/gaming.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.optional.gaming = lib.mkEnableOption "optional gaming settings"; options.swarselmodules.optional.gaming = lib.mkEnableOption "optional gaming settings";
config = lib.mkIf config.swarselsystems.modules.optional.gaming { config = lib.mkIf config.swarselmodules.optional.gaming {
# specialisation = { # specialisation = {
# gaming.configuration = { # gaming.configuration = {
home.packages = with pkgs; [ home.packages = with pkgs; [

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

@ -1,10 +1,10 @@
{ self, config, pkgs, lib, nixosConfig, ... }: { self, config, pkgs, lib, nixosConfig ? config, ... }:
let let
inherit (config.swarselsystems) homeDir; inherit (config.swarselsystems) homeDir;
in in
{ {
options.swarselsystems.modules.optional.work = lib.mkEnableOption "optional work settings"; options.swarselmodules.optional.work = lib.mkEnableOption "optional work settings";
config = lib.mkIf config.swarselsystems.modules.optional.work { config = lib.mkIf config.swarselmodules.optional.work {
home.packages = with pkgs; [ home.packages = with pkgs; [
stable.teams-for-linux stable.teams-for-linux
shellcheck shellcheck

1
modules/home/server/default.nix
View file

@ -6,6 +6,5 @@ in
{ {
imports = lib.swarselsystems.mkImports importNames "modules/home/server" ++ [ imports = lib.swarselsystems.mkImports importNames "modules/home/server" ++ [
"${modulesPath}/home/common/settings.nix" "${modulesPath}/home/common/settings.nix"
"${modulesPath}/home/common/sharedsetup.nix"
]; ];
} }

4
modules/home/server/symlink.nix
View file

@ -1,7 +1,7 @@
{ self, lib, config, ... }: { self, lib, config, ... }:
{ {
options.swarselsystems.modules.server.dotfiles = lib.mkEnableOption "server dotfiles settings"; options.swarselmodules.server.dotfiles = lib.mkEnableOption "server dotfiles settings";
config = lib.mkIf config.swarselsystems.modules.server.dotfiles { config = lib.mkIf config.swarselmodules.server.dotfiles {
home.file = { home.file = {
"init.el" = lib.mkForce { "init.el" = lib.mkForce {
source = self + /files/emacs/server.el; source = self + /files/emacs/server.el;

4
modules/nixos/client/appimage.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.appimage = lib.mkEnableOption "appimage config"; options.swarselmodules.appimage = lib.mkEnableOption "appimage config";
config = lib.mkIf config.swarselsystems.modules.appimage { config = lib.mkIf config.swarselmodules.appimage {
programs.appimage = { programs.appimage = {
enable = true; enable = true;
binfmt = true; binfmt = true;

4
modules/nixos/client/autologin.nix
View file

@ -3,8 +3,8 @@ let
inherit (config.swarselsystems) mainUser; inherit (config.swarselsystems) mainUser;
in in
{ {
options.swarselsystems.modules.autologin = lib.mkEnableOption "optional autologin settings"; options.swarselmodules.autologin = lib.mkEnableOption "optional autologin settings";
config = lib.mkIf config.swarselsystems.modules.autologin { config = lib.mkIf config.swarselmodules.autologin {
services = { services = {
getty.autologinUser = mainUser; getty.autologinUser = mainUser;
greetd.settings.initial_session.user = mainUser; greetd.settings.initial_session.user = mainUser;

4
modules/nixos/client/blueman.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.blueman = lib.mkEnableOption "blueman config"; options.swarselmodules.blueman = lib.mkEnableOption "blueman config";
config = lib.mkIf config.swarselsystems.modules.blueman { config = lib.mkIf config.swarselmodules.blueman {
services.blueman.enable = true; services.blueman.enable = true;
services.hardware.bolt.enable = true; services.hardware.bolt.enable = true;
}; };

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

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.distrobox = lib.mkEnableOption "distrobox config"; options.swarselmodules.distrobox = lib.mkEnableOption "distrobox config";
config = lib.mkIf config.swarselsystems.modules.distrobox { config = lib.mkIf config.swarselmodules.distrobox {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
distrobox distrobox
boxbuddy boxbuddy

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

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.env = lib.mkEnableOption "environment config"; options.swarselmodules.env = lib.mkEnableOption "environment config";
config = lib.mkIf config.swarselsystems.modules.env { config = lib.mkIf config.swarselmodules.env {
environment = { environment = {
wordlist.enable = true; wordlist.enable = true;

4
modules/nixos/client/gnome-keyring.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.gnome-keyring = lib.mkEnableOption "gnome-keyring config"; options.swarselmodules.gnome-keyring = lib.mkEnableOption "gnome-keyring config";
config = lib.mkIf config.swarselsystems.modules.gnome-keyring { config = lib.mkIf config.swarselmodules.gnome-keyring {
services.gnome.gnome-keyring = { services.gnome.gnome-keyring = {
enable = true; enable = true;
}; };

4
modules/nixos/client/gvfs.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.gvfs = lib.mkEnableOption "gvfs config for nautilus"; options.swarselmodules.gvfs = lib.mkEnableOption "gvfs config for nautilus";
config = lib.mkIf config.swarselsystems.modules.gvfs { config = lib.mkIf config.swarselmodules.gvfs {
services.gvfs.enable = true; services.gvfs.enable = true;
}; };
} }

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

@ -1,8 +1,8 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
{ {
options.swarselmodules.hardware = lib.mkEnableOption "hardware config";
options.swarselsystems = { options.swarselsystems = {
modules.hardware = lib.mkEnableOption "hardware config";
hasBluetooth = lib.mkEnableOption "bluetooth availability"; hasBluetooth = lib.mkEnableOption "bluetooth availability";
hasFingerprint = lib.mkEnableOption "fingerprint sensor availability"; hasFingerprint = lib.mkEnableOption "fingerprint sensor availability";
trackpoint = { trackpoint = {
@ -13,7 +13,7 @@
}; };
}; };
}; };
config = lib.mkIf config.swarselsystems.modules.hardware { config = lib.mkIf config.swarselmodules.hardware {
hardware = { hardware = {
# opengl.driSupport32Bit = true is replaced with graphics.enable32Bit and hence redundant # opengl.driSupport32Bit = true is replaced with graphics.enable32Bit and hence redundant
graphics = { graphics = {

4
modules/nixos/client/hardwarecompatibility-keyboards.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.keyboards = lib.mkEnableOption "keyboards config"; options.swarselmodules.keyboards = lib.mkEnableOption "keyboards config";
config = lib.mkIf config.swarselsystems.modules.keyboards { config = lib.mkIf config.swarselmodules.keyboards {
services.udev.packages = with pkgs; [ services.udev.packages = with pkgs; [
qmk-udev-rules qmk-udev-rules
vial vial

4
modules/nixos/client/hardwarecompatibility-ledger.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.ledger = lib.mkEnableOption "ledger config"; options.swarselmodules.ledger = lib.mkEnableOption "ledger config";
config = lib.mkIf config.swarselsystems.modules.ledger { config = lib.mkIf config.swarselmodules.ledger {
hardware.ledger.enable = true; hardware.ledger.enable = true;
services.udev.packages = with pkgs; [ services.udev.packages = with pkgs; [

4
modules/nixos/client/hardwarecompatibility-yubikey.nix
View file

@ -4,8 +4,8 @@ let
inherit (config.repo.secrets.common.yubikeys) cfg1 cfg2; inherit (config.repo.secrets.common.yubikeys) cfg1 cfg2;
in in
{ {
options.swarselsystems.modules.yubikey = lib.mkEnableOption "yubikey config"; options.swarselmodules.yubikey = lib.mkEnableOption "yubikey config";
config = lib.mkIf config.swarselsystems.modules.yubikey { config = lib.mkIf config.swarselmodules.yubikey {
programs.ssh.startAgent = false; programs.ssh.startAgent = false;
services.pcscd.enable = false; services.pcscd.enable = false;

4
modules/nixos/client/interceptiontools.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.interceptionTools = lib.mkEnableOption "interception tools config"; options.swarselmodules.interceptionTools = lib.mkEnableOption "interception tools config";
config = lib.mkIf config.swarselsystems.modules.interceptionTools { config = lib.mkIf config.swarselmodules.interceptionTools {
# Make CAPS work as a dual function ESC/CTRL key # Make CAPS work as a dual function ESC/CTRL key
services.interception-tools = { services.interception-tools = {
enable = true; enable = true;

4
modules/nixos/client/lid.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.lid = lib.mkEnableOption "lid config"; options.swarselmodules.lid = lib.mkEnableOption "lid config";
config = lib.mkIf config.swarselsystems.modules.lid { config = lib.mkIf config.swarselmodules.lid {
services.logind = { services.logind = {
lidSwitch = "suspend"; lidSwitch = "suspend";
lidSwitchDocked = "ignore"; lidSwitchDocked = "ignore";

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

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.login = lib.mkEnableOption "login config"; options.swarselmodules.login = lib.mkEnableOption "login config";
config = lib.mkIf config.swarselsystems.modules.login { config = lib.mkIf config.swarselmodules.login {
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {

4
modules/nixos/client/lowbattery.nix
View file

@ -1,7 +1,7 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
{ {
options.swarselsystems.modules.lowBattery = lib.mkEnableOption "low battery notification config"; options.swarselmodules.lowBattery = lib.mkEnableOption "low battery notification config";
config = lib.mkIf config.swarselsystems.modules.lowBattery { config = lib.mkIf config.swarselmodules.lowBattery {
systemd.user.services."battery-low" = { systemd.user.services."battery-low" = {
enable = true; enable = true;
description = "Timer for battery check that alerts at 10% or less"; description = "Timer for battery check that alerts at 10% or less";

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

@ -10,10 +10,10 @@ let
in in
{ {
options.swarselsystems = { options.swarselsystems = {
modules.network = lib.mkEnableOption "network config";
firewall = lib.swarselsystems.mkTrueOption; firewall = lib.swarselsystems.mkTrueOption;
}; };
config = lib.mkIf config.swarselsystems.modules.network { options.swarselmodules.network = lib.mkEnableOption "network config";
config = lib.mkIf config.swarselmodules.network {
sops = { sops = {
secrets = lib.mkIf (!config.swarselsystems.isPublic) { secrets = lib.mkIf (!config.swarselsystems.isPublic) {

4
modules/nixos/client/networkdevices.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.networkDevices = lib.mkEnableOption "network device config"; options.swarselmodules.networkDevices = lib.mkEnableOption "network device config";
config = lib.mkIf config.swarselsystems.modules.networkDevices { config = lib.mkIf config.swarselmodules.networkDevices {
# enable scanners over network # enable scanners over network
hardware.sane = { hardware.sane = {
enable = true; enable = true;

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

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.nix-ld = lib.mkEnableOption "nix-ld config"; options.swarselmodules.nix-ld = lib.mkEnableOption "nix-ld config";
config = lib.mkIf config.swarselsystems.modules.nix-ld { config = lib.mkIf config.swarselmodules.nix-ld {
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
libraries = with pkgs; [ libraries = with pkgs; [

4
modules/nixos/client/nvd-rebuild.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.nvd = lib.mkEnableOption "nvd config"; options.swarselmodules.nvd = lib.mkEnableOption "nvd config";
config = lib.mkIf config.swarselsystems.modules.nvd { config = lib.mkIf config.swarselmodules.nvd {
environment.systemPackages = [ environment.systemPackages = [
pkgs.nvd pkgs.nvd

4
modules/nixos/client/packages.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, minimal, ... }: { lib, config, pkgs, minimal, ... }:
{ {
options.swarselsystems.modules.packages = lib.mkEnableOption "install packages"; options.swarselmodules.packages = lib.mkEnableOption "install packages";
config = lib.mkIf config.swarselsystems.modules.packages { config = lib.mkIf config.swarselmodules.packages {
environment.systemPackages = with pkgs; lib.optionals (!minimal) [ environment.systemPackages = with pkgs; lib.optionals (!minimal) [
# yubikey packages # yubikey packages

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

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.pipewire = lib.mkEnableOption "pipewire config"; options.swarselmodules.pipewire = lib.mkEnableOption "pipewire config";
config = lib.mkIf config.swarselsystems.modules.pipewire { config = lib.mkIf config.swarselmodules.pipewire {
security.rtkit.enable = true; # this is required for pipewire real-time access security.rtkit.enable = true; # this is required for pipewire real-time access
services.pipewire = { services.pipewire = {

4
modules/nixos/client/polkit.nix
View file

@ -1,7 +1,7 @@
{ lib, config, minimal, ... }: { lib, config, minimal, ... }:
{ {
options.swarselsystems.modules.security = lib.mkEnableOption "security config"; options.swarselmodules.security = lib.mkEnableOption "security config";
config = lib.mkIf config.swarselsystems.modules.security { config = lib.mkIf config.swarselmodules.security {
security = { security = {
pam.services = lib.mkIf (!minimal) { pam.services = lib.mkIf (!minimal) {

4
modules/nixos/client/power-profiles-daemon.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.ppd = lib.mkEnableOption "power profiles daemon config"; options.swarselmodules.ppd = lib.mkEnableOption "power profiles daemon config";
config = lib.mkIf config.swarselsystems.modules.ppd { config = lib.mkIf config.swarselmodules.ppd {
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = true;
}; };
} }

4
modules/nixos/client/programs.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.programs = lib.mkEnableOption "small program modules config"; options.swarselmodules.programs = lib.mkEnableOption "small program modules config";
config = lib.mkIf config.swarselsystems.modules.programs { config = lib.mkIf config.swarselmodules.programs {
programs = { programs = {
dconf.enable = true; dconf.enable = true;
evince.enable = true; evince.enable = true;

4
modules/nixos/client/pulseaudio.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
options.swarselsystems.modules.pulseaudio = lib.mkEnableOption "pulseaudio config"; options.swarselmodules.pulseaudio = lib.mkEnableOption "pulseaudio config";
config = lib.mkIf config.swarselsystems.modules.pulseaudio { config = lib.mkIf config.swarselmodules.pulseaudio {
services.pulseaudio = { services.pulseaudio = {
enable = lib.mkIf (!config.services.pipewire.enable) true; enable = lib.mkIf (!config.services.pipewire.enable) true;
package = pkgs.pulseaudioFull; package = pkgs.pulseaudioFull;

4
modules/nixos/client/sops.nix
View file

@ -1,7 +1,7 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options.swarselsystems.modules.sops = lib.mkEnableOption "sops config"; options.swarselmodules.sops = lib.mkEnableOption "sops config";
config = lib.mkIf config.swarselsystems.modules.sops { config = lib.mkIf config.swarselmodules.sops {
sops = { sops = {
# age.sshKeyPaths = lib.swarselsystems.mkIfElseList config.swarselsystems.isBtrfs [ "/persist/.ssh/sops" "/persist/.ssh/ssh_host_ed25519_key" ] [ "${config.swarselsystems.homeDir}/.ssh/sops" "/etc/ssh/sops" "/etc/ssh/ssh_host_ed25519_key" ]; # age.sshKeyPaths = lib.swarselsystems.mkIfElseList config.swarselsystems.isBtrfs [ "/persist/.ssh/sops" "/persist/.ssh/ssh_host_ed25519_key" ] [ "${config.swarselsystems.homeDir}/.ssh/sops" "/etc/ssh/sops" "/etc/ssh/ssh_host_ed25519_key" ];

4
modules/nixos/client/stylix.nix
View file

@ -1,11 +1,11 @@
{ self, lib, config, ... }: { self, lib, config, ... }:
{ {
options.swarselsystems.modules.stylix = lib.mkEnableOption "stylix config"; options.swarselmodules.stylix = lib.mkEnableOption "stylix config";
config = { config = {
stylix = { stylix = {
enable = true; enable = true;
base16Scheme = "${self}/files/stylix/swarsel.yaml"; base16Scheme = "${self}/files/stylix/swarsel.yaml";
} // lib.optionalAttrs config.swarselsystems.modules.stylix } // lib.optionalAttrs config.swarselmodules.stylix
(lib.recursiveUpdate (lib.recursiveUpdate
{ {
targets.grub.enable = false; # the styling makes grub more ugly targets.grub.enable = false; # the styling makes grub more ugly

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

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.sway = lib.mkEnableOption "sway config"; options.swarselmodules.sway = lib.mkEnableOption "sway config";
config = lib.mkIf config.swarselsystems.modules.sway { config = lib.mkIf config.swarselmodules.sway {
programs.sway = { programs.sway = {
enable = true; enable = true;
package = pkgs.dev.swayfx; package = pkgs.dev.swayfx;

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

@ -1,7 +1,7 @@
{ lib, pkgs, config, ... }: { lib, pkgs, config, ... }:
{ {
options.swarselsystems.modules.swayosd = lib.mkEnableOption "swayosd settings"; options.swarselmodules.swayosd = lib.mkEnableOption "swayosd settings";
config = lib.mkIf config.swarselsystems.modules.swayosd { config = lib.mkIf config.swarselmodules.swayosd {
environment.systemPackages = [ pkgs.dev.swayosd ]; environment.systemPackages = [ pkgs.dev.swayosd ];
services.udev.packages = [ pkgs.dev.swayosd ]; services.udev.packages = [ pkgs.dev.swayosd ];
systemd.services.swayosd-libinput-backend = { systemd.services.swayosd-libinput-backend = {

4
modules/nixos/client/syncthing.nix
View file

@ -3,8 +3,8 @@ let
inherit (config.swarselsystems) mainUser homeDir; inherit (config.swarselsystems) mainUser homeDir;
in in
{ {
options.swarselsystems.modules.syncthing = lib.mkEnableOption "syncthing config"; options.swarselmodules.syncthing = lib.mkEnableOption "syncthing config";
config = lib.mkIf config.swarselsystems.modules.syncthing { config = lib.mkIf config.swarselmodules.syncthing {
services.syncthing = { services.syncthing = {
enable = true; enable = true;
package = pkgs.stable.syncthing; package = pkgs.stable.syncthing;

4
modules/nixos/client/systemd.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.systemdTimeout = lib.mkEnableOption "systemd timeout config"; options.swarselmodules.systemdTimeout = lib.mkEnableOption "systemd timeout config";
config = lib.mkIf config.swarselsystems.modules.systemdTimeout { config = lib.mkIf config.swarselmodules.systemdTimeout {
# systemd # systemd
systemd.extraConfig = '' systemd.extraConfig = ''
DefaultTimeoutStartSec=60s DefaultTimeoutStartSec=60s

4
modules/nixos/client/xdg-portal.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.xdg-portal = lib.mkEnableOption "xdg portal config"; options.swarselmodules.xdg-portal = lib.mkEnableOption "xdg portal config";
config = lib.mkIf config.swarselsystems.modules.xdg-portal { config = lib.mkIf config.swarselmodules.xdg-portal {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
config = { config = {

4
modules/nixos/client/zsh.nix
View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
options.swarselsystems.modules.zsh = lib.mkEnableOption "zsh base config"; options.swarselmodules.zsh = lib.mkEnableOption "zsh base config";
config = lib.mkIf config.swarselsystems.modules.zsh { config = lib.mkIf config.swarselmodules.zsh {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = false; enableCompletion = false;

13
modules/nixos/common/home-manager.nix
View file

@ -1,7 +1,7 @@
{ self, inputs, config, lib, outputs, globals, nodes, minimal, configName, ... }: { self, inputs, config, lib, outputs, globals, options, nodes, minimal, configName, ... }:
{ {
options.swarselsystems.modules.home-manager = lib.mkEnableOption "home-manager"; options.swarselmodules.home-manager = lib.mkEnableOption "home-manager";
config = lib.mkIf config.swarselsystems.modules.home-manager { config = lib.mkIf config.swarselmodules.home-manager {
home-manager = lib.mkIf config.swarselsystems.withHomeManager { home-manager = lib.mkIf config.swarselsystems.withHomeManager {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
@ -14,8 +14,11 @@
imports = [ imports = [
"${self}/profiles/home" "${self}/profiles/home"
"${self}/modules/home" "${self}/modules/home"
# "${self}/modules/nixos/common/pii.nix" {
# "${self}/modules/nixos/common/meta.nix" swarselprofiles = {
minimal = lib.mkIf minimal true;
};
}
]; ];
# node = { # node = {
# secretsDir = if (!config.swarselsystems.isNixos) then ../../../hosts/home/${configName}/secrets else ../../../hosts/nixos/${configName}/secrets; # secretsDir = if (!config.swarselsystems.isNixos) then ../../../hosts/home/${configName}/secrets else ../../../hosts/nixos/${configName}/secrets;

4
modules/nixos/common/impermanence.nix
View file

@ -4,8 +4,8 @@ let
inherit (config.swarselsystems) isImpermanence isCrypted; inherit (config.swarselsystems) isImpermanence isCrypted;
in in
{ {
options.swarselsystems.modules.impermanence = lib.mkEnableOption "impermanence config"; options.swarselmodules.impermanence = lib.mkEnableOption "impermanence config";
config = lib.mkIf config.swarselsystems.modules.impermanence { config = lib.mkIf config.swarselmodules.impermanence {
security.sudo.extraConfig = lib.mkIf isImpermanence '' security.sudo.extraConfig = lib.mkIf isImpermanence ''

4
modules/nixos/common/lanzaboote.nix
View file

@ -1,7 +1,7 @@
{ lib, pkgs, config, minimal, ... }: { lib, pkgs, config, minimal, ... }:
{ {
options.swarselsystems.modules.lanzaboote = lib.mkEnableOption "lanzaboote config"; options.swarselmodules.lanzaboote = lib.mkEnableOption "lanzaboote config";
config = lib.mkIf config.swarselsystems.modules.lanzaboote { config = lib.mkIf config.swarselmodules.lanzaboote {
environment.systemPackages = lib.mkIf config.swarselsystems.isSecureBoot [ environment.systemPackages = lib.mkIf config.swarselsystems.isSecureBoot [
pkgs.sbctl pkgs.sbctl

4
modules/nixos/common/pii.nix
View file

@ -58,9 +58,9 @@ in
description = "Exposes the loaded repo secrets. This option is read-only."; description = "Exposes the loaded repo secrets. This option is read-only.";
}; };
}; };
swarselsystems.modules.pii = lib.mkEnableOption "enable pii management"; swarselmodules.pii = lib.mkEnableOption "enable pii management";
}; };
config = lib.mkIf config.swarselsystems.modules.pii { config = lib.mkIf config.swarselmodules.pii {
repo.secretFiles = repo.secretFiles =
let let
local = config.node.secretsDir + "/pii.nix.enc"; local = config.node.secretsDir + "/pii.nix.enc";

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

@ -52,8 +52,8 @@ let
}; };
in in
{ {
options.swarselsystems.modules.general = lib.mkEnableOption "general nix settings"; options.swarselmodules.general = lib.mkEnableOption "general nix settings";
config = lib.mkIf config.swarselsystems.modules.general config = lib.mkIf config.swarselmodules.general
(lib.recursiveUpdate (lib.recursiveUpdate
{ {
sops.secrets.github-api-token = lib.mkIf (!minimal) { sops.secrets.github-api-token = lib.mkIf (!minimal) {

27
modules/nixos/common/sharedsetup.nix
View file

@ -1,27 +0,0 @@
{ lib, ... }:
{
options = {
swarselsystems = {
withHomeManager = lib.mkOption {
type = lib.types.bool;
default = true;
};
isSwap = lib.mkOption {
type = lib.types.bool;
default = true;
};
swapSize = lib.mkOption {
type = lib.types.str;
default = "8G";
};
rootDisk = lib.mkOption {
type = lib.types.str;
default = "";
};
isCrypted = lib.mkEnableOption "uses full disk encryption";
isImpermanence = lib.mkEnableOption "use impermanence on this system";
isSecureBoot = lib.mkEnableOption "use secure boot on this system";
};
};
}

4
modules/nixos/common/time.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.time = lib.mkEnableOption "time config"; options.swarselmodules.time = lib.mkEnableOption "time config";
config = lib.mkIf config.swarselsystems.modules.time { config = lib.mkIf config.swarselmodules.time {
time = { time = {
timeZone = "Europe/Vienna"; timeZone = "Europe/Vienna";
# hardwareClockInLocalTime = true; # hardwareClockInLocalTime = true;

4
modules/nixos/common/users.nix
View file

@ -3,8 +3,8 @@ let
sopsFile = self + /secrets/general/secrets.yaml; sopsFile = self + /secrets/general/secrets.yaml;
in in
{ {
options.swarselsystems.modules.users = lib.mkEnableOption "user config"; options.swarselmodules.users = lib.mkEnableOption "user config";
config = lib.mkIf config.swarselsystems.modules.users { config = lib.mkIf config.swarselmodules.users {
sops.secrets.main-user-hashed-pw = lib.mkIf (!config.swarselsystems.isPublic) { inherit sopsFile; neededForUsers = true; }; sops.secrets.main-user-hashed-pw = lib.mkIf (!config.swarselsystems.isPublic) { inherit sopsFile; neededForUsers = true; };
users = { users = {

4
modules/nixos/common/xserver.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.xserver = lib.mkEnableOption "xserver keymap"; options.swarselmodules.xserver = lib.mkEnableOption "xserver keymap";
config = lib.mkIf config.swarselsystems.modules.packages { config = lib.mkIf config.swarselmodules.packages {
services.xserver = { services.xserver = {
xkb = { xkb = {
layout = "us"; layout = "us";

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

@ -6,8 +6,8 @@ in
imports = [ imports = [
]; ];
options.swarselsystems.modules.darwin.general = lib.mkEnableOption "darwin config"; options.swarselmodules.optional.darwin = lib.mkEnableOption "optional darwin settings";
config = lib.mkIf config.swarselsystems.modules.darwin.general { config = lib.mkIf config.swarselmodules.optional.darwin {
nix.settings.experimental-features = "nix-command flakes"; nix.settings.experimental-features = "nix-command flakes";
nixpkgs = { nixpkgs = {
hostPlatform = "x86_64-darwin"; hostPlatform = "x86_64-darwin";

4
modules/nixos/optional/amdcpu.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.optional.amdcpu = lib.mkEnableOption "optional amd cpu settings"; options.swarselmodules.optional.amdcpu = lib.mkEnableOption "optional amd cpu settings";
config = lib.mkIf config.swarselsystems.modules.optional.amdcpu { config = lib.mkIf config.swarselmodules.optional.amdcpu {
hardware = { hardware = {
cpu.amd.updateMicrocode = true; cpu.amd.updateMicrocode = true;
}; };

4
modules/nixos/optional/amdgpu.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.optional.amdgpu = lib.mkEnableOption "optional amd gpu settings"; options.swarselmodules.optional.amdgpu = lib.mkEnableOption "optional amd gpu settings";
config = lib.mkIf config.swarselsystems.modules.optional.amdgpu { config = lib.mkIf config.swarselmodules.optional.amdgpu {
hardware = { hardware = {
amdgpu = { amdgpu = {
opencl.enable = true; opencl.enable = true;

4
modules/nixos/optional/btrfs.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
options.swarselsystems.modules.optional.btrfs = lib.mkEnableOption "optional btrfs settings"; options.swarselmodules.optional.btrfs = lib.mkEnableOption "optional btrfs settings";
config = lib.mkIf config.swarselsystems.modules.optional.btrfs { config = lib.mkIf config.swarselmodules.optional.btrfs {
boot = { boot = {
supportedFilesystems = [ "btrfs" ]; supportedFilesystems = [ "btrfs" ];
}; };

Some files were not shown because too many files have changed in this diff Show more