diff --git a/SwarselSystems.org b/SwarselSystems.org index 93e6425..940be17 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -483,10 +483,6 @@ A short overview over each input and what it does: url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - microvm = { - url = "github:astro/microvm.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = @@ -855,15 +851,10 @@ The rest of the outputs either define or help define the actual configurations: inputs.nswitch-rcm-nix.nixosModules.nswitch-rcm inputs.swarsel-modules.nixosModules.default inputs.niri-flake.nixosModules.niri - inputs.microvm.nixosModules.host - inputs.microvm.nixosModules.microvm "${self}/hosts/nixos/${configName}" "${self}/profiles/nixos" "${self}/modules/nixos" { - - microvm.guest.enable = lib.mkDefault false; - node = { name = configName; secretsDir = ../hosts/nixos/${configName}/secrets; @@ -1979,8 +1970,7 @@ My work machine. Built for more security, this is the gold standard of my config # ''; boot = { - # kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages; - kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages; binfmt.emulatedSystems = [ "aarch64-linux" ]; initrd = { availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "cryptd" "usbhid" "sd_mod" "r8152" ]; @@ -2384,7 +2374,6 @@ This is my main server that I run at home. It handles most tasks that require bi swarselsystems = { info = "ASRock J4105-ITX, 32GB RAM"; - flakePath = "/root/.dotfiles"; isImpermanence = false; isSecureBoot = true; isCrypted = true; @@ -4695,6 +4684,7 @@ Mostly used to install some compilers and lsp's that I want to have available wh nixd zig zls + ansible-language-server elk-to-svg @@ -4926,7 +4916,7 @@ Here I only enable =networkmanager= and a few default networks. The rest of the certsSopsFile = self + /secrets/certs/secrets.yaml; clientSopsFile = self + /secrets/${config.node.name}/secrets.yaml; - inherit (config.repo.secrets.common.network) wlan1 mobile1 vpn1-location vpn1-cipher vpn1-address eduroam-anon; + inherit (config.repo.secrets.common.network) wlan1 wlan2 mobile1 vpn1-location vpn1-cipher vpn1-address eduroam-anon; iwd = config.networking.networkmanager.wifi.backend == "iwd"; in @@ -4972,9 +4962,6 @@ Here I only enable =networkmanager= and a few default networks. The rest of the networking = { inherit (config.swarselsystems) hostName; - hosts = { - "192.168.178.24" = [ "store.swarsel.win" ]; - }; wireless.iwd = { enable = true; settings = { @@ -5026,7 +5013,6 @@ Here I only enable =networkmanager= and a few default networks. The rest of the id = wlan1; # permissions = ""; type = "wifi"; - autoconnect-priority = "999"; }; ipv4 = { # dns-search = ""; @@ -5114,11 +5100,32 @@ Here I only enable =networkmanager= and a few default networks. The rest of the proxy = { }; }; + ${wlan2} = { + connection = { + id = wlan2; + type = "wifi"; + }; + ipv4 = { method = "auto"; }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + method = "auto"; + }; + proxy = { }; + wifi = { + band = "bg"; + mode = "infrastructure"; + ssid = wlan2; + }; + wifi-security = { + key-mgmt = "wpa-psk"; + psk = "$WLAN2_PW"; + }; + }; + ${mobile1} = { connection = { id = mobile1; type = "wifi"; - autoconnect-priority = "500"; }; ipv4 = { method = "auto"; }; ipv6 = { @@ -6770,13 +6777,6 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t services.pipewire.systemWide = true; - # https://github.com/Spotifyd/spotifyd/issues/1366 - networking.hosts."0.0.0.0" = [ "apresolve.spotify.com" ]; - - # hacky way to enable multi-session - # when another user connects, the service will crash and the new user will login - systemd.services.spotifyd.serviceConfig.RestartSec = lib.mkForce 1; - services.spotifyd = { enable = true; settings = { @@ -6784,11 +6784,8 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t dbus_type = "session"; use_mpris = false; device = "sysdefault:CARD=PCH"; - # device = "default"; device_name = "SwarselSpot"; - # backend = "pulseaudio"; - backend = "alsa"; - # mixer = "alsa"; + mixer = "alsa"; zeroconf_port = servicePort; }; }; @@ -7148,14 +7145,14 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t address = "http://localhost:${builtins.toString servicePort}"; domain = serviceDomain; }; - database = { - type = "postgres"; - uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql"; - }; appservice = { address = "http://localhost:${builtins.toString whatsappPort}"; hostname = "0.0.0.0"; port = whatsappPort; + database = { + type = "postgres"; + uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql"; + }; }; bridge = { displayname_template = "{{or .FullName .PushName .JID}} (WA)"; @@ -7195,14 +7192,14 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t address = "http://localhost:${builtins.toString servicePort}"; domain = serviceDomain; }; - database = { - type = "postgres"; - uri = "postgresql:///mautrix-signal?host=/run/postgresql"; - }; appservice = { address = "http://localhost:${builtins.toString signalPort}"; hostname = "0.0.0.0"; port = signalPort; + database = { + type = "postgres"; + uri = "postgresql:///mautrix-signal?host=/run/postgresql"; + }; }; bridge = { displayname_template = "{{or .ContactName .ProfileName .PhoneNumber}} (Signal)"; @@ -7326,7 +7323,7 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t configureRedis = true; maxUploadSize = "4G"; extraApps = { - inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin; + inherit (pkgs.nextcloud30Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin; }; extraAppsEnable = true; config = { @@ -7353,9 +7350,6 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t locations = { "/" = { proxyPass = "http://${serviceName}"; - extraConfig = '' - client_max_body_size 0; - ''; }; }; }; @@ -10342,35 +10336,27 @@ This sets the VirtualBox configuration. Guest should not be enabled if not direl { options.swarselmodules.optional.virtualbox = lib.mkEnableOption "optional VBox settings"; config = lib.mkIf config.swarselmodules.optional.virtualbox { - # specialisation = { - # VBox.configuration = { - virtualisation.virtualbox = { - host = { - enable = true; - enableKvm = true; - addNetworkInterface = lib.mkIf config.virtualisation.virtualbox.host.enableKvm false; - package = pkgs.stable.virtualbox; - enableExtensionPack = true; - }; - # leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch - guest = { - enable = false; + specialisation = { + VBox.configuration = { + virtualisation.virtualbox = { + host = { + enable = true; + enableExtensionPack = true; + }; + # leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch + guest = { + enable = false; + }; + }; + # run an older kernel to provide compatibility with windows vm + boot = { + kernelPackages = lib.mkForce pkgs.stable24_05.linuxPackages; + # kernelParams = [ + # "amd_iommu=on" + # ]; + }; }; }; - # run an older kernel to provide compatibility with windows vm - # boot = { - # kernelPackages = lib.mkForce pkgs.stable24_05.linuxPackages; - # # kernelParams = [ - # # "amd_iommu=on" - # # ]; - # }; - - - # fixes the issue of running together with QEMU - # NOTE: once you start a QEMU VM (use kvm) VirtualBox will fail to start VMs - # boot.kernelParams = [ "kvm.enable_virt_at_load=0" ]; - # }; - # }; }; } @@ -10427,8 +10413,11 @@ This smashes Atmosphere 1.3.2 on the switch, which is what I am currenty using. This holds configuration that is specific to framework laptops. #+begin_src nix-ts :tangle modules/nixos/optional/framework.nix - { lib, config, ... }: + { lib, config, inputs, ... }: { + # imports = [ + # inputs.fw-fanctrl.nixosModules.default + # ]; options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings"; config = lib.mkIf config.swarselmodules.optional.framework { services = { @@ -10487,11 +10476,10 @@ This holds configuration that is specific to framework laptops. hardware = { amdgpu = { opencl.enable = true; - initrd.enable = true; - # amdvlk = { - # enable = true; - # support32Bit.enable = true; - # }; + amdvlk = { + enable = true; + support32Bit.enable = true; + }; }; }; }; @@ -10650,8 +10638,6 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9 connection = { id = "VBC"; type = "wifi"; - autoconnect-priority = "500"; - secondaries = "48d09de4-0521-47d7-9bd5-43f97e23ff82"; # vpn uuid }; ipv4 = { method = "auto"; }; ipv6 = { @@ -10720,8 +10706,7 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9 govc terraform opentofu - # dev.terragrunt - terragrunt + dev.terragrunt graphviz azure-cli @@ -10758,7 +10743,7 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9 folders = { "Documents" = { path = "${homeDir}/Documents"; - devices = [ "moonside@oracle" ]; + devices = [ "magicant" "winters" "moonside@oracle" ]; id = "hgr3d-pfu3w"; }; }; @@ -10786,100 +10771,6 @@ Options that I need specifically at work. There are more options at [[#h:f0b2ea9 } #+end_src -**** microvm-host - -Some standard options that should be set for every microvm host. - -#+begin_src nix-ts :tangle modules/nixos/optional/microvm-host.nix - { lib, config, ... }: - { - options.swarselmodules.optional.microvmHost = lib.mkEnableOption "optional microvmHost settings"; - # imports = [ - # inputs.microvm.nixosModules.host - # ]; - - config = lib.mkIf (config.swarselmodules.optional.microvmHost && config.swarselsystems.withMicroVMs) { - - microvm = { - hypervisor = lib.mkDefault "qemu"; - }; - }; - - } -#+end_src - -**** microvm-guest - -Some standard options that should be set vor every microvm guest. We set the default - -#+begin_src nix-ts :tangle modules/nixos/optional/microvm-guest.nix - { lib, config, ... }: - { - options.swarselmodules.optional.microvmGuest = lib.mkEnableOption "optional microvmGuest settings"; - # imports = [ - # inputs.microvm.nixosModules.microvm - # "${self}/profiles/nixos" - # "${self}/modules/nixos" - # ]; - config = lib.mkIf config.swarselmodules.optional.microvmGuest - { - # imports = [ - # inputs.microvm.nixosModules.microvm - - # "${self}/profiles/nixos" - # "${self}/modules/nixos" - # ]; - - boot.kernelParams = [ "systemd.hostname=${config.networking.hostName}" ]; - - node.name = config; - documentation.enable = lib.mkForce false; - - microvm = { - guest.enable = lib.mkForce true; - hypervisor = lib.mkDefault "qemu"; - mem = lib.mkDefault 1024 * 4; - vcpu = lib.mkDefault 4; - optimize.enable = false; - writableStoreOverlay = "/nix/.rw-store"; - - # interfaces = flip lib.mapAttrsToList guestCfg.microvm.interfaces ( - # _: { mac, hostLink, ...}: - # { - # type = "macvtap"; - # id = "vm-${replaceStrings [ ":" ] [ "" ] mac}"; - # inherit mac; - # macvtap = { - # link = hostLink; - # mode = "bridge"; - # }; - # } - # ); - shares = - [ - { - source = "/nix/store"; - mountPoint = "/nix/.ro-store"; - tag = "ro-store"; - proto = "virtiofs"; - } - ]; - }; - # systemd.network.networks = lib.flip lib.concatMapAttrs guestCfg.microvm.interfaces ( - # name: - # { mac, ... }: - # { - # "10-${name}".matchConfig = mkForce { - # MACAddress = mac; - # }; - # } - # ); - - }; - } - -#+end_src - ** Home-manager :PROPERTIES: :CUSTOM_ID: h:08ded95b-9c43-475d-a0b2-fc088a512287 @@ -11535,47 +11426,46 @@ TODO: Non-NixOS machines (=sp3) should not use these by default, but instead the }; xdg.mimeApps = { + enable = true; defaultApplications = { - "application/epub+zip" = [ "calibre-ebook-viewer.desktop" ]; - "application/metalink+xml" = [ "emacsclient.desktop" ]; - "application/msword" = [ "writer.desktop" ]; - "application/pdf" = [ "org.gnome.Evince.desktop" ]; - "application/sql" = [ "emacsclient.desktop" ]; - "application/vnd.ms-excel" = [ "calc.desktop" ]; - "application/vnd.ms-powerpoint" = [ "impress.desktop" ]; + "x-scheme-handler/http" = [ "firefox.desktop" ]; + "x-scheme-handler/https" = [ "firefox.desktop" ]; + "x-scheme-handler/chrome" = [ "firefox.desktop" ]; + "text/plain" = [ "emacsclient.desktop" ]; + "text/csv" = [ "emacsclient.desktop" ]; + "text/html" = [ "firefox.desktop" ]; "application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "firefox.desktop" ]; - "application/x-extension-xht" = [ "firefox.desktop" ]; - "application/x-extension-xhtml" = [ "firefox.desktop" ]; "application/xhtml+xml" = [ "firefox.desktop" ]; + "application/x-extension-xhtml" = [ "firefox.desktop" ]; + "application/x-extension-xht" = [ "firefox.desktop" ]; + "image/png" = [ "imv.desktop" ]; + "image/jpeg" = [ "imv.desktop" ]; + "image/gif" = [ "imv.desktop" ]; + "image/svg" = [ "imv.desktop" ]; + "image/webp" = [ "firefox.desktop" ]; + "image/vnd.adobe.photoshop" = [ "gimp.desktop" ]; + "image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ]; "audio/flac" = [ "mpv.desktop" ]; "audio/mp3" = [ "mpv.desktop" ]; "audio/ogg" = [ "mpv.desktop" ]; "audio/wav" = [ "mpv.desktop" ]; - "image/gif" = [ "imv.desktop" ]; - "image/jpeg" = [ "imv.desktop" ]; - "image/png" = [ "imv.desktop" ]; - "image/svg" = [ "imv.desktop" ]; - "image/vnd.adobe.photoshop" = [ "gimp.desktop" ]; - "image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ]; - "image/webp" = [ "firefox.desktop" ]; - "text/csv" = [ "emacsclient.desktop" ]; - "text/html" = [ "firefox.desktop" ]; - "text/plain" = [ "emacsclient.desktop" ]; - "video/3gp" = [ "umpv.desktop" ]; - "video/flv" = [ "umpv.desktop" ]; - "video/mkv" = [ "umpv.desktop" ]; "video/mp4" = [ "umpv.desktop" ]; - "x-scheme-handler/chrome" = [ "firefox.desktop" ]; - "x-scheme-handler/http" = [ "firefox.desktop" ]; - "x-scheme-handler/https" = [ "firefox.desktop" ]; + "video/mkv" = [ "umpv.desktop" ]; + "video/flv" = [ "umpv.desktop" ]; + "video/3gp" = [ "umpv.desktop" ]; + "application/pdf" = [ "org.gnome.Evince.desktop" ]; + "application/metalink+xml" = [ "emacsclient.desktop" ]; + "application/sql" = [ "emacsclient.desktop" ]; + "application/vnd.ms-powerpoint" = [ "impress.desktop" ]; + "application/msword" = [ "writer.desktop" ]; + "application/vnd.ms-excel" = [ "calc.desktop" ]; }; associations = { added = { "application/x-zerosize" = [ "emacsclient.desktop" ]; - "application/epub+zip" = [ "calibre-ebook-viewer.desktop" ]; }; }; }; @@ -11704,11 +11594,7 @@ This section is for programs that require no further configuration. zsh Integrat jq.enable = true; ripgrep.enable = true; pandoc.enable = true; - fzf = { - enable = true; - enableBashIntegration = false; - enableZshIntegration = false; - }; + # fzf.enable = true; zoxide = { enable = true; enableZshIntegration = true; @@ -13381,159 +13267,6 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi } #+end_src -***** blueman-applet - -#+begin_src nix-ts :tangle modules/home/common/blueman-applet.nix - { lib, config, ... }: - { - options.swarselmodules.blueman-applet = lib.mkEnableOption "enable blueman applet for tray"; - config = lib.mkIf config.swarselmodules.blueman-applet { - services.blueman-applet.enable = true; - }; - } -#+end_src - -***** network-manager-applet - -#+begin_src nix-ts :tangle modules/home/common/network-manager-applet.nix - { lib, config, ... }: - { - options.swarselmodules.nm-applet = lib.mkEnableOption "enable network manager applet for tray"; - config = lib.mkIf config.swarselmodules.nm-applet { - services.network-manager-applet.enable = true; - xsession.preferStatusNotifierItems = true; # needed for indicator icon to show - }; - } -#+end_src - -***** obsidian service for tray - -#+begin_src nix-ts :tangle modules/home/common/obsidian-tray.nix - { lib, config, pkgs, ... }: - { - options.swarselmodules.obsidian-tray = lib.mkEnableOption "enable obsidian applet for tray"; - config = lib.mkIf config.swarselmodules.obsidian-tray { - - systemd.user.services.obsidian-applet = { - Unit = { - Description = "Obsidian applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.obsidian}/bin/obsidian"; - }; - }; - }; - - } -#+end_src - -***** anki service for tray - -#+begin_src nix-ts :tangle modules/home/common/anki-tray.nix - { lib, config, pkgs, ... }: - { - options.swarselmodules.anki-tray = lib.mkEnableOption "enable anki applet for tray"; - config = lib.mkIf config.swarselmodules.anki-tray { - - systemd.user.services.anki-applet = { - Unit = { - Description = "Anki applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.anki-bin}/bin/anki-bin"; - }; - }; - - }; - } -#+end_src - -***** element service for tray - -#+begin_src nix-ts :tangle modules/home/common/element-tray.nix - { lib, config, pkgs, ... }: - { - options.swarselmodules.element-tray = lib.mkEnableOption "enable element applet for tray"; - config = lib.mkIf config.swarselmodules.element-tray { - - systemd.user.services.element-applet = { - Unit = { - Description = "Element applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.element-desktop}/bin/element-desktop --hidden --enable-features=useozoneplatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; - }; - }; - }; - - } -#+end_src - -***** vesktop service for tray - -#+begin_src nix-ts :tangle modules/home/common/vesktop-tray.nix - { lib, config, pkgs, ... }: - { - options.swarselmodules.vesktop-tray = lib.mkEnableOption "enable vesktop applet for tray"; - config = lib.mkIf config.swarselmodules.vesktop-tray { - - systemd.user.services.vesktop-applet = { - Unit = { - Description = "Vesktop applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.vesktop}/bin/vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; - }; - }; - }; - - } -#+end_src - **** Sway :PROPERTIES: :CUSTOM_ID: h:02df9dfc-d1af-4a37-a7a0-d8da0af96a20 @@ -13571,11 +13304,11 @@ Currently, I am too lazy to explain every option here, but most of it is very se type = lib.types.listOf (lib.types.attrsOf lib.types.str); default = [ # { command = "nextcloud --background"; } - # { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } - # { command = "element-desktop --hidden --enable-features=useozoneplatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } - # { command = "anki"; } - # { command = "obsidian"; } - # { command = "nm-applet"; } + { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } + { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } + { command = "anki"; } + { command = "obsidian"; } + { command = "nm-applet"; } # { command = "feishin"; } ]; }; @@ -14162,11 +13895,11 @@ Currently, I am too lazy to explain every option here, but most of it is very se "Mod+Shift+0".action = move-column-to-index 0; }; spawn-at-startup = [ - # { command = [ "vesktop" "--start-minimized" "--enable-speech-dispatcher" "--ozone-platform-hint=auto" "--enable-features=WaylandWindowDecorations" "--enable-wayland-ime" ]; } - # { command = [ "element-desktop" "--hidden" "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" "--disable-gpu-driver-bug-workarounds" ]; } - # { command = [ "anki" ]; } - # { command = [ "obsidian" ]; } - # { command = [ "nm-applet" ]; } + { command = [ "vesktop" "--start-minimized" "--enable-speech-dispatcher" "--ozone-platform-hint=auto" "--enable-features=WaylandWindowDecorations" "--enable-wayland-ime" ]; } + { command = [ "element-desktop" "--hidden" "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" "--disable-gpu-driver-bug-workarounds" ]; } + { command = [ "anki" ]; } + { command = [ "obsidian" ]; } + { command = [ "nm-applet" ]; } { command = [ "niri" "msg" "action" "focus-workspace" "2" ]; } ]; workspaces = { @@ -14947,54 +14680,11 @@ The rest of the settings is at [[#h:bbf2ecb6-c8ff-4462-b5d5-d45b28604ddf][work]] }; }; - systemd.user.services = { - pizauth.Service = { - ExecStartPost = [ - "${pkgs.toybox}/bin/sleep 1" - "//bin/sh -c '${lib.getExe pkgs.pizauth} restore < ${homeDir}/.pizauth.state'" - ]; - }; - - teams-applet = { - Unit = { - Description = "teams applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.stable.teams-for-linux}/bin/teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; - }; - }; - - onepassword-applet = { - Unit = { - Description = "1password applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs._1password-gui}/bin/1password"; - }; - }; - + systemd.user.services.pizauth.Service = { + ExecStartPost = [ + "${pkgs.toybox}/bin/sleep 1" + "//bin/sh -c '${lib.getExe pkgs.pizauth} restore < ${homeDir}/.pizauth.state'" + ]; }; swarselservices.pizauth = { @@ -15071,14 +14761,14 @@ The rest of the settings is at [[#h:bbf2ecb6-c8ff-4462-b5d5-d45b28604ddf][work]] swarselsystems = { startup = [ # { command = "nextcloud --background"; } - # { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } - # { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } - # { command = "anki"; } - # { command = "obsidian"; } - # { command = "nm-applet"; } + { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } + { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } + { command = "anki"; } + { command = "obsidian"; } + { command = "nm-applet"; } # { command = "feishin"; } - # { command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; } - # { command = "1password"; } + { command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; } + { command = "1password"; } ]; monitors = { work_back_middle = rec { @@ -15263,7 +14953,6 @@ TODO: check which of these can be replaced but builtin functions. default = "swarsel"; }; isCrypted = lib.mkEnableOption "uses full disk encryption"; - withMicroVMs = lib.mkEnableOption "enable MicroVMs on this host"; isImpermanence = lib.mkEnableOption "use impermanence on this system"; isSecureBoot = lib.mkEnableOption "use secure boot on this system"; @@ -17868,12 +17557,7 @@ This holds modules that are to be used on most hosts. These are also the most im gpgagent = lib.mkDefault true; gammastep = lib.mkDefault true; spicetify = lib.mkDefault true; - blueman-applet = lib.mkDefault true; - nm-applet = lib.mkDefault true; - obsidian-tray = lib.mkDefault true; - anki-tray = lib.mkDefault true; - element-tray = lib.mkDefault true; - vesktop-tray = lib.mkDefault true; + }; }; diff --git a/flake.lock b/flake.lock index f5b7234..b385dcf 100644 --- a/flake.lock +++ b/flake.lock @@ -98,22 +98,6 @@ "type": "github" } }, - "base16-fish_6": { - "flake": false, - "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { @@ -163,22 +147,6 @@ } }, "base16-helix_4": { - "flake": false, - "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-helix_5": { "flake": false, "locked": { "lastModified": 1748408240, @@ -194,7 +162,7 @@ "type": "github" } }, - "base16-helix_6": { + "base16-helix_5": { "flake": false, "locked": { "lastModified": 1748408240, @@ -295,23 +263,6 @@ "type": "github" } }, - "base16-vim_6": { - "flake": false, - "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - } - }, "base16_2": { "inputs": { "fromYaml": "fromYaml_2" @@ -335,11 +286,11 @@ "fromYaml": "fromYaml_3" }, "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -384,24 +335,6 @@ "type": "github" } }, - "base16_6": { - "inputs": { - "fromYaml": "fromYaml_6" - }, - "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1754269165, @@ -432,36 +365,6 @@ "type": "github" } }, - "crane_11": { - "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", - "owner": "ipetkov", - "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_12": { - "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", - "owner": "ipetkov", - "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "crane_2": { "locked": { "lastModified": 1754269165, @@ -494,11 +397,11 @@ }, "crane_4": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", "type": "github" }, "original": { @@ -569,11 +472,11 @@ }, "crane_9": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -627,57 +530,6 @@ "type": "github" } }, - "devshell_11": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", - "owner": "numtide", - "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_12": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nix-topology", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "devshell_2": { "inputs": { "nixpkgs": [ @@ -886,11 +738,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "type": "github" }, "original": { @@ -908,11 +760,11 @@ ] }, "locked": { - "lastModified": 1757508292, - "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -931,11 +783,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1751854533, + "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", "type": "github" }, "original": { @@ -968,31 +820,6 @@ "type": "github" } }, - "disko_6": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751854533, - "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", - "owner": "nix-community", - "repo": "disko", - "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, "emacs-overlay": { "inputs": { "nixpkgs": [ @@ -1001,11 +828,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1759770590, - "narHash": "sha256-ex/JTut0wrrVHFWwNIuBAlnR71R7dletYxcJEH9NYAw=", + "lastModified": 1758705066, + "narHash": "sha256-CFVYMyz/p4c/w0E2BLz/dCmjl4zfJRUS+ERUJmaZj+E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4e4ed8f8beda9d47887cf4411720cb8a83a43e90", + "rev": "d8da68a0986380aca8ee9d277dfc4bcb0761a278", "type": "github" }, "original": { @@ -1023,11 +850,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1758705066, - "narHash": "sha256-CFVYMyz/p4c/w0E2BLz/dCmjl4zfJRUS+ERUJmaZj+E=", + "lastModified": 1757927471, + "narHash": "sha256-odfHgmioy0yGxiAFTnAq7SMYTLUv1JApKES5i2KfS4c=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d8da68a0986380aca8ee9d277dfc4bcb0761a278", + "rev": "6302a8a5904203bc18532e71b3d61f4b324d20fb", "type": "github" }, "original": { @@ -1046,11 +873,11 @@ "nixpkgs-stable": "nixpkgs-stable_7" }, "locked": { - "lastModified": 1757927471, - "narHash": "sha256-odfHgmioy0yGxiAFTnAq7SMYTLUv1JApKES5i2KfS4c=", + "lastModified": 1754705618, + "narHash": "sha256-JYwLLpnzJz0+ihJrwZUTAodx2+iBPWfnmfhJy3lpSw4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6302a8a5904203bc18532e71b3d61f4b324d20fb", + "rev": "c5aea4616a2c482eb3f1765f90de9771ba1d134a", "type": "github" }, "original": { @@ -1070,11 +897,11 @@ "nixpkgs-stable": "nixpkgs-stable_10" }, "locked": { - "lastModified": 1754705618, - "narHash": "sha256-JYwLLpnzJz0+ihJrwZUTAodx2+iBPWfnmfhJy3lpSw4=", + "lastModified": 1751908357, + "narHash": "sha256-7JeYhMYTdfzHsFfGZRUM+t0nx4HdYa3oaMH2B/qz9MA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c5aea4616a2c482eb3f1765f90de9771ba1d134a", + "rev": "8e4ecd7c43c5e061dd2fc4d9d1994ec4d67cab2e", "type": "github" }, "original": { @@ -1092,33 +919,7 @@ "swarsel", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_13" - }, - "locked": { - "lastModified": 1751908357, - "narHash": "sha256-7JeYhMYTdfzHsFfGZRUM+t0nx4HdYa3oaMH2B/qz9MA=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "8e4ecd7c43c5e061dd2fc4d9d1994ec4d67cab2e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "emacs-overlay_6": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_15" + "nixpkgs-stable": "nixpkgs-stable_12" }, "locked": { "lastModified": 1751908357, @@ -1137,11 +938,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -1169,11 +970,11 @@ "firefox-gnome-theme_3": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -1214,30 +1015,14 @@ "type": "github" } }, - "firefox-gnome-theme_6": { - "flake": false, - "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -1249,11 +1034,11 @@ "flake-compat_10": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -1265,11 +1050,11 @@ "flake-compat_11": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -1281,11 +1066,11 @@ "flake-compat_12": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -1295,6 +1080,22 @@ } }, "flake-compat_13": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_14": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1310,7 +1111,7 @@ "type": "github" } }, - "flake-compat_14": { + "flake-compat_15": { "flake": false, "locked": { "lastModified": 1696426674, @@ -1326,14 +1127,14 @@ "type": "github" } }, - "flake-compat_15": { + "flake-compat_16": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -1342,7 +1143,7 @@ "type": "github" } }, - "flake-compat_16": { + "flake-compat_17": { "flake": false, "locked": { "lastModified": 1733328505, @@ -1358,7 +1159,7 @@ "type": "github" } }, - "flake-compat_17": { + "flake-compat_18": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1374,22 +1175,6 @@ "type": "github" } }, - "flake-compat_18": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_19": { "flake": false, "locked": { @@ -1407,38 +1192,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_20": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_21": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1454,23 +1207,7 @@ "type": "github" } }, - "flake-compat_22": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_23": { + "flake-compat_20": { "flake": false, "locked": { "lastModified": 1696426674, @@ -1487,6 +1224,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1502,7 +1255,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1733328505, @@ -1518,7 +1271,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1534,7 +1287,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -1550,7 +1303,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1566,7 +1319,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_9": { "flake": false, "locked": { "lastModified": 1733328505, @@ -1582,32 +1335,16 @@ "type": "github" } }, - "flake-compat_9": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -1643,11 +1380,11 @@ "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -1729,11 +1466,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -1747,11 +1484,11 @@ "nixpkgs-lib": "nixpkgs-lib_7" }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -1771,11 +1508,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -1857,11 +1594,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -1985,11 +1722,11 @@ "nixpkgs-lib": "nixpkgs-lib_11" }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -2000,22 +1737,14 @@ }, "flake-parts_27": { "inputs": { - "nixpkgs-lib": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "lanzaboote", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib_12" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -2026,39 +1755,14 @@ }, "flake-parts_28": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_12" + "nixpkgs-lib": "nixpkgs-lib_13" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_29": { - "inputs": { - "nixpkgs-lib": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -2084,104 +1788,6 @@ "type": "indirect" } }, - "flake-parts_30": { - "inputs": { - "nixpkgs-lib": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_31": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_13" - }, - "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_32": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_14" - }, - "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_33": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_15" - }, - "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_34": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_16" - }, - "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-parts_4": { "inputs": { "nixpkgs-lib": [ @@ -2307,24 +1913,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_10": { - "inputs": { - "systems": "systems_18" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -2339,9 +1927,27 @@ "type": "github" } }, + "flake-utils_10": { + "inputs": { + "systems": "systems_17" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_11": { "inputs": { - "systems": "systems_19" + "systems": "systems_21" }, "locked": { "lastModified": 1731533236, @@ -2359,14 +1965,14 @@ }, "flake-utils_12": { "inputs": { - "systems": "systems_21" + "systems": "systems_24" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -2377,7 +1983,7 @@ }, "flake-utils_13": { "inputs": { - "systems": "systems_22" + "systems": "systems_28" }, "locked": { "lastModified": 1731533236, @@ -2395,7 +2001,7 @@ }, "flake-utils_14": { "inputs": { - "systems": "systems_26" + "systems": "systems_32" }, "locked": { "lastModified": 1731533236, @@ -2413,79 +2019,7 @@ }, "flake-utils_15": { "inputs": { - "systems": "systems_29" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_16": { - "inputs": { - "systems": "systems_33" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_17": { - "inputs": { - "systems": "systems_37" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_18": { - "inputs": { - "systems": "systems_41" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_19": { - "inputs": { - "systems": "systems_45" + "systems": "systems_36" }, "locked": { "lastModified": 1731533236, @@ -2506,11 +2040,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -2521,14 +2055,14 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -2542,11 +2076,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -2557,14 +2091,14 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_9" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -2578,11 +2112,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -2593,14 +2127,14 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_11" + "systems": "systems_13" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -2614,11 +2148,11 @@ "systems": "systems_14" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -2629,14 +2163,14 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -2725,27 +2259,10 @@ "type": "github" } }, - "fromYaml_6": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, "fw-fanctrl": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat", "nixpkgs": [ - "swarsel", "nixpkgs" ] }, @@ -2766,9 +2283,8 @@ }, "fw-fanctrl_2": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_5", "nixpkgs": [ - "swarsel", "swarsel", "nixpkgs" ] @@ -2790,9 +2306,8 @@ }, "fw-fanctrl_3": { "inputs": { - "flake-compat": "flake-compat_12", + "flake-compat": "flake-compat_9", "nixpkgs": [ - "swarsel", "swarsel", "swarsel", "nixpkgs" @@ -2815,12 +2330,11 @@ }, "fw-fanctrl_4": { "inputs": { - "flake-compat": "flake-compat_16", + "flake-compat": "flake-compat_13", "nixpkgs": [ "swarsel", "swarsel", "swarsel", - "swarsel", "nixpkgs" ] }, @@ -2841,13 +2355,12 @@ }, "fw-fanctrl_5": { "inputs": { - "flake-compat": "flake-compat_20", + "flake-compat": "flake-compat_17", "nixpkgs": [ "swarsel", "swarsel", "swarsel", "swarsel", - "swarsel", "nixpkgs" ] }, @@ -3039,86 +2552,6 @@ "type": "github" } }, - "gitignore_16": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "lanzaboote", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_17": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nix-topology", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_18": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gitignore_2": { "inputs": { "nixpkgs": [ @@ -3386,23 +2819,6 @@ "type": "github" } }, - "gnome-shell_6": { - "flake": false, - "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "48.2", - "repo": "gnome-shell", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -3410,11 +2826,11 @@ ] }, "locked": { - "lastModified": 1759761710, - "narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=", + "lastModified": 1758692005, + "narHash": "sha256-bNRMXWSLM4K9cF1YaHYjLol60KIAWW4GzAoJDp5tA0w=", "owner": "nix-community", "repo": "home-manager", - "rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c", + "rev": "6ce2e18007ff022db41d9cc042f8838e8c51ed66", "type": "github" }, "original": { @@ -3448,57 +2864,6 @@ "type": "github" } }, - "home-manager_11": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751824240, - "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_12": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nix-on-droid", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_2": { "inputs": { "nixpkgs": [ @@ -3528,11 +2893,11 @@ ] }, "locked": { - "lastModified": 1758692005, - "narHash": "sha256-bNRMXWSLM4K9cF1YaHYjLol60KIAWW4GzAoJDp5tA0w=", + "lastModified": 1757920978, + "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ce2e18007ff022db41d9cc042f8838e8c51ed66", + "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", "type": "github" }, "original": { @@ -3572,11 +2937,11 @@ ] }, "locked": { - "lastModified": 1757920978, - "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", + "lastModified": 1754756528, + "narHash": "sha256-W1jYKMetZSOHP5m2Z5Wokdj/ct17swPHs+MiY2WT1HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", + "rev": "3ec1cd9a0703fbd55d865b7fd2b07d08374f0355", "type": "github" }, "original": { @@ -3618,11 +2983,11 @@ ] }, "locked": { - "lastModified": 1754756528, - "narHash": "sha256-W1jYKMetZSOHP5m2Z5Wokdj/ct17swPHs+MiY2WT1HQ=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ec1cd9a0703fbd55d865b7fd2b07d08374f0355", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -3754,25 +3119,10 @@ "type": "github" } }, - "impermanence_6": { - "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", @@ -3795,7 +3145,7 @@ "lanzaboote_2": { "inputs": { "crane": "crane_2", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_7", "nixpkgs": "nixpkgs_9", "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", @@ -3818,35 +3168,12 @@ "lanzaboote_3": { "inputs": { "crane": "crane_3", - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_10", "flake-parts": "flake-parts_12", "nixpkgs": "nixpkgs_17", "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", "rust-overlay": "rust-overlay_3" }, - "locked": { - "lastModified": 1756744479, - "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "747b7912f49e2885090c83364d88cf853a020ac1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lanzaboote", - "type": "github" - } - }, - "lanzaboote_4": { - "inputs": { - "crane": "crane_4", - "flake-compat": "flake-compat_13", - "flake-parts": "flake-parts_17", - "nixpkgs": "nixpkgs_25", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", - "rust-overlay": "rust-overlay_4" - }, "locked": { "lastModified": 1754297745, "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", @@ -3861,10 +3188,33 @@ "type": "github" } }, + "lanzaboote_4": { + "inputs": { + "crane": "crane_4", + "flake-compat": "flake-compat_14", + "flake-parts": "flake-parts_17", + "nixpkgs": "nixpkgs_25", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1751381593, + "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lanzaboote", + "type": "github" + } + }, "lanzaboote_5": { "inputs": { "crane": "crane_5", - "flake-compat": "flake-compat_17", + "flake-compat": "flake-compat_18", "flake-parts": "flake-parts_22", "nixpkgs": "nixpkgs_33", "pre-commit-hooks-nix": "pre-commit-hooks-nix_5", @@ -3884,51 +3234,6 @@ "type": "github" } }, - "lanzaboote_6": { - "inputs": { - "crane": "crane_6", - "flake-compat": "flake-compat_21", - "flake-parts": "flake-parts_27", - "nixpkgs": "nixpkgs_41", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_6", - "rust-overlay": "rust-overlay_6" - }, - "locked": { - "lastModified": 1751381593, - "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lanzaboote", - "type": "github" - } - }, - "microvm": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "spectrum": "spectrum" - }, - "locked": { - "lastModified": 1759708185, - "narHash": "sha256-s8bRMSQVILQlhbBqCKBFtIcsxbcuH2oX35JJ7FHw4BI=", - "owner": "astro", - "repo": "microvm.nix", - "rev": "901c80e256d41f63d8036b042d1675c745c1a617", - "type": "github" - }, - "original": { - "owner": "astro", - "repo": "microvm.nix", - "type": "github" - } - }, "niri-flake": { "inputs": { "niri-stable": "niri-stable", @@ -3941,11 +3246,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759711756, - "narHash": "sha256-gdX1IM8MT3vTqLSXLDc9HNg30EcHkAgUXeNh4UpcyYU=", + "lastModified": 1758697829, + "narHash": "sha256-1pO4A16ssvjHNyHilpvxo15mBkAifCSOiLs3hBlrYdU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "372ecde34b3af73ae523d4b055f5bcdab00b5ee6", + "rev": "9dbeb8f613d2da107bff8375c2db7182a2bb79bb", "type": "github" }, "original": { @@ -3967,11 +3272,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable_2" }, "locked": { - "lastModified": 1758697829, - "narHash": "sha256-1pO4A16ssvjHNyHilpvxo15mBkAifCSOiLs3hBlrYdU=", + "lastModified": 1757870947, + "narHash": "sha256-0N8w6SB6a68kWioFmlr+KfwfG44KVjPjJIBSQKNdNhE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9dbeb8f613d2da107bff8375c2db7182a2bb79bb", + "rev": "8e9b1a571399104e42d8fa5de6c28c63bff0c16a", "type": "github" }, "original": { @@ -3993,34 +3298,6 @@ "xwayland-satellite-stable": "xwayland-satellite-stable_3", "xwayland-satellite-unstable": "xwayland-satellite-unstable_3" }, - "locked": { - "lastModified": 1757870947, - "narHash": "sha256-0N8w6SB6a68kWioFmlr+KfwfG44KVjPjJIBSQKNdNhE=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "8e9b1a571399104e42d8fa5de6c28c63bff0c16a", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-flake_4": { - "inputs": { - "niri-stable": "niri-stable_4", - "niri-unstable": "niri-unstable_4", - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_11", - "xwayland-satellite-stable": "xwayland-satellite-stable_4", - "xwayland-satellite-unstable": "xwayland-satellite-unstable_4" - }, "locked": { "lastModified": 1754797984, "narHash": "sha256-t2WFkdB2qUyZt5rdqmJ340kqhvQWWOCJBJIc1nQ/Hg4=", @@ -4070,23 +3347,6 @@ } }, "niri-stable_3": { - "flake": false, - "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-stable_4": { "flake": false, "locked": { "lastModified": 1748151941, @@ -4104,22 +3364,6 @@ } }, "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1759395653, - "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable_2": { "flake": false, "locked": { "lastModified": 1758691861, @@ -4135,7 +3379,7 @@ "type": "github" } }, - "niri-unstable_3": { + "niri-unstable_2": { "flake": false, "locked": { "lastModified": 1757832020, @@ -4151,7 +3395,7 @@ "type": "github" } }, - "niri-unstable_4": { + "niri-unstable_3": { "flake": false, "locked": { "lastModified": 1754742008, @@ -4174,11 +3418,11 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1758447883, + "narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1", "type": "github" }, "original": { @@ -4195,11 +3439,11 @@ ] }, "locked": { - "lastModified": 1758447883, - "narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -4217,11 +3461,11 @@ ] }, "locked": { - "lastModified": 1757430124, - "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "type": "github" }, "original": { @@ -4277,31 +3521,6 @@ "type": "github" } }, - "nix-darwin_6": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751313918, - "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -4427,61 +3646,12 @@ "type": "github" } }, - "nix-formatter-pack_6": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nix-on-droid", - "nixpkgs" - ], - "nmd": "nmd_11", - "nmt": "nmt_6" - }, - "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", - "type": "github" - }, - "original": { - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, - "locked": { - "lastModified": 1759637156, - "narHash": "sha256-8NI1SqntLfKl6Q0Luemc3aIboezSJElofUrqipF5g78=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "0ca69684091aa3a6b1fe994c4afeff305b15e915", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, - "nix-index-database_2": { - "inputs": { - "nixpkgs": [ - "swarsel", - "nixpkgs" - ] - }, "locked": { "lastModified": 1758427679, "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", @@ -4496,10 +3666,9 @@ "type": "github" } }, - "nix-index-database_3": { + "nix-index-database_2": { "inputs": { "nixpkgs": [ - "swarsel", "swarsel", "nixpkgs" ] @@ -4518,10 +3687,9 @@ "type": "github" } }, - "nix-index-database_4": { + "nix-index-database_3": { "inputs": { "nixpkgs": [ - "swarsel", "swarsel", "swarsel", "nixpkgs" @@ -4541,13 +3709,12 @@ "type": "github" } }, - "nix-index-database_5": { + "nix-index-database_4": { "inputs": { "nixpkgs": [ "swarsel", "swarsel", "swarsel", - "swarsel", "nixpkgs" ] }, @@ -4565,14 +3732,13 @@ "type": "github" } }, - "nix-index-database_6": { + "nix-index-database_5": { "inputs": { "nixpkgs": [ "swarsel", "swarsel", "swarsel", "swarsel", - "swarsel", "nixpkgs" ] }, @@ -4730,41 +3896,10 @@ "type": "github" } }, - "nix-on-droid_6": { - "inputs": { - "home-manager": "home-manager_12", - "nix-formatter-pack": "nix-formatter-pack_6", - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ], - "nixpkgs-docs": "nixpkgs-docs_6", - "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap_6", - "nmd": "nmd_12" - }, - "locked": { - "lastModified": 1720396533, - "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=", - "owner": "nix-community", - "repo": "nix-on-droid", - "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "nix-on-droid", - "type": "github" - } - }, "nix-topology": { "inputs": { "devshell": "devshell_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks" }, @@ -4785,7 +3920,7 @@ "nix-topology_2": { "inputs": { "devshell": "devshell_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_10", "pre-commit-hooks": "pre-commit-hooks_3" }, @@ -4806,7 +3941,7 @@ "nix-topology_3": { "inputs": { "devshell": "devshell_6", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_18", "pre-commit-hooks": "pre-commit-hooks_5" }, @@ -4827,16 +3962,16 @@ "nix-topology_4": { "inputs": { "devshell": "devshell_8", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_26", "pre-commit-hooks": "pre-commit-hooks_7" }, "locked": { - "lastModified": 1752093877, - "narHash": "sha256-P0TySh6sQl1EhfxjW9ZqGxEyUBSsEpdnchOe1QB0pLA=", + "lastModified": 1744142264, + "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=", "owner": "oddlama", "repo": "nix-topology", - "rev": "6a536c4b686ee4bcf07a7b0f8b823584560e2633", + "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa", "type": "github" }, "original": { @@ -4848,7 +3983,7 @@ "nix-topology_5": { "inputs": { "devshell": "devshell_10", - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_9", "nixpkgs": "nixpkgs_34", "pre-commit-hooks": "pre-commit-hooks_9" }, @@ -4866,30 +4001,9 @@ "type": "github" } }, - "nix-topology_6": { - "inputs": { - "devshell": "devshell_12", - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_42", - "pre-commit-hooks": "pre-commit-hooks_11" - }, - "locked": { - "lastModified": 1744142264, - "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=", - "owner": "oddlama", - "repo": "nix-topology", - "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa", - "type": "github" - }, - "original": { - "owner": "oddlama", - "repo": "nix-topology", - "type": "github" - } - }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -4908,7 +4022,7 @@ }, "nixgl_2": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_11" }, "locked": { @@ -4927,7 +4041,7 @@ }, "nixgl_3": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_19" }, "locked": { @@ -4946,28 +4060,9 @@ }, "nixgl_4": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": "nixpkgs_27" }, - "locked": { - "lastModified": 1752054764, - "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", - "owner": "guibou", - "repo": "nixGL", - "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", - "type": "github" - }, - "original": { - "owner": "guibou", - "repo": "nixGL", - "type": "github" - } - }, - "nixgl_5": { - "inputs": { - "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_35" - }, "locked": { "lastModified": 1751696036, "narHash": "sha256-hXq4IOgSdAAaF/9q/2U8TBDL7aXZyQmtq4wl6USZjKo=", @@ -4982,10 +4077,10 @@ "type": "github" } }, - "nixgl_6": { + "nixgl_5": { "inputs": { - "flake-utils": "flake-utils_13", - "nixpkgs": "nixpkgs_43" + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_35" }, "locked": { "lastModified": 1751696036, @@ -5076,21 +4171,6 @@ "type": "github" } }, - "nixlib_6": { - "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixos-generators": { "inputs": { "nixlib": "nixlib", @@ -5206,49 +4286,7 @@ "type": "github" } }, - "nixos-generators_6": { - "inputs": { - "nixlib": "nixlib_6", - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixos-hardware": { - "locked": { - "lastModified": 1759582739, - "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "3441b5242af7577230a78ffb03542add264179ab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixos-hardware_2": { "locked": { "lastModified": 1758663926, "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", @@ -5264,7 +4302,7 @@ "type": "github" } }, - "nixos-hardware_3": { + "nixos-hardware_2": { "locked": { "lastModified": 1757891025, "narHash": "sha256-NfiTk59huy/YK9H4W4wVwRYyiP2u86QqROM5KK4f5F4=", @@ -5280,7 +4318,7 @@ "type": "github" } }, - "nixos-hardware_4": { + "nixos-hardware_3": { "locked": { "lastModified": 1754564048, "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", @@ -5296,7 +4334,7 @@ "type": "github" } }, - "nixos-hardware_5": { + "nixos-hardware_4": { "locked": { "lastModified": 1751432711, "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", @@ -5312,7 +4350,7 @@ "type": "github" } }, - "nixos-hardware_6": { + "nixos-hardware_5": { "locked": { "lastModified": 1751432711, "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", @@ -5346,11 +4384,11 @@ }, "nixpkgs-dev": { "locked": { - "lastModified": 1759233809, - "narHash": "sha256-ww6JlKuclxzcBb+cb4GCnVw4PtI+7xd3J9/ctINWKeA=", + "lastModified": 1758012660, + "narHash": "sha256-f3jC14FeFhapXEKzk4Hfy3LXxZ2PIpmCxciVniHXSLA=", "owner": "Swarsel", "repo": "nixpkgs", - "rev": "d3e334a2a4f9d50568bf03ec62cd445faac7ce9e", + "rev": "3c0bb56bf5189fd91ead7e1443976301a42fac37", "type": "github" }, "original": { @@ -5377,22 +4415,6 @@ } }, "nixpkgs-dev_3": { - "locked": { - "lastModified": 1758012660, - "narHash": "sha256-f3jC14FeFhapXEKzk4Hfy3LXxZ2PIpmCxciVniHXSLA=", - "owner": "Swarsel", - "repo": "nixpkgs", - "rev": "3c0bb56bf5189fd91ead7e1443976301a42fac37", - "type": "github" - }, - "original": { - "owner": "Swarsel", - "ref": "main", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-dev_4": { "locked": { "lastModified": 1756088794, "narHash": "sha256-aBaRmk3lNNUm/1H1Jf6hA8miLg3HsYEhcuxUXTGa2gw=", @@ -5408,7 +4430,7 @@ "type": "github" } }, - "nixpkgs-dev_5": { + "nixpkgs-dev_4": { "locked": { "lastModified": 1752736260, "narHash": "sha256-90Gt98hmw/20aOAd7KaSW6otXu7MOBctRmI9RlXD/s0=", @@ -5424,7 +4446,7 @@ "type": "github" } }, - "nixpkgs-dev_6": { + "nixpkgs-dev_5": { "locked": { "lastModified": 1752440522, "narHash": "sha256-CInQkEG3f8XwIBQxYFhuFCT+T++JPstThfifAMD0yRk=", @@ -5520,22 +4542,6 @@ "type": "github" } }, - "nixpkgs-docs_6": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-for-bootstrap": { "locked": { "lastModified": 1720244366, @@ -5616,22 +4622,6 @@ "type": "github" } }, - "nixpkgs-for-bootstrap_6": { - "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - } - }, "nixpkgs-kernel": { "locked": { "lastModified": 1748026106, @@ -5717,23 +4707,6 @@ "type": "github" } }, - "nixpkgs-kernel_6": { - "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", - "type": "github" - }, - "original": { - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1754788789, @@ -5762,33 +4735,6 @@ } }, "nixpkgs-lib_11": { - "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_12": { - "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - } - }, - "nixpkgs-lib_13": { "locked": { "lastModified": 1753579242, "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", @@ -5803,7 +4749,7 @@ "type": "github" } }, - "nixpkgs-lib_14": { + "nixpkgs-lib_12": { "locked": { "lastModified": 1754788789, "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", @@ -5818,22 +4764,7 @@ "type": "github" } }, - "nixpkgs-lib_15": { - "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_16": { + "nixpkgs-lib_13": { "locked": { "lastModified": 1754788789, "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", @@ -5889,11 +4820,11 @@ }, "nixpkgs-lib_5": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1753579242, + "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", "type": "github" }, "original": { @@ -5916,11 +4847,11 @@ }, "nixpkgs-lib_7": { "locked": { - "lastModified": 1753579242, - "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "type": "github" }, "original": { @@ -5958,16 +4889,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -6052,22 +4983,6 @@ "type": "github" } }, - "nixpkgs-stable24_05_6": { - "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable24_11": { "locked": { "lastModified": 1751274312, @@ -6148,22 +5063,6 @@ "type": "github" } }, - "nixpkgs-stable24_11_6": { - "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable_10": { "locked": { "lastModified": 1751274312, @@ -6181,54 +5080,6 @@ } }, "nixpkgs-stable_11": { - "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_12": { - "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_13": { - "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_14": { "locked": { "lastModified": 1751741127, "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", @@ -6244,7 +5095,7 @@ "type": "github" } }, - "nixpkgs-stable_15": { + "nixpkgs-stable_12": { "locked": { "lastModified": 1751274312, "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", @@ -6260,7 +5111,7 @@ "type": "github" } }, - "nixpkgs-stable_16": { + "nixpkgs-stable_13": { "locked": { "lastModified": 1751741127, "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", @@ -6278,11 +5129,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -6294,11 +5145,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -6326,11 +5177,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1758589230, - "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -6342,11 +5193,11 @@ }, "nixpkgs-stable_6": { "locked": { - "lastModified": 1758589230, - "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -6374,11 +5225,11 @@ }, "nixpkgs-stable_8": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -6390,11 +5241,11 @@ }, "nixpkgs-stable_9": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -6437,11 +5288,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -6469,11 +5320,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -6485,11 +5336,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1758262103, - "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -6580,11 +5431,11 @@ }, "nixpkgs_20": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -6612,11 +5463,11 @@ }, "nixpkgs_22": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -6628,11 +5479,11 @@ }, "nixpkgs_23": { "locked": { - "lastModified": 1757746433, - "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -6644,11 +5495,11 @@ }, "nixpkgs_24": { "locked": { - "lastModified": 1756819007, - "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -6660,11 +5511,11 @@ }, "nixpkgs_25": { "locked": { - "lastModified": 1754243818, - "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", + "lastModified": 1751203939, + "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", + "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", "type": "github" }, "original": { @@ -6707,11 +5558,11 @@ }, "nixpkgs_28": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -6754,11 +5605,11 @@ }, "nixpkgs_30": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -6786,11 +5637,11 @@ }, "nixpkgs_32": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -6913,11 +5764,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -6945,58 +5796,43 @@ }, "nixpkgs_41": { "locked": { - "lastModified": 1751203939, - "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", + "lastModified": 1750865895, + "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", + "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_42": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1750865895, + "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_43": { "locked": { - "lastModified": 1746378225, - "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "93e8cdce7afc64297cfec447c311470788131cd9", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_44": { - "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -7006,13 +5842,29 @@ "type": "github" } }, + "nixpkgs_44": { + "locked": { + "lastModified": 1750865895, + "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_45": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -7024,27 +5876,11 @@ }, "nixpkgs_46": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_47": { - "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1754800730, + "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "641d909c4a7538f1539da9240dedb1755c907e40", "type": "github" }, "original": { @@ -7054,29 +5890,29 @@ "type": "github" } }, - "nixpkgs_48": { + "nixpkgs_47": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", - "owner": "NixOS", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_49": { + "nixpkgs_48": { "locked": { - "lastModified": 1750865895, - "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", + "lastModified": 1754800730, + "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", + "rev": "641d909c4a7538f1539da9240dedb1755c907e40", "type": "github" }, "original": { @@ -7102,87 +5938,7 @@ "type": "github" } }, - "nixpkgs_50": { - "locked": { - "lastModified": 1750865895, - "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_51": { - "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_52": { - "locked": { - "lastModified": 1750865895, - "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_53": { - "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_54": { - "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_55": { + "nixpkgs_6": { "locked": { "lastModified": 1758427187, "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", @@ -7198,77 +5954,13 @@ "type": "github" } }, - "nixpkgs_56": { - "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_57": { - "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_58": { - "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_7": { "locked": { - "lastModified": 1759570798, - "narHash": "sha256-kbkzsUKYzKhuvMOuxt/aTwWU2mnrwoY964yN3Y4dE98=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d4f673a88f8405ae14484e6a1ea870e0ba4ca26", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { @@ -7280,11 +5972,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1756819007, + "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", "type": "github" }, "original": { @@ -7352,49 +6044,6 @@ "type": "sourcehut" } }, - "nmd_11": { - "flake": false, - "locked": { - "lastModified": 1666190571, - "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", - "owner": "rycee", - "repo": "nmd", - "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmd", - "type": "gitlab" - } - }, - "nmd_12": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nix-on-droid", - "nixpkgs-docs" - ], - "scss-reset": "scss-reset_6" - }, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, "nmd_2": { "inputs": { "nixpkgs": [ @@ -7633,22 +6282,6 @@ "type": "gitlab" } }, - "nmt_6": { - "flake": false, - "locked": { - "lastModified": 1648075362, - "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", - "owner": "rycee", - "repo": "nmt", - "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmt", - "type": "gitlab" - } - }, "nswitch-rcm-nix": { "inputs": { "flake-parts": "flake-parts_3", @@ -7744,36 +6377,17 @@ "type": "github" } }, - "nswitch-rcm-nix_6": { - "inputs": { - "flake-parts": "flake-parts_28", - "nixpkgs": "nixpkgs_45" - }, - "locked": { - "lastModified": 1721304043, - "narHash": "sha256-8mY9tdjo44E23xGMcUFA2a1tUcEpz7oK5upuZZ9v5SU=", - "owner": "Swarsel", - "repo": "nswitch-rcm-nix", - "rev": "b45dc5d673631c97a4b8379926de89a66561d6dc", - "type": "github" - }, - "original": { - "owner": "Swarsel", - "repo": "nswitch-rcm-nix", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts_4", "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1759783224, - "narHash": "sha256-QTsVtR+MhvH6QTFcn31Jubm7qXltInAhTFdtsPifcbA=", + "lastModified": 1758706012, + "narHash": "sha256-Gee6jqg2BLBwG6uv/U7xEQRuBobbKJOLIm5/KfpcYq4=", "owner": "nix-community", "repo": "NUR", - "rev": "9d6e275d4f74ac272aef29fb9845ea7da6559de6", + "rev": "8f016c352545dc7d55969e1ab3f1dc2f01cdb3e4", "type": "github" }, "original": { @@ -7800,61 +6414,6 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1748730660, - "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", - "owner": "nix-community", - "repo": "NUR", - "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "nur_11": { - "inputs": { - "flake-parts": "flake-parts_29", - "nixpkgs": "nixpkgs_46" - }, - "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", - "owner": "nix-community", - "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "nur_12": { - "inputs": { - "flake-parts": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "stylix", - "flake-parts" - ], - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "stylix", - "nixpkgs" - ], "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -7883,11 +6442,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", "type": "github" }, "original": { @@ -7902,11 +6461,11 @@ "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1758706012, - "narHash": "sha256-Gee6jqg2BLBwG6uv/U7xEQRuBobbKJOLIm5/KfpcYq4=", + "lastModified": 1757935448, + "narHash": "sha256-dIk3hiBlSsHZJViknedzOyTb7VjHFmty6d2P59/DRi4=", "owner": "nix-community", "repo": "NUR", - "rev": "8f016c352545dc7d55969e1ab3f1dc2f01cdb3e4", + "rev": "b8ed69c1bcb6c358bb1df56e2a2e64323f6572c6", "type": "github" }, "original": { @@ -7948,11 +6507,11 @@ "nixpkgs": "nixpkgs_22" }, "locked": { - "lastModified": 1757935448, - "narHash": "sha256-dIk3hiBlSsHZJViknedzOyTb7VjHFmty6d2P59/DRi4=", + "lastModified": 1754726338, + "narHash": "sha256-Zz4zAgAvgXwAzkJuhuoYFpQ9eJs/vtaYCso+rfwahsw=", "owner": "nix-community", "repo": "NUR", - "rev": "b8ed69c1bcb6c358bb1df56e2a2e64323f6572c6", + "rev": "ab1e2e53a418b3907f87c24ce277975438f1bd78", "type": "github" }, "original": { @@ -7977,11 +6536,11 @@ ] }, "locked": { - "lastModified": 1756961635, - "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", "owner": "nix-community", "repo": "NUR", - "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", "type": "github" }, "original": { @@ -7996,11 +6555,11 @@ "nixpkgs": "nixpkgs_30" }, "locked": { - "lastModified": 1754726338, - "narHash": "sha256-Zz4zAgAvgXwAzkJuhuoYFpQ9eJs/vtaYCso+rfwahsw=", + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", "owner": "nix-community", "repo": "NUR", - "rev": "ab1e2e53a418b3907f87c24ce277975438f1bd78", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", "type": "github" }, "original": { @@ -8024,14 +6583,15 @@ "swarsel", "stylix", "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", "type": "github" }, "original": { @@ -8061,7 +6621,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", "nixpkgs": [ "nix-topology", @@ -8236,45 +6796,9 @@ "type": "github" } }, - "pre-commit-hooks-nix_6": { - "inputs": { - "flake-compat": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "lanzaboote", - "flake-compat" - ], - "gitignore": "gitignore_16", - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks_10": { "inputs": { - "flake-compat": "flake-compat_19", + "flake-compat": "flake-compat_20", "gitignore": "gitignore_15", "nixpkgs": [ "swarsel", @@ -8298,84 +6822,20 @@ "type": "github" } }, - "pre-commit-hooks_11": { - "inputs": { - "flake-compat": "flake-compat_22", - "gitignore": "gitignore_17", - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nix-topology", - "nixpkgs" - ], - "nixpkgs-stable": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nix-topology", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730797577, - "narHash": "sha256-SrID5yVpyUfknUTGWgYkTyvdr9J1LxUym4om3SVGPkg=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "1864030ed24a2b8b4e4d386a5eeaf0c5369e50a9", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_12": { - "inputs": { - "flake-compat": "flake-compat_23", - "gitignore": "gitignore_18", - "nixpkgs": [ - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "swarsel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1759523803, - "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -8386,7 +6846,7 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "gitignore": "gitignore_5", "nixpkgs": [ "swarsel", @@ -8415,7 +6875,7 @@ }, "pre-commit-hooks_4": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "gitignore": "gitignore_6", "nixpkgs": [ "swarsel", @@ -8423,11 +6883,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1757588530, + "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "type": "github" }, "original": { @@ -8438,7 +6898,7 @@ }, "pre-commit-hooks_5": { "inputs": { - "flake-compat": "flake-compat_10", + "flake-compat": "flake-compat_11", "gitignore": "gitignore_8", "nixpkgs": [ "swarsel", @@ -8469,7 +6929,7 @@ }, "pre-commit-hooks_6": { "inputs": { - "flake-compat": "flake-compat_11", + "flake-compat": "flake-compat_12", "gitignore": "gitignore_9", "nixpkgs": [ "swarsel", @@ -8478,11 +6938,11 @@ ] }, "locked": { - "lastModified": 1757588530, - "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", "type": "github" }, "original": { @@ -8493,7 +6953,7 @@ }, "pre-commit-hooks_7": { "inputs": { - "flake-compat": "flake-compat_14", + "flake-compat": "flake-compat_15", "gitignore": "gitignore_11", "nixpkgs": [ "swarsel", @@ -8526,7 +6986,7 @@ }, "pre-commit-hooks_8": { "inputs": { - "flake-compat": "flake-compat_15", + "flake-compat": "flake-compat_16", "gitignore": "gitignore_12", "nixpkgs": [ "swarsel", @@ -8536,11 +6996,11 @@ ] }, "locked": { - "lastModified": 1754416808, - "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -8551,7 +7011,7 @@ }, "pre-commit-hooks_9": { "inputs": { - "flake-compat": "flake-compat_18", + "flake-compat": "flake-compat_19", "gitignore": "gitignore_14", "nixpkgs": [ "swarsel", @@ -8590,10 +7050,10 @@ "disko": "disko", "emacs-overlay": "emacs-overlay", "flake-parts": "flake-parts", + "fw-fanctrl": "fw-fanctrl", "home-manager": "home-manager", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "microvm": "microvm", "niri-flake": "niri-flake", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", @@ -8615,10 +7075,10 @@ "spicetify-nix": "spicetify-nix", "stylix": "stylix", "swarsel": "swarsel", - "swarsel-modules": "swarsel-modules_4", - "systems": "systems_43", - "vbc-nix": "vbc-nix_6", - "zjstatus": "zjstatus_6" + "swarsel-modules": "swarsel-modules_3", + "systems": "systems_34", + "vbc-nix": "vbc-nix_5", + "zjstatus": "zjstatus_5" } }, "rust-overlay": { @@ -8643,51 +7103,6 @@ } }, "rust-overlay_10": { - "inputs": { - "nixpkgs": [ - "swarsel", - "swarsel", - "zjstatus", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754880555, - "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_11": { - "inputs": { - "nixpkgs": [ - "swarsel", - "zjstatus", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754880555, - "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_12": { "inputs": { "nixpkgs": [ "zjstatus", @@ -8764,11 +7179,11 @@ ] }, "locked": { - "lastModified": 1754189623, - "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", + "lastModified": 1751165203, + "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", + "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "type": "github" }, "original": { @@ -8809,17 +7224,16 @@ "swarsel", "swarsel", "swarsel", - "swarsel", - "lanzaboote", + "zjstatus", "nixpkgs" ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1750905536, + "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", "type": "github" }, "original": { @@ -8831,8 +7245,6 @@ "rust-overlay_7": { "inputs": { "nixpkgs": [ - "swarsel", - "swarsel", "swarsel", "swarsel", "swarsel", @@ -8857,8 +7269,6 @@ "rust-overlay_8": { "inputs": { "nixpkgs": [ - "swarsel", - "swarsel", "swarsel", "swarsel", "zjstatus", @@ -8882,19 +7292,17 @@ "rust-overlay_9": { "inputs": { "nixpkgs": [ - "swarsel", - "swarsel", "swarsel", "zjstatus", "nixpkgs" ] }, "locked": { - "lastModified": 1750905536, - "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", + "lastModified": 1754880555, + "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", + "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", "type": "github" }, "original": { @@ -8983,44 +7391,10 @@ "type": "github" } }, - "scss-reset_6": { - "flake": false, - "locked": { - "lastModified": 1631450058, - "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", - "owner": "andreymatin", - "repo": "scss-reset", - "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", - "type": "github" - }, - "original": { - "owner": "andreymatin", - "repo": "scss-reset", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_7" }, - "locked": { - "lastModified": 1759635238, - "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, - "sops-nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_15" - }, "locked": { "lastModified": 1758425756, "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", @@ -9035,9 +7409,9 @@ "type": "github" } }, - "sops-nix_3": { + "sops-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1757847158, @@ -9053,9 +7427,9 @@ "type": "github" } }, - "sops-nix_4": { + "sops-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_31" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1754328224, @@ -9071,6 +7445,24 @@ "type": "github" } }, + "sops-nix_4": { + "inputs": { + "nixpkgs": "nixpkgs_31" + }, + "locked": { + "lastModified": 1751606940, + "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "sops-nix_5": { "inputs": { "nixpkgs": "nixpkgs_39" @@ -9089,68 +7481,12 @@ "type": "github" } }, - "sops-nix_6": { - "inputs": { - "nixpkgs": "nixpkgs_47" - }, - "locked": { - "lastModified": 1751606940, - "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, - "spectrum": { - "flake": false, - "locked": { - "lastModified": 1759482047, - "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", - "ref": "refs/heads/main", - "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", - "revCount": 996, - "type": "git", - "url": "https://spectrum-os.org/git/spectrum" - }, - "original": { - "type": "git", - "url": "https://spectrum-os.org/git/spectrum" - } - }, "spicetify-nix": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1759638324, - "narHash": "sha256-bj0L3n2UWE/DjqFjsydWsSzO74+dqUA4tiOX4At6LbM=", - "owner": "Gerg-l", - "repo": "spicetify-nix", - "rev": "c39a58510e55c4970e57176ab14b722a978e5f01", - "type": "github" - }, - "original": { - "owner": "Gerg-l", - "repo": "spicetify-nix", - "type": "github" - } - }, - "spicetify-nix_2": { - "inputs": { - "nixpkgs": [ - "swarsel", - "nixpkgs" - ], - "systems": "systems_8" + "systems": "systems_3" }, "locked": { "lastModified": 1758584568, @@ -9166,14 +7502,13 @@ "type": "github" } }, - "spicetify-nix_3": { + "spicetify-nix_2": { "inputs": { "nixpkgs": [ - "swarsel", "swarsel", "nixpkgs" ], - "systems": "systems_12" + "systems": "systems_7" }, "locked": { "lastModified": 1757824114, @@ -9189,15 +7524,14 @@ "type": "github" } }, - "spicetify-nix_4": { + "spicetify-nix_3": { "inputs": { "nixpkgs": [ - "swarsel", "swarsel", "swarsel", "nixpkgs" ], - "systems": "systems_16" + "systems": "systems_11" }, "locked": { "lastModified": 1754196919, @@ -9224,7 +7558,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_8", "nur": "nur_2", - "systems": "systems_5", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -9232,11 +7566,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759690047, - "narHash": "sha256-Vlpa0d1xOgPO9waHwxJNi6LcD2PYqB3EjwLRtSxXlHc=", + "lastModified": 1758698745, + "narHash": "sha256-IonbUp7KTYzXS1UGraXPAa7QJFgLJrAZGswE5CfUILU=", "owner": "danth", "repo": "stylix", - "rev": "09022804b2bcd217f3a41a644d26b23d30375d12", + "rev": "799c811ac53ef9820dd007b6ddf33390964c6bef", "type": "github" }, "original": { @@ -9256,7 +7590,7 @@ "gnome-shell": "gnome-shell_2", "nixpkgs": "nixpkgs_16", "nur": "nur_4", - "systems": "systems_9", + "systems": "systems_8", "tinted-foot": "tinted-foot_2", "tinted-kitty": "tinted-kitty_2", "tinted-schemes": "tinted-schemes_2", @@ -9264,11 +7598,11 @@ "tinted-zed": "tinted-zed_2" }, "locked": { - "lastModified": 1758698745, - "narHash": "sha256-IonbUp7KTYzXS1UGraXPAa7QJFgLJrAZGswE5CfUILU=", + "lastModified": 1757360005, + "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", "owner": "danth", "repo": "stylix", - "rev": "799c811ac53ef9820dd007b6ddf33390964c6bef", + "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", "type": "github" }, "original": { @@ -9288,7 +7622,7 @@ "gnome-shell": "gnome-shell_3", "nixpkgs": "nixpkgs_24", "nur": "nur_6", - "systems": "systems_13", + "systems": "systems_12", "tinted-foot": "tinted-foot_3", "tinted-kitty": "tinted-kitty_3", "tinted-schemes": "tinted-schemes_3", @@ -9296,11 +7630,11 @@ "tinted-zed": "tinted-zed_3" }, "locked": { - "lastModified": 1757360005, - "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", + "lastModified": 1754597531, + "narHash": "sha256-OpC9/PBIuL2WEJUkcuD/wVxI8r+3o6f5RylSIefjHo4=", "owner": "danth", "repo": "stylix", - "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", + "rev": "63bb34a66ad7d1af2e95ee20dd675896b2074c32", "type": "github" }, "original": { @@ -9320,7 +7654,7 @@ "gnome-shell": "gnome-shell_4", "nixpkgs": "nixpkgs_32", "nur": "nur_8", - "systems": "systems_17", + "systems": "systems_15", "tinted-foot": "tinted-foot_4", "tinted-kitty": "tinted-kitty_4", "tinted-schemes": "tinted-schemes_4", @@ -9328,11 +7662,11 @@ "tinted-zed": "tinted-zed_4" }, "locked": { - "lastModified": 1754597531, - "narHash": "sha256-OpC9/PBIuL2WEJUkcuD/wVxI8r+3o6f5RylSIefjHo4=", + "lastModified": 1751906932, + "narHash": "sha256-vRZH3bq24I/heef0AIFnaBmDGdQSpTmyjT4vtpa7qqk=", "owner": "danth", "repo": "stylix", - "rev": "63bb34a66ad7d1af2e95ee20dd675896b2074c32", + "rev": "c538d1a3571386eaaca31aef7bb5fd5c155327b0", "type": "github" }, "original": { @@ -9352,7 +7686,7 @@ "gnome-shell": "gnome-shell_5", "nixpkgs": "nixpkgs_40", "nur": "nur_10", - "systems": "systems_20", + "systems": "systems_18", "tinted-foot": "tinted-foot_5", "tinted-kitty": "tinted-kitty_5", "tinted-schemes": "tinted-schemes_5", @@ -9373,45 +7707,13 @@ "type": "github" } }, - "stylix_6": { - "inputs": { - "base16": "base16_6", - "base16-fish": "base16-fish_6", - "base16-helix": "base16-helix_6", - "base16-vim": "base16-vim_6", - "firefox-gnome-theme": "firefox-gnome-theme_6", - "flake-parts": "flake-parts_30", - "gnome-shell": "gnome-shell_6", - "nixpkgs": "nixpkgs_48", - "nur": "nur_12", - "systems": "systems_23", - "tinted-foot": "tinted-foot_6", - "tinted-kitty": "tinted-kitty_6", - "tinted-schemes": "tinted-schemes_6", - "tinted-tmux": "tinted-tmux_6", - "tinted-zed": "tinted-zed_6" - }, - "locked": { - "lastModified": 1751906932, - "narHash": "sha256-vRZH3bq24I/heef0AIFnaBmDGdQSpTmyjT4vtpa7qqk=", - "owner": "danth", - "repo": "stylix", - "rev": "c538d1a3571386eaaca31aef7bb5fd5c155327b0", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, "swarsel": { "inputs": { "devshell": "devshell_3", "disko": "disko_2", "emacs-overlay": "emacs-overlay_2", "flake-parts": "flake-parts_6", - "fw-fanctrl": "fw-fanctrl", + "fw-fanctrl": "fw-fanctrl_2", "home-manager": "home-manager_3", "impermanence": "impermanence_2", "lanzaboote": "lanzaboote_2", @@ -9436,17 +7738,17 @@ "spicetify-nix": "spicetify-nix_2", "stylix": "stylix_2", "swarsel": "swarsel_2", - "swarsel-modules": "swarsel-modules_3", - "systems": "systems_39", - "vbc-nix": "vbc-nix_5", - "zjstatus": "zjstatus_5" + "swarsel-modules": "swarsel-modules_2", + "systems": "systems_30", + "vbc-nix": "vbc-nix_4", + "zjstatus": "zjstatus_4" }, "locked": { - "lastModified": 1758869406, - "narHash": "sha256-TulduD1ANpUvR9WNm3Hci+crvfTETd0Y3RevczQR8SQ=", + "lastModified": 1758712194, + "narHash": "sha256-ySYaSpCWBd0tlhnuJJY9XqcUNGXrACGMXVhTiigThhg=", "owner": "Swarsel", "repo": ".dotfiles", - "rev": "a896d5eb5db719b7539825d355ab1bb8ec563b4b", + "rev": "355cf03bd13a9325bb8ef10912900fe3623771ac", "type": "github" }, "original": { @@ -9457,9 +7759,9 @@ }, "swarsel-modules": { "inputs": { - "flake-parts": "flake-parts_31", - "nixpkgs": "nixpkgs_51", - "systems": "systems_30" + "flake-parts": "flake-parts_26", + "nixpkgs": "nixpkgs_43", + "systems": "systems_25" }, "locked": { "lastModified": 1756088962, @@ -9478,9 +7780,9 @@ }, "swarsel-modules_2": { "inputs": { - "flake-parts": "flake-parts_32", - "nixpkgs": "nixpkgs_53", - "systems": "systems_34" + "flake-parts": "flake-parts_27", + "nixpkgs": "nixpkgs_45", + "systems": "systems_29" }, "locked": { "lastModified": 1756090249, @@ -9499,30 +7801,9 @@ }, "swarsel-modules_3": { "inputs": { - "flake-parts": "flake-parts_33", - "nixpkgs": "nixpkgs_55", - "systems": "systems_38" - }, - "locked": { - "lastModified": 1757950182, - "narHash": "sha256-+dfxuorjUbaTvn+GNJMyCTbJjUVkkGTEIIaWpK2lGWM=", - "owner": "Swarsel", - "repo": "swarsel-modules", - "rev": "161c215217c9d6037658b00eebca9d420a44a733", - "type": "github" - }, - "original": { - "owner": "Swarsel", - "ref": "main", - "repo": "swarsel-modules", - "type": "github" - } - }, - "swarsel-modules_4": { - "inputs": { - "flake-parts": "flake-parts_34", - "nixpkgs": "nixpkgs_57", - "systems": "systems_42" + "flake-parts": "flake-parts_28", + "nixpkgs": "nixpkgs_47", + "systems": "systems_33" }, "locked": { "lastModified": 1757950182, @@ -9545,7 +7826,7 @@ "disko": "disko_3", "emacs-overlay": "emacs-overlay_3", "flake-parts": "flake-parts_11", - "fw-fanctrl": "fw-fanctrl_2", + "fw-fanctrl": "fw-fanctrl_3", "home-manager": "home-manager_5", "impermanence": "impermanence_3", "lanzaboote": "lanzaboote_3", @@ -9570,58 +7851,8 @@ "spicetify-nix": "spicetify-nix_3", "stylix": "stylix_3", "swarsel": "swarsel_3", - "swarsel-modules": "swarsel-modules_2", - "systems": "systems_35", - "vbc-nix": "vbc-nix_4", - "zjstatus": "zjstatus_4" - }, - "locked": { - "lastModified": 1758712194, - "narHash": "sha256-ySYaSpCWBd0tlhnuJJY9XqcUNGXrACGMXVhTiigThhg=", - "owner": "Swarsel", - "repo": ".dotfiles", - "rev": "355cf03bd13a9325bb8ef10912900fe3623771ac", - "type": "github" - }, - "original": { - "owner": "Swarsel", - "repo": ".dotfiles", - "type": "github" - } - }, - "swarsel_3": { - "inputs": { - "devshell": "devshell_7", - "disko": "disko_4", - "emacs-overlay": "emacs-overlay_4", - "flake-parts": "flake-parts_16", - "fw-fanctrl": "fw-fanctrl_3", - "home-manager": "home-manager_7", - "impermanence": "impermanence_4", - "lanzaboote": "lanzaboote_4", - "niri-flake": "niri-flake_4", - "nix-darwin": "nix-darwin_4", - "nix-index-database": "nix-index-database_4", - "nix-on-droid": "nix-on-droid_4", - "nix-topology": "nix-topology_4", - "nixgl": "nixgl_4", - "nixos-generators": "nixos-generators_4", - "nixos-hardware": "nixos-hardware_4", - "nixpkgs": "nixpkgs_28", - "nixpkgs-dev": "nixpkgs-dev_4", - "nixpkgs-kernel": "nixpkgs-kernel_4", - "nixpkgs-stable": "nixpkgs-stable_12", - "nixpkgs-stable24_05": "nixpkgs-stable24_05_4", - "nixpkgs-stable24_11": "nixpkgs-stable24_11_4", - "nswitch-rcm-nix": "nswitch-rcm-nix_4", - "nur": "nur_7", - "pre-commit-hooks": "pre-commit-hooks_8", - "sops-nix": "sops-nix_4", - "spicetify-nix": "spicetify-nix_4", - "stylix": "stylix_4", - "swarsel": "swarsel_4", "swarsel-modules": "swarsel-modules", - "systems": "systems_31", + "systems": "systems_26", "vbc-nix": "vbc-nix_3", "zjstatus": "zjstatus_3" }, @@ -9639,36 +7870,36 @@ "type": "github" } }, - "swarsel_4": { + "swarsel_3": { "inputs": { - "devshell": "devshell_9", - "disko": "disko_5", - "emacs-overlay": "emacs-overlay_5", - "flake-parts": "flake-parts_21", + "devshell": "devshell_7", + "disko": "disko_4", + "emacs-overlay": "emacs-overlay_4", + "flake-parts": "flake-parts_16", "fw-fanctrl": "fw-fanctrl_4", - "home-manager": "home-manager_9", - "impermanence": "impermanence_5", - "lanzaboote": "lanzaboote_5", - "nix-darwin": "nix-darwin_5", - "nix-index-database": "nix-index-database_5", - "nix-on-droid": "nix-on-droid_5", - "nix-topology": "nix-topology_5", - "nixgl": "nixgl_5", - "nixos-generators": "nixos-generators_5", - "nixos-hardware": "nixos-hardware_5", - "nixpkgs": "nixpkgs_36", - "nixpkgs-dev": "nixpkgs-dev_5", - "nixpkgs-kernel": "nixpkgs-kernel_5", - "nixpkgs-stable": "nixpkgs-stable_14", - "nixpkgs-stable24_05": "nixpkgs-stable24_05_5", - "nixpkgs-stable24_11": "nixpkgs-stable24_11_5", - "nswitch-rcm-nix": "nswitch-rcm-nix_5", - "nur": "nur_9", - "pre-commit-hooks": "pre-commit-hooks_10", - "sops-nix": "sops-nix_5", - "stylix": "stylix_5", - "swarsel": "swarsel_5", - "systems": "systems_27", + "home-manager": "home-manager_7", + "impermanence": "impermanence_4", + "lanzaboote": "lanzaboote_4", + "nix-darwin": "nix-darwin_4", + "nix-index-database": "nix-index-database_4", + "nix-on-droid": "nix-on-droid_4", + "nix-topology": "nix-topology_4", + "nixgl": "nixgl_4", + "nixos-generators": "nixos-generators_4", + "nixos-hardware": "nixos-hardware_4", + "nixpkgs": "nixpkgs_28", + "nixpkgs-dev": "nixpkgs-dev_4", + "nixpkgs-kernel": "nixpkgs-kernel_4", + "nixpkgs-stable": "nixpkgs-stable_11", + "nixpkgs-stable24_05": "nixpkgs-stable24_05_4", + "nixpkgs-stable24_11": "nixpkgs-stable24_11_4", + "nswitch-rcm-nix": "nswitch-rcm-nix_4", + "nur": "nur_7", + "pre-commit-hooks": "pre-commit-hooks_8", + "sops-nix": "sops-nix_4", + "stylix": "stylix_4", + "swarsel": "swarsel_4", + "systems": "systems_22", "vbc-nix": "vbc-nix_2", "zjstatus": "zjstatus_2" }, @@ -9686,35 +7917,35 @@ "type": "github" } }, - "swarsel_5": { + "swarsel_4": { "inputs": { - "devshell": "devshell_11", - "disko": "disko_6", - "emacs-overlay": "emacs-overlay_6", - "flake-parts": "flake-parts_26", + "devshell": "devshell_9", + "disko": "disko_5", + "emacs-overlay": "emacs-overlay_5", + "flake-parts": "flake-parts_21", "fw-fanctrl": "fw-fanctrl_5", - "home-manager": "home-manager_11", - "impermanence": "impermanence_6", - "lanzaboote": "lanzaboote_6", - "nix-darwin": "nix-darwin_6", - "nix-index-database": "nix-index-database_6", - "nix-on-droid": "nix-on-droid_6", - "nix-topology": "nix-topology_6", - "nixgl": "nixgl_6", - "nixos-generators": "nixos-generators_6", - "nixos-hardware": "nixos-hardware_6", - "nixpkgs": "nixpkgs_44", - "nixpkgs-dev": "nixpkgs-dev_6", - "nixpkgs-kernel": "nixpkgs-kernel_6", - "nixpkgs-stable": "nixpkgs-stable_16", - "nixpkgs-stable24_05": "nixpkgs-stable24_05_6", - "nixpkgs-stable24_11": "nixpkgs-stable24_11_6", - "nswitch-rcm-nix": "nswitch-rcm-nix_6", - "nur": "nur_11", - "pre-commit-hooks": "pre-commit-hooks_12", - "sops-nix": "sops-nix_6", - "stylix": "stylix_6", - "systems": "systems_24", + "home-manager": "home-manager_9", + "impermanence": "impermanence_5", + "lanzaboote": "lanzaboote_5", + "nix-darwin": "nix-darwin_5", + "nix-index-database": "nix-index-database_5", + "nix-on-droid": "nix-on-droid_5", + "nix-topology": "nix-topology_5", + "nixgl": "nixgl_5", + "nixos-generators": "nixos-generators_5", + "nixos-hardware": "nixos-hardware_5", + "nixpkgs": "nixpkgs_36", + "nixpkgs-dev": "nixpkgs-dev_5", + "nixpkgs-kernel": "nixpkgs-kernel_5", + "nixpkgs-stable": "nixpkgs-stable_13", + "nixpkgs-stable24_05": "nixpkgs-stable24_05_5", + "nixpkgs-stable24_11": "nixpkgs-stable24_11_5", + "nswitch-rcm-nix": "nswitch-rcm-nix_5", + "nur": "nur_9", + "pre-commit-hooks": "pre-commit-hooks_10", + "sops-nix": "sops-nix_5", + "stylix": "stylix_5", + "systems": "systems_19", "vbc-nix": "vbc-nix", "zjstatus": "zjstatus" }, @@ -9914,16 +8145,16 @@ }, "systems_20": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -9959,16 +8190,16 @@ }, "systems_23": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -9989,16 +8220,16 @@ }, "systems_25": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -10018,21 +8249,6 @@ } }, "systems_27": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_28": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -10047,6 +8263,21 @@ "type": "github" } }, + "systems_28": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_29": { "locked": { "lastModified": 1681028828, @@ -10093,21 +8324,6 @@ } }, "systems_31": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_32": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -10122,6 +8338,21 @@ "type": "github" } }, + "systems_32": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_33": { "locked": { "lastModified": 1681028828, @@ -10153,21 +8384,6 @@ } }, "systems_35": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_36": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -10182,37 +8398,7 @@ "type": "github" } }, - "systems_37": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_38": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_39": { + "systems_36": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -10242,96 +8428,6 @@ "type": "github" } }, - "systems_40": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_41": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_42": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_43": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_44": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_45": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_5": { "locked": { "lastModified": 1681028828, @@ -10492,23 +8588,6 @@ "type": "github" } }, - "tinted-foot_6": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -10589,30 +8668,14 @@ "type": "github" } }, - "tinted-kitty_6": { - "flake": false, - "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "type": "github" - } - }, "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -10640,11 +8703,11 @@ "tinted-schemes_3": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -10656,11 +8719,11 @@ "tinted-schemes_4": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -10685,30 +8748,14 @@ "type": "github" } }, - "tinted-schemes_6": { - "flake": false, - "locked": { - "lastModified": 1748180480, - "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", - "owner": "tinted-theming", - "repo": "schemes", - "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "schemes", - "type": "github" - } - }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -10736,11 +8783,11 @@ "tinted-tmux_3": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -10752,11 +8799,11 @@ "tinted-tmux_4": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { @@ -10781,30 +8828,14 @@ "type": "github" } }, - "tinted-tmux_6": { - "flake": false, - "locked": { - "lastModified": 1748740859, - "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -10832,11 +8863,11 @@ "tinted-zed_3": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { @@ -10848,11 +8879,11 @@ "tinted-zed_4": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", "type": "github" }, "original": { @@ -10877,29 +8908,12 @@ "type": "github" } }, - "tinted-zed_6": { - "flake": false, - "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ "swarsel", "swarsel", "swarsel", - "swarsel", "stylix", "nur", "nixpkgs" @@ -10926,7 +8940,6 @@ "swarsel", "swarsel", "swarsel", - "swarsel", "stylix", "nur", "nixpkgs" @@ -10953,10 +8966,9 @@ "swarsel", "swarsel", "swarsel", - "swarsel", "nixpkgs" ], - "systems": "systems_25" + "systems": "systems_20" }, "locked": { "lastModified": 1742477270, @@ -10979,10 +8991,9 @@ "swarsel", "swarsel", "swarsel", - "swarsel", "nixpkgs" ], - "systems": "systems_28" + "systems": "systems_23" }, "locked": { "lastModified": 1742477270, @@ -11002,12 +9013,11 @@ "vbc-nix_3": { "inputs": { "nixpkgs": [ - "swarsel", "swarsel", "swarsel", "nixpkgs" ], - "systems": "systems_32" + "systems": "systems_27" }, "locked": { "lastModified": 1742477270, @@ -11027,11 +9037,10 @@ "vbc-nix_4": { "inputs": { "nixpkgs": [ - "swarsel", "swarsel", "nixpkgs" ], - "systems": "systems_36" + "systems": "systems_31" }, "locked": { "lastModified": 1742477270, @@ -11051,32 +9060,9 @@ "vbc-nix_5": { "inputs": { "nixpkgs": [ - "swarsel", "nixpkgs" ], - "systems": "systems_40" - }, - "locked": { - "lastModified": 1742477270, - "narHash": "sha256-u78SeVemHqEkN6J+PieL1Kymu+n7LWiTPrUXNd+uePA=", - "ref": "main", - "rev": "0525ad64e2729077ed2cf313d2022e8b8c51153f", - "revCount": 2, - "type": "git", - "url": "ssh://git@github.com/vbc-it/vbc-nix.git" - }, - "original": { - "ref": "main", - "type": "git", - "url": "ssh://git@github.com/vbc-it/vbc-nix.git" - } - }, - "vbc-nix_6": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_44" + "systems": "systems_35" }, "locked": { "lastModified": 1742477270, @@ -11128,23 +9114,6 @@ } }, "xwayland-satellite-stable_3": { - "flake": false, - "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.7", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-stable_4": { "flake": false, "locked": { "lastModified": 1748488455, @@ -11162,22 +9131,6 @@ } }, "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1759707084, - "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable_2": { "flake": false, "locked": { "lastModified": 1758577423, @@ -11193,7 +9146,7 @@ "type": "github" } }, - "xwayland-satellite-unstable_3": { + "xwayland-satellite-unstable_2": { "flake": false, "locked": { "lastModified": 1757179758, @@ -11209,7 +9162,7 @@ "type": "github" } }, - "xwayland-satellite-unstable_4": { + "xwayland-satellite-unstable_3": { "flake": false, "locked": { "lastModified": 1754533920, @@ -11227,10 +9180,10 @@ }, "zjstatus": { "inputs": { - "crane": "crane_7", - "flake-utils": "flake-utils_14", - "nixpkgs": "nixpkgs_49", - "rust-overlay": "rust-overlay_7" + "crane": "crane_6", + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_41", + "rust-overlay": "rust-overlay_6" }, "locked": { "lastModified": 1750957292, @@ -11248,10 +9201,10 @@ }, "zjstatus_2": { "inputs": { - "crane": "crane_8", - "flake-utils": "flake-utils_15", - "nixpkgs": "nixpkgs_50", - "rust-overlay": "rust-overlay_8" + "crane": "crane_7", + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_42", + "rust-overlay": "rust-overlay_7" }, "locked": { "lastModified": 1750957292, @@ -11269,10 +9222,10 @@ }, "zjstatus_3": { "inputs": { - "crane": "crane_9", - "flake-utils": "flake-utils_16", - "nixpkgs": "nixpkgs_52", - "rust-overlay": "rust-overlay_9" + "crane": "crane_8", + "flake-utils": "flake-utils_13", + "nixpkgs": "nixpkgs_44", + "rust-overlay": "rust-overlay_8" }, "locked": { "lastModified": 1753722377, @@ -11290,10 +9243,10 @@ }, "zjstatus_4": { "inputs": { - "crane": "crane_10", - "flake-utils": "flake-utils_17", - "nixpkgs": "nixpkgs_54", - "rust-overlay": "rust-overlay_10" + "crane": "crane_9", + "flake-utils": "flake-utils_14", + "nixpkgs": "nixpkgs_46", + "rust-overlay": "rust-overlay_9" }, "locked": { "lastModified": 1757256304, @@ -11311,31 +9264,10 @@ }, "zjstatus_5": { "inputs": { - "crane": "crane_11", - "flake-utils": "flake-utils_18", - "nixpkgs": "nixpkgs_56", - "rust-overlay": "rust-overlay_11" - }, - "locked": { - "lastModified": 1757256304, - "narHash": "sha256-qANK2Hwhi4Nbpcsy6lunncyt725gthaSX/0dLluBxtw=", - "owner": "dj95", - "repo": "zjstatus", - "rev": "e2ea91819408f0b0dd7ee15249341cace6eb09cc", - "type": "github" - }, - "original": { - "owner": "dj95", - "repo": "zjstatus", - "type": "github" - } - }, - "zjstatus_6": { - "inputs": { - "crane": "crane_12", - "flake-utils": "flake-utils_19", - "nixpkgs": "nixpkgs_58", - "rust-overlay": "rust-overlay_12" + "crane": "crane_10", + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_48", + "rust-overlay": "rust-overlay_10" }, "locked": { "lastModified": 1757256304, diff --git a/flake.nix b/flake.nix index ac839db..c6036ef 100644 --- a/flake.nix +++ b/flake.nix @@ -59,12 +59,11 @@ zjstatus = { url = "github:dj95/zjstatus"; }; - # has been upstreamed - # fw-fanctrl = { - # # url = "github:TamtamHero/fw-fanctrl/packaging/nix"; - # url = "github:Swarsel/fw-fanctrl/packaging/nix"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + fw-fanctrl = { + # url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + url = "github:Swarsel/fw-fanctrl/packaging/nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-darwin = { url = "github:lnl7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; @@ -91,10 +90,6 @@ url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - microvm = { - url = "github:astro/microvm.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = diff --git a/hosts/nixos/pyramid/hardware-configuration.nix b/hosts/nixos/pyramid/hardware-configuration.nix index 8ee6c63..18047d6 100644 --- a/hosts/nixos/pyramid/hardware-configuration.nix +++ b/hosts/nixos/pyramid/hardware-configuration.nix @@ -22,8 +22,7 @@ # ''; boot = { - # kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages; - kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages; binfmt.emulatedSystems = [ "aarch64-linux" ]; initrd = { availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "cryptd" "usbhid" "sd_mod" "r8152" ]; diff --git a/hosts/nixos/winters/default.nix b/hosts/nixos/winters/default.nix index 38207d8..0c60f22 100644 --- a/hosts/nixos/winters/default.nix +++ b/hosts/nixos/winters/default.nix @@ -22,7 +22,6 @@ swarselsystems = { info = "ASRock J4105-ITX, 32GB RAM"; - flakePath = "/root/.dotfiles"; isImpermanence = false; isSecureBoot = true; isCrypted = true; diff --git a/index.html b/index.html index 8e78e79..70ff103 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + SwarselSystems: NixOS + Emacs Configurationo @@ -443,8 +443,6 @@
  • 3.2.5.8. Hibernation
  • 3.2.5.9. BTRFS
  • 3.2.5.10. work
  • -
  • 3.2.5.11. microvm-host
  • -
  • 3.2.5.12. microvm-guest
  • @@ -494,12 +492,6 @@
  • 3.3.1.30.3. Mako
  • 3.3.1.30.4. SwayOSD
  • 3.3.1.30.5. yubikey-touch-detector
  • -
  • 3.3.1.30.6. blueman-applet
  • -
  • 3.3.1.30.7. network-manager-applet
  • -
  • 3.3.1.30.8. obsidian service for tray
  • -
  • 3.3.1.30.9. anki service for tray
  • -
  • 3.3.1.30.10. element service for tray
  • -
  • 3.3.1.30.11. vesktop service for tray
  • 3.3.1.31. Sway
  • @@ -572,7 +564,7 @@
  • 3.5.31. swarsel-build
  • 3.5.32. swarsel-instantiate
  • 3.5.33. sshrm
  • -
  • 3.5.34. endme
  • +
  • 3.5.34. endme
  • 3.6. Profiles @@ -581,7 +573,7 @@ @@ -905,7 +897,7 @@ system-configuration-options
    ---prefix=/nix/store/qrqw5n6fivwcqfpg83x28bj1klpgfzg8-emacs-git-pgtk-20250928.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets --with-dbus --with-selinux
    +--prefix=/nix/store/4gbb3sfa5p6l3lhhnf0khvfj6w7qbqk5-emacs-git-pgtk-20250914.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets --with-dbus --with-selinux
     
    @@ -1411,10 +1403,6 @@ This provides devshell support for flake-parts
  • url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - microvm = { - url = "github:astro/microvm.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = @@ -1847,15 +1835,10 @@ The rest of the outputs either define or help define the actual configurations: inputs.nswitch-rcm-nix.nixosModules.nswitch-rcm inputs.swarsel-modules.nixosModules.default inputs.niri-flake.nixosModules.niri - inputs.microvm.nixosModules.host - inputs.microvm.nixosModules.microvm "${self}/hosts/nixos/${configName}" "${self}/profiles/nixos" "${self}/modules/nixos" { - - microvm.guest.enable = lib.mkDefault false; - node = { name = configName; secretsDir = ../hosts/nixos/${configName}/secrets; @@ -3053,8 +3036,7 @@ in # ''; boot = { - # kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages; - kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + kernelPackages = lib.mkDefault pkgs.kernel.linuxPackages; binfmt.emulatedSystems = [ "aarch64-linux" ]; initrd = { availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "cryptd" "usbhid" "sd_mod" "r8152" ]; @@ -3466,7 +3448,6 @@ This is my main server that I run at home. It handles most tasks that require bi swarselsystems = { info = "ASRock J4105-ITX, 32GB RAM"; - flakePath = "/root/.dotfiles"; isImpermanence = false; isSecureBoot = true; isCrypted = true; @@ -5851,6 +5832,7 @@ Mostly used to install some compilers and lsp's that I want to have available wh nixd zig zls + ansible-language-server elk-to-svg @@ -6098,7 +6080,7 @@ let certsSopsFile = self + /secrets/certs/secrets.yaml; clientSopsFile = self + /secrets/${config.node.name}/secrets.yaml; - inherit (config.repo.secrets.common.network) wlan1 mobile1 vpn1-location vpn1-cipher vpn1-address eduroam-anon; + inherit (config.repo.secrets.common.network) wlan1 wlan2 mobile1 vpn1-location vpn1-cipher vpn1-address eduroam-anon; iwd = config.networking.networkmanager.wifi.backend == "iwd"; in @@ -6144,9 +6126,6 @@ in networking = { inherit (config.swarselsystems) hostName; - hosts = { - "192.168.178.24" = [ "store.swarsel.win" ]; - }; wireless.iwd = { enable = true; settings = { @@ -6198,7 +6177,6 @@ in id = wlan1; # permissions = ""; type = "wifi"; - autoconnect-priority = "999"; }; ipv4 = { # dns-search = ""; @@ -6286,11 +6264,32 @@ in proxy = { }; }; + ${wlan2} = { + connection = { + id = wlan2; + type = "wifi"; + }; + ipv4 = { method = "auto"; }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + method = "auto"; + }; + proxy = { }; + wifi = { + band = "bg"; + mode = "infrastructure"; + ssid = wlan2; + }; + wifi-security = { + key-mgmt = "wpa-psk"; + psk = "$WLAN2_PW"; + }; + }; + ${mobile1} = { connection = { id = mobile1; type = "wifi"; - autoconnect-priority = "500"; }; ipv4 = { method = "auto"; }; ipv6 = { @@ -8025,13 +8024,6 @@ in services.pipewire.systemWide = true; - # https://github.com/Spotifyd/spotifyd/issues/1366 - networking.hosts."0.0.0.0" = [ "apresolve.spotify.com" ]; - - # hacky way to enable multi-session - # when another user connects, the service will crash and the new user will login - systemd.services.spotifyd.serviceConfig.RestartSec = lib.mkForce 1; - services.spotifyd = { enable = true; settings = { @@ -8039,11 +8031,8 @@ in dbus_type = "session"; use_mpris = false; device = "sysdefault:CARD=PCH"; - # device = "default"; device_name = "SwarselSpot"; - # backend = "pulseaudio"; - backend = "alsa"; - # mixer = "alsa"; + mixer = "alsa"; zeroconf_port = servicePort; }; }; @@ -8403,14 +8392,14 @@ in address = "http://localhost:${builtins.toString servicePort}"; domain = serviceDomain; }; - database = { - type = "postgres"; - uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql"; - }; appservice = { address = "http://localhost:${builtins.toString whatsappPort}"; hostname = "0.0.0.0"; port = whatsappPort; + database = { + type = "postgres"; + uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql"; + }; }; bridge = { displayname_template = "{{or .FullName .PushName .JID}} (WA)"; @@ -8450,14 +8439,14 @@ in address = "http://localhost:${builtins.toString servicePort}"; domain = serviceDomain; }; - database = { - type = "postgres"; - uri = "postgresql:///mautrix-signal?host=/run/postgresql"; - }; appservice = { address = "http://localhost:${builtins.toString signalPort}"; hostname = "0.0.0.0"; port = signalPort; + database = { + type = "postgres"; + uri = "postgresql:///mautrix-signal?host=/run/postgresql"; + }; }; bridge = { displayname_template = "{{or .ContactName .ProfileName .PhoneNumber}} (Signal)"; @@ -8581,7 +8570,7 @@ in configureRedis = true; maxUploadSize = "4G"; extraApps = { - inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin; + inherit (pkgs.nextcloud30Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin; }; extraAppsEnable = true; config = { @@ -8608,9 +8597,6 @@ in locations = { "/" = { proxyPass = "http://${serviceName}"; - extraConfig = '' - client_max_body_size 0; - ''; }; }; }; @@ -11638,35 +11624,27 @@ This sets the VirtualBox configuration. Guest should not be enabled if not direl { options.swarselmodules.optional.virtualbox = lib.mkEnableOption "optional VBox settings"; config = lib.mkIf config.swarselmodules.optional.virtualbox { - # specialisation = { - # VBox.configuration = { - virtualisation.virtualbox = { - host = { - enable = true; - enableKvm = true; - addNetworkInterface = lib.mkIf config.virtualisation.virtualbox.host.enableKvm false; - package = pkgs.stable.virtualbox; - enableExtensionPack = true; - }; - # leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch - guest = { - enable = false; + specialisation = { + VBox.configuration = { + virtualisation.virtualbox = { + host = { + enable = true; + enableExtensionPack = true; + }; + # leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch + guest = { + enable = false; + }; + }; + # run an older kernel to provide compatibility with windows vm + boot = { + kernelPackages = lib.mkForce pkgs.stable24_05.linuxPackages; + # kernelParams = [ + # "amd_iommu=on" + # ]; + }; }; }; - # run an older kernel to provide compatibility with windows vm - # boot = { - # kernelPackages = lib.mkForce pkgs.stable24_05.linuxPackages; - # # kernelParams = [ - # # "amd_iommu=on" - # # ]; - # }; - - - # fixes the issue of running together with QEMU - # NOTE: once you start a QEMU VM (use kvm) VirtualBox will fail to start VMs - # boot.kernelParams = [ "kvm.enable_virt_at_load=0" ]; - # }; - # }; }; } @@ -11728,8 +11706,11 @@ This holds configuration that is specific to framework laptops.

    -
    { lib, config, ... }:
    +
    { lib, config, inputs, ... }:
     {
    +  # imports = [
    +  #   inputs.fw-fanctrl.nixosModules.default
    +  # ];
       options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings";
       config = lib.mkIf config.swarselmodules.optional.framework {
         services = {
    @@ -11787,11 +11768,10 @@ This holds configuration that is specific to framework laptops.
         hardware = {
           amdgpu = {
             opencl.enable = true;
    -        initrd.enable = true;
    -        # amdvlk = {
    -        #   enable = true;
    -        #   support32Bit.enable = true;
    -        # };
    +        amdvlk = {
    +          enable = true;
    +          support32Bit.enable = true;
    +        };
           };
         };
       };
    @@ -11952,8 +11932,6 @@ in
                   connection = {
                     id = "VBC";
                     type = "wifi";
    -                autoconnect-priority = "500";
    -                secondaries = "48d09de4-0521-47d7-9bd5-43f97e23ff82"; # vpn uuid
                   };
                   ipv4 = { method = "auto"; };
                   ipv6 = {
    @@ -12022,8 +12000,7 @@ in
           govc
           terraform
           opentofu
    -      # dev.terragrunt
    -      terragrunt
    +      dev.terragrunt
           graphviz
           azure-cli
     
    @@ -12060,7 +12037,7 @@ in
               folders = {
                 "Documents" = {
                   path = "${homeDir}/Documents";
    -              devices = [ "moonside@oracle" ];
    +              devices = [ "magicant" "winters" "moonside@oracle" ];
                   id = "hgr3d-pfu3w";
                 };
               };
    @@ -12086,110 +12063,6 @@ in
       };
     
     }
    -
    -
    - - -
    -
    3.2.5.11. microvm-host
    -
    -

    -Some standard options that should be set for every microvm host. -

    - -
    -
    { lib, config, ... }:
    -{
    -  options.swarselmodules.optional.microvmHost = lib.mkEnableOption "optional microvmHost settings";
    -  # imports = [
    -  #   inputs.microvm.nixosModules.host
    -  # ];
    -
    -  config = lib.mkIf (config.swarselmodules.optional.microvmHost && config.swarselsystems.withMicroVMs) {
    -
    -    microvm = {
    -      hypervisor = lib.mkDefault "qemu";
    -    };
    -  };
    -
    -}
    -
    -
    -
    -
    -
    -
    3.2.5.12. microvm-guest
    -
    -

    -Some standard options that should be set vor every microvm guest. We set the default -

    - -
    -
    { lib, config, ... }:
    -{
    -  options.swarselmodules.optional.microvmGuest = lib.mkEnableOption "optional microvmGuest settings";
    -  # imports = [
    -  #   inputs.microvm.nixosModules.microvm
    -  #   "${self}/profiles/nixos"
    -  #   "${self}/modules/nixos"
    -  # ];
    -  config = lib.mkIf config.swarselmodules.optional.microvmGuest
    -    {
    -      # imports = [
    -      #   inputs.microvm.nixosModules.microvm
    -
    -      #   "${self}/profiles/nixos"
    -      #   "${self}/modules/nixos"
    -      # ];
    -
    -      boot.kernelParams = [ "systemd.hostname=${config.networking.hostName}" ];
    -
    -      node.name = config;
    -      documentation.enable = lib.mkForce false;
    -
    -      microvm = {
    -        guest.enable = lib.mkForce true;
    -        hypervisor = lib.mkDefault "qemu";
    -        mem = lib.mkDefault 1024 * 4;
    -        vcpu = lib.mkDefault 4;
    -        optimize.enable = false;
    -        writableStoreOverlay = "/nix/.rw-store";
    -
    -        # interfaces = flip lib.mapAttrsToList guestCfg.microvm.interfaces (
    -        #   _: { mac, hostLink, ...}:
    -        #   {
    -        #     type = "macvtap";
    -        #     id = "vm-${replaceStrings [ ":" ] [ "" ] mac}";
    -        #     inherit mac;
    -        #     macvtap = {
    -        #       link = hostLink;
    -        #       mode = "bridge";
    -        #     };
    -        #   }
    -        # );
    -        shares =
    -          [
    -            {
    -              source = "/nix/store";
    -              mountPoint = "/nix/.ro-store";
    -              tag = "ro-store";
    -              proto = "virtiofs";
    -            }
    -          ];
    -      };
    -      # systemd.network.networks = lib.flip lib.concatMapAttrs guestCfg.microvm.interfaces (
    -      #   name:
    -      #   { mac, ... }:
    -      #   {
    -      #     "10-${name}".matchConfig = mkForce {
    -      #       MACAddress = mac;
    -      #     };
    -      #   }
    -      # );
    -
    -    };
    -}
    -
     
    @@ -12888,47 +12761,46 @@ TODO: Non-NixOS machines (=sp3) should not use these by default, but instead the }; xdg.mimeApps = { + enable = true; defaultApplications = { - "application/epub+zip" = [ "calibre-ebook-viewer.desktop" ]; - "application/metalink+xml" = [ "emacsclient.desktop" ]; - "application/msword" = [ "writer.desktop" ]; - "application/pdf" = [ "org.gnome.Evince.desktop" ]; - "application/sql" = [ "emacsclient.desktop" ]; - "application/vnd.ms-excel" = [ "calc.desktop" ]; - "application/vnd.ms-powerpoint" = [ "impress.desktop" ]; + "x-scheme-handler/http" = [ "firefox.desktop" ]; + "x-scheme-handler/https" = [ "firefox.desktop" ]; + "x-scheme-handler/chrome" = [ "firefox.desktop" ]; + "text/plain" = [ "emacsclient.desktop" ]; + "text/csv" = [ "emacsclient.desktop" ]; + "text/html" = [ "firefox.desktop" ]; "application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "firefox.desktop" ]; - "application/x-extension-xht" = [ "firefox.desktop" ]; - "application/x-extension-xhtml" = [ "firefox.desktop" ]; "application/xhtml+xml" = [ "firefox.desktop" ]; + "application/x-extension-xhtml" = [ "firefox.desktop" ]; + "application/x-extension-xht" = [ "firefox.desktop" ]; + "image/png" = [ "imv.desktop" ]; + "image/jpeg" = [ "imv.desktop" ]; + "image/gif" = [ "imv.desktop" ]; + "image/svg" = [ "imv.desktop" ]; + "image/webp" = [ "firefox.desktop" ]; + "image/vnd.adobe.photoshop" = [ "gimp.desktop" ]; + "image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ]; "audio/flac" = [ "mpv.desktop" ]; "audio/mp3" = [ "mpv.desktop" ]; "audio/ogg" = [ "mpv.desktop" ]; "audio/wav" = [ "mpv.desktop" ]; - "image/gif" = [ "imv.desktop" ]; - "image/jpeg" = [ "imv.desktop" ]; - "image/png" = [ "imv.desktop" ]; - "image/svg" = [ "imv.desktop" ]; - "image/vnd.adobe.photoshop" = [ "gimp.desktop" ]; - "image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ]; - "image/webp" = [ "firefox.desktop" ]; - "text/csv" = [ "emacsclient.desktop" ]; - "text/html" = [ "firefox.desktop" ]; - "text/plain" = [ "emacsclient.desktop" ]; - "video/3gp" = [ "umpv.desktop" ]; - "video/flv" = [ "umpv.desktop" ]; - "video/mkv" = [ "umpv.desktop" ]; "video/mp4" = [ "umpv.desktop" ]; - "x-scheme-handler/chrome" = [ "firefox.desktop" ]; - "x-scheme-handler/http" = [ "firefox.desktop" ]; - "x-scheme-handler/https" = [ "firefox.desktop" ]; + "video/mkv" = [ "umpv.desktop" ]; + "video/flv" = [ "umpv.desktop" ]; + "video/3gp" = [ "umpv.desktop" ]; + "application/pdf" = [ "org.gnome.Evince.desktop" ]; + "application/metalink+xml" = [ "emacsclient.desktop" ]; + "application/sql" = [ "emacsclient.desktop" ]; + "application/vnd.ms-powerpoint" = [ "impress.desktop" ]; + "application/msword" = [ "writer.desktop" ]; + "application/vnd.ms-excel" = [ "calc.desktop" ]; }; associations = { added = { "application/x-zerosize" = [ "emacsclient.desktop" ]; - "application/epub+zip" = [ "calibre-ebook-viewer.desktop" ]; }; }; }; @@ -13067,11 +12939,7 @@ This section is for programs that require no further configuration. zsh Integrat jq.enable = true; ripgrep.enable = true; pandoc.enable = true; - fzf = { - enable = true; - enableBashIntegration = false; - enableZshIntegration = false; - }; + # fzf.enable = true; zoxide = { enable = true; enableZshIntegration = true; @@ -14815,177 +14683,6 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
    -
    -
    3.3.1.30.6. blueman-applet
    -
    -
    -
    { lib, config, ... }:
    -{
    -  options.swarselmodules.blueman-applet = lib.mkEnableOption "enable blueman applet for tray";
    -  config = lib.mkIf config.swarselmodules.blueman-applet {
    -    services.blueman-applet.enable = true;
    -  };
    -}
    -
    -
    -
    -
    -
    -
    3.3.1.30.7. network-manager-applet
    -
    -
    -
    { lib, config, ... }:
    -{
    -  options.swarselmodules.nm-applet = lib.mkEnableOption "enable network manager applet for tray";
    -  config = lib.mkIf config.swarselmodules.nm-applet {
    -    services.network-manager-applet.enable = true;
    -    xsession.preferStatusNotifierItems = true; # needed for indicator icon to show
    -  };
    -}
    -
    -
    -
    -
    -
    -
    3.3.1.30.8. obsidian service for tray
    -
    -
    -
    { lib, config, pkgs, ... }:
    -{
    -  options.swarselmodules.obsidian-tray = lib.mkEnableOption "enable obsidian applet for tray";
    -  config = lib.mkIf config.swarselmodules.obsidian-tray {
    -
    -    systemd.user.services.obsidian-applet = {
    -      Unit = {
    -        Description = "Obsidian applet";
    -        Requires = [ "tray.target" ];
    -        After = [
    -          "graphical-session.target"
    -          "tray.target"
    -        ];
    -        PartOf = [ "graphical-session.target" ];
    -      };
    -
    -      Install = {
    -        WantedBy = [ "graphical-session.target" ];
    -      };
    -
    -      Service = {
    -        ExecStart = "${pkgs.obsidian}/bin/obsidian";
    -      };
    -    };
    -  };
    -
    -}
    -
    -
    -
    -
    -
    -
    3.3.1.30.9. anki service for tray
    -
    -
    -
    { lib, config, pkgs, ... }:
    -{
    -  options.swarselmodules.anki-tray = lib.mkEnableOption "enable anki applet for tray";
    -  config = lib.mkIf config.swarselmodules.anki-tray {
    -
    -    systemd.user.services.anki-applet = {
    -      Unit = {
    -        Description = "Anki applet";
    -        Requires = [ "tray.target" ];
    -        After = [
    -          "graphical-session.target"
    -          "tray.target"
    -        ];
    -        PartOf = [ "graphical-session.target" ];
    -      };
    -
    -      Install = {
    -        WantedBy = [ "graphical-session.target" ];
    -      };
    -
    -      Service = {
    -        ExecStart = "${pkgs.anki-bin}/bin/anki-bin";
    -      };
    -    };
    -
    -  };
    -}
    -
    -
    -
    -
    -
    -
    3.3.1.30.10. element service for tray
    -
    -
    -
    { lib, config, pkgs, ... }:
    -{
    -  options.swarselmodules.element-tray = lib.mkEnableOption "enable element applet for tray";
    -  config = lib.mkIf config.swarselmodules.element-tray {
    -
    -    systemd.user.services.element-applet = {
    -      Unit = {
    -        Description = "Element applet";
    -        Requires = [ "tray.target" ];
    -        After = [
    -          "graphical-session.target"
    -          "tray.target"
    -        ];
    -        PartOf = [ "graphical-session.target" ];
    -      };
    -
    -      Install = {
    -        WantedBy = [ "graphical-session.target" ];
    -      };
    -
    -      Service = {
    -        ExecStart = "${pkgs.element-desktop}/bin/element-desktop --hidden --enable-features=useozoneplatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds";
    -      };
    -    };
    -  };
    -
    -}
    -
    -
    -
    -
    -
    -
    3.3.1.30.11. vesktop service for tray
    -
    -
    -
    { lib, config, pkgs, ... }:
    -{
    -  options.swarselmodules.vesktop-tray = lib.mkEnableOption "enable vesktop applet for tray";
    -  config = lib.mkIf config.swarselmodules.vesktop-tray {
    -
    -    systemd.user.services.vesktop-applet = {
    -      Unit = {
    -        Description = "Vesktop applet";
    -        Requires = [ "tray.target" ];
    -        After = [
    -          "graphical-session.target"
    -          "tray.target"
    -        ];
    -        PartOf = [ "graphical-session.target" ];
    -      };
    -
    -      Install = {
    -        WantedBy = [ "graphical-session.target" ];
    -      };
    -
    -      Service = {
    -        ExecStart = "${pkgs.vesktop}/bin/vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime";
    -      };
    -    };
    -  };
    -
    -}
    -
    -
    -
    -
    3.3.1.31. Sway
    @@ -15026,11 +14723,11 @@ Currently, I am too lazy to explain every option here, but most of it is very se type = lib.types.listOf (lib.types.attrsOf lib.types.str); default = [ # { command = "nextcloud --background"; } - # { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } - # { command = "element-desktop --hidden --enable-features=useozoneplatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } - # { command = "anki"; } - # { command = "obsidian"; } - # { command = "nm-applet"; } + { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } + { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } + { command = "anki"; } + { command = "obsidian"; } + { command = "nm-applet"; } # { command = "feishin"; } ]; }; @@ -15617,11 +15314,11 @@ exec_always autotiling "Mod+Shift+0".action = move-column-to-index 0; }; spawn-at-startup = [ - # { command = [ "vesktop" "--start-minimized" "--enable-speech-dispatcher" "--ozone-platform-hint=auto" "--enable-features=WaylandWindowDecorations" "--enable-wayland-ime" ]; } - # { command = [ "element-desktop" "--hidden" "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" "--disable-gpu-driver-bug-workarounds" ]; } - # { command = [ "anki" ]; } - # { command = [ "obsidian" ]; } - # { command = [ "nm-applet" ]; } + { command = [ "vesktop" "--start-minimized" "--enable-speech-dispatcher" "--ozone-platform-hint=auto" "--enable-features=WaylandWindowDecorations" "--enable-wayland-ime" ]; } + { command = [ "element-desktop" "--hidden" "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" "--disable-gpu-driver-bug-workarounds" ]; } + { command = [ "anki" ]; } + { command = [ "obsidian" ]; } + { command = [ "nm-applet" ]; } { command = [ "niri" "msg" "action" "focus-workspace" "2" ]; } ]; workspaces = { @@ -16420,54 +16117,11 @@ in }; }; - systemd.user.services = { - pizauth.Service = { - ExecStartPost = [ - "${pkgs.toybox}/bin/sleep 1" - "//bin/sh -c '${lib.getExe pkgs.pizauth} restore < ${homeDir}/.pizauth.state'" - ]; - }; - - teams-applet = { - Unit = { - Description = "teams applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.stable.teams-for-linux}/bin/teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; - }; - }; - - onepassword-applet = { - Unit = { - Description = "1password applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs._1password-gui}/bin/1password"; - }; - }; - + systemd.user.services.pizauth.Service = { + ExecStartPost = [ + "${pkgs.toybox}/bin/sleep 1" + "//bin/sh -c '${lib.getExe pkgs.pizauth} restore < ${homeDir}/.pizauth.state'" + ]; }; swarselservices.pizauth = { @@ -16544,14 +16198,14 @@ in swarselsystems = { startup = [ # { command = "nextcloud --background"; } - # { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } - # { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } - # { command = "anki"; } - # { command = "obsidian"; } - # { command = "nm-applet"; } + { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } + { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } + { command = "anki"; } + { command = "obsidian"; } + { command = "nm-applet"; } # { command = "feishin"; } - # { command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; } - # { command = "1password"; } + { command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; } + { command = "1password"; } ]; monitors = { work_back_middle = rec { @@ -16745,7 +16399,6 @@ TODO: check which of these can be replaced but builtin functions. default = "swarsel"; }; isCrypted = lib.mkEnableOption "uses full disk encryption"; - withMicroVMs = lib.mkEnableOption "enable MicroVMs on this host"; isImpermanence = lib.mkEnableOption "use impermanence on this system"; isSecureBoot = lib.mkEnableOption "use secure boot on this system"; @@ -18999,8 +18652,8 @@ writeShellApplication {
    -
    -

    3.5.34. endme

    +
    +

    3.5.34. endme

    Sometimes my DE crashes after putting it to suspend - to be precise, it happens when I put it into suspend when I have multiple screens plugged in. I have never taken the time to debug the issue, but instead just switch to a different TTY and then use this script to kill the hanging session. @@ -19160,8 +18813,8 @@ in

    -
    -
    3.6.1.3. Optionals
    +
    +
    3.6.1.3. Optionals
    { lib, config, ... }:
    @@ -19430,12 +19083,7 @@ in
           gpgagent = lib.mkDefault true;
           gammastep = lib.mkDefault true;
           spicetify = lib.mkDefault true;
    -      blueman-applet = lib.mkDefault true;
    -      nm-applet = lib.mkDefault true;
    -      obsidian-tray = lib.mkDefault true;
    -      anki-tray = lib.mkDefault true;
    -      element-tray = lib.mkDefault true;
    -      vesktop-tray = lib.mkDefault true;
    +
         };
       };
     
    @@ -26218,7 +25866,7 @@ similarly, there exists an version that starts from the right.
     

    Author: Leon Schwarzäugl

    -

    Created: 2025-10-07 Di 21:23

    +

    Created: 2025-09-26 Fr 08:49

    Validate

    diff --git a/modules/home/common/anki-tray.nix b/modules/home/common/anki-tray.nix deleted file mode 100644 index 3cb0f64..0000000 --- a/modules/home/common/anki-tray.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, config, pkgs, ... }: -{ - options.swarselmodules.anki-tray = lib.mkEnableOption "enable anki applet for tray"; - config = lib.mkIf config.swarselmodules.anki-tray { - - systemd.user.services.anki-applet = { - Unit = { - Description = "Anki applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.anki-bin}/bin/anki-bin"; - }; - }; - - }; -} diff --git a/modules/home/common/blueman-applet.nix b/modules/home/common/blueman-applet.nix deleted file mode 100644 index 26e5edd..0000000 --- a/modules/home/common/blueman-applet.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, config, ... }: -{ - options.swarselmodules.blueman-applet = lib.mkEnableOption "enable blueman applet for tray"; - config = lib.mkIf config.swarselmodules.blueman-applet { - services.blueman-applet.enable = true; - }; -} diff --git a/modules/home/common/desktop.nix b/modules/home/common/desktop.nix index cf04c2a..a24eb94 100644 --- a/modules/home/common/desktop.nix +++ b/modules/home/common/desktop.nix @@ -56,47 +56,46 @@ }; xdg.mimeApps = { + enable = true; defaultApplications = { - "application/epub+zip" = [ "calibre-ebook-viewer.desktop" ]; - "application/metalink+xml" = [ "emacsclient.desktop" ]; - "application/msword" = [ "writer.desktop" ]; - "application/pdf" = [ "org.gnome.Evince.desktop" ]; - "application/sql" = [ "emacsclient.desktop" ]; - "application/vnd.ms-excel" = [ "calc.desktop" ]; - "application/vnd.ms-powerpoint" = [ "impress.desktop" ]; + "x-scheme-handler/http" = [ "firefox.desktop" ]; + "x-scheme-handler/https" = [ "firefox.desktop" ]; + "x-scheme-handler/chrome" = [ "firefox.desktop" ]; + "text/plain" = [ "emacsclient.desktop" ]; + "text/csv" = [ "emacsclient.desktop" ]; + "text/html" = [ "firefox.desktop" ]; "application/x-extension-htm" = [ "firefox.desktop" ]; "application/x-extension-html" = [ "firefox.desktop" ]; "application/x-extension-shtml" = [ "firefox.desktop" ]; - "application/x-extension-xht" = [ "firefox.desktop" ]; - "application/x-extension-xhtml" = [ "firefox.desktop" ]; "application/xhtml+xml" = [ "firefox.desktop" ]; + "application/x-extension-xhtml" = [ "firefox.desktop" ]; + "application/x-extension-xht" = [ "firefox.desktop" ]; + "image/png" = [ "imv.desktop" ]; + "image/jpeg" = [ "imv.desktop" ]; + "image/gif" = [ "imv.desktop" ]; + "image/svg" = [ "imv.desktop" ]; + "image/webp" = [ "firefox.desktop" ]; + "image/vnd.adobe.photoshop" = [ "gimp.desktop" ]; + "image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ]; "audio/flac" = [ "mpv.desktop" ]; "audio/mp3" = [ "mpv.desktop" ]; "audio/ogg" = [ "mpv.desktop" ]; "audio/wav" = [ "mpv.desktop" ]; - "image/gif" = [ "imv.desktop" ]; - "image/jpeg" = [ "imv.desktop" ]; - "image/png" = [ "imv.desktop" ]; - "image/svg" = [ "imv.desktop" ]; - "image/vnd.adobe.photoshop" = [ "gimp.desktop" ]; - "image/vnd.dxf" = [ "org.inkscape.Inkscape.desktop" ]; - "image/webp" = [ "firefox.desktop" ]; - "text/csv" = [ "emacsclient.desktop" ]; - "text/html" = [ "firefox.desktop" ]; - "text/plain" = [ "emacsclient.desktop" ]; - "video/3gp" = [ "umpv.desktop" ]; - "video/flv" = [ "umpv.desktop" ]; - "video/mkv" = [ "umpv.desktop" ]; "video/mp4" = [ "umpv.desktop" ]; - "x-scheme-handler/chrome" = [ "firefox.desktop" ]; - "x-scheme-handler/http" = [ "firefox.desktop" ]; - "x-scheme-handler/https" = [ "firefox.desktop" ]; + "video/mkv" = [ "umpv.desktop" ]; + "video/flv" = [ "umpv.desktop" ]; + "video/3gp" = [ "umpv.desktop" ]; + "application/pdf" = [ "org.gnome.Evince.desktop" ]; + "application/metalink+xml" = [ "emacsclient.desktop" ]; + "application/sql" = [ "emacsclient.desktop" ]; + "application/vnd.ms-powerpoint" = [ "impress.desktop" ]; + "application/msword" = [ "writer.desktop" ]; + "application/vnd.ms-excel" = [ "calc.desktop" ]; }; associations = { added = { "application/x-zerosize" = [ "emacsclient.desktop" ]; - "application/epub+zip" = [ "calibre-ebook-viewer.desktop" ]; }; }; }; diff --git a/modules/home/common/element-tray.nix b/modules/home/common/element-tray.nix deleted file mode 100644 index 8f8ba76..0000000 --- a/modules/home/common/element-tray.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, config, pkgs, ... }: -{ - options.swarselmodules.element-tray = lib.mkEnableOption "enable element applet for tray"; - config = lib.mkIf config.swarselmodules.element-tray { - - systemd.user.services.element-applet = { - Unit = { - Description = "Element applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.element-desktop}/bin/element-desktop --hidden --enable-features=useozoneplatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; - }; - }; - }; - -} diff --git a/modules/home/common/network-manager-applet.nix b/modules/home/common/network-manager-applet.nix deleted file mode 100644 index a237ef7..0000000 --- a/modules/home/common/network-manager-applet.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, config, ... }: -{ - options.swarselmodules.nm-applet = lib.mkEnableOption "enable network manager applet for tray"; - config = lib.mkIf config.swarselmodules.nm-applet { - services.network-manager-applet.enable = true; - xsession.preferStatusNotifierItems = true; # needed for indicator icon to show - }; -} diff --git a/modules/home/common/niri.nix b/modules/home/common/niri.nix index e90219c..16f173b 100644 --- a/modules/home/common/niri.nix +++ b/modules/home/common/niri.nix @@ -182,11 +182,11 @@ "Mod+Shift+0".action = move-column-to-index 0; }; spawn-at-startup = [ - # { command = [ "vesktop" "--start-minimized" "--enable-speech-dispatcher" "--ozone-platform-hint=auto" "--enable-features=WaylandWindowDecorations" "--enable-wayland-ime" ]; } - # { command = [ "element-desktop" "--hidden" "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" "--disable-gpu-driver-bug-workarounds" ]; } - # { command = [ "anki" ]; } - # { command = [ "obsidian" ]; } - # { command = [ "nm-applet" ]; } + { command = [ "vesktop" "--start-minimized" "--enable-speech-dispatcher" "--ozone-platform-hint=auto" "--enable-features=WaylandWindowDecorations" "--enable-wayland-ime" ]; } + { command = [ "element-desktop" "--hidden" "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" "--disable-gpu-driver-bug-workarounds" ]; } + { command = [ "anki" ]; } + { command = [ "obsidian" ]; } + { command = [ "nm-applet" ]; } { command = [ "niri" "msg" "action" "focus-workspace" "2" ]; } ]; workspaces = { diff --git a/modules/home/common/obsidian-tray.nix b/modules/home/common/obsidian-tray.nix deleted file mode 100644 index b6863c3..0000000 --- a/modules/home/common/obsidian-tray.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, config, pkgs, ... }: -{ - options.swarselmodules.obsidian-tray = lib.mkEnableOption "enable obsidian applet for tray"; - config = lib.mkIf config.swarselmodules.obsidian-tray { - - systemd.user.services.obsidian-applet = { - Unit = { - Description = "Obsidian applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.obsidian}/bin/obsidian"; - }; - }; - }; - -} diff --git a/modules/home/common/programs.nix b/modules/home/common/programs.nix index f971174..26f2619 100644 --- a/modules/home/common/programs.nix +++ b/modules/home/common/programs.nix @@ -18,11 +18,7 @@ jq.enable = true; ripgrep.enable = true; pandoc.enable = true; - fzf = { - enable = true; - enableBashIntegration = false; - enableZshIntegration = false; - }; + # fzf.enable = true; zoxide = { enable = true; enableZshIntegration = true; diff --git a/modules/home/common/sway.nix b/modules/home/common/sway.nix index 6977c49..a903b0a 100644 --- a/modules/home/common/sway.nix +++ b/modules/home/common/sway.nix @@ -25,11 +25,11 @@ in type = lib.types.listOf (lib.types.attrsOf lib.types.str); default = [ # { command = "nextcloud --background"; } - # { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } - # { command = "element-desktop --hidden --enable-features=useozoneplatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } - # { command = "anki"; } - # { command = "obsidian"; } - # { command = "nm-applet"; } + { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } + { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } + { command = "anki"; } + { command = "obsidian"; } + { command = "nm-applet"; } # { command = "feishin"; } ]; }; diff --git a/modules/home/common/vesktop-tray.nix b/modules/home/common/vesktop-tray.nix deleted file mode 100644 index 1d258d7..0000000 --- a/modules/home/common/vesktop-tray.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, config, pkgs, ... }: -{ - options.swarselmodules.vesktop-tray = lib.mkEnableOption "enable vesktop applet for tray"; - config = lib.mkIf config.swarselmodules.vesktop-tray { - - systemd.user.services.vesktop-applet = { - Unit = { - Description = "Vesktop applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.vesktop}/bin/vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; - }; - }; - }; - -} diff --git a/modules/home/optional/work.nix b/modules/home/optional/work.nix index ef5ca2d..54e50fe 100644 --- a/modules/home/optional/work.nix +++ b/modules/home/optional/work.nix @@ -390,54 +390,11 @@ in }; }; - systemd.user.services = { - pizauth.Service = { - ExecStartPost = [ - "${pkgs.toybox}/bin/sleep 1" - "//bin/sh -c '${lib.getExe pkgs.pizauth} restore < ${homeDir}/.pizauth.state'" - ]; - }; - - teams-applet = { - Unit = { - Description = "teams applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs.stable.teams-for-linux}/bin/teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; - }; - }; - - onepassword-applet = { - Unit = { - Description = "1password applet"; - Requires = [ "tray.target" ]; - After = [ - "graphical-session.target" - "tray.target" - ]; - PartOf = [ "graphical-session.target" ]; - }; - - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - - Service = { - ExecStart = "${pkgs._1password-gui}/bin/1password"; - }; - }; - + systemd.user.services.pizauth.Service = { + ExecStartPost = [ + "${pkgs.toybox}/bin/sleep 1" + "//bin/sh -c '${lib.getExe pkgs.pizauth} restore < ${homeDir}/.pizauth.state'" + ]; }; swarselservices.pizauth = { @@ -514,14 +471,14 @@ in swarselsystems = { startup = [ # { command = "nextcloud --background"; } - # { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } - # { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } - # { command = "anki"; } - # { command = "obsidian"; } - # { command = "nm-applet"; } + { command = "vesktop --start-minimized --enable-speech-dispatcher --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime"; } + { command = "element-desktop --hidden --enable-features=UseOzonePlatform --ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; } + { command = "anki"; } + { command = "obsidian"; } + { command = "nm-applet"; } # { command = "feishin"; } - # { command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; } - # { command = "1password"; } + { command = "teams-for-linux --disableGpu=true --minimized=true --trayIconEnabled=true"; } + { command = "1password"; } ]; monitors = { work_back_middle = rec { diff --git a/modules/nixos/client/network.nix b/modules/nixos/client/network.nix index 9dc06c7..7c23b32 100644 --- a/modules/nixos/client/network.nix +++ b/modules/nixos/client/network.nix @@ -3,7 +3,7 @@ let certsSopsFile = self + /secrets/certs/secrets.yaml; clientSopsFile = self + /secrets/${config.node.name}/secrets.yaml; - inherit (config.repo.secrets.common.network) wlan1 mobile1 vpn1-location vpn1-cipher vpn1-address eduroam-anon; + inherit (config.repo.secrets.common.network) wlan1 wlan2 mobile1 vpn1-location vpn1-cipher vpn1-address eduroam-anon; iwd = config.networking.networkmanager.wifi.backend == "iwd"; in @@ -49,9 +49,6 @@ in networking = { inherit (config.swarselsystems) hostName; - hosts = { - "192.168.178.24" = [ "store.swarsel.win" ]; - }; wireless.iwd = { enable = true; settings = { @@ -103,7 +100,6 @@ in id = wlan1; # permissions = ""; type = "wifi"; - autoconnect-priority = "999"; }; ipv4 = { # dns-search = ""; @@ -191,11 +187,32 @@ in proxy = { }; }; + ${wlan2} = { + connection = { + id = wlan2; + type = "wifi"; + }; + ipv4 = { method = "auto"; }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + method = "auto"; + }; + proxy = { }; + wifi = { + band = "bg"; + mode = "infrastructure"; + ssid = wlan2; + }; + wifi-security = { + key-mgmt = "wpa-psk"; + psk = "$WLAN2_PW"; + }; + }; + ${mobile1} = { connection = { id = mobile1; type = "wifi"; - autoconnect-priority = "500"; }; ipv4 = { method = "auto"; }; ipv6 = { diff --git a/modules/nixos/client/packages.nix b/modules/nixos/client/packages.nix index 2ac4386..ce4d934 100644 --- a/modules/nixos/client/packages.nix +++ b/modules/nixos/client/packages.nix @@ -68,6 +68,7 @@ nixd zig zls + ansible-language-server elk-to-svg diff --git a/modules/nixos/optional/amdgpu.nix b/modules/nixos/optional/amdgpu.nix index 7af14c6..c6aa61f 100644 --- a/modules/nixos/optional/amdgpu.nix +++ b/modules/nixos/optional/amdgpu.nix @@ -5,11 +5,10 @@ hardware = { amdgpu = { opencl.enable = true; - initrd.enable = true; - # amdvlk = { - # enable = true; - # support32Bit.enable = true; - # }; + amdvlk = { + enable = true; + support32Bit.enable = true; + }; }; }; }; diff --git a/modules/nixos/optional/framework.nix b/modules/nixos/optional/framework.nix index 5f0d00d..949cc82 100644 --- a/modules/nixos/optional/framework.nix +++ b/modules/nixos/optional/framework.nix @@ -1,5 +1,8 @@ -{ lib, config, ... }: +{ lib, config, inputs, ... }: { + imports = [ + inputs.fw-fanctrl.nixosModules.default + ]; options.swarselmodules.optional.framework = lib.mkEnableOption "optional framework machine settings"; config = lib.mkIf config.swarselmodules.optional.framework { services = { @@ -17,7 +20,7 @@ ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" ''; }; - hardware.fw-fanctrl = { + programs.fw-fanctrl = { enable = true; config = { defaultStrategy = "lazy"; diff --git a/modules/nixos/optional/microvm-guest.nix b/modules/nixos/optional/microvm-guest.nix deleted file mode 100644 index 2eed2f8..0000000 --- a/modules/nixos/optional/microvm-guest.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, config, ... }: -{ - options.swarselmodules.optional.microvmGuest = lib.mkEnableOption "optional microvmGuest settings"; - # imports = [ - # inputs.microvm.nixosModules.microvm - # "${self}/profiles/nixos" - # "${self}/modules/nixos" - # ]; - config = lib.mkIf config.swarselmodules.optional.microvmGuest - { - # imports = [ - # inputs.microvm.nixosModules.microvm - - # "${self}/profiles/nixos" - # "${self}/modules/nixos" - # ]; - - boot.kernelParams = [ "systemd.hostname=${config.networking.hostName}" ]; - - node.name = config; - documentation.enable = lib.mkForce false; - - microvm = { - guest.enable = lib.mkForce true; - hypervisor = lib.mkDefault "qemu"; - mem = lib.mkDefault 1024 * 4; - vcpu = lib.mkDefault 4; - optimize.enable = false; - writableStoreOverlay = "/nix/.rw-store"; - - # interfaces = flip lib.mapAttrsToList guestCfg.microvm.interfaces ( - # _: { mac, hostLink, ...}: - # { - # type = "macvtap"; - # id = "vm-${replaceStrings [ ":" ] [ "" ] mac}"; - # inherit mac; - # macvtap = { - # link = hostLink; - # mode = "bridge"; - # }; - # } - # ); - shares = - [ - { - source = "/nix/store"; - mountPoint = "/nix/.ro-store"; - tag = "ro-store"; - proto = "virtiofs"; - } - ]; - }; - # systemd.network.networks = lib.flip lib.concatMapAttrs guestCfg.microvm.interfaces ( - # name: - # { mac, ... }: - # { - # "10-${name}".matchConfig = mkForce { - # MACAddress = mac; - # }; - # } - # ); - - }; -} diff --git a/modules/nixos/optional/microvm-host.nix b/modules/nixos/optional/microvm-host.nix deleted file mode 100644 index 73dac40..0000000 --- a/modules/nixos/optional/microvm-host.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, config, ... }: -{ - options.swarselmodules.optional.microvmHost = lib.mkEnableOption "optional microvmHost settings"; - # imports = [ - # inputs.microvm.nixosModules.host - # ]; - - config = lib.mkIf (config.swarselmodules.optional.microvmHost && config.swarselsystems.withMicroVMs) { - - microvm = { - hypervisor = lib.mkDefault "qemu"; - }; - }; - -} diff --git a/modules/nixos/optional/virtualbox.nix b/modules/nixos/optional/virtualbox.nix index dc5aa61..ee5a4b7 100644 --- a/modules/nixos/optional/virtualbox.nix +++ b/modules/nixos/optional/virtualbox.nix @@ -2,35 +2,27 @@ { options.swarselmodules.optional.virtualbox = lib.mkEnableOption "optional VBox settings"; config = lib.mkIf config.swarselmodules.optional.virtualbox { - # specialisation = { - # VBox.configuration = { - virtualisation.virtualbox = { - host = { - enable = true; - enableKvm = true; - addNetworkInterface = lib.mkIf config.virtualisation.virtualbox.host.enableKvm false; - package = pkgs.stable.virtualbox; - enableExtensionPack = true; - }; - # leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch - guest = { - enable = false; + specialisation = { + VBox.configuration = { + virtualisation.virtualbox = { + host = { + enable = true; + enableExtensionPack = true; + }; + # leaving this here for future notice. setting guest.enable = true will make 'restarting sysinit-reactivation.target' take till timeout on nixos-rebuild switch + guest = { + enable = false; + }; + }; + # run an older kernel to provide compatibility with windows vm + boot = { + kernelPackages = lib.mkForce pkgs.stable24_05.linuxPackages; + # kernelParams = [ + # "amd_iommu=on" + # ]; + }; }; }; - # run an older kernel to provide compatibility with windows vm - # boot = { - # kernelPackages = lib.mkForce pkgs.stable24_05.linuxPackages; - # # kernelParams = [ - # # "amd_iommu=on" - # # ]; - # }; - - - # fixes the issue of running together with QEMU - # NOTE: once you start a QEMU VM (use kvm) VirtualBox will fail to start VMs - # boot.kernelParams = [ "kvm.enable_virt_at_load=0" ]; - # }; - # }; }; } diff --git a/modules/nixos/optional/work.nix b/modules/nixos/optional/work.nix index 747a9f3..cd9eebf 100644 --- a/modules/nixos/optional/work.nix +++ b/modules/nixos/optional/work.nix @@ -93,8 +93,6 @@ in connection = { id = "VBC"; type = "wifi"; - autoconnect-priority = "500"; - secondaries = "48d09de4-0521-47d7-9bd5-43f97e23ff82"; # vpn uuid }; ipv4 = { method = "auto"; }; ipv6 = { @@ -163,8 +161,7 @@ in govc terraform opentofu - # dev.terragrunt - terragrunt + dev.terragrunt graphviz azure-cli @@ -201,7 +198,7 @@ in folders = { "Documents" = { path = "${homeDir}/Documents"; - devices = [ "moonside@oracle" ]; + devices = [ "magicant" "winters" "moonside@oracle" ]; id = "hgr3d-pfu3w"; }; }; diff --git a/modules/nixos/server/matrix.nix b/modules/nixos/server/matrix.nix index 24f4530..1544331 100644 --- a/modules/nixos/server/matrix.nix +++ b/modules/nixos/server/matrix.nix @@ -215,14 +215,14 @@ in address = "http://localhost:${builtins.toString servicePort}"; domain = serviceDomain; }; - database = { - type = "postgres"; - uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql"; - }; appservice = { address = "http://localhost:${builtins.toString whatsappPort}"; hostname = "0.0.0.0"; port = whatsappPort; + database = { + type = "postgres"; + uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql"; + }; }; bridge = { displayname_template = "{{or .FullName .PushName .JID}} (WA)"; @@ -262,14 +262,14 @@ in address = "http://localhost:${builtins.toString servicePort}"; domain = serviceDomain; }; - database = { - type = "postgres"; - uri = "postgresql:///mautrix-signal?host=/run/postgresql"; - }; appservice = { address = "http://localhost:${builtins.toString signalPort}"; hostname = "0.0.0.0"; port = signalPort; + database = { + type = "postgres"; + uri = "postgresql:///mautrix-signal?host=/run/postgresql"; + }; }; bridge = { displayname_template = "{{or .ContactName .ProfileName .PhoneNumber}} (Signal)"; diff --git a/modules/nixos/server/nextcloud.nix b/modules/nixos/server/nextcloud.nix index 36765d2..13d671d 100644 --- a/modules/nixos/server/nextcloud.nix +++ b/modules/nixos/server/nextcloud.nix @@ -37,7 +37,7 @@ in configureRedis = true; maxUploadSize = "4G"; extraApps = { - inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin; + inherit (pkgs.nextcloud30Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin; }; extraAppsEnable = true; config = { @@ -64,9 +64,6 @@ in locations = { "/" = { proxyPass = "http://${serviceName}"; - extraConfig = '' - client_max_body_size 0; - ''; }; }; }; diff --git a/modules/nixos/server/spotifyd.nix b/modules/nixos/server/spotifyd.nix index fd12435..ef4babd 100644 --- a/modules/nixos/server/spotifyd.nix +++ b/modules/nixos/server/spotifyd.nix @@ -23,13 +23,6 @@ in services.pipewire.systemWide = true; - # https://github.com/Spotifyd/spotifyd/issues/1366 - networking.hosts."0.0.0.0" = [ "apresolve.spotify.com" ]; - - # hacky way to enable multi-session - # when another user connects, the service will crash and the new user will login - systemd.services.spotifyd.serviceConfig.RestartSec = lib.mkForce 1; - services.spotifyd = { enable = true; settings = { @@ -37,11 +30,8 @@ in dbus_type = "session"; use_mpris = false; device = "sysdefault:CARD=PCH"; - # device = "default"; device_name = "SwarselSpot"; - # backend = "pulseaudio"; - backend = "alsa"; - # mixer = "alsa"; + mixer = "alsa"; zeroconf_port = servicePort; }; }; diff --git a/modules/shared/options.nix b/modules/shared/options.nix index d73c0a2..f126351 100644 --- a/modules/shared/options.nix +++ b/modules/shared/options.nix @@ -22,7 +22,6 @@ default = "swarsel"; }; isCrypted = lib.mkEnableOption "uses full disk encryption"; - withMicroVMs = lib.mkEnableOption "enable MicroVMs on this host"; isImpermanence = lib.mkEnableOption "use impermanence on this system"; isSecureBoot = lib.mkEnableOption "use secure boot on this system"; diff --git a/nix/hosts.nix b/nix/hosts.nix index 2eb1b92..972ddca 100644 --- a/nix/hosts.nix +++ b/nix/hosts.nix @@ -20,15 +20,10 @@ inputs.nswitch-rcm-nix.nixosModules.nswitch-rcm inputs.swarsel-modules.nixosModules.default inputs.niri-flake.nixosModules.niri - inputs.microvm.nixosModules.host - inputs.microvm.nixosModules.microvm "${self}/hosts/nixos/${configName}" "${self}/profiles/nixos" "${self}/modules/nixos" { - - microvm.guest.enable = lib.mkDefault false; - node = { name = configName; secretsDir = ../hosts/nixos/${configName}/secrets; diff --git a/profiles/home/personal/default.nix b/profiles/home/personal/default.nix index 45cb791..6cb38ec 100644 --- a/profiles/home/personal/default.nix +++ b/profiles/home/personal/default.nix @@ -42,12 +42,7 @@ gpgagent = lib.mkDefault true; gammastep = lib.mkDefault true; spicetify = lib.mkDefault true; - blueman-applet = lib.mkDefault true; - nm-applet = lib.mkDefault true; - obsidian-tray = lib.mkDefault true; - anki-tray = lib.mkDefault true; - element-tray = lib.mkDefault true; - vesktop-tray = lib.mkDefault true; + }; };