diff options
63 files changed, 138 insertions, 138 deletions
diff --git a/hm/jaki/default.nix b/hm/jaki/default.nix index 6fd1a71..5e12d4f 100644 --- a/hm/jaki/default.nix +++ b/hm/jaki/default.nix @@ -23,7 +23,7 @@ stateVersion = "23.05"; }; - sils = { + jaki = { bat.enable = true; direnv.enable = true; etesync-dav.enable = true; diff --git a/hm/silas/default.nix b/hm/silas/default.nix index 6c54d0a..c62a259 100644 --- a/hm/silas/default.nix +++ b/hm/silas/default.nix @@ -23,7 +23,7 @@ stateVersion = "23.05"; }; - sils = { + jaki = { bat.enable = true; direnv.enable = true; etesync-dav.enable = true; diff --git a/hm/zsh/config/functions.zsh b/hm/zsh/config/functions.zsh index c0afb5f..f0d6dc6 100644 --- a/hm/zsh/config/functions.zsh +++ b/hm/zsh/config/functions.zsh @@ -1,4 +1,4 @@ sys-update() { [ -f ~/.mozilla/firefox/default/containers.json ] && rm ~/.mozilla/firefox/default/containers.json - sudo nixos-rebuild $1 --flake /home/sils/repos/sils/nix-config# + sudo nixos-rebuild $1 --flake /home/jaki/repos/jaki/nix-config# } diff --git a/hosts/hplappi.nix b/hosts/hplappi.nix index ef01626..fec57b3 100644 --- a/hosts/hplappi.nix +++ b/hosts/hplappi.nix @@ -4,11 +4,11 @@ pkgs, ... }: { - role.sils = "laptop"; + role.jaki = "laptop"; environment.systemPackages = [pkgs.gnome-browser-connector]; - sils = { + jaki = { disks.enable = false; docker.enable = true; meta = { @@ -26,10 +26,10 @@ initrd = { luks.devices."cryptroot" = { crypttabExtraOpts = ["fido2-device=auto"]; - device = config.sils.meta.rootPart; + device = config.jaki.meta.rootPart; }; }; - resumeDevice = config.sils.meta.mainDisk; + resumeDevice = config.jaki.meta.mainDisk; kernelParams = ["resume_offset=369403136"]; }; @@ -45,48 +45,48 @@ options = ["defaults" "size=5G" "mode=755"]; }; "/nix" = { - device = config.sils.meta.mainDisk; + device = config.jaki.meta.mainDisk; fsType = "btrfs"; options = ["subvol=nix" "compress-force=zstd"]; }; "/etc/NetworkManager" = { - device = config.sils.meta.mainDisk; + device = config.jaki.meta.mainDisk; fsType = "btrfs"; options = ["subvol=networkmanagerconfig" "compress-force=zstd"]; }; "/etc/secureboot" = { - device = config.sils.meta.mainDisk; + device = config.jaki.meta.mainDisk; fsType = "btrfs"; options = ["subvol=secureboot" "compress-force=zstd"]; }; "/etc/nixos" = { - device = config.sils.meta.mainDisk; + device = config.jaki.meta.mainDisk; fsType = "btrfs"; options = ["subvol=nixconfig" "compress-force=zstd"]; }; "/srv" = { - device = config.sils.meta.mainDisk; + device = config.jaki.meta.mainDisk; fsType = "btrfs"; options = ["subvol=srv" "compress-force=zstd"]; neededForBoot = true; }; "/swap" = { - device = config.sils.meta.mainDisk; + device = config.jaki.meta.mainDisk; fsType = "btrfs"; options = ["subvol=swap" "noatime"]; }; "/home" = { - device = config.sils.meta.mainDisk; + device = config.jaki.meta.mainDisk; fsType = "btrfs"; options = ["subvol=home" "compress-force=zstd"]; }; "/srv/snapshots" = { - device = config.sils.meta.mainDisk; + device = config.jaki.meta.mainDisk; fsType = "btrfs"; options = ["subvol=snapshots" "compress-force=zstd"]; }; "/boot" = { - device = config.sils.meta.bootPart; + device = config.jaki.meta.bootPart; fsType = "vfat"; }; }; diff --git a/hosts/hpserver.nix b/hosts/hpserver.nix index aabcb08..c6c1fee 100644 --- a/hosts/hpserver.nix +++ b/hosts/hpserver.nix @@ -1,6 +1,6 @@ {...}: { - role.sils = "workstation"; - sils = { + role.jaki = "workstation"; + jaki = { bootloader = "grub"; disks.disk = "/dev/disk/by-id/wwn-0x600508b1001c0d733397035f990e3942"; meta = { diff --git a/hosts/schrotti.nix b/hosts/schrotti.nix index 417b179..d1e60aa 100644 --- a/hosts/schrotti.nix +++ b/hosts/schrotti.nix @@ -1,6 +1,6 @@ {...}: { - role.sils = "laptop-light"; - sils = { + role.jaki = "laptop-light"; + jaki = { meta = { bootPart = "/dev/disk/by-uuid/4064-2D6C"; globalDataDir = "/srv"; diff --git a/hosts/thinklappi.nix b/hosts/thinklappi.nix index 23d3779..37f10f7 100644 --- a/hosts/thinklappi.nix +++ b/hosts/thinklappi.nix @@ -1,6 +1,6 @@ {...}: { - role.sils = "laptop"; - sils = { + role.jaki = "laptop"; + jaki = { meta = { bootPart = "/dev/disk/by-uuid/4064-2D6C"; globalDataDir = "/srv"; diff --git a/modules/hm/jaki/bat.nix b/modules/hm/jaki/bat.nix index 5f7b967..2e89b7d 100644 --- a/modules/hm/jaki/bat.nix +++ b/modules/hm/jaki/bat.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.bat; + cfg = config.jaki.bat; in { - options.sils.bat.enable = lib.mkEnableOption "bat"; + options.jaki.bat.enable = lib.mkEnableOption "bat"; config = lib.mkIf cfg.enable { programs.bat = { enable = true; diff --git a/modules/hm/jaki/direnv.nix b/modules/hm/jaki/direnv.nix index 88ee8f8..8763f27 100644 --- a/modules/hm/jaki/direnv.nix +++ b/modules/hm/jaki/direnv.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.direnv; + cfg = config.jaki.direnv; in { - options.sils.direnv.enable = lib.mkEnableOption "direnv"; + options.jaki.direnv.enable = lib.mkEnableOption "direnv"; config = lib.mkIf cfg.enable { programs.direnv = { enable = true; diff --git a/modules/hm/jaki/etesync-dav.nix b/modules/hm/jaki/etesync-dav.nix index f524928..ee168ff 100644 --- a/modules/hm/jaki/etesync-dav.nix +++ b/modules/hm/jaki/etesync-dav.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.etesync-dav; + cfg = config.jaki.etesync-dav; in { - options.sils.etesync-dav.enable = lib.mkEnableOption "etesync-dav"; + options.jaki.etesync-dav.enable = lib.mkEnableOption "etesync-dav"; config = lib.mkIf cfg.enable { services.etesync-dav = { enable = true; diff --git a/modules/hm/jaki/fastfetch.nix b/modules/hm/jaki/fastfetch.nix index f3efcab..7434e13 100644 --- a/modules/hm/jaki/fastfetch.nix +++ b/modules/hm/jaki/fastfetch.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.fastfetch; + cfg = config.jaki.fastfetch; in { - options.sils.fastfetch = { + options.jaki.fastfetch = { enable = lib.mkEnableOption "fastfetch"; }; config = lib.mkIf cfg.enable { diff --git a/modules/hm/jaki/fd.nix b/modules/hm/jaki/fd.nix index 7f8e35c..acddd4e 100644 --- a/modules/hm/jaki/fd.nix +++ b/modules/hm/jaki/fd.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.fd; + cfg = config.jaki.fd; in { - options.sils.fd = { + options.jaki.fd = { enable = lib.mkEnableOption "fd, a fast find alternative"; }; diff --git a/modules/hm/jaki/firefox/default.nix b/modules/hm/jaki/firefox/default.nix index 7e40c9b..cf447e4 100644 --- a/modules/hm/jaki/firefox/default.nix +++ b/modules/hm/jaki/firefox/default.nix @@ -5,7 +5,7 @@ arkenfox-user-js, ... }: let - cfg = config.sils.firefox; + cfg = config.jaki.firefox; user-overrides-js = pkgs.writeText "user_override.js" (builtins.readFile ./user-overrides.js); user-js = pkgs.runCommand "user.js" {} '' mkdir $out; @@ -13,7 +13,7 @@ cat "${user-overrides-js}" >> $out/user.js; ''; in { - options.sils.firefox = { + options.jaki.firefox = { enable = lib.mkEnableOption "opinionated firefox configuration"; }; config = lib.mkIf cfg.enable { diff --git a/modules/hm/jaki/foot.nix b/modules/hm/jaki/foot.nix index b6a0212..6ea8f84 100644 --- a/modules/hm/jaki/foot.nix +++ b/modules/hm/jaki/foot.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.foot; + cfg = config.jaki.foot; in { - options.sils.foot.enable = lib.mkEnableOption "the foot terminal emulator"; + options.jaki.foot.enable = lib.mkEnableOption "the foot terminal emulator"; config = lib.mkIf cfg.enable { programs.foot = { enable = true; diff --git a/modules/hm/jaki/ghostty.nix b/modules/hm/jaki/ghostty.nix index cd871bc..5910a2e 100644 --- a/modules/hm/jaki/ghostty.nix +++ b/modules/hm/jaki/ghostty.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.ghostty; + cfg = config.jaki.ghostty; in { - options.sils.ghostty.enable = lib.mkEnableOption "the ghostty terminal emulator"; + options.jaki.ghostty.enable = lib.mkEnableOption "the ghostty terminal emulator"; config = lib.mkIf cfg.enable { programs.ghostty = { enable = true; diff --git a/modules/hm/jaki/git.nix b/modules/hm/jaki/git.nix index a17adfe..50001fb 100644 --- a/modules/hm/jaki/git.nix +++ b/modules/hm/jaki/git.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.git; + cfg = config.jaki.git; in { - options.sils.git.enable = lib.mkEnableOption "sils git config"; + options.jaki.git.enable = lib.mkEnableOption "jaki git config"; config = lib.mkIf cfg.enable { programs = { git = { @@ -17,7 +17,7 @@ in { recommit = "commit --file=.git/COMMIT_EDITMSG --edit"; }; user = { - name = "Silas Schöffel"; + name = "Jaki Schöffel"; email = "sils@sils.li"; }; signing = { diff --git a/modules/hm/jaki/hyfetch.nix b/modules/hm/jaki/hyfetch.nix index e664e0e..743e4e9 100644 --- a/modules/hm/jaki/hyfetch.nix +++ b/modules/hm/jaki/hyfetch.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.hyfetch; + cfg = config.jaki.hyfetch; in { - options.sils.hyfetch = { + options.jaki.hyfetch = { enable = lib.mkEnableOption "hyfetch"; }; diff --git a/modules/hm/jaki/hyprland.nix b/modules/hm/jaki/hyprland.nix index b21aef2..ff93c07 100644 --- a/modules/hm/jaki/hyprland.nix +++ b/modules/hm/jaki/hyprland.nix @@ -5,9 +5,9 @@ self, ... }: let - cfg = config.sils.hyprland; + cfg = config.jaki.hyprland; in { - options.sils.hyprland.enable = lib.mkEnableOption "sils hyprland config"; + options.jaki.hyprland.enable = lib.mkEnableOption "jaki hyprland config"; config = lib.mkIf cfg.enable { home.pointerCursor = { enable = true; diff --git a/modules/hm/jaki/iamb.nix b/modules/hm/jaki/iamb.nix index 2c6932a..2be6bd3 100644 --- a/modules/hm/jaki/iamb.nix +++ b/modules/hm/jaki/iamb.nix @@ -3,10 +3,10 @@ lib, ... }: let - cfg = config.sils.iamb; + cfg = config.jaki.iamb; in { options = { - sils.iamb.enable = lib.mkEnableOption "iamb, a matrix tui client"; + jaki.iamb.enable = lib.mkEnableOption "iamb, a matrix tui client"; }; config = lib.mkIf cfg.enable { programs.iamb = { diff --git a/modules/hm/jaki/jameica.nix b/modules/hm/jaki/jameica.nix index 815fb60..79589d3 100644 --- a/modules/hm/jaki/jameica.nix +++ b/modules/hm/jaki/jameica.nix @@ -4,9 +4,9 @@ lib, ... }: let - cfg = config.sils.jameica; + cfg = config.jaki.jameica; in { - options.sils.jameica.enable = lib.mkEnableOption "jameica"; + options.jaki.jameica.enable = lib.mkEnableOption "jameica"; config = lib.mkIf cfg.enable { home.packages = [ pkgs.jameica diff --git a/modules/hm/jaki/kdeconnect.nix b/modules/hm/jaki/kdeconnect.nix index f8fe386..d028c86 100644 --- a/modules/hm/jaki/kdeconnect.nix +++ b/modules/hm/jaki/kdeconnect.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.kdeconnect; + cfg = config.jaki.kdeconnect; in { - options.sils.kdeconnect.enable = lib.mkEnableOption "kdeconnect"; + options.jaki.kdeconnect.enable = lib.mkEnableOption "kdeconnect"; config = lib.mkIf cfg.enable { services.kdeconnect = { enable = true; diff --git a/modules/hm/jaki/mail.nix b/modules/hm/jaki/mail.nix index 85583a2..e5a0b18 100644 --- a/modules/hm/jaki/mail.nix +++ b/modules/hm/jaki/mail.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - cfg = config.sils.mail; + cfg = config.jaki.mail; vhackImap = { host = "mail.foss-syndicate.org"; port = 993; @@ -14,7 +14,7 @@ port = 993; }; in { - options.sils.mail.enable = lib.mkOption { + options.jaki.mail.enable = lib.mkOption { type = lib.types.bool; default = false; description = "Enable sophisticated mail setup"; diff --git a/modules/hm/jaki/nextcloud.nix b/modules/hm/jaki/nextcloud.nix index f71eb21..0c89b6d 100644 --- a/modules/hm/jaki/nextcloud.nix +++ b/modules/hm/jaki/nextcloud.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.nextcloud; + cfg = config.jaki.nextcloud; in { - options.sils.nextcloud.enable = lib.mkEnableOption "the nextcloud desktop + options.jaki.nextcloud.enable = lib.mkEnableOption "the nextcloud desktop client"; config = lib.mkIf cfg.enable { services.nextcloud-client = { diff --git a/modules/hm/jaki/poweralertd/default.nix b/modules/hm/jaki/poweralertd/default.nix index 15cfdc9..32754ef 100644 --- a/modules/hm/jaki/poweralertd/default.nix +++ b/modules/hm/jaki/poweralertd/default.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.poweralertd; + cfg = config.jaki.poweralertd; in { - options.sils.poweralertd.enable = lib.mkEnableOption "poweralertd"; + options.jaki.poweralertd.enable = lib.mkEnableOption "poweralertd"; config = lib.mkIf cfg.enable { services.poweralertd = { enable = true; diff --git a/modules/hm/jaki/sway.nix b/modules/hm/jaki/sway.nix index 4298dd0..4720f29 100644 --- a/modules/hm/jaki/sway.nix +++ b/modules/hm/jaki/sway.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.sway; + cfg = config.jaki.sway; in { - options.sils.sway.enable = lib.mkEnableOption "sway"; + options.jaki.sway.enable = lib.mkEnableOption "sway"; config = lib.mkIf cfg.enable { wayland.windowManager.sway = { enable = true; diff --git a/modules/hm/jaki/swaync/default.nix b/modules/hm/jaki/swaync/default.nix index 328888b..1cc2d08 100644 --- a/modules/hm/jaki/swaync/default.nix +++ b/modules/hm/jaki/swaync/default.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.swaync; + cfg = config.jaki.swaync; in { - options.sils.swaync.enable = lib.mkEnableOption "swaync"; + options.jaki.swaync.enable = lib.mkEnableOption "swaync"; config = lib.mkIf cfg.enable { services.swaync = { enable = true; diff --git a/modules/hm/jaki/theming.nix b/modules/hm/jaki/theming.nix index 9b7535c..a792a84 100644 --- a/modules/hm/jaki/theming.nix +++ b/modules/hm/jaki/theming.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.theming; + cfg = config.jaki.theming; in { - options.sils.theming.enable = lib.mkEnableOption "theming"; + options.jaki.theming.enable = lib.mkEnableOption "theming"; config = lib.mkIf cfg.enable { stylix = { enable = true; diff --git a/modules/hm/jaki/vscodium.nix b/modules/hm/jaki/vscodium.nix index ea048ed..99442af 100644 --- a/modules/hm/jaki/vscodium.nix +++ b/modules/hm/jaki/vscodium.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.vscodium; + cfg = config.jaki.vscodium; in { - options.sils.vscodium.enable = lib.mkEnableOption "vscodium editor"; + options.jaki.vscodium.enable = lib.mkEnableOption "vscodium editor"; config = lib.mkIf cfg.enable { programs.vscode = { enable = true; diff --git a/modules/hm/jaki/wofi/default.nix b/modules/hm/jaki/wofi/default.nix index 36f5916..c48f52a 100644 --- a/modules/hm/jaki/wofi/default.nix +++ b/modules/hm/jaki/wofi/default.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.wofi; + cfg = config.jaki.wofi; in { - options.sils.wofi.enable = lib.mkEnableOption "wofi"; + options.jaki.wofi.enable = lib.mkEnableOption "wofi"; config = lib.mkIf cfg.enable { programs.wofi = { enable = true; diff --git a/modules/hm/jaki/yt-dlp.nix b/modules/hm/jaki/yt-dlp.nix index 6b3d66c..e979446 100644 --- a/modules/hm/jaki/yt-dlp.nix +++ b/modules/hm/jaki/yt-dlp.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.yt-dlp; + cfg = config.jaki.yt-dlp; in { - options.sils.yt-dlp.enable = lib.mkEnableOption "yt-dlp"; + options.jaki.yt-dlp.enable = lib.mkEnableOption "yt-dlp"; config = lib.mkIf cfg.enable { programs.yt-dlp.enable = true; }; diff --git a/modules/hm/jaki/zathura.nix b/modules/hm/jaki/zathura.nix index 22529a3..e7775d7 100644 --- a/modules/hm/jaki/zathura.nix +++ b/modules/hm/jaki/zathura.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.zathura; + cfg = config.jaki.zathura; in { - options.sils.zathura.enable = lib.mkEnableOption "zathura"; + options.jaki.zathura.enable = lib.mkEnableOption "zathura"; config = lib.mkIf cfg.enable { programs.zathura = { enable = true; diff --git a/modules/hm/jaki/zellij.nix b/modules/hm/jaki/zellij.nix index 1038a0c..94a51f0 100644 --- a/modules/hm/jaki/zellij.nix +++ b/modules/hm/jaki/zellij.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.zellij; + cfg = config.jaki.zellij; in { - options.sils.zellij.enable = lib.mkEnableOption "zellij"; + options.jaki.zellij.enable = lib.mkEnableOption "zellij"; config = lib.mkIf cfg.enable { programs.zellij = { enable = true; diff --git a/modules/nixos/jaki/apparmor.nix b/modules/nixos/jaki/apparmor.nix index 69cec21..8076eea 100644 --- a/modules/nixos/jaki/apparmor.nix +++ b/modules/nixos/jaki/apparmor.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.apparmor; + cfg = config.jaki.apparmor; in { - options.sils.apparmor.enable = lib.mkEnableOption "apparmor"; + options.jaki.apparmor.enable = lib.mkEnableOption "apparmor"; config = lib.mkIf cfg.enable { security.apparmor = { enable = true; diff --git a/modules/nixos/jaki/basesystem.nix b/modules/nixos/jaki/basesystem.nix index 0e9f6de..319816e 100644 --- a/modules/nixos/jaki/basesystem.nix +++ b/modules/nixos/jaki/basesystem.nix @@ -5,12 +5,12 @@ modulesPath, ... }: let - cfg = config.sils.basesystem; + cfg = config.jaki.basesystem; in { - options.sils.basesystem.enable = lib.mkEnableOption "basesystem"; + options.jaki.basesystem.enable = lib.mkEnableOption "basesystem"; config = lib.mkIf cfg.enable { - networking.hostName = config.sils.meta.hostname; + networking.hostName = config.jaki.meta.hostname; boot = { initrd = { @@ -29,7 +29,7 @@ in { time.timeZone = "Europe/Berlin"; - nixpkgs.hostPlatform = config.sils.meta.system; + nixpkgs.hostPlatform = config.jaki.meta.system; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware = { cpu.intel.updateMicrocode = true; diff --git a/modules/nixos/jaki/bluetooth.nix b/modules/nixos/jaki/bluetooth.nix index 2d67717..ed7fd15 100644 --- a/modules/nixos/jaki/bluetooth.nix +++ b/modules/nixos/jaki/bluetooth.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.bluetooth; + cfg = config.jaki.bluetooth; in { - options.sils.bluetooth.enable = lib.mkEnableOption "bluetooth"; + options.jaki.bluetooth.enable = lib.mkEnableOption "bluetooth"; config = lib.mkIf cfg.enable { hardware.bluetooth.enable = true; }; diff --git a/modules/nixos/jaki/bootloader.nix b/modules/nixos/jaki/bootloader.nix index fc0e0f3..f90b0f7 100644 --- a/modules/nixos/jaki/bootloader.nix +++ b/modules/nixos/jaki/bootloader.nix @@ -3,9 +3,9 @@ lib, ... }: let - btl = config.sils.bootloader; + btl = config.jaki.bootloader; in { - options.sils.bootloader = lib.mkOption { + options.jaki.bootloader = lib.mkOption { type = lib.types.enum ["lanzaboote" "grub"]; default = "lanzaboote"; description = "Which bootloader to use."; diff --git a/modules/nixos/jaki/disks.nix b/modules/nixos/jaki/disks.nix index bf0e2b0..ac2214f 100644 --- a/modules/nixos/jaki/disks.nix +++ b/modules/nixos/jaki/disks.nix @@ -4,13 +4,13 @@ pkgs, ... }: let - cfg = config.sils.disks; + cfg = config.jaki.disks; defaultMountOptions = [ "noatime" # should have some performance upsides, and I don't use it anyways "lazytime" # make time changes in memory ]; in { - options.sils.disks = { + options.jaki.disks = { enable = lib.mkEnableOption "disk setup with disko"; disk = lib.mkOption { diff --git a/modules/nixos/jaki/docker.nix b/modules/nixos/jaki/docker.nix index 131b857..3b6c70a 100644 --- a/modules/nixos/jaki/docker.nix +++ b/modules/nixos/jaki/docker.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.docker; + cfg = config.jaki.docker; in { - options.sils.docker.enable = lib.mkEnableOption "docker"; + options.jaki.docker.enable = lib.mkEnableOption "docker"; config = lib.mkIf cfg.enable { virtualisation.docker = { enable = true; diff --git a/modules/nixos/jaki/environment.nix b/modules/nixos/jaki/environment.nix index 0ffa422..07649fd 100644 --- a/modules/nixos/jaki/environment.nix +++ b/modules/nixos/jaki/environment.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.environment; + cfg = config.jaki.environment; in { - options.sils.environment.enable = lib.mkEnableOption "custom env vars"; + options.jaki.environment.enable = lib.mkEnableOption "custom env vars"; config = lib.mkIf cfg.enable { environment = { sessionVariables = { diff --git a/modules/nixos/jaki/firejail.nix b/modules/nixos/jaki/firejail.nix index 5886918..9cbdb0b 100644 --- a/modules/nixos/jaki/firejail.nix +++ b/modules/nixos/jaki/firejail.nix @@ -4,11 +4,11 @@ pkgs, ... }: let - cfg = config.sils.firejail; + cfg = config.jaki.firejail; in { - options.sils.firejail.enable = lib.mkEnableOption "firejail"; + options.jaki.firejail.enable = lib.mkEnableOption "firejail"; config = lib.mkIf cfg.enable { - sils.apparmor.enable = true; + jaki.apparmor.enable = true; programs.firejail = { enable = true; wrappedBinaries = { diff --git a/modules/nixos/jaki/font.nix b/modules/nixos/jaki/font.nix index e079c99..6dd9b5c 100644 --- a/modules/nixos/jaki/font.nix +++ b/modules/nixos/jaki/font.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.font; + cfg = config.jaki.font; in { - options.sils.font.enable = lib.mkEnableOption "font config"; + options.jaki.font.enable = lib.mkEnableOption "font config"; config = lib.mkIf cfg.enable { fonts = { packages = with pkgs; [ diff --git a/modules/nixos/jaki/fprintd.nix b/modules/nixos/jaki/fprintd.nix index dd5c1cc..0894a9e 100644 --- a/modules/nixos/jaki/fprintd.nix +++ b/modules/nixos/jaki/fprintd.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.fingerprint; + cfg = config.jaki.fingerprint; in { - options.sils.fingerprint.enable = lib.mkEnableOption "fingerprint auth"; + options.jaki.fingerprint.enable = lib.mkEnableOption "fingerprint auth"; config = lib.mkIf cfg.enable { services.fprintd = { enable = true; diff --git a/modules/nixos/jaki/gnome.nix b/modules/nixos/jaki/gnome.nix index 7b798d9..6255956 100644 --- a/modules/nixos/jaki/gnome.nix +++ b/modules/nixos/jaki/gnome.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.gnome; + cfg = config.jaki.gnome; in { - options.sils.gnome.enable = lib.mkEnableOption "The Gnome DE"; + options.jaki.gnome.enable = lib.mkEnableOption "The Gnome DE"; config = lib.mkIf cfg.enable { services = { xserver.enable = true; diff --git a/modules/nixos/jaki/graphics.nix b/modules/nixos/jaki/graphics.nix index 77f58d8..0b21b33 100644 --- a/modules/nixos/jaki/graphics.nix +++ b/modules/nixos/jaki/graphics.nix @@ -3,9 +3,9 @@ config, ... }: let - cfg = config.sils.graphics; + cfg = config.jaki.graphics; in { - options.sils.graphics.enable = lib.mkEnableOption "graphics"; + options.jaki.graphics.enable = lib.mkEnableOption "graphics"; config = lib.mkIf cfg.enable { hardware.graphics.enable = true; }; diff --git a/modules/nixos/jaki/hyprland.nix b/modules/nixos/jaki/hyprland.nix index 73ba9c2..ad8ab15 100644 --- a/modules/nixos/jaki/hyprland.nix +++ b/modules/nixos/jaki/hyprland.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.hyprland; + cfg = config.jaki.hyprland; in { - options.sils.hyprland.enable = lib.mkEnableOption "hyprland"; + options.jaki.hyprland.enable = lib.mkEnableOption "hyprland"; config = lib.mkIf cfg.enable { programs.hyprland = { enable = true; diff --git a/modules/nixos/jaki/impermanence.nix b/modules/nixos/jaki/impermanence.nix index cf67a91..134e13e 100644 --- a/modules/nixos/jaki/impermanence.nix +++ b/modules/nixos/jaki/impermanence.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.impermanence; + cfg = config.jaki.impermanence; in { - options.sils.impermanence.enable = lib.mkEnableOption "impermanence to persist directories"; + options.jaki.impermanence.enable = lib.mkEnableOption "impermanence to persist directories"; config = lib.mkIf cfg.enable { environment.persistence."/srv".directories = [ { diff --git a/modules/nixos/jaki/meta.nix b/modules/nixos/jaki/meta.nix index 57ef081..4d6097f 100644 --- a/modules/nixos/jaki/meta.nix +++ b/modules/nixos/jaki/meta.nix @@ -1,7 +1,7 @@ {lib, ...}: let nullable = type: lib.types.nullOr type; in { - options.sils.meta = { + options.jaki.meta = { bootPart = lib.mkOption { type = nullable lib.types.str; default = null; diff --git a/modules/nixos/jaki/networking.nix b/modules/nixos/jaki/networking.nix index 9ec34ab..cf780df 100644 --- a/modules/nixos/jaki/networking.nix +++ b/modules/nixos/jaki/networking.nix @@ -4,9 +4,9 @@ lib, ... }: let - cfg = config.sils.networking; + cfg = config.jaki.networking; in { - options.sils.networking.enable = lib.mkEnableOption "networking"; + options.jaki.networking.enable = lib.mkEnableOption "networking"; config = lib.mkIf cfg.enable { services.resolved.enable = true; networking = { diff --git a/modules/nixos/jaki/nix.nix b/modules/nixos/jaki/nix.nix index 9d73fcd..d946453 100644 --- a/modules/nixos/jaki/nix.nix +++ b/modules/nixos/jaki/nix.nix @@ -5,9 +5,9 @@ lib, ... }: let - cfg = config.sils.nix-config; + cfg = config.jaki.nix-config; in { - options.sils.nix-config = { + options.jaki.nix-config = { enable = lib.mkEnableOption "nix config"; remoteBuild = lib.mkEnableOption "remote builds"; }; diff --git a/modules/nixos/jaki/pamconfig.nix b/modules/nixos/jaki/pamconfig.nix index 4e9f3eb..e05df6e 100644 --- a/modules/nixos/jaki/pamconfig.nix +++ b/modules/nixos/jaki/pamconfig.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.pamconfig; + cfg = config.jaki.pamconfig; in { - options.sils.pamconfig.enable = lib.mkEnableOption "custom pamconfig"; + options.jaki.pamconfig.enable = lib.mkEnableOption "custom pamconfig"; config = lib.mkIf cfg.enable { security.pam = { services = { diff --git a/modules/nixos/jaki/plasma.nix b/modules/nixos/jaki/plasma.nix index f196447..0fdcb39 100644 --- a/modules/nixos/jaki/plasma.nix +++ b/modules/nixos/jaki/plasma.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.plasma; + cfg = config.jaki.plasma; in { - options.sils.plasma.enable = lib.mkEnableOption "KDE Plasma"; + options.jaki.plasma.enable = lib.mkEnableOption "KDE Plasma"; config = lib.mkIf cfg.enable { services = { greetd.enable = lib.mkForce false; diff --git a/modules/nixos/jaki/plymouth.nix b/modules/nixos/jaki/plymouth.nix index 8e39220..3227187 100644 --- a/modules/nixos/jaki/plymouth.nix +++ b/modules/nixos/jaki/plymouth.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.plymouth; + cfg = config.jaki.plymouth; in { - options.sils.plymouth.enable = lib.mkEnableOption "Enable Plymouth"; + options.jaki.plymouth.enable = lib.mkEnableOption "Enable Plymouth"; config = lib.mkIf cfg.enable { boot.plymouth.enable = true; }; diff --git a/modules/nixos/jaki/printing.nix b/modules/nixos/jaki/printing.nix index 44b2a10..d011b45 100644 --- a/modules/nixos/jaki/printing.nix +++ b/modules/nixos/jaki/printing.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.printing; + cfg = config.jaki.printing; in { - options.sils.printing.enable = lib.mkEnableOption "printing configuration"; + options.jaki.printing.enable = lib.mkEnableOption "printing configuration"; config = lib.mkIf cfg.enable { services = { printing = { diff --git a/modules/nixos/jaki/roles.nix b/modules/nixos/jaki/roles.nix index 52bfb54..d05a144 100644 --- a/modules/nixos/jaki/roles.nix +++ b/modules/nixos/jaki/roles.nix @@ -3,9 +3,9 @@ lib, ... }: let - roleCmp = string: config.role.sils == string; + roleCmp = string: config.role.jaki == string; in { - config.sils = + config.jaki = if roleCmp "laptop" then { apparmor.enable = lib.mkDefault true; diff --git a/modules/nixos/jaki/sound.nix b/modules/nixos/jaki/sound.nix index 3ad26fb..b154854 100644 --- a/modules/nixos/jaki/sound.nix +++ b/modules/nixos/jaki/sound.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.sound; + cfg = config.jaki.sound; in { - options.sils.sound.enable = lib.mkEnableOption "sound config"; + options.jaki.sound.enable = lib.mkEnableOption "sound config"; config = lib.mkIf cfg.enable { services.pipewire = { enable = true; diff --git a/modules/nixos/jaki/steam.nix b/modules/nixos/jaki/steam.nix index 3c834a6..cd7a4fe 100644 --- a/modules/nixos/jaki/steam.nix +++ b/modules/nixos/jaki/steam.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.steam; + cfg = config.jaki.steam; in { - options.sils.steam.enable = lib.mkEnableOption "Steam"; + options.jaki.steam.enable = lib.mkEnableOption "Steam"; config = lib.mkIf cfg.enable { nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ diff --git a/modules/nixos/jaki/sudo.nix b/modules/nixos/jaki/sudo.nix index 2ad117f..4027ca0 100644 --- a/modules/nixos/jaki/sudo.nix +++ b/modules/nixos/jaki/sudo.nix @@ -3,14 +3,14 @@ lib, ... }: let - persistentLecture = !config.sils.sudo.persistentLecture.disable; + persistentLecture = !config.jaki.sudo.persistentLecture.disable; in { - options.sils.sudo.persistentLecture.disable = lib.mkEnableOption "sudo lecture after every boot"; + options.jaki.sudo.persistentLecture.disable = lib.mkEnableOption "sudo lecture after every boot"; config = { security.sudo = { enable = true; }; - environment.persistence.${config.sils.meta.globalDataDir}.files = lib.mkIf persistentLecture [ + environment.persistence.${config.jaki.meta.globalDataDir}.files = lib.mkIf persistentLecture [ { file = "/var/db/sudo/lectured/${builtins.toString config.users.users.jaki.uid}"; parentDirectory = { diff --git a/modules/nixos/jaki/sway.nix b/modules/nixos/jaki/sway.nix index 4aac2f4..d58cfb9 100644 --- a/modules/nixos/jaki/sway.nix +++ b/modules/nixos/jaki/sway.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.sway; + cfg = config.jaki.sway; in { - options.sils.sway.enable = lib.mkEnableOption "sway"; + options.jaki.sway.enable = lib.mkEnableOption "sway"; config = lib.mkIf cfg.enable { programs.sway = { enable = true; diff --git a/modules/nixos/jaki/tailscale.nix b/modules/nixos/jaki/tailscale.nix index e1f49a4..0ebe9ea 100644 --- a/modules/nixos/jaki/tailscale.nix +++ b/modules/nixos/jaki/tailscale.nix @@ -3,9 +3,9 @@ lib, ... }: let - cfg = config.sils.tailscale; + cfg = config.jaki.tailscale; in { - options.sils.tailscale = { + options.jaki.tailscale = { enable = lib.mkEnableOption "Tailscale"; openFirewall = true; role = lib.mkOption { diff --git a/modules/nixos/jaki/theming/default.nix b/modules/nixos/jaki/theming/default.nix index 2d5d2fd..5288854 100644 --- a/modules/nixos/jaki/theming/default.nix +++ b/modules/nixos/jaki/theming/default.nix @@ -4,9 +4,9 @@ pkgs, ... }: let - cfg = config.sils.theming; + cfg = config.jaki.theming; in { - options.sils.theming.enable = lib.mkEnableOption "theming"; + options.jaki.theming.enable = lib.mkEnableOption "theming"; config = lib.mkIf cfg.enable { stylix = { enable = true; diff --git a/modules/nixos/jaki/tor.nix b/modules/nixos/jaki/tor.nix index 01fdc1f..06f2c24 100644 --- a/modules/nixos/jaki/tor.nix +++ b/modules/nixos/jaki/tor.nix @@ -4,9 +4,9 @@ lib, ... }: let - cfg = config.sils.tor; + cfg = config.jaki.tor; in { - options.sils.tor.enable = lib.mkEnableOption "tor"; + options.jaki.tor.enable = lib.mkEnableOption "tor"; config = lib.mkIf cfg.enable { services = { tor = { diff --git a/modules/nixos/roles.nix b/modules/nixos/roles.nix index 69b2819..0c7f3bd 100644 --- a/modules/nixos/roles.nix +++ b/modules/nixos/roles.nix @@ -1,5 +1,5 @@ {lib, ...}: { - options.role.sils = lib.mkOption { + options.role.jaki = lib.mkOption { type = lib.types.nullOr (lib.types.enum ["laptop" "laptop-light" "undefined" "vm" "workstation"]); default = null; description = "The role which should be applied to your configuration."; diff --git a/sys/services/restic/default.nix b/sys/services/restic/default.nix index 1bd886a..5e58c01 100644 --- a/sys/services/restic/default.nix +++ b/sys/services/restic/default.nix @@ -17,9 +17,9 @@ snapshotDir ]; exclude = [ - "${homeDir}/sils/.cache" - "${homeDir}/sils/bulk" - "${homeDir}/sils/downloads" + "${homeDir}/jaki/.cache" + "${homeDir}/jaki/bulk" + "${homeDir}/jaki/downloads" ]; extraBackupArgs = [ "--verbose" # Spam log |