diff --git a/hosts/athame/nixos/hw.nix b/hosts/athame/nixos/hw.nix index 246533e3..24193e6f 100644 --- a/hosts/athame/nixos/hw.nix +++ b/hosts/athame/nixos/hw.nix @@ -1,5 +1,5 @@ { sources, ... }: { - imports = [ ( sources.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ]; + imports = [ (sources.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ]; boot.loader.grub.device = "/dev/sda"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 46fade38..ab49cb94 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -49,5 +49,4 @@ let }); }; -in (pkgs.extend (import (sources.arc-nixexprs + "/overlay.nix"))).extend -overlay +in (pkgs.extend (import (sources.arc-nixexprs + "/overlay.nix"))).extend overlay diff --git a/profiles/gui/home/mpv.nix b/profiles/gui/home/mpv.nix index 6d457485..849fca52 100644 --- a/profiles/gui/home/mpv.nix +++ b/profiles/gui/home/mpv.nix @@ -3,7 +3,7 @@ { programs.mpv = { enable = true; - scripts = [ pkgs.mpvScripts.sponsorblock ]; + scripts = [ pkgs.mpvScripts.sponsorblock ]; config = { profile = "gpu-hq"; gpu-context = "wayland"; @@ -17,31 +17,31 @@ }; }; - programs.syncplay = { - enable = false; - username = "kat"; - defaultRoom = "lounge"; - server = { - host = "sync.kittywit.ch"; - password = witch.secrets.hosts.athame.syncplay.password; + programs.syncplay = { + enable = false; + username = "kat"; + defaultRoom = "lounge"; + server = { + host = "sync.kittywit.ch"; + password = witch.secrets.hosts.athame.syncplay.password; + }; + # gui = false; + trustedDomains = [ "youtube.com" "youtu.be" "twitch.tv" "soundcloud.com" ]; + config = { + client_settings = { + autoplayrequiresamefiles = false; + readyatstart = true; + pauseonleave = false; + rewindondesync = false; + rewindthreshold = 6.0; + fastforwardthreshold = 6.0; + unpauseaction = "Always"; }; - # gui = false; - trustedDomains = [ "youtube.com" "youtu.be" "twitch.tv" "soundcloud.com" ]; - config = { - client_settings = { - autoplayrequiresamefiles = false; - readyatstart = true; - pauseonleave = false; - rewindondesync = false; - rewindthreshold = 6.0; - fastforwardthreshold = 6.0; - unpauseaction = "Always"; - }; - gui = { - #autosavejoinstolist = false; - showdurationnotification = false; - chatoutputrelativefontsize = config.lib.gui.fontSize 13.0; - }; + gui = { + #autosavejoinstolist = false; + showdurationnotification = false; + chatoutputrelativefontsize = config.lib.gui.fontSize 13.0; }; }; + }; } diff --git a/profiles/kat/home/git.nix b/profiles/kat/home/git.nix index 929feeff..0b820d03 100644 --- a/profiles/kat/home/git.nix +++ b/profiles/kat/home/git.nix @@ -15,9 +15,7 @@ userName = "kat witch"; userEmail = "kat@kittywit.ch"; extraConfig = { - init = { - defaultBranch = "main"; - }; + init = { defaultBranch = "main"; }; protocol.gcrypt.allow = "always"; annex = { autocommit = false; diff --git a/profiles/sway/home/sway.nix b/profiles/sway/home/sway.nix index 22210497..6e7fda7e 100644 --- a/profiles/sway/home/sway.nix +++ b/profiles/sway/home/sway.nix @@ -123,8 +123,17 @@ "5824:1503:screenstub-tablet" = { events = "disabled"; }; "5824:1503:screenstub-mouse" = { events = "disabled"; }; "5824:1503:screenstub-kbd" = { events = "disabled"; }; - "1386:215:Wacom_BambooPT_2FG_Small_Pen" = { map_to_output = "HDMI-A-1"; }; - "1386:215:Wacom_BambooPT_2FG_Small_Finger" = { natural_scroll = "enabled"; middle_emulation = "enabled"; tap = "enabled"; dwt = "enabled"; accel_profile = "flat"; pointer_accel = "0.05"; }; + "1386:215:Wacom_BambooPT_2FG_Small_Pen" = { + map_to_output = "HDMI-A-1"; + }; + "1386:215:Wacom_BambooPT_2FG_Small_Finger" = { + natural_scroll = "enabled"; + middle_emulation = "enabled"; + tap = "enabled"; + dwt = "enabled"; + accel_profile = "flat"; + pointer_accel = "0.05"; + }; "*" = { xkb_layout = "gb"; # xkb_variant = "nodeadkeys"; diff --git a/services/matrix.nix b/services/matrix.nix index 3d002b6d..eef6af1b 100644 --- a/services/matrix.nix +++ b/services/matrix.nix @@ -26,11 +26,9 @@ }]; }]; }; - + secrets.files = { - telegram-env = { - source = ../private/files/matrix/mautrix-telegram.env; - }; + telegram-env = { source = ../private/files/matrix/mautrix-telegram.env; }; }; services.mautrix-telegram = { @@ -51,7 +49,10 @@ }; bridge = { relaybot.authless_portals = false; - permissions = { "@kat:kittywit.ch" = "admin"; "kittywit.ch" = "full"; }; + permissions = { + "@kat:kittywit.ch" = "admin"; + "kittywit.ch" = "full"; + }; }; }; environmentFile = config.secrets.files.telegram-env.path; diff --git a/services/restic.nix b/services/restic.nix index cf5b416b..18e5c335 100644 --- a/services/restic.nix +++ b/services/restic.nix @@ -1,20 +1,14 @@ { config, lib, pkgs, ... }: { - services.restic.backups.tardis = { + services.restic.backups.tardis = { passwordFile = "/etc/restic/system"; - paths = [ - "/home" - "/var/lib" - ]; - pruneOpts = [ - "--keep-daily 7" - "--keep-weekly 5" - "--keep-monthly 12" - ]; + paths = [ "/home" "/var/lib" ]; + pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ]; repository = ""; }; - systemd.services."restic-backups-tardis".environment.RESTIC_REPOSITORY_FILE = "/etc/restic/system.repo"; + systemd.services."restic-backups-tardis".environment.RESTIC_REPOSITORY_FILE = + "/etc/restic/system.repo"; services.postgresqlBackup = { enable = config.services.postgresql.enable; backupAll = true;