diff --git a/.gitignore b/.gitignore index 79165fc..c664d49 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ install/flake.lock result *.~undo-tree~ *.iso +*.bak .pre-commit-config.yaml .direnv diff --git a/SwarselSystems.org b/SwarselSystems.org index c614af1..7fb7b3b 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -300,6 +300,7 @@ Here I give a brief overview over the hostmachines that I am using. This is held ** Manual steps when setting up a new machine #+begin_src markdown :noweb yes :exports both :results html + These steps are required when setting up a normal NixOS host: <> @@ -307,6 +308,17 @@ Here I give a brief overview over the hostmachines that I am using. This is held <> + If the new machine is home-manager only, perform these steps: + + <> +#+end_src + +** Current issues + +#+begin_src markdown :noweb yes :exports both :results html + Currently, these adaptions are made to the configuration to account for bugs in upstream repos: + + <> #+end_src * flake.nix @@ -420,18 +432,19 @@ A short overview over each input and what it does: nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-stable24_05.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable24_11.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-stable25_05.url = "github:NixOS/nixpkgs/nixos-25.05"; systems.url = "github:nix-systems/default"; swarsel-modules.url = "github:Swarsel/swarsel-modules/main"; swarsel-nix.url = "github:Swarsel/swarsel-nix/main"; home-manager = { - # url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager"; # url = "github:Swarsel/home-manager/main"; - url = "github:JuneStepp/home-manager/anki-fix-booleans"; inputs.nixpkgs.follows = "nixpkgs"; }; swarsel.url = "github:Swarsel/.dotfiles"; emacs-overlay = { - url = "github:nix-community/emacs-overlay"; + # url = "github:nix-community/emacs-overlay"; + url = "github:nix-community/emacs-overlay/aba8daa237dc07a3bb28a61c252a718e8eb38057?narHash=sha256-4OXXccXsY1sBXTXjYIthdjXLAotozSh4F8StGRuLyMQ%3D"; inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/NUR"; @@ -941,6 +954,7 @@ The rest of the outputs either define or help define the actual configurations: minimal = false; }; modules = [ + inputs.stylix.homeModules.stylix inputs.niri-flake.homeModules.niri inputs.nix-index-database.homeModules.nix-index # inputs.sops-nix.homeManagerModules.sops @@ -1497,9 +1511,8 @@ As such, I also define three additional overlays: NOTE: The packages themselves are built in [[#h:6ed1a641-dba8-4e85-a62e-be93264df57a][Packages (pkgs)]]; here, we just add them to the overlay that we then use in the configuration. 2) =modification= These are for packages that are on nixpkgs, but do not fit my usecase, meaning I need to perform modifications on them. -3) =nixpkgs-[stable,...]= - These are simply mirrors of other branches of nixpkgs (mostly past stable branches). Useful for packages that are broken on nixpkgs, but do not need to be on bleeding edge anyways. - - TODO: I need to check out if overlays are really the way to go in this case, or if I should just use =packages=, which should make evalutation a good bit faster. +3) =nixpkgs-stable-versions= + These are simply mirrors of other branches of nixpkgs (mostly past stable branches). Useful for packages that are broken on nixpkgs, but do not need to be on bleeding edge anyways. Automatically fetches all inputs names =nixpkgs-= and adds them under the name in ==. Also, this is where I define all of my own modules. These are mostly used for setting some host-specifics directly than opposed to through multiple options. @@ -1523,7 +1536,13 @@ On the structure of overlays: as you notice, all of the attributes within overla overlays = { default = final: prev: let - additions = final: _: import "${self}/pkgs" { pkgs = final; inherit self lib; }; + additions = final: _: import "${self}/pkgs" { pkgs = final; inherit self lib; } + // { + swarsel-nix = import inputs.swarsel-nix { + pkgs = prev; + }; + zjstatus = inputs.zjstatus.packages.${prev.system}.default; + }; modifications = final: prev: { # vesktop = prev.vesktop.override { @@ -1554,63 +1573,35 @@ On the structure of overlays: as you notice, all of the attributes within overla melonds # ds dolphin # gc/wii ]); + }; - nixpkgs-stable = final: _: { - stable = import inputs.nixpkgs-stable { - inherit (final) system; - config.allowUnfree = true; - }; - }; + nixpkgs-stable-versions = final: _: + let + nixpkgsInputs = + lib.filterAttrs + (name: _v: builtins.match "^nixpkgs-.*" name != null) + inputs; - nixpkgs-dev = final: _: { - dev = import inputs.nixpkgs-dev { - inherit (final) system; - config.allowUnfree = true; - }; - }; + rename = name: builtins.replaceStrings [ "nixpkgs-" ] [ "" ] name; - nixpkgs-kernel = final: _: { - kernel = import inputs.nixpkgs-kernel { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - nixpkgs-stable24_05 = final: _: { - stable24_05 = import inputs.nixpkgs-stable24_05 { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - nixpkgs-stable24_11 = final: _: { - stable24_11 = import inputs.nixpkgs-stable24_11 { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - swarsel-nix = _: prev: { - swarsel-nix = import inputs.swarsel-nix { - pkgs = prev; - }; - }; - - zjstatus = _: prev: { - zjstatus = inputs.zjstatus.packages.${prev.system}.default; - }; + mkPkgs = src: + import src { + inherit (final) system; + config.allowUnfree = true; + }; + in + builtins.listToAttrs (map + (name: { + name = rename name; + value = mkPkgs nixpkgsInputs.${name}; + }) + (builtins.attrNames nixpkgsInputs)); in (additions final prev) // (modifications final prev) - // (nixpkgs-stable final prev) - // (nixpkgs-dev final prev) - // (nixpkgs-kernel final prev) - // (nixpkgs-stable24_05 final prev) - // (nixpkgs-stable24_11 final prev) - // (swarsel-nix final prev) - // (zjstatus final prev) + // (nixpkgs-stable-versions final prev) // (inputs.niri-flake.overlays.niri final prev) // (inputs.vbc-nix.overlays.default final prev) // (inputs.nur.overlays.default final prev) @@ -2631,13 +2622,11 @@ My phone. I use only a minimal config for remote debugging here. **** Treehouse (DGX Spark) #+begin_src nix-ts :tangle hosts/home/treehouse/default.nix - { self, inputs, outputs, ... }: + { self, outputs, ... }: { imports = [ - inputs.stylix.homeModules.stylix # inputs.sops-nix.homeManagerModules.sops - inputs.nix-index-database.homeModules.nix-index "${self}/modules/home" "${self}/modules/nixos/common/pii.nix" "${self}/modules/nixos/common/meta.nix" @@ -4712,7 +4701,7 @@ Mostly used to install some compilers and lsp's that I want to have available wh yubikey-touch-detector yubico-piv-tool cfssl - pcsctools + pcsc-tools pcscliteWithPolkit.out # ledger packages @@ -5425,7 +5414,7 @@ Here I disable global completion to prevent redundant compinit calls and cache i config = lib.mkIf config.swarselmodules.syncthing { services.syncthing = { enable = true; - package = pkgs.stable.syncthing; + package = pkgs.syncthing; user = mainUser; dataDir = homeDir; configDir = "${homeDir}/.config/syncthing"; @@ -5861,7 +5850,7 @@ When a program does not work, start with =nix-ldd =. This will tell you gdk-pixbuf glew110 glib - stable.gnome2.GConf + gnome2.GConf pango gtk2 gtk3 @@ -5910,8 +5899,8 @@ When a program does not work, start with =nix-ldd =. This will tell you pipewire pixman speex - stdenv.cc.cc - stable.steam-fhsenv-without-steam + # stable.cc.cc + stable25_05.steam-fhsenv-without-steam systemd tbb vulkan-loader @@ -6008,7 +5997,7 @@ This is used to better integrate Sway into the system on NixOS hosts. On the hom config = lib.mkIf config.swarselmodules.sway { programs.sway = { enable = true; - package = pkgs.dev.swayfx; + package = pkgs.swayfx; wrapperFeatures = { base = true; gtk = true; @@ -10247,7 +10236,7 @@ Deployment notes: topology.self.services.${serviceName}.info = "https://${serviceDomain}"; globals.services.${serviceName}.domain = serviceDomain; - swarselservices.${serviceName} = { + services.${serviceName} = { enable = true; package = pkgs.dev.homebox; database.createLocally = true; @@ -10830,7 +10819,7 @@ When setting up a new machine: spice spice-gtk spice-protocol - win-virtio + virtio-win win-spice powershell @@ -10997,6 +10986,26 @@ The general structure here is the same as in the [[#h:6da812f5-358c-49cb-aff2-0a #+end_src +*** Steps to setup/upgrade home-manager only +Steps to get a home-manager only setup up and running: + +#+begin_src markdown :noweb-ref homemanageronlysetup :exports both :results html + + - (Optional) Install openssh-server + - Set hostname to the name specified in the home-manager configuration + - Install nix, either: + - (if upgrading existing nix) Install nix version matching with version that `nix-plugins` is compiled against: `nix-env --install --file '' cacert -I nixpkgs=channel:nixpkgs-unstable --attr nixVersions.nix_x_yy` + - (or installing nix freshly): + - Grab the link to the install script of the needed nix version from https://releases.nixos.org/?prefix=nix, e.g. https://releases.nixos.org/nix/nix-2.30.1/install + - `bash <(curl -L https://releases.nixos.org/nix/nix-x-yy-y/install) --daemon` + - add the following to /etc/nix/nix.conf to become a trusted user: `trusted-users = @wheel root swarsel` + - For the first build: + 1) Clone dotfile repo & change into it + 2) `nix --extra-experimental-features 'nix-command flakes' develop` + 3) `home-manager --extra-experimental-features 'nix-command flakes' switch --flake .#$(hostname) --show-trace` + +#+end_src + *** TODO Common :PROPERTIES: :CUSTOM_ID: h:f0a6b5e0-2157-4522-b5e1-3f0abd91c05e @@ -11053,7 +11062,7 @@ Again, we adapt =nix= to our needs, enable the home-manager command for non-NixO #+begin_src nix-ts :tangle modules/home/common/settings.nix { self, lib, pkgs, config, ... }: let - inherit (config.swarselsystems) mainUser; + inherit (config.swarselsystems) mainUser flakePath isNixos isLinux; in { options.swarselmodules.general = lib.mkEnableOption "general nix settings"; @@ -11096,33 +11105,21 @@ Again, we adapt =nix= to our needs, enable the home-manager command for non-NixO auto-optimise-store = true; warn-dirty = false; max-jobs = 1; - use-cgroups = lib.mkIf config.swarselsystems.isLinux true; + use-cgroups = lib.mkIf isLinux true; }; }; - nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null); + nixpkgs.overlays = lib.mkIf isNixos (lib.mkForce null); programs = { - home-manager = lib.mkIf (!config.swarselsystems.isNixos) - { - enable = true; - package = pkgs.symlinkJoin { - name = "home-manager"; - buildInputs = [ pkgs.makeWrapper ]; - paths = [ pkgs.home-manager ]; - postBuild = '' - wrapProgram $out/bin/home-manager \ - --append-flags '--flake .#$(hostname)' - ''; - }; - }; + # home-manager.enable = lib.mkIf (!isNixos) true; man = { enable = true; generateCaches = true; }; }; - targets.genericLinux.enable = lib.mkIf (!config.swarselsystems.isNixos) true; + targets.genericLinux.enable = lib.mkIf (!isNixos) true; home = { username = lib.mkDefault mainUser; @@ -11137,6 +11134,17 @@ Again, we adapt =nix= to our needs, enable the home-manager command for non-NixO "info" "devdoc" ]; + packages = lib.mkIf (!isNixos) [ + (pkgs.symlinkJoin { + name = "home-manager"; + buildInputs = [ pkgs.makeWrapper ]; + paths = [ pkgs.home-manager ]; + postBuild = '' + wrapProgram $out/bin/home-manager \ + --append-flags '--flake ${flakePath}#$(hostname)' + ''; + }) + ]; }; }; @@ -11249,7 +11257,7 @@ This holds packages that I can use as provided, or with small modifications (as sshfs fuse # ventoy - poppler_utils + poppler-utils vdhcoapp # nix @@ -11337,7 +11345,7 @@ This holds packages that I can use as provided, or with small modifications (as unzip #nautilus - stable.nautilus + nautilus xfce.tumbler libgsf @@ -11354,7 +11362,7 @@ This holds packages that I can use as provided, or with small modifications (as # the following packages are used (in some way) by waybar # playerctl - stable.pavucontrol + pavucontrol # stable.pamixer # gnome.gnome-clocks # wlogout @@ -11376,22 +11384,22 @@ This holds packages that I can use as provided, or with small modifications (as # latex and related packages (texlive.combine { inherit (pkgs.texlive) scheme-full - dvisvgm dvipng# for preview and export as html - wrapfig amsmath ulem hyperref capt-of; + dvisvgm dvipng# for preview and export as html + wrapfig amsmath ulem hyperref capt-of; }) # font stuff nerd-fonts.fira-mono nerd-fonts.fira-code nerd-fonts.symbols-only - noto-fonts-emoji + noto-fonts-color-emoji font-awesome_5 noto-fonts noto-fonts-cjk-sans ]; }; } -#+end_src + #+end_src ***** Self-defined :PROPERTIES: @@ -11460,17 +11468,17 @@ I use sops-nix to handle secrets that I want to have available on my machines at let inherit (config.swarselsystems) homeDir; in - { - options.swarselmodules.sops = lib.mkEnableOption "sops settings"; - config = lib.optionalAttrs (inputs ? sops) { - sops = { - age.sshKeyPaths = [ "${homeDir}/.ssh/sops" "${homeDir}/.ssh/ssh_host_ed25519_key" ]; - defaultSopsFile = "${homeDir}/.dotfiles/secrets/general/secrets.yaml"; + { + options.swarselmodules.sops = lib.mkEnableOption "sops settings"; + config = lib.optionalAttrs (inputs ? sops) { + sops = { + age.sshKeyPaths = [ "${homeDir}/.ssh/sops" "${homeDir}/.ssh/ssh_host_ed25519_key" ]; + defaultSopsFile = "${homeDir}/.dotfiles/secrets/general/secrets.yaml"; - validateSopsFiles = false; + validateSopsFiles = false; + }; }; - }; - } + } #+end_src **** Yubikey @@ -11510,70 +11518,70 @@ I use sops-nix to handle secrets that I want to have available on my machines at It is very convenient to have SSH aliases in place for machines that I use. This is mainly used for some server machines and some university clusters. We also enable agent forwarding to have our Yubikey SSH key accessible on the remote host. #+begin_src nix-ts :tangle modules/home/common/ssh.nix - { lib, config, ... }: - { - options.swarselmodules.ssh = lib.mkEnableOption "ssh settings"; - config = lib.mkIf config.swarselmodules.ssh { - programs.ssh = { - enable = true; - enableDefaultConfig = false; - extraConfig = '' - SetEnv TERM=xterm-256color - ServerAliveInterval 20 - ''; - matchBlocks = { - "*" = { - forwardAgent = true; - addKeysToAgent = "no"; - compression = false; - serverAliveInterval = 0; - serverAliveCountMax = 3; - hashKnownHosts = false; - userKnownHostsFile = "~/.ssh/known_hosts"; - controlMaster = "no"; - controlPath = "~/.ssh/master-%r@%n:%p"; - controlPersist = "no"; - }; - "pfsense" = { - hostname = "192.168.1.1"; - user = "root"; - }; - "bakery" = { - hostname = "192.168.1.136"; - user = "root"; - }; - "dgx" = { - hostname = "192.168.48.200"; - user = "swarsel"; - }; - "winters" = { - hostname = "192.168.178.24"; - user = "root"; - }; - "minecraft" = { - hostname = "130.61.119.129"; - user = "opc"; - }; - "milkywell" = { - hostname = "193.122.53.173"; - user = "root"; - }; - "moonside" = { - hostname = "130.61.238.239"; - user = "root"; - }; - "songdiver" = { - hostname = "89.168.100.65"; - user = "ubuntu"; - }; - "pkv" = { - hostname = "46.232.248.161"; - user = "root"; - }; + { lib, config, ... }: + { + options.swarselmodules.ssh = lib.mkEnableOption "ssh settings"; + config = lib.mkIf config.swarselmodules.ssh { + programs.ssh = { + enable = true; + enableDefaultConfig = false; + extraConfig = '' + SetEnv TERM=xterm-256color + ServerAliveInterval 20 + ''; + matchBlocks = { + "*" = { + forwardAgent = true; + addKeysToAgent = "no"; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; + "pfsense" = { + hostname = "192.168.1.1"; + user = "root"; + }; + "bakery" = { + hostname = "192.168.1.136"; + user = "root"; + }; + "dgx" = { + hostname = "192.168.48.200"; + user = "swarsel"; + }; + "winters" = { + hostname = "192.168.178.24"; + user = "root"; + }; + "minecraft" = { + hostname = "130.61.119.129"; + user = "opc"; + }; + "milkywell" = { + hostname = "193.122.53.173"; + user = "root"; + }; + "moonside" = { + hostname = "130.61.238.239"; + user = "root"; + }; + "songdiver" = { + hostname = "89.168.100.65"; + user = "ubuntu"; + }; + "pkv" = { + hostname = "46.232.248.161"; + user = "root"; }; }; }; - } + }; + } #+end_src **** Theme (stylix) @@ -11588,13 +11596,14 @@ This section has been notably empty ever since switching to stylix. Only Emacs i =theme= is defined in [[#h:5bc1b0c9-dc59-4c81-b5b5-e60699deda78][Theme (stylix)]]. #+begin_src nix-ts :noweb yes :tangle modules/home/common/stylix.nix - { lib, config, vars, ... }: + { self, lib, config, vars, ... }: { options.swarselmodules.stylix = lib.mkEnableOption "stylix settings"; config = lib.mkIf config.swarselmodules.stylix { - stylix = lib.mkIf (!config.swarselsystems.isNixos) (lib.recursiveUpdate + stylix = lib.mkIf (!config.swarselsystems.isNixos && config.swarselmodules.stylix) (lib.recursiveUpdate { - image = config.swarselsystems.wallpaper; + enable = true; + base16Scheme = "${self}/files/stylix/swarsel.yaml"; targets = vars.stylixHomeTargets; } vars.stylix); @@ -11823,90 +11832,97 @@ This section is for programs that require no further configuration. zsh Integrat #+begin_src nix-ts :tangle modules/home/common/programs.nix { lib, config, pkgs, ... }: - { - options.swarselmodules.programs = lib.mkEnableOption "programs settings"; - config = lib.mkIf config.swarselmodules.programs { - programs = { - bat = { - enable = true; - extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; - }; - bottom.enable = true; - carapace.enable = true; - fzf = { - enable = true; - enableBashIntegration = false; - enableZshIntegration = false; - }; - imv.enable = true; - jq.enable = true; - less.enable = true; - lesspipe.enable = true; - mpv.enable = true; - pandoc.enable = true; - rclone.enable = true; - ripgrep.enable = true; - sioyek.enable = true; - swayr.enable = true; - timidity.enable = true; - wlogout ={ - enable = true; - layout = [ - { - label = "lock"; - action = "loginctl lock-session"; - text = "Lock"; - keybind = "l"; - circular = true; - } - { - label = "hibernate"; - action = "systemctl hibernate"; - text = "Hibernate"; - keybind = "h"; - circular = true; - } - { - label = "logout"; - action = "loginctl terminate-user $USER"; - text = "Logout"; - keybind = "u"; - circular = true; - } - { - label = "shutdown"; - action = "systemctl poweroff"; - text = "Shutdown"; - keybind = "p"; - circular = true; - } - { - label = "suspend"; - action = "systemctl suspend"; - text = "Suspend"; - keybind = "s"; - circular = true; - } - { - label = "reboot"; - action = "systemctl reboot"; - text = "Reboot"; - keybind = "r"; - circular = true; - } - ]; - }; - yt-dlp.enable = true; - zoxide = { - enable = true; - enableZshIntegration = true; - options = [ - "--cmd cd" - ]; - }; - }; + { + options.swarselmodules.programs = lib.mkEnableOption "programs settings"; + config = lib.mkIf config.swarselmodules.programs { + programs = { + bat = { + enable = true; + extraPackages = [ + pkgs.bat-extras.batdiff + pkgs.bat-extras.batman + pkgs.bat-extras.batwatch + ] ++ [ + pkgs.stable.bat-extras.batgrep + ]; + # extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; }; - } + bottom.enable = true; + carapace.enable = true; + fzf = { + enable = true; + enableBashIntegration = false; + enableZshIntegration = false; + }; + imv.enable = true; + jq.enable = true; + less.enable = true; + lesspipe.enable = true; + mpv.enable = true; + pandoc.enable = true; + rclone.enable = true; + ripgrep.enable = true; + sioyek.enable = true; + swayr.enable = true; + timidity.enable = true; + wlogout = { + enable = true; + layout = [ + { + label = "lock"; + action = "loginctl lock-session"; + text = "Lock"; + keybind = "l"; + circular = true; + } + { + label = "hibernate"; + action = "systemctl hibernate"; + text = "Hibernate"; + keybind = "h"; + circular = true; + } + { + label = "logout"; + action = "loginctl terminate-user $USER"; + text = "Logout"; + keybind = "u"; + circular = true; + } + { + label = "shutdown"; + action = "systemctl poweroff"; + text = "Shutdown"; + keybind = "p"; + circular = true; + } + { + label = "suspend"; + action = "systemctl suspend"; + text = "Suspend"; + keybind = "s"; + circular = true; + } + { + label = "reboot"; + action = "systemctl reboot"; + text = "Reboot"; + keybind = "r"; + circular = true; + } + ]; + }; + yt-dlp.enable = true; + zoxide = { + enable = true; + enableZshIntegration = true; + options = [ + "--cmd cd" + ]; + }; + }; + }; + } #+end_src **** nix-index @@ -11932,13 +11948,13 @@ nix-index provides a way to find out which packages are provided by which deriva ''; in - { - enable = true; - package = pkgs.symlinkJoin { - name = "nix-index"; - paths = [ commandNotFound ]; + { + enable = true; + package = pkgs.symlinkJoin { + name = "nix-index"; + paths = [ commandNotFound ]; + }; }; - }; }; } #+end_src @@ -12077,26 +12093,29 @@ Here I set up my git config, automatic signing of commits, useful aliases for my programs.git = { enable = true; } // lib.optionalAttrs (!minimal) { - aliases = { - a = "add"; - c = "commit"; - cl = "clone"; - co = "checkout"; - b = "branch"; - i = "init"; - m = "merge"; - s = "status"; - r = "restore"; - p = "pull"; - pp = "push"; + settings = { + alias = { + a = "add"; + c = "commit"; + cl = "clone"; + co = "checkout"; + b = "branch"; + i = "init"; + m = "merge"; + s = "status"; + r = "restore"; + p = "pull"; + pp = "push"; + }; + user = { + email = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) (lib.mkDefault address1); + name = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) fullName; + }; }; signing = { key = "0x76FD3810215AE097"; signByDefault = true; }; - userEmail = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) (lib.mkDefault address1); - userName = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) fullName; - difftastic.enable = true; lfs.enable = true; includes = [ { @@ -12111,6 +12130,7 @@ Here I set up my git config, automatic signing of commits, useful aliases for my } ]; }; + programs.difftastic.enable = lib.mkIf (!minimal) true; }; } #+end_src @@ -12337,7 +12357,7 @@ Currently I only use it as before with =initExtra= though. #+begin_src nix-ts :tangle modules/home/common/zsh.nix { config, pkgs, lib, minimal, inputs, globals, nixosConfig ? config, ... }: let - inherit (config.swarselsystems) flakePath; + inherit (config.swarselsystems) flakePath isNixos; crocDomain = globals.services.croc.domain; in { @@ -12358,12 +12378,10 @@ Currently I only use it as before with =initExtra= though. shellAliases = lib.recursiveUpdate { hg = "history | grep"; - hmswitch = "home-manager --flake ${flakePath}#$(whoami)@$(hostname) switch |& nom"; - # nswitch = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) --show-trace --log-format internal-json -v switch |& nom --json"; - nswitch = "cd ${flakePath}; swarsel-deploy $(hostname) switch; cd -;"; - nboot = "cd ${flakePath}; swarsel-deploy $(hostname) boot; cd -;"; - ndry = "cd ${flakePath}; swarsel-deploy $(hostname) dry-activate; cd -;"; - # nboot = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) --show-trace --log-format internal-json -v boot |& nom --json"; + hmswitch = lib.mkIf (!isNixos) "${lib.getExe pkgs.home-manager} --flake ${flakePath}#$(hostname) switch |& nom"; + nswitch = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) switch; cd -;"; + nboot = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) boot; cd -;"; + ndry = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) dry-activate; cd -;"; magit = "emacsclient -nc -e \"(magit-status)\""; config = "git --git-dir=$HOME/.cfg/ --work-tree=$HOME"; g = "git"; @@ -12385,7 +12403,7 @@ Currently I only use it as before with =initExtra= though. cc = "wl-copy"; build-topology = "nix build .#topology.x86_64-linux.config.output"; build-iso = "nix build --print-out-paths .#live-iso"; - nix-review- = "nix run nixpkgs#nixpkgs-review -- rev HEAD"; + nix-review-local = "nix run nixpkgs#nixpkgs-review -- rev HEAD"; nix-review-post = "nix run nixpkgs#nixpkgs-review -- pr --post-result --systems linux"; } config.swarselsystems.shellAliases; @@ -12847,6 +12865,7 @@ Lastly, I am defining some more packages here that the parser has problems findi epkgs.lsp-bridge epkgs.doom-themes epkgs.vterm + # pkgs.stable.emacs.pkgs.elpaPackages.tramp # use the unstable version from elpa epkgs.treesit-grammars.with-all-grammars # build the rest of the packages myself @@ -14322,9 +14341,11 @@ Currently, I am too lazy to explain every option here, but most of it is very se "Mod+Shift+Escape".action = spawn "kitty" "-o" "confirm_os_window_close=0" "btm"; "Mod+h".action = sh ''hyprpicker | wl-copy''; # "Mod+s".action = spawn "grim" "-g" "\"$(slurp)\"" "-t" "png" "-" "|" "wl-copy" "-t" "image/png"; - "Mod+s".action = screenshot { show-pointer = false; }; + # "Mod+s".action = screenshot { show-pointer = false; }; + "Mod+s".action.screenshot = { show-pointer = false; }; # "Mod+Shift+s".action = spawn "slurp" "|" "grim" "-g" "-" "Pictures/Screenshots/$(date +'screenshot_%Y-%m-%d-%H%M%S.png')"; - "Mod+Shift+s".action = screenshot-window { write-to-disk = true; }; + # "Mod+Shift+s".action = screenshot-window { write-to-disk = true; }; + "Mod+Shift+s".action.screenshot-window = { write-to-disk = true; }; # "Mod+Shift+v".action = spawn "wf-recorder" "-g" "'$(slurp -f %o -or)'" "-f" "~/Videos/screenrecord_$(date +%Y-%m-%d-%H%M%S).mkv"; "Mod+e".action = sh "emacsclient -nquc -a emacs -e '(dashboard-open)'"; @@ -14631,7 +14652,7 @@ This service changes the screen hue at night. I am not sure if that really does programs.spicetify = { enable = true; # spotifyPackage = pkgs.stable24_11.spotify; - spotifyPackage = pkgs.stable.spotify; + spotifyPackage = pkgs.spotify; enabledExtensions = with spicePkgs.extensions; [ fullAppDisplay shuffle @@ -14664,8 +14685,9 @@ This service changes the screen hue at night. I am not sure if that really does "${config.programs.obsidian.vaults.${name}.target}/.obsidian/core-plugins.json".force = true; }; - programs.obsidian = - { + programs.obsidian = let + pluginSource = pkgs.nur.repos.swarsel; + in { enable = true; package = pkgs.obsidian; defaultSettings = { @@ -14712,7 +14734,8 @@ This service changes the screen hue at night. I am not sure if that really does "templates" "word-count" ]; - communityPlugins = with pkgs.swarsel-nix; [ + # communityPlugins = with pkgs.swarsel-nix; [ + communityPlugins = with pluginSource; [ advanced-tables calendar file-hider @@ -14730,7 +14753,8 @@ This service changes the screen hue at night. I am not sure if that really does appearance = { baseFontSize = lib.mkForce 19; }; - communityPlugins = with pkgs.swarsel-nix; [ + # communityPlugins = with pkgs.swarsel-nix; [ + communityPlugins = with pluginSource; [ { pkg = advanced-tables; enable = true; @@ -14970,7 +14994,7 @@ This service changes the screen hue at night. I am not sure if that really does **** vesktop #+begin_src nix-ts :tangle modules/home/common/vesktop.nix - { lib, config, ... }: + { lib, pkgs, config, ... }: let moduleName = "vesktop"; in @@ -14979,6 +15003,7 @@ This service changes the screen hue at night. I am not sure if that really does config = lib.mkIf config.swarselmodules.${moduleName} { programs.${moduleName} = { enable = true; + package = pkgs.stable.vesktop; settings = { appBadge = false; arRPC = false; @@ -15091,7 +15116,7 @@ This service changes the screen hue at night. I am not sure if that really does { options.swarselmodules.${moduleName} = lib.mkEnableOption "enable ${moduleName} and settings"; config = lib.mkIf config.swarselmodules.${moduleName} { - swarselservices.${moduleName} = { + services.${moduleName} = { enable = true; systemdTarget = config.wayland.systemd.target; }; @@ -15165,7 +15190,6 @@ This service changes the screen hue at night. I am not sure if that really does } #+end_src - *** Server :PROPERTIES: :CUSTOM_ID: h:b1a00339-6e9b-4ae4-b5dc-6fd5669a2ddb @@ -15363,7 +15387,7 @@ When setting up a new machine: postman # rclone libguestfs-with-appliance - stable.prometheus.cli + prometheus.cli tigervnc # openstackclient @@ -15488,7 +15512,7 @@ When setting up a new machine: # }; # }; }; - git.userEmail = lib.mkForce gitMail; + git.settings.user.email = lib.mkForce gitMail; zsh = { shellAliases = { @@ -15811,7 +15835,7 @@ When setting up a new machine: }; - swarselservices.pizauth = { + services.pizauth = { enable = true; extraConfig = '' auth_notify_cmd = "if [[ \"$(notify-send -A \"Open $PIZAUTH_ACCOUNT\" -t 30000 'pizauth authorisation')\" == \"0\" ]]; then open \"$PIZAUTH_URL\"; fi"; @@ -15991,7 +16015,7 @@ When setting up a new machine: options.swarselmodules.optional.uni = lib.mkEnableOption "optional uni settings"; config = lib.mkIf config.swarselmodules.optional.uni { - swarselservices.pizauth = { + services.pizauth = { enable = true; accounts = { uni = { @@ -16195,7 +16219,7 @@ In short, the options defined here are passed to the modules systems using =_mod name = "FiraCode Nerd Font Mono"; }; emoji = { - package = pkgs.noto-fonts-emoji; + package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; }; @@ -21676,6 +21700,7 @@ Tramp allows for SSH access of files over Emacs. I have no ideas what the option (use-package tramp + ;; :ensure nil :init (setq vc-ignore-dir-regexp (format "\\(%s\\)\\|\\(%s\\)" @@ -22397,6 +22422,31 @@ These general steps are needed when setting up a new machine and do not fit into - `systemd-cryptenroll --fido2-device=auto /dev/` #+end_src +** Current patches and fixes + +These are current deviations from the standard settings that I take while some things are broken upstream + +#+begin_src markdown :noweb-ref fixes :exports both :results html +- 202501102: + - flake: + - emacs-overlay: + - : version pinned because emacsclient is currently broken on latest + - niri-flake: + - currently not using the sugared version of screenshot-[,window], as it is currently broken + - home-manager: + - emacs-tramp: + - using stable version in extraPackages (broken in unstable) + - :ensure nil in emacs tramp settings to use package in extraPackages + - emacs-calfwL + - pinned to version not in nixpkgs (is in latest emacs-overlay, but that is broken) + - vesktop: + - running stable version (broken in unstable) + - batgrep: + - running stable version (broken in unstable) + - swayosd: + - pinned to version not in nixpkgs (fixes https://github.com/ErikReider/SwayOSD/issues/175) +#+end_src + * Appendix B: Supplementary Files :PROPERTIES: :CUSTOM_ID: h:8fc9f66a-7412-4091-8dee-a06f897baf67 diff --git a/files/emacs/init.el b/files/emacs/init.el index 6c07bbb..b947bff 100644 --- a/files/emacs/init.el +++ b/files/emacs/init.el @@ -1358,6 +1358,7 @@ create a new one." ;; :mode ("\\.rs" . rustic-mode)) (use-package tramp + ;; :ensure nil :init (setq vc-ignore-dir-regexp (format "\\(%s\\)\\|\\(%s\\)" diff --git a/flake.lock b/flake.lock index 5f0760e..edf4925 100644 --- a/flake.lock +++ b/flake.lock @@ -38,16 +38,17 @@ "base16-fish_2": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -131,6 +132,22 @@ "type": "github" } }, + "base16-fish_8": { + "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": { @@ -212,6 +229,22 @@ } }, "base16-helix_6": { + "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_7": { "flake": false, "locked": { "lastModified": 1748408240, @@ -227,7 +260,7 @@ "type": "github" } }, - "base16-helix_7": { + "base16-helix_8": { "flake": false, "locked": { "lastModified": 1748408240, @@ -362,6 +395,23 @@ "type": "github" } }, + "base16-vim_8": { + "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" @@ -421,11 +471,11 @@ "fromYaml": "fromYaml_5" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -470,6 +520,24 @@ "type": "github" } }, + "base16_8": { + "inputs": { + "fromYaml": "fromYaml_8" + }, + "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, @@ -502,11 +570,11 @@ }, "crane_11": { "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": { @@ -560,6 +628,36 @@ "type": "github" } }, + "crane_15": { + "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_16": { + "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, @@ -622,11 +720,11 @@ }, "crane_6": { "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": { @@ -829,6 +927,61 @@ "type": "github" } }, + "devshell_15": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "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_16": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "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": [ @@ -1016,11 +1169,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1761899396, + "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", "type": "github" }, "original": { @@ -1081,6 +1234,30 @@ "nixpkgs" ] }, + "locked": { + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "owner": "nix-community", + "repo": "disko", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, + "disko_5": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ] + }, "locked": { "lastModified": 1757508292, "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", @@ -1095,13 +1272,14 @@ "type": "github" } }, - "disko_5": { + "disko_6": { "inputs": { "nixpkgs": [ "swarsel", "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -1119,7 +1297,7 @@ "type": "github" } }, - "disko_6": { + "disko_7": { "inputs": { "nixpkgs": [ "swarsel", @@ -1127,6 +1305,7 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -1144,7 +1323,7 @@ "type": "github" } }, - "disko_7": { + "disko_8": { "inputs": { "nixpkgs": [ "swarsel", @@ -1153,6 +1332,7 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -1186,8 +1366,10 @@ "type": "github" }, "original": { + "narHash": "sha256-4OXXccXsY1sBXTXjYIthdjXLAotozSh4F8StGRuLyMQ=", "owner": "nix-community", "repo": "emacs-overlay", + "rev": "aba8daa237dc07a3bb28a61c252a718e8eb38057", "type": "github" } }, @@ -1200,11 +1382,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1759770590, - "narHash": "sha256-ex/JTut0wrrVHFWwNIuBAlnR71R7dletYxcJEH9NYAw=", + "lastModified": 1760432944, + "narHash": "sha256-4OXXccXsY1sBXTXjYIthdjXLAotozSh4F8StGRuLyMQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4e4ed8f8beda9d47887cf4411720cb8a83a43e90", + "rev": "aba8daa237dc07a3bb28a61c252a718e8eb38057", "type": "github" }, "original": { @@ -1223,11 +1405,11 @@ "nixpkgs-stable": "nixpkgs-stable_7" }, "locked": { - "lastModified": 1758705066, - "narHash": "sha256-CFVYMyz/p4c/w0E2BLz/dCmjl4zfJRUS+ERUJmaZj+E=", + "lastModified": 1759770590, + "narHash": "sha256-ex/JTut0wrrVHFWwNIuBAlnR71R7dletYxcJEH9NYAw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d8da68a0986380aca8ee9d277dfc4bcb0761a278", + "rev": "4e4ed8f8beda9d47887cf4411720cb8a83a43e90", "type": "github" }, "original": { @@ -1247,11 +1429,11 @@ "nixpkgs-stable": "nixpkgs-stable_10" }, "locked": { - "lastModified": 1757927471, - "narHash": "sha256-odfHgmioy0yGxiAFTnAq7SMYTLUv1JApKES5i2KfS4c=", + "lastModified": 1758705066, + "narHash": "sha256-CFVYMyz/p4c/w0E2BLz/dCmjl4zfJRUS+ERUJmaZj+E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6302a8a5904203bc18532e71b3d61f4b324d20fb", + "rev": "d8da68a0986380aca8ee9d277dfc4bcb0761a278", "type": "github" }, "original": { @@ -1272,11 +1454,11 @@ "nixpkgs-stable": "nixpkgs-stable_13" }, "locked": { - "lastModified": 1754705618, - "narHash": "sha256-JYwLLpnzJz0+ihJrwZUTAodx2+iBPWfnmfhJy3lpSw4=", + "lastModified": 1757927471, + "narHash": "sha256-odfHgmioy0yGxiAFTnAq7SMYTLUv1JApKES5i2KfS4c=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c5aea4616a2c482eb3f1765f90de9771ba1d134a", + "rev": "6302a8a5904203bc18532e71b3d61f4b324d20fb", "type": "github" }, "original": { @@ -1298,11 +1480,11 @@ "nixpkgs-stable": "nixpkgs-stable_16" }, "locked": { - "lastModified": 1751908357, - "narHash": "sha256-7JeYhMYTdfzHsFfGZRUM+t0nx4HdYa3oaMH2B/qz9MA=", + "lastModified": 1754705618, + "narHash": "sha256-JYwLLpnzJz0+ihJrwZUTAodx2+iBPWfnmfhJy3lpSw4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8e4ecd7c43c5e061dd2fc4d9d1994ec4d67cab2e", + "rev": "c5aea4616a2c482eb3f1765f90de9771ba1d134a", "type": "github" }, "original": { @@ -1322,7 +1504,35 @@ "swarsel", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_18" + "nixpkgs-stable": "nixpkgs-stable_19" + }, + "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_8": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_21" }, "locked": { "lastModified": 1751908357, @@ -1373,11 +1583,11 @@ "firefox-gnome-theme_3": { "flake": false, "locked": { - "lastModified": 1756083905, - "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -1405,11 +1615,11 @@ "firefox-gnome-theme_5": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", "type": "github" }, "original": { @@ -1450,6 +1660,22 @@ "type": "github" } }, + "firefox-gnome-theme_8": { + "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": { @@ -1469,11 +1695,11 @@ "flake-compat_10": { "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": { @@ -1485,11 +1711,11 @@ "flake-compat_11": { "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": { @@ -1501,11 +1727,11 @@ "flake-compat_12": { "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": { @@ -1517,11 +1743,11 @@ "flake-compat_13": { "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": { @@ -1531,22 +1757,6 @@ } }, "flake-compat_14": { - "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-compat_15": { "flake": false, "locked": { "lastModified": 1733328505, @@ -1562,7 +1772,7 @@ "type": "github" } }, - "flake-compat_16": { + "flake-compat_15": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1578,7 +1788,7 @@ "type": "github" } }, - "flake-compat_17": { + "flake-compat_16": { "flake": false, "locked": { "lastModified": 1696426674, @@ -1594,7 +1804,7 @@ "type": "github" } }, - "flake-compat_18": { + "flake-compat_17": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1610,7 +1820,7 @@ "type": "github" } }, - "flake-compat_19": { + "flake-compat_18": { "flake": false, "locked": { "lastModified": 1733328505, @@ -1626,6 +1836,22 @@ "type": "github" } }, + "flake-compat_19": { + "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-compat_2": { "flake": false, "locked": { @@ -1643,6 +1869,22 @@ } }, "flake-compat_20": { + "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_21": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1658,39 +1900,7 @@ "type": "github" } }, - "flake-compat_21": { - "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_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": false, "locked": { "lastModified": 1733328505, @@ -1706,7 +1916,7 @@ "type": "github" } }, - "flake-compat_24": { + "flake-compat_23": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1722,6 +1932,22 @@ "type": "github" } }, + "flake-compat_24": { + "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_25": { "flake": false, "locked": { @@ -1739,6 +1965,54 @@ } }, "flake-compat_26": { + "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_27": { + "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-compat_28": { + "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_29": { "flake": false, "locked": { "lastModified": 1696426674, @@ -1819,22 +2093,6 @@ } }, "flake-compat_7": { - "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_8": { "flake": false, "locked": { "lastModified": 1747046372, @@ -1850,7 +2108,7 @@ "type": "github" } }, - "flake-compat_9": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1696426674, @@ -1866,16 +2124,32 @@ "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": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -1911,11 +2185,11 @@ "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -2143,11 +2417,11 @@ "nixpkgs-lib": "nixpkgs-lib_9" }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -2235,11 +2509,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -2253,11 +2527,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": { @@ -2279,11 +2553,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -2365,11 +2639,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -2499,11 +2773,11 @@ "nixpkgs-lib": "nixpkgs-lib_15" }, "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": { @@ -2514,14 +2788,24 @@ }, "flake-parts_37": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_16" + "nixpkgs-lib": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "lanzaboote", + "nixpkgs" + ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -2532,32 +2816,41 @@ }, "flake-parts_38": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_17" + "nixpkgs-lib": "nixpkgs-lib_16" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" + "id": "flake-parts", + "type": "indirect" } }, "flake-parts_39": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_18" + "nixpkgs-lib": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nur", + "nixpkgs" + ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -2589,14 +2882,24 @@ }, "flake-parts_40": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_19" + "nixpkgs-lib": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "stylix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -2606,6 +2909,60 @@ } }, "flake-parts_41": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_17" + }, + "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_42": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_18" + }, + "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_43": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_19" + }, + "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_44": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_20" }, @@ -2623,7 +2980,7 @@ "type": "github" } }, - "flake-parts_42": { + "flake-parts_45": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_21" }, @@ -2641,6 +2998,78 @@ "type": "github" } }, + "flake-parts_46": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_22" + }, + "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_47": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_23" + }, + "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_48": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_24" + }, + "locked": { + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_49": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_25" + }, + "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_5": { "inputs": { "nixpkgs-lib": [ @@ -2764,11 +3193,11 @@ "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": { @@ -2779,14 +3208,14 @@ }, "flake-utils_11": { "inputs": { - "systems": "systems_19" + "systems": "systems_17" }, "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": { @@ -2800,11 +3229,11 @@ "systems": "systems_20" }, "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": { @@ -2815,14 +3244,14 @@ }, "flake-utils_13": { "inputs": { - "systems": "systems_23" + "systems": "systems_21" }, "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": { @@ -2835,6 +3264,24 @@ "inputs": { "systems": "systems_24" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_15": { + "inputs": { + "systems": "systems_25" + }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -2849,9 +3296,9 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_16": { "inputs": { - "systems": "systems_26" + "systems": "systems_28" }, "locked": { "lastModified": 1726560853, @@ -2867,27 +3314,9 @@ "type": "github" } }, - "flake-utils_16": { - "inputs": { - "systems": "systems_27" - }, - "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_31" + "systems": "systems_29" }, "locked": { "lastModified": 1731533236, @@ -2905,14 +3334,14 @@ }, "flake-utils_18": { "inputs": { - "systems": "systems_34" + "systems": "systems_31" }, "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": { @@ -2923,7 +3352,7 @@ }, "flake-utils_19": { "inputs": { - "systems": "systems_38" + "systems": "systems_32" }, "locked": { "lastModified": 1731533236, @@ -2959,7 +3388,7 @@ }, "flake-utils_20": { "inputs": { - "systems": "systems_42" + "systems": "systems_36" }, "locked": { "lastModified": 1731533236, @@ -2977,7 +3406,7 @@ }, "flake-utils_21": { "inputs": { - "systems": "systems_46" + "systems": "systems_39" }, "locked": { "lastModified": 1731533236, @@ -2995,7 +3424,7 @@ }, "flake-utils_22": { "inputs": { - "systems": "systems_51" + "systems": "systems_43" }, "locked": { "lastModified": 1731533236, @@ -3012,6 +3441,42 @@ } }, "flake-utils_23": { + "inputs": { + "systems": "systems_47" + }, + "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_24": { + "inputs": { + "systems": "systems_51" + }, + "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_25": { "inputs": { "systems": "systems_56" }, @@ -3029,6 +3494,42 @@ "type": "github" } }, + "flake-utils_26": { + "inputs": { + "systems": "systems_61" + }, + "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_27": { + "inputs": { + "systems": "systems_66" + }, + "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_3": { "inputs": { "systems": "systems_3" @@ -3105,24 +3606,6 @@ "inputs": { "systems": "systems_11" }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "inputs": { - "systems": "systems_12" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -3137,9 +3620,9 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { - "systems": "systems_15" + "systems": "systems_12" }, "locked": { "lastModified": 1726560853, @@ -3155,6 +3638,24 @@ "type": "github" } }, + "flake-utils_9": { + "inputs": { + "systems": "systems_13" + }, + "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" + } + }, "fromYaml": { "flake": false, "locked": { @@ -3267,10 +3768,27 @@ "type": "github" } }, + "fromYaml_8": { + "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_7", + "flake-compat": "flake-compat_10", "nixpkgs": [ + "swarsel", "swarsel", "swarsel", "nixpkgs" @@ -3293,11 +3811,12 @@ }, "fw-fanctrl_2": { "inputs": { - "flake-compat": "flake-compat_11", + "flake-compat": "flake-compat_14", "nixpkgs": [ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -3318,12 +3837,13 @@ }, "fw-fanctrl_3": { "inputs": { - "flake-compat": "flake-compat_15", + "flake-compat": "flake-compat_18", "nixpkgs": [ "swarsel", "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -3344,13 +3864,14 @@ }, "fw-fanctrl_4": { "inputs": { - "flake-compat": "flake-compat_19", + "flake-compat": "flake-compat_22", "nixpkgs": [ "swarsel", "swarsel", "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -3371,7 +3892,7 @@ }, "fw-fanctrl_5": { "inputs": { - "flake-compat": "flake-compat_23", + "flake-compat": "flake-compat_26", "nixpkgs": [ "swarsel", "swarsel", @@ -3379,6 +3900,7 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -3755,6 +4277,92 @@ "type": "github" } }, + "gitignore_22": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "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_23": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "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_24": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "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_3": { "inputs": { "nixpkgs": [ @@ -4034,6 +4642,23 @@ "type": "github" } }, + "gnome-shell_8": { + "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": [ @@ -4041,16 +4666,15 @@ ] }, "locked": { - "lastModified": 1760571159, - "narHash": "sha256-Y086n2U0kN9HjOo+UScwQDS27gKMiIlT6vDehvlmdAg=", - "owner": "JuneStepp", + "lastModified": 1762025346, + "narHash": "sha256-6KR4dsNfA3Pqm6uT8j7aKjWydP/KXFqZUhOfMlfP+1E=", + "owner": "nix-community", "repo": "home-manager", - "rev": "ce469fb711fe3a3e83d8f350d7ac6353ffcfe8db", + "rev": "87044c57222fb485974062e2dd557e7b8abd8fff", "type": "github" }, "original": { - "owner": "JuneStepp", - "ref": "anki-fix-booleans", + "owner": "nix-community", "repo": "home-manager", "type": "github" } @@ -4092,11 +4716,11 @@ ] }, "locked": { - "lastModified": 1751824240, - "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", + "lastModified": 1754756528, + "narHash": "sha256-W1jYKMetZSOHP5m2Z5Wokdj/ct17swPHs+MiY2WT1HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", + "rev": "3ec1cd9a0703fbd55d865b7fd2b07d08374f0355", "type": "github" }, "original": { @@ -4184,6 +4808,61 @@ "type": "github" } }, + "home-manager_15": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "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_16": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "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": [ @@ -4213,15 +4892,16 @@ ] }, "locked": { - "lastModified": 1759761710, - "narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=", - "owner": "nix-community", + "lastModified": 1760571159, + "narHash": "sha256-Y086n2U0kN9HjOo+UScwQDS27gKMiIlT6vDehvlmdAg=", + "owner": "JuneStepp", "repo": "home-manager", - "rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c", + "rev": "ce469fb711fe3a3e83d8f350d7ac6353ffcfe8db", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "JuneStepp", + "ref": "anki-fix-booleans", "repo": "home-manager", "type": "github" } @@ -4257,11 +4937,11 @@ ] }, "locked": { - "lastModified": 1758692005, - "narHash": "sha256-bNRMXWSLM4K9cF1YaHYjLol60KIAWW4GzAoJDp5tA0w=", + "lastModified": 1759761710, + "narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ce2e18007ff022db41d9cc042f8838e8c51ed66", + "rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c", "type": "github" }, "original": { @@ -4303,11 +4983,11 @@ ] }, "locked": { - "lastModified": 1757920978, - "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", + "lastModified": 1758692005, + "narHash": "sha256-bNRMXWSLM4K9cF1YaHYjLol60KIAWW4GzAoJDp5tA0w=", "owner": "nix-community", "repo": "home-manager", - "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", + "rev": "6ce2e18007ff022db41d9cc042f8838e8c51ed66", "type": "github" }, "original": { @@ -4351,11 +5031,11 @@ ] }, "locked": { - "lastModified": 1754756528, - "narHash": "sha256-W1jYKMetZSOHP5m2Z5Wokdj/ct17swPHs+MiY2WT1HQ=", + "lastModified": 1757920978, + "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ec1cd9a0703fbd55d865b7fd2b07d08374f0355", + "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", "type": "github" }, "original": { @@ -4469,6 +5149,21 @@ "type": "github" } }, + "impermanence_8": { + "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", @@ -4518,7 +5213,7 @@ "lanzaboote_3": { "inputs": { "crane": "crane_3", - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "flake-parts": "flake-parts_12", "nixpkgs": "nixpkgs_17", "pre-commit-hooks-nix": "pre-commit-hooks-nix_3", @@ -4541,7 +5236,7 @@ "lanzaboote_4": { "inputs": { "crane": "crane_4", - "flake-compat": "flake-compat_12", + "flake-compat": "flake-compat_11", "flake-parts": "flake-parts_17", "nixpkgs": "nixpkgs_25", "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", @@ -4564,12 +5259,35 @@ "lanzaboote_5": { "inputs": { "crane": "crane_5", - "flake-compat": "flake-compat_16", + "flake-compat": "flake-compat_15", "flake-parts": "flake-parts_22", "nixpkgs": "nixpkgs_33", "pre-commit-hooks-nix": "pre-commit-hooks-nix_5", "rust-overlay": "rust-overlay_5" }, + "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_6": { + "inputs": { + "crane": "crane_6", + "flake-compat": "flake-compat_19", + "flake-parts": "flake-parts_27", + "nixpkgs": "nixpkgs_41", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_6", + "rust-overlay": "rust-overlay_6" + }, "locked": { "lastModified": 1754297745, "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", @@ -4584,14 +5302,14 @@ "type": "github" } }, - "lanzaboote_6": { + "lanzaboote_7": { "inputs": { - "crane": "crane_6", - "flake-compat": "flake-compat_20", - "flake-parts": "flake-parts_27", - "nixpkgs": "nixpkgs_41", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_6", - "rust-overlay": "rust-overlay_6" + "crane": "crane_7", + "flake-compat": "flake-compat_23", + "flake-parts": "flake-parts_32", + "nixpkgs": "nixpkgs_49", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_7", + "rust-overlay": "rust-overlay_7" }, "locked": { "lastModified": 1751381593, @@ -4607,14 +5325,14 @@ "type": "github" } }, - "lanzaboote_7": { + "lanzaboote_8": { "inputs": { - "crane": "crane_7", - "flake-compat": "flake-compat_24", - "flake-parts": "flake-parts_32", - "nixpkgs": "nixpkgs_49", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_7", - "rust-overlay": "rust-overlay_7" + "crane": "crane_8", + "flake-compat": "flake-compat_27", + "flake-parts": "flake-parts_37", + "nixpkgs": "nixpkgs_57", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_8", + "rust-overlay": "rust-overlay_8" }, "locked": { "lastModified": 1751381593, @@ -4639,11 +5357,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1760236243, - "narHash": "sha256-u2HvURFrR6UnPbCltTOWQBvX6N8XSpCE5m0p4c8UOKA=", + "lastModified": 1762030278, + "narHash": "sha256-7p3blvxYNqOHQqpW4+MzcwxLh0ur0QtNXzNuquDyDxQ=", "owner": "astro", "repo": "microvm.nix", - "rev": "67c23f6fc72e78cc4b8e46b8b9b1d3982d27bee4", + "rev": "062a1d49f12d194855dbb87285a323f58ddfa725", "type": "github" }, "original": { @@ -4661,6 +5379,30 @@ ], "spectrum": "spectrum_2" }, + "locked": { + "lastModified": 1760236243, + "narHash": "sha256-u2HvURFrR6UnPbCltTOWQBvX6N8XSpCE5m0p4c8UOKA=", + "owner": "astro", + "repo": "microvm.nix", + "rev": "67c23f6fc72e78cc4b8e46b8b9b1d3982d27bee4", + "type": "github" + }, + "original": { + "owner": "astro", + "repo": "microvm.nix", + "type": "github" + } + }, + "microvm_3": { + "inputs": { + "flake-utils": "flake-utils_7", + "nixpkgs": [ + "swarsel", + "swarsel", + "nixpkgs" + ], + "spectrum": "spectrum_3" + }, "locked": { "lastModified": 1759708185, "narHash": "sha256-s8bRMSQVILQlhbBqCKBFtIcsxbcuH2oX35JJ7FHw4BI=", @@ -4687,11 +5429,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760432014, - "narHash": "sha256-shqc+38nKs/XS2scgJV8KP5/D0PWAXYYgf5nT6BfHNE=", + "lastModified": 1762026425, + "narHash": "sha256-7eDtQrr+CRZ1pLjJ6Bx7Ab9pUIowXJ7ooqEh6p3jIn8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f2aa74f5d28fed7fca48cd4bea4c0803699c0f6c", + "rev": "342730d4f8e109f3506932d2be1c8f9ab19a7039", "type": "github" }, "original": { @@ -4713,11 +5455,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable_2" }, "locked": { - "lastModified": 1759711756, - "narHash": "sha256-gdX1IM8MT3vTqLSXLDc9HNg30EcHkAgUXeNh4UpcyYU=", + "lastModified": 1760432014, + "narHash": "sha256-shqc+38nKs/XS2scgJV8KP5/D0PWAXYYgf5nT6BfHNE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "372ecde34b3af73ae523d4b055f5bcdab00b5ee6", + "rev": "f2aa74f5d28fed7fca48cd4bea4c0803699c0f6c", "type": "github" }, "original": { @@ -4740,11 +5482,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable_3" }, "locked": { - "lastModified": 1758697829, - "narHash": "sha256-1pO4A16ssvjHNyHilpvxo15mBkAifCSOiLs3hBlrYdU=", + "lastModified": 1759711756, + "narHash": "sha256-gdX1IM8MT3vTqLSXLDc9HNg30EcHkAgUXeNh4UpcyYU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9dbeb8f613d2da107bff8375c2db7182a2bb79bb", + "rev": "372ecde34b3af73ae523d4b055f5bcdab00b5ee6", "type": "github" }, "original": { @@ -4768,11 +5510,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable_4" }, "locked": { - "lastModified": 1757870947, - "narHash": "sha256-0N8w6SB6a68kWioFmlr+KfwfG44KVjPjJIBSQKNdNhE=", + "lastModified": 1758697829, + "narHash": "sha256-1pO4A16ssvjHNyHilpvxo15mBkAifCSOiLs3hBlrYdU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8e9b1a571399104e42d8fa5de6c28c63bff0c16a", + "rev": "9dbeb8f613d2da107bff8375c2db7182a2bb79bb", "type": "github" }, "original": { @@ -4796,6 +5538,36 @@ "xwayland-satellite-stable": "xwayland-satellite-stable_5", "xwayland-satellite-unstable": "xwayland-satellite-unstable_5" }, + "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_6": { + "inputs": { + "niri-stable": "niri-stable_6", + "niri-unstable": "niri-unstable_6", + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_17", + "xwayland-satellite-stable": "xwayland-satellite-stable_6", + "xwayland-satellite-unstable": "xwayland-satellite-unstable_6" + }, "locked": { "lastModified": 1754797984, "narHash": "sha256-t2WFkdB2qUyZt5rdqmJ340kqhvQWWOCJBJIc1nQ/Hg4=", @@ -4879,6 +5651,23 @@ } }, "niri-stable_5": { + "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_6": { "flake": false, "locked": { "lastModified": 1748151941, @@ -4896,6 +5685,22 @@ } }, "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1761888958, + "narHash": "sha256-YgArUHI81Esn6fOCwVSrMI2G4RI3f3BPbRbPWsJubAc=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "e2576879216a39e5c45b9d2906531bc2065e724c", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable_2": { "flake": false, "locked": { "lastModified": 1760426302, @@ -4911,7 +5716,7 @@ "type": "github" } }, - "niri-unstable_2": { + "niri-unstable_3": { "flake": false, "locked": { "lastModified": 1759395653, @@ -4927,7 +5732,7 @@ "type": "github" } }, - "niri-unstable_3": { + "niri-unstable_4": { "flake": false, "locked": { "lastModified": 1758691861, @@ -4943,7 +5748,7 @@ "type": "github" } }, - "niri-unstable_4": { + "niri-unstable_5": { "flake": false, "locked": { "lastModified": 1757832020, @@ -4959,7 +5764,7 @@ "type": "github" } }, - "niri-unstable_5": { + "niri-unstable_6": { "flake": false, "locked": { "lastModified": 1754742008, @@ -4981,6 +5786,27 @@ "nixpkgs" ] }, + "locked": { + "lastModified": 1762022020, + "narHash": "sha256-tNj4SqLu87rV3z2Pf1Zr3vC93zYyMuLif1qLhHmQl64=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "fc4e3dbe4039f8ff4fc303e50491ca8ba009ffd4", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-darwin_2": { + "inputs": { + "nixpkgs": [ + "swarsel", + "nixpkgs" + ] + }, "locked": { "lastModified": 1760338583, "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=", @@ -4995,9 +5821,10 @@ "type": "github" } }, - "nix-darwin_2": { + "nix-darwin_3": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "nixpkgs" ] @@ -5016,9 +5843,10 @@ "type": "github" } }, - "nix-darwin_3": { + "nix-darwin_4": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "swarsel", "nixpkgs" @@ -5038,12 +5866,13 @@ "type": "github" } }, - "nix-darwin_4": { + "nix-darwin_5": { "inputs": { "nixpkgs": [ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -5061,30 +5890,6 @@ "type": "github" } }, - "nix-darwin_5": { - "inputs": { - "nixpkgs": [ - "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-darwin_6": { "inputs": { "nixpkgs": [ @@ -5136,6 +5941,33 @@ "type": "github" } }, + "nix-darwin_8": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "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": [ @@ -5318,12 +6150,63 @@ "type": "github" } }, + "nix-formatter-pack_8": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nix-on-droid", + "nixpkgs" + ], + "nmd": "nmd_15", + "nmt": "nmt_8" + }, + "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": 1761451000, + "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, + "nix-index-database_2": { + "inputs": { + "nixpkgs": [ + "swarsel", + "nixpkgs" + ] + }, "locked": { "lastModified": 1760241904, "narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", @@ -5338,9 +6221,10 @@ "type": "github" } }, - "nix-index-database_2": { + "nix-index-database_3": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "nixpkgs" ] @@ -5359,9 +6243,10 @@ "type": "github" } }, - "nix-index-database_3": { + "nix-index-database_4": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "swarsel", "nixpkgs" @@ -5381,12 +6266,13 @@ "type": "github" } }, - "nix-index-database_4": { + "nix-index-database_5": { "inputs": { "nixpkgs": [ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -5404,13 +6290,14 @@ "type": "github" } }, - "nix-index-database_5": { + "nix-index-database_6": { "inputs": { "nixpkgs": [ "swarsel", "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -5428,7 +6315,7 @@ "type": "github" } }, - "nix-index-database_6": { + "nix-index-database_7": { "inputs": { "nixpkgs": [ "swarsel", @@ -5436,6 +6323,7 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -5453,7 +6341,7 @@ "type": "github" } }, - "nix-index-database_7": { + "nix-index-database_8": { "inputs": { "nixpkgs": [ "swarsel", @@ -5462,6 +6350,7 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ] }, @@ -5682,6 +6571,39 @@ "type": "github" } }, + "nix-on-droid_8": { + "inputs": { + "home-manager": "home-manager_16", + "nix-formatter-pack": "nix-formatter-pack_8", + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ], + "nixpkgs-docs": "nixpkgs-docs_8", + "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap_8", + "nmd": "nmd_16" + }, + "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", @@ -5727,7 +6649,7 @@ "nix-topology_3": { "inputs": { "devshell": "devshell_6", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": "nixpkgs_18", "pre-commit-hooks": "pre-commit-hooks_5" }, @@ -5748,7 +6670,7 @@ "nix-topology_4": { "inputs": { "devshell": "devshell_8", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_10", "nixpkgs": "nixpkgs_26", "pre-commit-hooks": "pre-commit-hooks_7" }, @@ -5769,7 +6691,7 @@ "nix-topology_5": { "inputs": { "devshell": "devshell_10", - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_12", "nixpkgs": "nixpkgs_34", "pre-commit-hooks": "pre-commit-hooks_9" }, @@ -5790,10 +6712,31 @@ "nix-topology_6": { "inputs": { "devshell": "devshell_12", - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_14", "nixpkgs": "nixpkgs_42", "pre-commit-hooks": "pre-commit-hooks_11" }, + "locked": { + "lastModified": 1752093877, + "narHash": "sha256-P0TySh6sQl1EhfxjW9ZqGxEyUBSsEpdnchOe1QB0pLA=", + "owner": "oddlama", + "repo": "nix-topology", + "rev": "6a536c4b686ee4bcf07a7b0f8b823584560e2633", + "type": "github" + }, + "original": { + "owner": "oddlama", + "repo": "nix-topology", + "type": "github" + } + }, + "nix-topology_7": { + "inputs": { + "devshell": "devshell_14", + "flake-utils": "flake-utils_16", + "nixpkgs": "nixpkgs_50", + "pre-commit-hooks": "pre-commit-hooks_13" + }, "locked": { "lastModified": 1744142264, "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=", @@ -5808,12 +6751,12 @@ "type": "github" } }, - "nix-topology_7": { + "nix-topology_8": { "inputs": { - "devshell": "devshell_14", - "flake-utils": "flake-utils_15", - "nixpkgs": "nixpkgs_50", - "pre-commit-hooks": "pre-commit-hooks_13" + "devshell": "devshell_16", + "flake-utils": "flake-utils_18", + "nixpkgs": "nixpkgs_58", + "pre-commit-hooks": "pre-commit-hooks_15" }, "locked": { "lastModified": 1744142264, @@ -5869,7 +6812,7 @@ }, "nixgl_3": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_9", "nixpkgs": "nixpkgs_19" }, "locked": { @@ -5888,7 +6831,7 @@ }, "nixgl_4": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_11", "nixpkgs": "nixpkgs_27" }, "locked": { @@ -5907,7 +6850,7 @@ }, "nixgl_5": { "inputs": { - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_13", "nixpkgs": "nixpkgs_35" }, "locked": { @@ -5926,9 +6869,28 @@ }, "nixgl_6": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_15", "nixpkgs": "nixpkgs_43" }, + "locked": { + "lastModified": 1752054764, + "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "owner": "guibou", + "repo": "nixGL", + "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "type": "github" + }, + "original": { + "owner": "guibou", + "repo": "nixGL", + "type": "github" + } + }, + "nixgl_7": { + "inputs": { + "flake-utils": "flake-utils_17", + "nixpkgs": "nixpkgs_51" + }, "locked": { "lastModified": 1751696036, "narHash": "sha256-hXq4IOgSdAAaF/9q/2U8TBDL7aXZyQmtq4wl6USZjKo=", @@ -5943,10 +6905,10 @@ "type": "github" } }, - "nixgl_7": { + "nixgl_8": { "inputs": { - "flake-utils": "flake-utils_16", - "nixpkgs": "nixpkgs_51" + "flake-utils": "flake-utils_19", + "nixpkgs": "nixpkgs_59" }, "locked": { "lastModified": 1751696036, @@ -6067,6 +7029,21 @@ "type": "github" } }, + "nixlib_8": { + "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", @@ -6235,7 +7212,51 @@ "type": "github" } }, + "nixos-generators_8": { + "inputs": { + "nixlib": "nixlib_8", + "nixpkgs": [ + "swarsel", + "swarsel", + "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": 1761933221, + "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixos-hardware_2": { "locked": { "lastModified": 1760106635, "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", @@ -6251,7 +7272,7 @@ "type": "github" } }, - "nixos-hardware_2": { + "nixos-hardware_3": { "locked": { "lastModified": 1759582739, "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", @@ -6267,7 +7288,7 @@ "type": "github" } }, - "nixos-hardware_3": { + "nixos-hardware_4": { "locked": { "lastModified": 1758663926, "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", @@ -6283,7 +7304,7 @@ "type": "github" } }, - "nixos-hardware_4": { + "nixos-hardware_5": { "locked": { "lastModified": 1757891025, "narHash": "sha256-NfiTk59huy/YK9H4W4wVwRYyiP2u86QqROM5KK4f5F4=", @@ -6299,7 +7320,7 @@ "type": "github" } }, - "nixos-hardware_5": { + "nixos-hardware_6": { "locked": { "lastModified": 1754564048, "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", @@ -6315,7 +7336,7 @@ "type": "github" } }, - "nixos-hardware_6": { + "nixos-hardware_7": { "locked": { "lastModified": 1751432711, "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", @@ -6331,7 +7352,7 @@ "type": "github" } }, - "nixos-hardware_7": { + "nixos-hardware_8": { "locked": { "lastModified": 1751432711, "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", @@ -6381,11 +7402,11 @@ }, "nixpkgs-dev_2": { "locked": { - "lastModified": 1759233809, - "narHash": "sha256-ww6JlKuclxzcBb+cb4GCnVw4PtI+7xd3J9/ctINWKeA=", + "lastModified": 1761589965, + "narHash": "sha256-ZtypYmGwo7wUOo88UKVAdUZCYCpvFM8O0bEmI7+NW5k=", "owner": "Swarsel", "repo": "nixpkgs", - "rev": "d3e334a2a4f9d50568bf03ec62cd445faac7ce9e", + "rev": "ed3254fbd834e5bfbf6bc9586d57307a92f1a269", "type": "github" }, "original": { @@ -6397,11 +7418,11 @@ }, "nixpkgs-dev_3": { "locked": { - "lastModified": 1758012660, - "narHash": "sha256-f3jC14FeFhapXEKzk4Hfy3LXxZ2PIpmCxciVniHXSLA=", + "lastModified": 1759233809, + "narHash": "sha256-ww6JlKuclxzcBb+cb4GCnVw4PtI+7xd3J9/ctINWKeA=", "owner": "Swarsel", "repo": "nixpkgs", - "rev": "3c0bb56bf5189fd91ead7e1443976301a42fac37", + "rev": "d3e334a2a4f9d50568bf03ec62cd445faac7ce9e", "type": "github" }, "original": { @@ -6428,6 +7449,22 @@ } }, "nixpkgs-dev_5": { + "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_6": { "locked": { "lastModified": 1756088794, "narHash": "sha256-aBaRmk3lNNUm/1H1Jf6hA8miLg3HsYEhcuxUXTGa2gw=", @@ -6443,7 +7480,7 @@ "type": "github" } }, - "nixpkgs-dev_6": { + "nixpkgs-dev_7": { "locked": { "lastModified": 1752736260, "narHash": "sha256-90Gt98hmw/20aOAd7KaSW6otXu7MOBctRmI9RlXD/s0=", @@ -6459,7 +7496,7 @@ "type": "github" } }, - "nixpkgs-dev_7": { + "nixpkgs-dev_8": { "locked": { "lastModified": 1752440522, "narHash": "sha256-CInQkEG3f8XwIBQxYFhuFCT+T++JPstThfifAMD0yRk=", @@ -6587,6 +7624,22 @@ "type": "github" } }, + "nixpkgs-docs_8": { + "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, @@ -6699,6 +7752,22 @@ "type": "github" } }, + "nixpkgs-for-bootstrap_8": { + "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, @@ -6818,6 +7887,23 @@ "type": "github" } }, + "nixpkgs-kernel_8": { + "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, @@ -6847,11 +7933,11 @@ }, "nixpkgs-lib_11": { "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "lastModified": 1753579242, + "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", "type": "github" }, "original": { @@ -6901,11 +7987,11 @@ }, "nixpkgs-lib_15": { "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": { @@ -6916,26 +8002,23 @@ }, "nixpkgs-lib_16": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", - "type": "github" + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs-lib_17": { "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": { @@ -7016,6 +8099,66 @@ "type": "github" } }, + "nixpkgs-lib_22": { + "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_23": { + "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_24": { + "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_25": { + "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_3": { "locked": { "lastModified": 1754788789, @@ -7099,11 +8242,11 @@ }, "nixpkgs-lib_9": { "locked": { - "lastModified": 1753579242, - "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { @@ -7240,6 +8383,22 @@ "type": "github" } }, + "nixpkgs-stable24_05_8": { + "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, @@ -7352,6 +8511,38 @@ "type": "github" } }, + "nixpkgs-stable24_11_8": { + "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-stable25_05": { + "locked": { + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable_10": { "locked": { "lastModified": 1751274312, @@ -7370,11 +8561,11 @@ }, "nixpkgs-stable_11": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -7386,11 +8577,11 @@ }, "nixpkgs-stable_12": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -7418,11 +8609,11 @@ }, "nixpkgs-stable_14": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -7434,11 +8625,11 @@ }, "nixpkgs-stable_15": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -7466,11 +8657,11 @@ }, "nixpkgs-stable_17": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -7481,6 +8672,22 @@ } }, "nixpkgs-stable_18": { + "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_19": { "locked": { "lastModified": 1751274312, "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", @@ -7496,7 +8703,23 @@ "type": "github" } }, - "nixpkgs-stable_19": { + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_20": { "locked": { "lastModified": 1751741127, "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", @@ -7512,87 +8735,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1760139962, - "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1760139962, - "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_5": { - "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_6": { - "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_7": { + "nixpkgs-stable_21": { "locked": { "lastModified": 1751274312, "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", @@ -7608,13 +8751,109 @@ "type": "github" } }, - "nixpkgs-stable_8": { + "nixpkgs-stable_22": { "locked": { - "lastModified": 1758589230, - "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", + "rev": "29e290002bfff26af1db6f64d070698019460302", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_5": { + "locked": { + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_6": { + "locked": { + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_7": { + "locked": { + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_8": { + "locked": { + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -7626,11 +8865,11 @@ }, "nixpkgs-stable_9": { "locked": { - "lastModified": 1758589230, - "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -7673,11 +8912,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -7705,11 +8944,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -7721,11 +8960,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1759570798, - "narHash": "sha256-kbkzsUKYzKhuvMOuxt/aTwWU2mnrwoY964yN3Y4dE98=", + "lastModified": 1760164275, + "narHash": "sha256-gKl2Gtro/LNf8P+4L3S2RsZ0G390ccd5MyXYrTdMCFE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d4f673a88f8405ae14484e6a1ea870e0ba4ca26", + "rev": "362791944032cb532aabbeed7887a441496d5e6e", "type": "github" }, "original": { @@ -7816,11 +9055,11 @@ }, "nixpkgs_20": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -7848,11 +9087,11 @@ }, "nixpkgs_22": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -7864,11 +9103,11 @@ }, "nixpkgs_23": { "locked": { - "lastModified": 1758262103, - "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", + "lastModified": 1759570798, + "narHash": "sha256-kbkzsUKYzKhuvMOuxt/aTwWU2mnrwoY964yN3Y4dE98=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "0d4f673a88f8405ae14484e6a1ea870e0ba4ca26", "type": "github" }, "original": { @@ -7880,11 +9119,11 @@ }, "nixpkgs_24": { "locked": { - "lastModified": 1756819007, - "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", + "lastModified": 1758690382, + "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", + "rev": "e643668fd71b949c53f8626614b21ff71a07379d", "type": "github" }, "original": { @@ -7943,11 +9182,11 @@ }, "nixpkgs_28": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -7990,11 +9229,11 @@ }, "nixpkgs_30": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -8006,11 +9245,11 @@ }, "nixpkgs_31": { "locked": { - "lastModified": 1757746433, - "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { @@ -8085,11 +9324,11 @@ }, "nixpkgs_36": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -8117,11 +9356,11 @@ }, "nixpkgs_38": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -8133,11 +9372,11 @@ }, "nixpkgs_39": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -8149,11 +9388,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -8165,11 +9404,11 @@ }, "nixpkgs_40": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1756819007, + "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", "type": "github" }, "original": { @@ -8181,11 +9420,11 @@ }, "nixpkgs_41": { "locked": { - "lastModified": 1751203939, - "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", + "lastModified": 1754243818, + "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", + "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", "type": "github" }, "original": { @@ -8228,11 +9467,11 @@ }, "nixpkgs_44": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -8260,11 +9499,11 @@ }, "nixpkgs_46": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -8292,11 +9531,11 @@ }, "nixpkgs_48": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -8451,11 +9690,122 @@ }, "nixpkgs_57": { "locked": { - "lastModified": 1750865895, - "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", + "lastModified": 1751203939, + "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", + "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_58": { + "locked": { + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_59": { + "locked": { + "lastModified": 1746378225, + "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "93e8cdce7afc64297cfec447c311470788131cd9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_60": { + "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_61": { + "locked": { + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_62": { + "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_63": { + "locked": { + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -8465,7 +9815,23 @@ "type": "github" } }, - "nixpkgs_58": { + "nixpkgs_64": { + "locked": { + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_65": { "locked": { "lastModified": 1750865895, "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", @@ -8481,7 +9847,23 @@ "type": "github" } }, - "nixpkgs_59": { + "nixpkgs_66": { + "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_67": { "locked": { "lastModified": 1755615617, "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", @@ -8497,23 +9879,7 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_60": { + "nixpkgs_68": { "locked": { "lastModified": 1750865895, "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", @@ -8529,7 +9895,7 @@ "type": "github" } }, - "nixpkgs_61": { + "nixpkgs_69": { "locked": { "lastModified": 1757745802, "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", @@ -8545,141 +9911,13 @@ "type": "github" } }, - "nixpkgs_62": { - "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_63": { - "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_64": { - "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_65": { - "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_66": { - "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_67": { - "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_68": { - "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_69": { - "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_7": { "locked": { - "lastModified": 1760164275, - "narHash": "sha256-gKl2Gtro/LNf8P+4L3S2RsZ0G390ccd5MyXYrTdMCFE=", + "lastModified": 1760596604, + "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "362791944032cb532aabbeed7887a441496d5e6e", + "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", "type": "github" }, "original": { @@ -8705,6 +9943,150 @@ "type": "github" } }, + "nixpkgs_71": { + "locked": { + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_72": { + "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_73": { + "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_74": { + "locked": { + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_75": { + "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_76": { + "locked": { + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_77": { + "locked": { + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_78": { + "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_79": { + "locked": { + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_8": { "locked": { "lastModified": 1758690382, @@ -8721,6 +10103,38 @@ "type": "github" } }, + "nixpkgs_80": { + "locked": { + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_81": { + "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_9": { "locked": { "lastModified": 1754243818, @@ -8866,6 +10280,51 @@ "type": "sourcehut" } }, + "nmd_15": { + "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_16": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nix-on-droid", + "nixpkgs-docs" + ], + "scss-reset": "scss-reset_8" + }, + "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": [ @@ -9136,6 +10595,22 @@ "type": "gitlab" } }, + "nmt_8": { + "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", @@ -9269,17 +10744,36 @@ "type": "github" } }, + "nswitch-rcm-nix_8": { + "inputs": { + "flake-parts": "flake-parts_38", + "nixpkgs": "nixpkgs_61" + }, + "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": 1760434122, - "narHash": "sha256-PICj8/WLB+WSVv6d09i9n0pY2jobzDLhDijebTmwslQ=", + "lastModified": 1762033460, + "narHash": "sha256-RXBIqO8fcw/kiveRGxFVA+j6hPJkB6ikg0I1/pueud0=", "owner": "nix-community", "repo": "NUR", - "rev": "53775ebf6ee76abaa2a4462393ea26b1bbe6f655", + "rev": "c5403cdf368174b0792dd0a155f8e5bc8f0bade7", "type": "github" }, "original": { @@ -9308,11 +10802,11 @@ ] }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", "type": "github" }, "original": { @@ -9327,11 +10821,11 @@ "nixpkgs": "nixpkgs_46" }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1754726338, + "narHash": "sha256-Zz4zAgAvgXwAzkJuhuoYFpQ9eJs/vtaYCso+rfwahsw=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "ab1e2e53a418b3907f87c24ce277975438f1bd78", "type": "github" }, "original": { @@ -9359,15 +10853,14 @@ "swarsel", "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1748730660, - "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", "owner": "nix-community", "repo": "NUR", - "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", "type": "github" }, "original": { @@ -9417,6 +10910,65 @@ "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_15": { + "inputs": { + "flake-parts": "flake-parts_39", + "nixpkgs": "nixpkgs_62" + }, + "locked": { + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "nur_16": { + "inputs": { + "flake-parts": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "stylix", + "nixpkgs" + ], "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -9464,11 +11016,11 @@ "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1759783224, - "narHash": "sha256-QTsVtR+MhvH6QTFcn31Jubm7qXltInAhTFdtsPifcbA=", + "lastModified": 1760434122, + "narHash": "sha256-PICj8/WLB+WSVv6d09i9n0pY2jobzDLhDijebTmwslQ=", "owner": "nix-community", "repo": "NUR", - "rev": "9d6e275d4f74ac272aef29fb9845ea7da6559de6", + "rev": "53775ebf6ee76abaa2a4462393ea26b1bbe6f655", "type": "github" }, "original": { @@ -9510,11 +11062,11 @@ "nixpkgs": "nixpkgs_22" }, "locked": { - "lastModified": 1758706012, - "narHash": "sha256-Gee6jqg2BLBwG6uv/U7xEQRuBobbKJOLIm5/KfpcYq4=", + "lastModified": 1759783224, + "narHash": "sha256-QTsVtR+MhvH6QTFcn31Jubm7qXltInAhTFdtsPifcbA=", "owner": "nix-community", "repo": "NUR", - "rev": "8f016c352545dc7d55969e1ab3f1dc2f01cdb3e4", + "rev": "9d6e275d4f74ac272aef29fb9845ea7da6559de6", "type": "github" }, "original": { @@ -9539,11 +11091,11 @@ ] }, "locked": { - "lastModified": 1756961635, - "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -9558,11 +11110,11 @@ "nixpkgs": "nixpkgs_30" }, "locked": { - "lastModified": 1757935448, - "narHash": "sha256-dIk3hiBlSsHZJViknedzOyTb7VjHFmty6d2P59/DRi4=", + "lastModified": 1758706012, + "narHash": "sha256-Gee6jqg2BLBwG6uv/U7xEQRuBobbKJOLIm5/KfpcYq4=", "owner": "nix-community", "repo": "NUR", - "rev": "b8ed69c1bcb6c358bb1df56e2a2e64323f6572c6", + "rev": "8f016c352545dc7d55969e1ab3f1dc2f01cdb3e4", "type": "github" }, "original": { @@ -9608,11 +11160,11 @@ "nixpkgs": "nixpkgs_38" }, "locked": { - "lastModified": 1754726338, - "narHash": "sha256-Zz4zAgAvgXwAzkJuhuoYFpQ9eJs/vtaYCso+rfwahsw=", + "lastModified": 1757935448, + "narHash": "sha256-dIk3hiBlSsHZJViknedzOyTb7VjHFmty6d2P59/DRi4=", "owner": "nix-community", "repo": "NUR", - "rev": "ab1e2e53a418b3907f87c24ce277975438f1bd78", + "rev": "b8ed69c1bcb6c358bb1df56e2a2e64323f6572c6", "type": "github" }, "original": { @@ -9872,9 +11424,49 @@ "type": "github" } }, + "pre-commit-hooks-nix_8": { + "inputs": { + "flake-compat": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "lanzaboote", + "flake-compat" + ], + "gitignore": "gitignore_22", + "nixpkgs": [ + "swarsel", + "swarsel", + "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_18", + "flake-compat": "flake-compat_17", "gitignore": "gitignore_15", "nixpkgs": [ "swarsel", @@ -9885,11 +11477,11 @@ ] }, "locked": { - "lastModified": 1754416808, - "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", + "lastModified": 1757588530, + "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", + "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", "type": "github" }, "original": { @@ -9900,7 +11492,7 @@ }, "pre-commit-hooks_11": { "inputs": { - "flake-compat": "flake-compat_21", + "flake-compat": "flake-compat_20", "gitignore": "gitignore_17", "nixpkgs": [ "swarsel", @@ -9937,7 +11529,7 @@ }, "pre-commit-hooks_12": { "inputs": { - "flake-compat": "flake-compat_22", + "flake-compat": "flake-compat_21", "gitignore": "gitignore_18", "nixpkgs": [ "swarsel", @@ -9949,11 +11541,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", "type": "github" }, "original": { @@ -9964,7 +11556,7 @@ }, "pre-commit-hooks_13": { "inputs": { - "flake-compat": "flake-compat_25", + "flake-compat": "flake-compat_24", "gitignore": "gitignore_20", "nixpkgs": [ "swarsel", @@ -10003,7 +11595,7 @@ }, "pre-commit-hooks_14": { "inputs": { - "flake-compat": "flake-compat_26", + "flake-compat": "flake-compat_25", "gitignore": "gitignore_21", "nixpkgs": [ "swarsel", @@ -10029,6 +11621,76 @@ "type": "github" } }, + "pre-commit-hooks_15": { + "inputs": { + "flake-compat": "flake-compat_28", + "gitignore": "gitignore_23", + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nix-topology", + "nixpkgs" + ], + "nixpkgs-stable": [ + "swarsel", + "swarsel", + "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_16": { + "inputs": { + "flake-compat": "flake-compat_29", + "gitignore": "gitignore_24", + "nixpkgs": [ + "swarsel", + "swarsel", + "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", @@ -10038,11 +11700,11 @@ ] }, "locked": { - "lastModified": 1760392170, - "narHash": "sha256-WftxJgr2MeDDFK47fQKywzC72L2jRc/PWcyGdjaDzkw=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -10090,11 +11752,11 @@ ] }, "locked": { - "lastModified": 1759523803, - "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", + "lastModified": 1760392170, + "narHash": "sha256-WftxJgr2MeDDFK47fQKywzC72L2jRc/PWcyGdjaDzkw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", + "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85", "type": "github" }, "original": { @@ -10105,7 +11767,7 @@ }, "pre-commit-hooks_5": { "inputs": { - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_8", "gitignore": "gitignore_8", "nixpkgs": [ "swarsel", @@ -10136,7 +11798,7 @@ }, "pre-commit-hooks_6": { "inputs": { - "flake-compat": "flake-compat_10", + "flake-compat": "flake-compat_9", "gitignore": "gitignore_9", "nixpkgs": [ "swarsel", @@ -10145,11 +11807,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1759523803, + "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", "type": "github" }, "original": { @@ -10160,7 +11822,7 @@ }, "pre-commit-hooks_7": { "inputs": { - "flake-compat": "flake-compat_13", + "flake-compat": "flake-compat_12", "gitignore": "gitignore_11", "nixpkgs": [ "swarsel", @@ -10193,7 +11855,7 @@ }, "pre-commit-hooks_8": { "inputs": { - "flake-compat": "flake-compat_14", + "flake-compat": "flake-compat_13", "gitignore": "gitignore_12", "nixpkgs": [ "swarsel", @@ -10203,11 +11865,11 @@ ] }, "locked": { - "lastModified": 1757588530, - "narHash": "sha256-tJ7A8mID3ct69n9WCvZ3PzIIl3rXTdptn/lZmqSS95U=", + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b084b2c2b6bc23e83bbfe583b03664eb0b18c411", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "type": "github" }, "original": { @@ -10218,7 +11880,7 @@ }, "pre-commit-hooks_9": { "inputs": { - "flake-compat": "flake-compat_17", + "flake-compat": "flake-compat_16", "gitignore": "gitignore_14", "nixpkgs": [ "swarsel", @@ -10275,6 +11937,7 @@ "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable24_05": "nixpkgs-stable24_05", "nixpkgs-stable24_11": "nixpkgs-stable24_11", + "nixpkgs-stable25_05": "nixpkgs-stable25_05", "nswitch-rcm-nix": "nswitch-rcm-nix", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks_2", @@ -10282,11 +11945,11 @@ "spicetify-nix": "spicetify-nix", "stylix": "stylix", "swarsel": "swarsel", - "swarsel-modules": "swarsel-modules_5", - "swarsel-nix": "swarsel-nix_2", - "systems": "systems_54", - "vbc-nix": "vbc-nix_7", - "zjstatus": "zjstatus_7" + "swarsel-modules": "swarsel-modules_6", + "swarsel-nix": "swarsel-nix_3", + "systems": "systems_64", + "vbc-nix": "vbc-nix_8", + "zjstatus": "zjstatus_8" } }, "rust-overlay": { @@ -10317,6 +11980,8 @@ "swarsel", "swarsel", "swarsel", + "swarsel", + "swarsel", "zjstatus", "nixpkgs" ] @@ -10338,6 +12003,8 @@ "rust-overlay_11": { "inputs": { "nixpkgs": [ + "swarsel", + "swarsel", "swarsel", "swarsel", "swarsel", @@ -10346,11 +12013,11 @@ ] }, "locked": { - "lastModified": 1754880555, - "narHash": "sha256-tG6l0wiX8V8IvG4HFYY8IYN5vpNAxQ+UWunjjpE6SqU=", + "lastModified": 1750905536, + "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "17c591a44e4eb77f05f27cd37e1cfc3f219c7fc4", + "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", "type": "github" }, "original": { @@ -10362,6 +12029,8 @@ "rust-overlay_12": { "inputs": { "nixpkgs": [ + "swarsel", + "swarsel", "swarsel", "swarsel", "zjstatus", @@ -10385,6 +12054,8 @@ "rust-overlay_13": { "inputs": { "nixpkgs": [ + "swarsel", + "swarsel", "swarsel", "zjstatus", "nixpkgs" @@ -10405,6 +12076,51 @@ } }, "rust-overlay_14": { + "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_15": { + "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_16": { "inputs": { "nixpkgs": [ "zjstatus", @@ -10532,11 +12248,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1754189623, + "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", "type": "github" }, "original": { @@ -10581,16 +12297,17 @@ "swarsel", "swarsel", "swarsel", - "zjstatus", + "swarsel", + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1750905536, - "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", + "lastModified": 1751165203, + "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", + "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "type": "github" }, "original": { @@ -10607,6 +12324,8 @@ "swarsel", "swarsel", "swarsel", + "swarsel", + "swarsel", "zjstatus", "nixpkgs" ] @@ -10737,10 +12456,44 @@ "type": "github" } }, + "scss-reset_8": { + "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": 1760998189, + "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, + "sops-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_15" + }, "locked": { "lastModified": 1760393368, "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", @@ -10755,9 +12508,9 @@ "type": "github" } }, - "sops-nix_2": { + "sops-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1759635238, @@ -10773,9 +12526,9 @@ "type": "github" } }, - "sops-nix_3": { + "sops-nix_4": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_31" }, "locked": { "lastModified": 1758425756, @@ -10791,9 +12544,9 @@ "type": "github" } }, - "sops-nix_4": { + "sops-nix_5": { "inputs": { - "nixpkgs": "nixpkgs_31" + "nixpkgs": "nixpkgs_39" }, "locked": { "lastModified": 1757847158, @@ -10809,9 +12562,9 @@ "type": "github" } }, - "sops-nix_5": { + "sops-nix_6": { "inputs": { - "nixpkgs": "nixpkgs_39" + "nixpkgs": "nixpkgs_47" }, "locked": { "lastModified": 1754328224, @@ -10827,9 +12580,9 @@ "type": "github" } }, - "sops-nix_6": { + "sops-nix_7": { "inputs": { - "nixpkgs": "nixpkgs_47" + "nixpkgs": "nixpkgs_55" }, "locked": { "lastModified": 1751606940, @@ -10845,9 +12598,9 @@ "type": "github" } }, - "sops-nix_7": { + "sops-nix_8": { "inputs": { - "nixpkgs": "nixpkgs_55" + "nixpkgs": "nixpkgs_63" }, "locked": { "lastModified": 1751606940, @@ -10895,6 +12648,22 @@ "url": "https://spectrum-os.org/git/spectrum" } }, + "spectrum_3": { + "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": [ @@ -10903,11 +12672,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1760243311, - "narHash": "sha256-LNrok211+WWlMGWqpGPpnGcnWhyo5SfvMv62uDiLzoI=", + "lastModified": 1761452941, + "narHash": "sha256-yy+9lSj40cWS4awLqjQ5H5/7/SOf9ZarOgTzH8GHkRk=", "owner": "Gerg-l", "repo": "spicetify-nix", - "rev": "93f1d45e48191a0b24c5c15e5cf369566ff75be9", + "rev": "20a56cfc4dc794ade2e8d4346cc4a5adcd1bb512", "type": "github" }, "original": { @@ -10925,11 +12694,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1759638324, - "narHash": "sha256-bj0L3n2UWE/DjqFjsydWsSzO74+dqUA4tiOX4At6LbM=", + "lastModified": 1760243311, + "narHash": "sha256-LNrok211+WWlMGWqpGPpnGcnWhyo5SfvMv62uDiLzoI=", "owner": "Gerg-l", "repo": "spicetify-nix", - "rev": "c39a58510e55c4970e57176ab14b722a978e5f01", + "rev": "93f1d45e48191a0b24c5c15e5cf369566ff75be9", "type": "github" }, "original": { @@ -10945,14 +12714,14 @@ "swarsel", "nixpkgs" ], - "systems": "systems_13" + "systems": "systems_14" }, "locked": { - "lastModified": 1758584568, - "narHash": "sha256-FDxTheW6ynpbro/8eTZHhAY7J+HOf0jXeXq3jrJDcS8=", + "lastModified": 1759638324, + "narHash": "sha256-bj0L3n2UWE/DjqFjsydWsSzO74+dqUA4tiOX4At6LbM=", "owner": "Gerg-l", "repo": "spicetify-nix", - "rev": "9e9e48ca16628bf09a02bc5449d4b0761e15eebd", + "rev": "c39a58510e55c4970e57176ab14b722a978e5f01", "type": "github" }, "original": { @@ -10969,14 +12738,14 @@ "swarsel", "nixpkgs" ], - "systems": "systems_17" + "systems": "systems_18" }, "locked": { - "lastModified": 1757824114, - "narHash": "sha256-cyVbc8UxyWKAuXOgqLggil2mXLZWY0wyfBWYqUwgYjM=", + "lastModified": 1758584568, + "narHash": "sha256-FDxTheW6ynpbro/8eTZHhAY7J+HOf0jXeXq3jrJDcS8=", "owner": "Gerg-l", "repo": "spicetify-nix", - "rev": "d23584b2000b7f7a59a1764ff9ab93b89444bfd9", + "rev": "9e9e48ca16628bf09a02bc5449d4b0761e15eebd", "type": "github" }, "original": { @@ -10994,7 +12763,33 @@ "swarsel", "nixpkgs" ], - "systems": "systems_21" + "systems": "systems_22" + }, + "locked": { + "lastModified": 1757824114, + "narHash": "sha256-cyVbc8UxyWKAuXOgqLggil2mXLZWY0wyfBWYqUwgYjM=", + "owner": "Gerg-l", + "repo": "spicetify-nix", + "rev": "d23584b2000b7f7a59a1764ff9ab93b89444bfd9", + "type": "github" + }, + "original": { + "owner": "Gerg-l", + "repo": "spicetify-nix", + "type": "github" + } + }, + "spicetify-nix_6": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ], + "systems": "systems_26" }, "locked": { "lastModified": 1754196919, @@ -11029,11 +12824,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760350849, - "narHash": "sha256-JqcM5Pkm5q1c9D5zpINJsN1yCB4Vq1cL12ZuFyo32T4=", + "lastModified": 1761840967, + "narHash": "sha256-alE8Vesztx3tPxXpJURtYWD8x1cXaU/x+10Q6hbgGBY=", "owner": "danth", "repo": "stylix", - "rev": "7b4957d716f4fb615bf0e37d3b23c112579b1408", + "rev": "c33226f205aeab42a170913cd1f8bc3428b7e6b1", "type": "github" }, "original": { @@ -11061,11 +12856,11 @@ "tinted-zed": "tinted-zed_2" }, "locked": { - "lastModified": 1759690047, - "narHash": "sha256-Vlpa0d1xOgPO9waHwxJNi6LcD2PYqB3EjwLRtSxXlHc=", + "lastModified": 1760350849, + "narHash": "sha256-JqcM5Pkm5q1c9D5zpINJsN1yCB4Vq1cL12ZuFyo32T4=", "owner": "danth", "repo": "stylix", - "rev": "09022804b2bcd217f3a41a644d26b23d30375d12", + "rev": "7b4957d716f4fb615bf0e37d3b23c112579b1408", "type": "github" }, "original": { @@ -11085,7 +12880,7 @@ "gnome-shell": "gnome-shell_3", "nixpkgs": "nixpkgs_24", "nur": "nur_6", - "systems": "systems_14", + "systems": "systems_15", "tinted-foot": "tinted-foot_3", "tinted-kitty": "tinted-kitty_3", "tinted-schemes": "tinted-schemes_3", @@ -11093,11 +12888,11 @@ "tinted-zed": "tinted-zed_3" }, "locked": { - "lastModified": 1758698745, - "narHash": "sha256-IonbUp7KTYzXS1UGraXPAa7QJFgLJrAZGswE5CfUILU=", + "lastModified": 1759690047, + "narHash": "sha256-Vlpa0d1xOgPO9waHwxJNi6LcD2PYqB3EjwLRtSxXlHc=", "owner": "danth", "repo": "stylix", - "rev": "799c811ac53ef9820dd007b6ddf33390964c6bef", + "rev": "09022804b2bcd217f3a41a644d26b23d30375d12", "type": "github" }, "original": { @@ -11117,7 +12912,7 @@ "gnome-shell": "gnome-shell_4", "nixpkgs": "nixpkgs_32", "nur": "nur_8", - "systems": "systems_18", + "systems": "systems_19", "tinted-foot": "tinted-foot_4", "tinted-kitty": "tinted-kitty_4", "tinted-schemes": "tinted-schemes_4", @@ -11125,11 +12920,11 @@ "tinted-zed": "tinted-zed_4" }, "locked": { - "lastModified": 1757360005, - "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", + "lastModified": 1758698745, + "narHash": "sha256-IonbUp7KTYzXS1UGraXPAa7QJFgLJrAZGswE5CfUILU=", "owner": "danth", "repo": "stylix", - "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", + "rev": "799c811ac53ef9820dd007b6ddf33390964c6bef", "type": "github" }, "original": { @@ -11149,7 +12944,7 @@ "gnome-shell": "gnome-shell_5", "nixpkgs": "nixpkgs_40", "nur": "nur_10", - "systems": "systems_22", + "systems": "systems_23", "tinted-foot": "tinted-foot_5", "tinted-kitty": "tinted-kitty_5", "tinted-schemes": "tinted-schemes_5", @@ -11157,11 +12952,11 @@ "tinted-zed": "tinted-zed_5" }, "locked": { - "lastModified": 1754597531, - "narHash": "sha256-OpC9/PBIuL2WEJUkcuD/wVxI8r+3o6f5RylSIefjHo4=", + "lastModified": 1757360005, + "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", "owner": "danth", "repo": "stylix", - "rev": "63bb34a66ad7d1af2e95ee20dd675896b2074c32", + "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", "type": "github" }, "original": { @@ -11181,7 +12976,7 @@ "gnome-shell": "gnome-shell_6", "nixpkgs": "nixpkgs_48", "nur": "nur_12", - "systems": "systems_25", + "systems": "systems_27", "tinted-foot": "tinted-foot_6", "tinted-kitty": "tinted-kitty_6", "tinted-schemes": "tinted-schemes_6", @@ -11189,11 +12984,11 @@ "tinted-zed": "tinted-zed_6" }, "locked": { - "lastModified": 1751906932, - "narHash": "sha256-vRZH3bq24I/heef0AIFnaBmDGdQSpTmyjT4vtpa7qqk=", + "lastModified": 1754597531, + "narHash": "sha256-OpC9/PBIuL2WEJUkcuD/wVxI8r+3o6f5RylSIefjHo4=", "owner": "danth", "repo": "stylix", - "rev": "c538d1a3571386eaaca31aef7bb5fd5c155327b0", + "rev": "63bb34a66ad7d1af2e95ee20dd675896b2074c32", "type": "github" }, "original": { @@ -11213,7 +13008,7 @@ "gnome-shell": "gnome-shell_7", "nixpkgs": "nixpkgs_56", "nur": "nur_14", - "systems": "systems_28", + "systems": "systems_30", "tinted-foot": "tinted-foot_7", "tinted-kitty": "tinted-kitty_7", "tinted-schemes": "tinted-schemes_7", @@ -11234,6 +13029,38 @@ "type": "github" } }, + "stylix_8": { + "inputs": { + "base16": "base16_8", + "base16-fish": "base16-fish_8", + "base16-helix": "base16-helix_8", + "base16-vim": "base16-vim_8", + "firefox-gnome-theme": "firefox-gnome-theme_8", + "flake-parts": "flake-parts_40", + "gnome-shell": "gnome-shell_8", + "nixpkgs": "nixpkgs_64", + "nur": "nur_16", + "systems": "systems_33", + "tinted-foot": "tinted-foot_8", + "tinted-kitty": "tinted-kitty_8", + "tinted-schemes": "tinted-schemes_8", + "tinted-tmux": "tinted-tmux_8", + "tinted-zed": "tinted-zed_8" + }, + "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", @@ -11265,18 +13092,18 @@ "spicetify-nix": "spicetify-nix_2", "stylix": "stylix_2", "swarsel": "swarsel_2", - "swarsel-modules": "swarsel-modules_4", - "swarsel-nix": "swarsel-nix", - "systems": "systems_49", - "vbc-nix": "vbc-nix_6", - "zjstatus": "zjstatus_6" + "swarsel-modules": "swarsel-modules_5", + "swarsel-nix": "swarsel-nix_2", + "systems": "systems_59", + "vbc-nix": "vbc-nix_7", + "zjstatus": "zjstatus_7" }, "locked": { - "lastModified": 1760219467, - "narHash": "sha256-DcbzT2+6RElOsaaToQAoYnHLEBqFm0pomLaOhgxyHZ4=", + "lastModified": 1762037797, + "narHash": "sha256-5tDtggBgcwLvUPbXUo2Jwu4cXKPXxCaUZ9KArrr9uXQ=", "owner": "Swarsel", "repo": ".dotfiles", - "rev": "95fa226b9e70df2b7f78cdd630583c842a38e822", + "rev": "40b42028d2e56e091d6b687c252ce2c86fb03f5f", "type": "github" }, "original": { @@ -11287,9 +13114,9 @@ }, "swarsel-modules": { "inputs": { - "flake-parts": "flake-parts_36", - "nixpkgs": "nixpkgs_59", - "systems": "systems_35" + "flake-parts": "flake-parts_41", + "nixpkgs": "nixpkgs_67", + "systems": "systems_40" }, "locked": { "lastModified": 1756088962, @@ -11308,9 +13135,9 @@ }, "swarsel-modules_2": { "inputs": { - "flake-parts": "flake-parts_37", - "nixpkgs": "nixpkgs_61", - "systems": "systems_39" + "flake-parts": "flake-parts_42", + "nixpkgs": "nixpkgs_69", + "systems": "systems_44" }, "locked": { "lastModified": 1756090249, @@ -11329,9 +13156,9 @@ }, "swarsel-modules_3": { "inputs": { - "flake-parts": "flake-parts_38", - "nixpkgs": "nixpkgs_63", - "systems": "systems_43" + "flake-parts": "flake-parts_43", + "nixpkgs": "nixpkgs_71", + "systems": "systems_48" }, "locked": { "lastModified": 1757950182, @@ -11350,9 +13177,9 @@ }, "swarsel-modules_4": { "inputs": { - "flake-parts": "flake-parts_39", - "nixpkgs": "nixpkgs_65", - "systems": "systems_47" + "flake-parts": "flake-parts_44", + "nixpkgs": "nixpkgs_73", + "systems": "systems_52" }, "locked": { "lastModified": 1757950182, @@ -11371,9 +13198,30 @@ }, "swarsel-modules_5": { "inputs": { - "flake-parts": "flake-parts_41", - "nixpkgs": "nixpkgs_68", - "systems": "systems_52" + "flake-parts": "flake-parts_46", + "nixpkgs": "nixpkgs_76", + "systems": "systems_57" + }, + "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_6": { + "inputs": { + "flake-parts": "flake-parts_48", + "nixpkgs": "nixpkgs_79", + "systems": "systems_62" }, "locked": { "lastModified": 1757950182, @@ -11392,9 +13240,9 @@ }, "swarsel-nix": { "inputs": { - "flake-parts": "flake-parts_40", - "nixpkgs": "nixpkgs_66", - "systems": "systems_48" + "flake-parts": "flake-parts_45", + "nixpkgs": "nixpkgs_74", + "systems": "systems_53" }, "locked": { "lastModified": 1760190732, @@ -11413,9 +13261,30 @@ }, "swarsel-nix_2": { "inputs": { - "flake-parts": "flake-parts_42", - "nixpkgs": "nixpkgs_69", - "systems": "systems_53" + "flake-parts": "flake-parts_47", + "nixpkgs": "nixpkgs_77", + "systems": "systems_58" + }, + "locked": { + "lastModified": 1760190732, + "narHash": "sha256-Bxn/5+MCKOzR9LgUyHDhxCU3eejxz+hfsAT9Sqqz6B0=", + "owner": "Swarsel", + "repo": "swarsel-nix", + "rev": "f0ab1f68c94d777aa7d0a8f23745cb9aa8172fd4", + "type": "github" + }, + "original": { + "owner": "Swarsel", + "ref": "main", + "repo": "swarsel-nix", + "type": "github" + } + }, + "swarsel-nix_3": { + "inputs": { + "flake-parts": "flake-parts_49", + "nixpkgs": "nixpkgs_80", + "systems": "systems_63" }, "locked": { "lastModified": 1760190732, @@ -11438,10 +13307,10 @@ "disko": "disko_3", "emacs-overlay": "emacs-overlay_3", "flake-parts": "flake-parts_11", - "fw-fanctrl": "fw-fanctrl", "home-manager": "home-manager_5", "impermanence": "impermanence_3", "lanzaboote": "lanzaboote_3", + "microvm": "microvm_3", "niri-flake": "niri-flake_3", "nix-darwin": "nix-darwin_3", "nix-index-database": "nix-index-database_3", @@ -11463,17 +13332,18 @@ "spicetify-nix": "spicetify-nix_3", "stylix": "stylix_3", "swarsel": "swarsel_3", - "swarsel-modules": "swarsel-modules_3", - "systems": "systems_44", - "vbc-nix": "vbc-nix_5", - "zjstatus": "zjstatus_5" + "swarsel-modules": "swarsel-modules_4", + "swarsel-nix": "swarsel-nix", + "systems": "systems_54", + "vbc-nix": "vbc-nix_6", + "zjstatus": "zjstatus_6" }, "locked": { - "lastModified": 1758869406, - "narHash": "sha256-TulduD1ANpUvR9WNm3Hci+crvfTETd0Y3RevczQR8SQ=", + "lastModified": 1760219467, + "narHash": "sha256-DcbzT2+6RElOsaaToQAoYnHLEBqFm0pomLaOhgxyHZ4=", "owner": "Swarsel", "repo": ".dotfiles", - "rev": "a896d5eb5db719b7539825d355ab1bb8ec563b4b", + "rev": "95fa226b9e70df2b7f78cdd630583c842a38e822", "type": "github" }, "original": { @@ -11488,7 +13358,7 @@ "disko": "disko_4", "emacs-overlay": "emacs-overlay_4", "flake-parts": "flake-parts_16", - "fw-fanctrl": "fw-fanctrl_2", + "fw-fanctrl": "fw-fanctrl", "home-manager": "home-manager_7", "impermanence": "impermanence_4", "lanzaboote": "lanzaboote_4", @@ -11513,17 +13383,17 @@ "spicetify-nix": "spicetify-nix_4", "stylix": "stylix_4", "swarsel": "swarsel_4", - "swarsel-modules": "swarsel-modules_2", - "systems": "systems_40", - "vbc-nix": "vbc-nix_4", - "zjstatus": "zjstatus_4" + "swarsel-modules": "swarsel-modules_3", + "systems": "systems_49", + "vbc-nix": "vbc-nix_5", + "zjstatus": "zjstatus_5" }, "locked": { - "lastModified": 1758712194, - "narHash": "sha256-ySYaSpCWBd0tlhnuJJY9XqcUNGXrACGMXVhTiigThhg=", + "lastModified": 1758869406, + "narHash": "sha256-TulduD1ANpUvR9WNm3Hci+crvfTETd0Y3RevczQR8SQ=", "owner": "Swarsel", "repo": ".dotfiles", - "rev": "355cf03bd13a9325bb8ef10912900fe3623771ac", + "rev": "a896d5eb5db719b7539825d355ab1bb8ec563b4b", "type": "github" }, "original": { @@ -11538,7 +13408,7 @@ "disko": "disko_5", "emacs-overlay": "emacs-overlay_5", "flake-parts": "flake-parts_21", - "fw-fanctrl": "fw-fanctrl_3", + "fw-fanctrl": "fw-fanctrl_2", "home-manager": "home-manager_9", "impermanence": "impermanence_5", "lanzaboote": "lanzaboote_5", @@ -11563,8 +13433,58 @@ "spicetify-nix": "spicetify-nix_5", "stylix": "stylix_5", "swarsel": "swarsel_5", + "swarsel-modules": "swarsel-modules_2", + "systems": "systems_45", + "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_5": { + "inputs": { + "devshell": "devshell_11", + "disko": "disko_6", + "emacs-overlay": "emacs-overlay_6", + "flake-parts": "flake-parts_26", + "fw-fanctrl": "fw-fanctrl_3", + "home-manager": "home-manager_11", + "impermanence": "impermanence_6", + "lanzaboote": "lanzaboote_6", + "niri-flake": "niri-flake_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_18", + "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", + "spicetify-nix": "spicetify-nix_6", + "stylix": "stylix_6", + "swarsel": "swarsel_6", "swarsel-modules": "swarsel-modules", - "systems": "systems_36", + "systems": "systems_41", "vbc-nix": "vbc-nix_3", "zjstatus": "zjstatus_3" }, @@ -11582,36 +13502,36 @@ "type": "github" } }, - "swarsel_5": { + "swarsel_6": { "inputs": { - "devshell": "devshell_11", - "disko": "disko_6", - "emacs-overlay": "emacs-overlay_6", - "flake-parts": "flake-parts_26", + "devshell": "devshell_13", + "disko": "disko_7", + "emacs-overlay": "emacs-overlay_7", + "flake-parts": "flake-parts_31", "fw-fanctrl": "fw-fanctrl_4", - "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_17", - "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", - "swarsel": "swarsel_6", - "systems": "systems_32", + "home-manager": "home-manager_13", + "impermanence": "impermanence_7", + "lanzaboote": "lanzaboote_7", + "nix-darwin": "nix-darwin_7", + "nix-index-database": "nix-index-database_7", + "nix-on-droid": "nix-on-droid_7", + "nix-topology": "nix-topology_7", + "nixgl": "nixgl_7", + "nixos-generators": "nixos-generators_7", + "nixos-hardware": "nixos-hardware_7", + "nixpkgs": "nixpkgs_52", + "nixpkgs-dev": "nixpkgs-dev_7", + "nixpkgs-kernel": "nixpkgs-kernel_7", + "nixpkgs-stable": "nixpkgs-stable_20", + "nixpkgs-stable24_05": "nixpkgs-stable24_05_7", + "nixpkgs-stable24_11": "nixpkgs-stable24_11_7", + "nswitch-rcm-nix": "nswitch-rcm-nix_7", + "nur": "nur_13", + "pre-commit-hooks": "pre-commit-hooks_14", + "sops-nix": "sops-nix_7", + "stylix": "stylix_7", + "swarsel": "swarsel_7", + "systems": "systems_37", "vbc-nix": "vbc-nix_2", "zjstatus": "zjstatus_2" }, @@ -11629,35 +13549,35 @@ "type": "github" } }, - "swarsel_6": { + "swarsel_7": { "inputs": { - "devshell": "devshell_13", - "disko": "disko_7", - "emacs-overlay": "emacs-overlay_7", - "flake-parts": "flake-parts_31", + "devshell": "devshell_15", + "disko": "disko_8", + "emacs-overlay": "emacs-overlay_8", + "flake-parts": "flake-parts_36", "fw-fanctrl": "fw-fanctrl_5", - "home-manager": "home-manager_13", - "impermanence": "impermanence_7", - "lanzaboote": "lanzaboote_7", - "nix-darwin": "nix-darwin_7", - "nix-index-database": "nix-index-database_7", - "nix-on-droid": "nix-on-droid_7", - "nix-topology": "nix-topology_7", - "nixgl": "nixgl_7", - "nixos-generators": "nixos-generators_7", - "nixos-hardware": "nixos-hardware_7", - "nixpkgs": "nixpkgs_52", - "nixpkgs-dev": "nixpkgs-dev_7", - "nixpkgs-kernel": "nixpkgs-kernel_7", - "nixpkgs-stable": "nixpkgs-stable_19", - "nixpkgs-stable24_05": "nixpkgs-stable24_05_7", - "nixpkgs-stable24_11": "nixpkgs-stable24_11_7", - "nswitch-rcm-nix": "nswitch-rcm-nix_7", - "nur": "nur_13", - "pre-commit-hooks": "pre-commit-hooks_14", - "sops-nix": "sops-nix_7", - "stylix": "stylix_7", - "systems": "systems_29", + "home-manager": "home-manager_15", + "impermanence": "impermanence_8", + "lanzaboote": "lanzaboote_8", + "nix-darwin": "nix-darwin_8", + "nix-index-database": "nix-index-database_8", + "nix-on-droid": "nix-on-droid_8", + "nix-topology": "nix-topology_8", + "nixgl": "nixgl_8", + "nixos-generators": "nixos-generators_8", + "nixos-hardware": "nixos-hardware_8", + "nixpkgs": "nixpkgs_60", + "nixpkgs-dev": "nixpkgs-dev_8", + "nixpkgs-kernel": "nixpkgs-kernel_8", + "nixpkgs-stable": "nixpkgs-stable_22", + "nixpkgs-stable24_05": "nixpkgs-stable24_05_8", + "nixpkgs-stable24_11": "nixpkgs-stable24_11_8", + "nswitch-rcm-nix": "nswitch-rcm-nix_8", + "nur": "nur_15", + "pre-commit-hooks": "pre-commit-hooks_16", + "sops-nix": "sops-nix_8", + "stylix": "stylix_8", + "systems": "systems_34", "vbc-nix": "vbc-nix", "zjstatus": "zjstatus" }, @@ -12022,16 +13942,16 @@ }, "systems_30": { "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" } }, @@ -12067,16 +13987,16 @@ }, "systems_33": { "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" } }, @@ -12097,16 +14017,16 @@ }, "systems_35": { "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" } }, @@ -12126,21 +14046,6 @@ } }, "systems_37": { - "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_38": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -12155,6 +14060,21 @@ "type": "github" } }, + "systems_38": { + "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_39": { "locked": { "lastModified": 1681028828, @@ -12201,21 +14121,6 @@ } }, "systems_41": { - "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_42": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -12230,6 +14135,21 @@ "type": "github" } }, + "systems_42": { + "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_43": { "locked": { "lastModified": 1681028828, @@ -12261,21 +14181,6 @@ } }, "systems_45": { - "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_46": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -12290,6 +14195,21 @@ "type": "github" } }, + "systems_46": { + "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_47": { "locked": { "lastModified": 1681028828, @@ -12455,6 +14375,51 @@ "type": "github" } }, + "systems_57": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_58": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_59": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_6": { "locked": { "lastModified": 1681028828, @@ -12470,6 +14435,111 @@ "type": "github" } }, + "systems_60": { + "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_61": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_62": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_63": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_64": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_65": { + "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_66": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_7": { "locked": { "lastModified": 1681028828, @@ -12634,6 +14704,23 @@ "type": "github" } }, + "tinted-foot_8": { + "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": { @@ -12746,6 +14833,22 @@ "type": "github" } }, + "tinted-kitty_8": { + "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": { @@ -12781,11 +14884,11 @@ "tinted-schemes_3": { "flake": false, "locked": { - "lastModified": 1754779259, - "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -12811,6 +14914,22 @@ } }, "tinted-schemes_5": { + "flake": false, + "locked": { + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-schemes_6": { "flake": false, "locked": { "lastModified": 1750770351, @@ -12826,7 +14945,7 @@ "type": "github" } }, - "tinted-schemes_6": { + "tinted-schemes_7": { "flake": false, "locked": { "lastModified": 1748180480, @@ -12842,7 +14961,7 @@ "type": "github" } }, - "tinted-schemes_7": { + "tinted-schemes_8": { "flake": false, "locked": { "lastModified": 1748180480, @@ -12893,11 +15012,11 @@ "tinted-tmux_3": { "flake": false, "locked": { - "lastModified": 1754788770, - "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -12923,6 +15042,22 @@ } }, "tinted-tmux_5": { + "flake": false, + "locked": { + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-tmux_6": { "flake": false, "locked": { "lastModified": 1751159871, @@ -12938,7 +15073,7 @@ "type": "github" } }, - "tinted-tmux_6": { + "tinted-tmux_7": { "flake": false, "locked": { "lastModified": 1748740859, @@ -12954,7 +15089,7 @@ "type": "github" } }, - "tinted-tmux_7": { + "tinted-tmux_8": { "flake": false, "locked": { "lastModified": 1748740859, @@ -13005,11 +15140,11 @@ "tinted-zed_3": { "flake": false, "locked": { - "lastModified": 1755613540, - "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -13037,11 +15172,11 @@ "tinted-zed_5": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -13053,11 +15188,11 @@ "tinted-zed_6": { "flake": false, "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { @@ -13082,6 +15217,22 @@ "type": "github" } }, + "tinted-zed_8": { + "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": [ @@ -13090,6 +15241,7 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "stylix", "nur", "nixpkgs" @@ -13118,6 +15270,7 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "stylix", "nur", "nixpkgs" @@ -13146,9 +15299,10 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ], - "systems": "systems_30" + "systems": "systems_35" }, "locked": { "lastModified": 1742477270, @@ -13173,9 +15327,10 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ], - "systems": "systems_33" + "systems": "systems_38" }, "locked": { "lastModified": 1742477270, @@ -13199,9 +15354,10 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ], - "systems": "systems_37" + "systems": "systems_42" }, "locked": { "lastModified": 1742477270, @@ -13224,9 +15380,10 @@ "swarsel", "swarsel", "swarsel", + "swarsel", "nixpkgs" ], - "systems": "systems_41" + "systems": "systems_46" }, "locked": { "lastModified": 1742477270, @@ -13248,28 +15405,6 @@ "nixpkgs": [ "swarsel", "swarsel", - "nixpkgs" - ], - "systems": "systems_45" - }, - "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": [ "swarsel", "nixpkgs" ], @@ -13290,12 +15425,59 @@ "url": "ssh://git@github.com/vbc-it/vbc-nix.git" } }, + "vbc-nix_6": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "nixpkgs" + ], + "systems": "systems_55" + }, + "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_7": { + "inputs": { + "nixpkgs": [ + "swarsel", + "nixpkgs" + ], + "systems": "systems_60" + }, + "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_8": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "systems": "systems_55" + "systems": "systems_65" }, "locked": { "lastModified": 1742477270, @@ -13381,6 +15563,23 @@ } }, "xwayland-satellite-stable_5": { + "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_6": { "flake": false, "locked": { "lastModified": 1748488455, @@ -13400,11 +15599,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1759707084, - "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", + "lastModified": 1761622056, + "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", + "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", "type": "github" }, "original": { @@ -13430,6 +15629,22 @@ } }, "xwayland-satellite-unstable_3": { + "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_4": { "flake": false, "locked": { "lastModified": 1758577423, @@ -13445,7 +15660,7 @@ "type": "github" } }, - "xwayland-satellite-unstable_4": { + "xwayland-satellite-unstable_5": { "flake": false, "locked": { "lastModified": 1757179758, @@ -13461,7 +15676,7 @@ "type": "github" } }, - "xwayland-satellite-unstable_5": { + "xwayland-satellite-unstable_6": { "flake": false, "locked": { "lastModified": 1754533920, @@ -13479,10 +15694,10 @@ }, "zjstatus": { "inputs": { - "crane": "crane_8", - "flake-utils": "flake-utils_17", - "nixpkgs": "nixpkgs_57", - "rust-overlay": "rust-overlay_8" + "crane": "crane_9", + "flake-utils": "flake-utils_20", + "nixpkgs": "nixpkgs_65", + "rust-overlay": "rust-overlay_9" }, "locked": { "lastModified": 1750957292, @@ -13500,10 +15715,10 @@ }, "zjstatus_2": { "inputs": { - "crane": "crane_9", - "flake-utils": "flake-utils_18", - "nixpkgs": "nixpkgs_58", - "rust-overlay": "rust-overlay_9" + "crane": "crane_10", + "flake-utils": "flake-utils_21", + "nixpkgs": "nixpkgs_66", + "rust-overlay": "rust-overlay_10" }, "locked": { "lastModified": 1750957292, @@ -13521,10 +15736,10 @@ }, "zjstatus_3": { "inputs": { - "crane": "crane_10", - "flake-utils": "flake-utils_19", - "nixpkgs": "nixpkgs_60", - "rust-overlay": "rust-overlay_10" + "crane": "crane_11", + "flake-utils": "flake-utils_22", + "nixpkgs": "nixpkgs_68", + "rust-overlay": "rust-overlay_11" }, "locked": { "lastModified": 1753722377, @@ -13542,10 +15757,10 @@ }, "zjstatus_4": { "inputs": { - "crane": "crane_11", - "flake-utils": "flake-utils_20", - "nixpkgs": "nixpkgs_62", - "rust-overlay": "rust-overlay_11" + "crane": "crane_12", + "flake-utils": "flake-utils_23", + "nixpkgs": "nixpkgs_70", + "rust-overlay": "rust-overlay_12" }, "locked": { "lastModified": 1757256304, @@ -13563,10 +15778,10 @@ }, "zjstatus_5": { "inputs": { - "crane": "crane_12", - "flake-utils": "flake-utils_21", - "nixpkgs": "nixpkgs_64", - "rust-overlay": "rust-overlay_12" + "crane": "crane_13", + "flake-utils": "flake-utils_24", + "nixpkgs": "nixpkgs_72", + "rust-overlay": "rust-overlay_13" }, "locked": { "lastModified": 1757256304, @@ -13584,10 +15799,10 @@ }, "zjstatus_6": { "inputs": { - "crane": "crane_13", - "flake-utils": "flake-utils_22", - "nixpkgs": "nixpkgs_67", - "rust-overlay": "rust-overlay_13" + "crane": "crane_14", + "flake-utils": "flake-utils_25", + "nixpkgs": "nixpkgs_75", + "rust-overlay": "rust-overlay_14" }, "locked": { "lastModified": 1757256304, @@ -13605,10 +15820,10 @@ }, "zjstatus_7": { "inputs": { - "crane": "crane_14", - "flake-utils": "flake-utils_23", - "nixpkgs": "nixpkgs_70", - "rust-overlay": "rust-overlay_14" + "crane": "crane_15", + "flake-utils": "flake-utils_26", + "nixpkgs": "nixpkgs_78", + "rust-overlay": "rust-overlay_15" }, "locked": { "lastModified": 1757256304, @@ -13623,6 +15838,27 @@ "repo": "zjstatus", "type": "github" } + }, + "zjstatus_8": { + "inputs": { + "crane": "crane_16", + "flake-utils": "flake-utils_27", + "nixpkgs": "nixpkgs_81", + "rust-overlay": "rust-overlay_16" + }, + "locked": { + "lastModified": 1761162625, + "narHash": "sha256-cJD5RccT5aFwLFiId8PW91z39MpoQZIymj+qZEJ5jTE=", + "owner": "dj95", + "repo": "zjstatus", + "rev": "a4bb655af8f49fe53de7fefca54348de21ecbbb2", + "type": "github" + }, + "original": { + "owner": "dj95", + "repo": "zjstatus", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 287587c..1614ccd 100644 --- a/flake.nix +++ b/flake.nix @@ -16,18 +16,19 @@ nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-stable24_05.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable24_11.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-stable25_05.url = "github:NixOS/nixpkgs/nixos-25.05"; systems.url = "github:nix-systems/default"; swarsel-modules.url = "github:Swarsel/swarsel-modules/main"; swarsel-nix.url = "github:Swarsel/swarsel-nix/main"; home-manager = { - # url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager"; # url = "github:Swarsel/home-manager/main"; - url = "github:JuneStepp/home-manager/anki-fix-booleans"; inputs.nixpkgs.follows = "nixpkgs"; }; swarsel.url = "github:Swarsel/.dotfiles"; emacs-overlay = { - url = "github:nix-community/emacs-overlay"; + # url = "github:nix-community/emacs-overlay"; + url = "github:nix-community/emacs-overlay/aba8daa237dc07a3bb28a61c252a718e8eb38057?narHash=sha256-4OXXccXsY1sBXTXjYIthdjXLAotozSh4F8StGRuLyMQ%3D"; inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/NUR"; diff --git a/hosts/home/treehouse/default.nix b/hosts/home/treehouse/default.nix index b566bdb..ca98ce1 100644 --- a/hosts/home/treehouse/default.nix +++ b/hosts/home/treehouse/default.nix @@ -1,10 +1,8 @@ -{ self, inputs, outputs, ... }: +{ self, outputs, ... }: { imports = [ - inputs.stylix.homeModules.stylix # inputs.sops-nix.homeManagerModules.sops - inputs.nix-index-database.homeModules.nix-index "${self}/modules/home" "${self}/modules/nixos/common/pii.nix" "${self}/modules/nixos/common/meta.nix" diff --git a/index.html b/index.html index b6bd78d..a985883 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 @@ -209,7 +209,8 @@
  • 1.4. Hosts
  • 1.5. Programs
  • 1.6. Services
    • -
  • 1.7. Manual steps when setting up a new machine
    • +
  • 1.7. Manual steps when setting up a new machine
    • +
  • 1.8. Current issues
  • 2. flake.nix @@ -270,6 +271,7 @@
  • 3.1.2.4. machpizza (MacBook Pro)
  • 3.1.2.5. Magicant (Phone)
    • +
  • 3.1.2.6. Treehouse (DGX Spark)
  • 3.1.3. Virtual hosts @@ -299,13 +301,12 @@
  • 3.1.4.2. TODO Drugstore (ISO installer config)
    • -
  • 3.1.4.3. Treehouse (home-manager only example)
    • -
  • 3.1.4.4. ChaosTheatre (Demo Physical/VM) +
  • 3.1.4.3. ChaosTheatre (Demo Physical/VM)
    • @@ -444,102 +445,103 @@
  • 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
    • +
  • 3.2.5.11. microvm-host
    • +
  • 3.2.5.12. microvm-guest
  • 3.3. Home-manager @@ -585,8 +587,8 @@
  • 3.5.31. swarsel-build
  • 3.5.32. swarsel-instantiate
  • 3.5.33. sshrm
    • -
  • 3.5.34. endme
    • -
  • 3.5.35. git-replace
    • +
  • 3.5.34. endme
    • +
  • 3.5.35. git-replace
  • 3.6. Profiles @@ -595,7 +597,7 @@ @@ -776,7 +779,7 @@
  • 4.4.40. Calendar
    • @@ -791,7 +794,8 @@
  • 5. Appendix A: Noweb-Ref blocks
  • 6. Appendix B: Supplementary Files @@ -843,7 +847,7 @@

    -This file has 96633 words spanning 24946 lines and was last revised on 2025-10-21 21:55:49 +0200. +This file has 97685 words spanning 25221 lines and was last revised on 2025-11-02 12:29:26 +0100.

    @@ -912,7 +916,7 @@ This section defines my Emacs configuration. For a while, I considered to use ry

    -My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-10-21 21:55:49 +0200) +My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2025-11-02 12:29:26 +0100)

    • @@ -924,7 +928,7 @@ system-configuration-options 
    ---prefix=/nix/store/x7csgsyxznfca0sn3mank9rp0xd7dh5n-emacs-git-pgtk-20251013.0 --disable-build-details --with-modules --with-pgtk --disable-gc-mark-trace --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/3ncyph43ppsx6dnx46faxr5dmv9g8ym7-emacs-git-pgtk-20251013.0 --disable-build-details --with-modules --with-pgtk --disable-gc-mark-trace --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
    @@ -1215,11 +1219,12 @@ Here I give a brief overview over the hostmachines that I am using. This is held -
    -

    1.7. Manual steps when setting up a new machine

    +
    +

    1.7. Manual steps when setting up a new machine

    -
    +
    These steps are required when setting up a normal NixOS host:
+
 - setup gpgsm for signing of mails using S/MIME:
   - `gpgsm --import ~/Certificates/<certname>.p12`
   - `gpgsm --import ~/Certificates/harica-root.pem`
@@ -1238,6 +1243,50 @@ If the new machine is a work machine, these steps are additionally needed:
   - using the laptop certificate `.pem` as User cert and private key (CA cert: none)
   - vpn gateway is found in `nixosConfig.repo.secrets.local.work.vpnGateway`
 
+If the new machine is home-manager only, perform these steps:
+
+
+- (Optional) Install openssh-server
+- Set hostname to the name specified in the home-manager configuration
+- Install nix, either:
+  - (if upgrading existing nix) Install nix version matching with version that `nix-plugins` is compiled against: `nix-env --install --file '<nixpkgs>' cacert -I nixpkgs=channel:nixpkgs-unstable --attr nixVersions.nix_x_yy`
+  - (or installing nix freshly):
+    - Grab the link to the install script of the needed nix version from https://releases.nixos.org/?prefix=nix, e.g. https://releases.nixos.org/nix/nix-2.30.1/install
+    - `bash <(curl -L https://releases.nixos.org/nix/nix-x-yy-y/install) --daemon`
+- add the following to /etc/nix/nix.conf to become a trusted user: `trusted-users = @wheel root swarsel`
+- For the first build:
+  1) Clone dotfile repo & change into it
+  2) `nix --extra-experimental-features 'nix-command flakes' develop`
+  3) `home-manager --extra-experimental-features 'nix-command flakes' switch --flake .#$(hostname) --show-trace`
+
+
    
+
    +
    +
    +
    +

    1.8. Current issues

    +
    +
    +
    Currently, these adaptions are made to the configuration to account for bugs in upstream repos:
+
+- 202501102:
+  - flake:
+    - emacs-overlay:
+      - : version pinned because emacsclient is currently broken on latest
+    - niri-flake:
+      - currently not using the sugared version of screenshot-[,window], as it is currently broken
+  - home-manager:
+    - emacs-tramp:
+      - using stable version in extraPackages (broken in unstable)
+      - :ensure nil in emacs tramp settings to use package in extraPackages
+    - emacs-calfwL
+      - pinned to version not in nixpkgs (is in latest emacs-overlay, but that is broken)
+    - vesktop:
+      - running stable version (broken in unstable)
+    - batgrep:
+      - running stable version (broken in unstable)
+    - swayosd:
+      - pinned to version not in nixpkgs (fixes https://github.com/ErikReider/SwayOSD/issues/175)
    @@ -1382,18 +1431,19 @@ This provides devshell support for flake-parts nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-stable24_05.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-stable24_11.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-stable25_05.url = "github:NixOS/nixpkgs/nixos-25.05"; systems.url = "github:nix-systems/default"; swarsel-modules.url = "github:Swarsel/swarsel-modules/main"; swarsel-nix.url = "github:Swarsel/swarsel-nix/main"; home-manager = { - # url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager"; # url = "github:Swarsel/home-manager/main"; - url = "github:JuneStepp/home-manager/anki-fix-booleans"; inputs.nixpkgs.follows = "nixpkgs"; }; swarsel.url = "github:Swarsel/.dotfiles"; emacs-overlay = { - url = "github:nix-community/emacs-overlay"; + # url = "github:nix-community/emacs-overlay"; + url = "github:nix-community/emacs-overlay/aba8daa237dc07a3bb28a61c252a718e8eb38057?narHash=sha256-4OXXccXsY1sBXTXjYIthdjXLAotozSh4F8StGRuLyMQ%3D"; inputs.nixpkgs.follows = "nixpkgs"; }; nur.url = "github:nix-community/NUR"; @@ -1714,7 +1764,8 @@ in { flake = _: { - lib = (inputs.nixpkgs.lib // inputs.home-manager.lib).extend (_: _: { + lib = inputs.nixpkgs.lib.extend (_: _: { + inherit (inputs.home-manager.lib) hm; inherit swarselsystems; }); }; @@ -1927,7 +1978,10 @@ The rest of the outputs either define or help define the actual configurations: mkDarwinHost = { minimal }: configName: inputs.nix-darwin.lib.darwinSystem { - specialArgs = { inherit inputs outputs lib self minimal configName; inherit (config) globals nodes; }; + specialArgs = { + inherit inputs outputs lib self minimal configName; + inherit (config) globals nodes; + }; modules = [ # inputs.disko.nixosModules.disko # inputs.sops-nix.nixosModules.sops @@ -1957,8 +2011,21 @@ The rest of the outputs either define or help define the actual configurations: systemFunc { inherit pkgs; - extraSpecialArgs = { inherit inputs outputs lib self configName; }; - modules = [ "${self}/hosts/${type}/${configName}" ]; + extraSpecialArgs = { + inherit inputs outputs lib self configName; + inherit (config) globals nodes; + minimal = false; + }; + modules = [ + inputs.stylix.homeModules.stylix + inputs.niri-flake.homeModules.niri + inputs.nix-index-database.homeModules.nix-index + # inputs.sops-nix.homeManagerModules.sops + inputs.spicetify-nix.homeManagerModules.default + inputs.swarsel-nix.homeModules.default + "${self}/hosts/${type}/${configName}" + "${self}/profiles/home" + ]; }; }; @@ -1981,7 +2048,7 @@ The rest of the outputs either define or help define the actual configurations: }); # TODO: Build these for all architectures - homeConfigurations = mkHalfHostConfigs (lib.swarselsystems.readHosts "home") "home" lib.swarselsystems.pkgsFor.x86_64-linux; + homeConfigurations = mkHalfHostConfigs (lib.swarselsystems.readHosts "home") "home" lib.swarselsystems.pkgsFor.x86_64-linux // mkHalfHostConfigs (lib.swarselsystems.readHosts "home") "home" lib.swarselsystems.pkgsFor.aarch64-linux; nixOnDroidConfigurations = mkHalfHostConfigs (lib.swarselsystems.readHosts "android") "android" lib.swarselsystems.pkgsFor.aarch64-linux; diskoConfigurations.default = import "${self}/files/templates/hosts/nixos/disk-config.nix"; @@ -2271,18 +2338,28 @@ Lastly, in the perSystem attribute set, we see that it is actually }; }; - devshells.default = { + devshells.default = let + nix-version = "2_30"; + in { packages = [ - (builtins.trace "alarm: we pinned nix_2_28 because of https://github.com/shlevy/nix-plugins/issues/20" pkgs.nixVersions.nix_2_28) # Always use the nix version from this flake's nixpkgs version, so that nix-plugins (below) doesn't fail because of different nix versions. + (builtins.trace "alarm: pinned nix_${nix-version}" pkgs.nixVersions."nix_${nix-version}") pkgs.git pkgs.just pkgs.age pkgs.ssh-to-age pkgs.sops - pkgs.home-manager pkgs.nixpkgs-fmt self.packages.${system}.swarsel-build self.packages.${system}.swarsel-deploy + (pkgs.symlinkJoin { + name = "home-manager"; + buildInputs = [ pkgs.makeWrapper ]; + paths = [ pkgs.home-manager ]; + postBuild = '' + wrapProgram $out/bin/home-manager \ + --append-flags '--flake .#$(hostname)' + ''; + }) ]; commands = [ @@ -2309,12 +2386,12 @@ Lastly, in the perSystem attribute set, we see that it is actually { package = pkgs.nix-output-monitor; help = "Nix Output Monitor (a drop-in alternative for `nix` which shows a build graph)"; - name = "nom"; + name = "nom \"$@\""; } { name = "hm"; help = "Manage home-manager config"; - command = "home-manager"; + command = "home-manager \"$@\""; } { name = "fmt"; @@ -2339,7 +2416,7 @@ Lastly, in the perSystem attribute set, we see that it is actually { name = "bld"; help = "Build a number of configurations"; - command = "swarel-build \"$@\""; + command = "swarsel-build \"$@\""; } { name = "c"; @@ -2350,13 +2427,17 @@ Lastly, in the perSystem attribute set, we see that it is actually devshell.startup.pre-commit-install.text = "pre-commit install"; - env = [ + env = let + nix-plugins = pkgs.nix-plugins.override { + nixComponents = pkgs.nixVersions."nixComponents_${nix-version}"; + }; + in [ { # Additionally configure nix-plugins with our extra builtins file. # We need this for our repo secrets. name = "NIX_CONFIG"; value = '' - plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins + plugin-files = ${nix-plugins}/lib/nix/plugins extra-builtins-file = ${self + /nix/extra-builtins.nix} ''; } @@ -2532,11 +2613,8 @@ These are for the aforementioned added packages. NOTE: The packages themselves are built in Packages (pkgs); here, we just add them to the overlay that we then use in the configuration.
  • modification These are for packages that are on nixpkgs, but do not fit my usecase, meaning I need to perform modifications on them.
    • -
  • nixpkgs-[stable,...] -These are simply mirrors of other branches of nixpkgs (mostly past stable branches). Useful for packages that are broken on nixpkgs, but do not need to be on bleeding edge anyways. -
      -
    • TODO: I need to check out if overlays are really the way to go in this case, or if I should just use packages, which should make evalutation a good bit faster.
      • -
    • +
  • nixpkgs-stable-versions +These are simply mirrors of other branches of nixpkgs (mostly past stable branches). Useful for packages that are broken on nixpkgs, but do not need to be on bleeding edge anyways. Automatically fetches all inputs names nixpkgs-<suffix> and adds them under the name in <suffix>.

    • @@ -2571,7 +2649,13 @@ in overlays = { default = final: prev: let - additions = final: _: import "${self}/pkgs" { pkgs = final; inherit self lib; }; + additions = final: _: import "${self}/pkgs" { pkgs = final; inherit self lib; } + // { + swarsel-nix = import inputs.swarsel-nix { + pkgs = prev; + }; + zjstatus = inputs.zjstatus.packages.${prev.system}.default; + }; modifications = final: prev: { # vesktop = prev.vesktop.override { @@ -2602,63 +2686,35 @@ in melonds # ds dolphin # gc/wii ]); + }; - nixpkgs-stable = final: _: { - stable = import inputs.nixpkgs-stable { - inherit (final) system; - config.allowUnfree = true; - }; - }; + nixpkgs-stable-versions = final: _: + let + nixpkgsInputs = + lib.filterAttrs + (name: _v: builtins.match "^nixpkgs-.*" name != null) + inputs; - nixpkgs-dev = final: _: { - dev = import inputs.nixpkgs-dev { - inherit (final) system; - config.allowUnfree = true; - }; - }; + rename = name: builtins.replaceStrings [ "nixpkgs-" ] [ "" ] name; - nixpkgs-kernel = final: _: { - kernel = import inputs.nixpkgs-kernel { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - nixpkgs-stable24_05 = final: _: { - stable24_05 = import inputs.nixpkgs-stable24_05 { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - nixpkgs-stable24_11 = final: _: { - stable24_11 = import inputs.nixpkgs-stable24_11 { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - swarsel-nix = _: prev: { - swarsel-nix = import inputs.swarsel-nix { - pkgs = prev; - }; - }; - - zjstatus = _: prev: { - zjstatus = inputs.zjstatus.packages.${prev.system}.default; - }; + mkPkgs = src: + import src { + inherit (final) system; + config.allowUnfree = true; + }; + in + builtins.listToAttrs (map + (name: { + name = rename name; + value = mkPkgs nixpkgsInputs.${name}; + }) + (builtins.attrNames nixpkgsInputs)); in (additions final prev) // (modifications final prev) - // (nixpkgs-stable final prev) - // (nixpkgs-dev final prev) - // (nixpkgs-kernel final prev) - // (nixpkgs-stable24_05 final prev) - // (nixpkgs-stable24_11 final prev) - // (swarsel-nix final prev) - // (zjstatus final prev) + // (nixpkgs-stable-versions final prev) // (inputs.niri-flake.overlays.niri final prev) // (inputs.vbc-nix.overlays.default final prev) // (inputs.nur.overlays.default final prev) @@ -3719,6 +3775,57 @@ My phone. I use only a minimal config for remote debugging here. } + +

    +
    + +
    +
    3.1.2.6. Treehouse (DGX Spark)
    +
    +
    +
    { self, outputs, ... }:
+{
+
+  imports = [
+    # inputs.sops-nix.homeManagerModules.sops
+    "${self}/modules/home"
+    "${self}/modules/nixos/common/pii.nix"
+    "${self}/modules/nixos/common/meta.nix"
+  ];
+
+  nixpkgs = {
+    overlays = [ outputs.overlays.default ];
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  services.xcape = {
+    enable = true;
+    mapExpression = {
+      Control_L = "Escape";
+    };
+  };
+
+  # programs.zsh.initContent = "
+  #   export GPG_TTY=\"$(tty)\"
+  # export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+  # gpgconf --launch gpg-agent
+  #       ";
+
+  swarselsystems = {
+    isLaptop = false;
+    isNixos = false;
+    wallpaper = self + /files/wallpaper/surfacewp.png;
+  };
+
+  swarselprofiles = {
+    dgxspark = true;
+  };
+
+}
+
+
    @@ -4659,65 +4766,12 @@ in } - -
    - - -
    -
    3.1.4.3. Treehouse (home-manager only example)
    -
    -

    -This is the "reference implementation" of a setup that runs without NixOS, only relying on home-manager. I try to test this every now and then and keep it supported. However, manual steps are needed to get the system to work fully, depending on what distribution you are running on. -

    - -
    -
    { self, inputs, outputs, ... }:
-{
-
-  imports = [
-    inputs.stylix.homeManagerModules.stylix
-    inputs.sops-nix.homeManagerModules.sops
-    inputs.nix-index-database.homeModules.nix-index
-    "${self}/modules/home"
-    "${self}/modules/nixos/common/pii.nix"
-    "${self}/modules/nixos/common/meta.nix"
-  ];
-
-  nixpkgs = {
-    overlays = [ outputs.overlays.default ];
-    config = {
-      allowUnfree = true;
-    };
-  };
-
-  services.xcape = {
-    enable = true;
-    mapExpression = {
-      Control_L = "Escape";
-    };
-  };
-
-  programs.zsh.initContent = "
-    export GPG_TTY=\"$(tty)\"
-  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-  gpgconf --launch gpg-agent
-        ";
-
-  swarselsystems = {
-    isLaptop = true;
-    isNixos = false;
-    wallpaper = self + /files/wallpaper/surfacewp.png;
-  };
-
-}
-
-
    -
    3.1.4.4. ChaosTheatre (Demo Physical/VM)
    +
    3.1.4.3. ChaosTheatre (Demo Physical/VM)

    This is just a demo host. It applies all the configuration found in the common parts of the flake, but disables all secrets-related features (as they would not work without the proper SSH keys). @@ -4728,7 +4782,7 @@ I also set the WLR_RENDERER_ALLOW_SOFTWARE=1 to allow this configur

    -
    3.1.4.4.1. Main configuration
    +
    3.1.4.3.1. Main configuration
    { self, config, pkgs, lib, minimal, ... }:
@@ -4791,7 +4845,7 @@ in
    -
    3.1.4.4.2. disko
    +
    3.1.4.3.2. disko
    # NOTE: ... is needed because dikso passes diskoFile
@@ -4927,7 +4981,7 @@ in
    -
    3.1.4.4.3. NixOS dummy options configuration
    +
    3.1.4.3.3. NixOS dummy options configuration
    _:
@@ -4938,7 +4992,7 @@ in
    -
    3.1.4.4.4. home-manager dummy options configuration
    +
    3.1.4.3.4. home-manager dummy options configuration
    _:
@@ -5347,34 +5401,49 @@ in
           sopsFile = "${config.swarselsystems.flakePath}/secrets/general/secrets.yaml";
         };
 
-        nix = {
-          package = pkgs.nixVersions.nix_2_28;
-          settings = {
-            experimental-features = [
-              "nix-command"
-              "flakes"
-              "ca-derivations"
-              "cgroups"
-              "pipe-operators"
-            ];
-            trusted-users = [ "@wheel" "${config.swarselsystems.mainUser}" ];
+        nix =
+          let
+            nix-version = "2_30";
+          in
+          {
+            package = pkgs.nixVersions."nix_${nix-version}";
+            settings = {
+              experimental-features = [
+                "nix-command"
+                "flakes"
+                "ca-derivations"
+                "cgroups"
+                "pipe-operators"
+              ];
+              trusted-users = [ "@wheel" "${config.swarselsystems.mainUser}" ];
+            };
+            # extraOptions = ''
+            #   plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins
+            #   extra-builtins-file = ${self + /nix/extra-builtins.nix}
+            # '' + lib.optionalString (!minimal) ''
+            #   !include ${config.sops.secrets.github-api-token.path}
+            # '';
+            # extraOptions = ''
+            #   plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
+            #     buildInputs = [config.nix.package pkgs.boost];
+            #     patches = o.patches or [];
+            #   })}/lib/nix/plugins
+            #   extra-builtins-file = ${self + /nix/extra-builtins.nix}
+            # '';
+
+            extraOptions =
+              let
+                nix-plugins = pkgs.nix-plugins.override {
+                  nixComponents = pkgs.nixVersions."nixComponents_${nix-version}";
+                };
+              in
+              ''
+                plugin-files = ${nix-plugins}/lib/nix/plugins
+                extra-builtins-file = ${self + /nix/extra-builtins.nix}
+              '' + lib.optionalString (!minimal) ''
+                !include ${config.sops.secrets.github-api-token.path}
+              '';
           };
-          # extraOptions = ''
-          #   plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins
-          #   extra-builtins-file = ${self + /nix/extra-builtins.nix}
-          # '' + lib.optionalString (!minimal) ''
-          #   !include ${config.sops.secrets.github-api-token.path}
-          # '';
-          extraOptions = ''
-            plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
-              buildInputs = [config.nix.package pkgs.boost];
-              patches = o.patches or [];
-            })}/lib/nix/plugins
-            extra-builtins-file = ${self + /nix/extra-builtins.nix}
-          '' + lib.optionalString (!minimal) ''
-            !include ${config.sops.secrets.github-api-token.path}
-          '';
-        };
 
         system.stateVersion = lib.mkDefault "23.05";
 
@@ -5858,7 +5927,7 @@ Mostly used to install some compilers and lsp's that I want to have available wh
       yubikey-touch-detector
       yubico-piv-tool
       cfssl
-      pcsctools
+      pcsc-tools
       pcscliteWithPolkit.out
 
       # ledger packages
@@ -5993,8 +6062,11 @@ Needed for control over system-wide privileges etc. Also I make sure that the ro
       pam.services = lib.mkIf (!minimal) {
         login.u2fAuth = true;
         sudo.u2fAuth = true;
-        swaylock.u2fAuth = true;
-        swaylock.fprintAuth = false;
+        sshd.u2fAuth = false;
+        swaylock = {
+          u2fAuth = true;
+          fprintAuth = false;
+        };
       };
       polkit.enable = lib.mkIf (!minimal) true;
 
@@ -6595,7 +6667,7 @@ in
   config = lib.mkIf config.swarselmodules.syncthing {
     services.syncthing = {
       enable = true;
-      package = pkgs.stable.syncthing;
+      package = pkgs.syncthing;
       user = mainUser;
       dataDir = homeDir;
       configDir = "${homeDir}/.config/syncthing";
@@ -6998,12 +7070,13 @@ This section houses the greetd related settings. I do not really want to use a d
       settings = {
         # initial_session.command = "sway";
         initial_session.command = "uwsm start -- sway-uwsm.desktop";
+            # --cmd sway
         default_session.command = ''
           ${pkgs.tuigreet}/bin/tuigreet \
             --time \
             --asterisks \
             --user-menu \
-            --cmd sway
+            --cmd "uwsm start -- sway-uwsm.desktop"
         '';
       };
     };
@@ -7068,7 +7141,7 @@ When a program does not work, start with nix-ldd <program>. T
         gdk-pixbuf
         glew110
         glib
-        stable.gnome2.GConf
+        gnome2.GConf
         pango
         gtk2
         gtk3
@@ -7117,8 +7190,8 @@ When a program does not work, start with nix-ldd <program>. T
         pipewire
         pixman
         speex
-        stdenv.cc.cc
-        stable.steam-fhsenv-without-steam
+        # stable.cc.cc
+        stable25_05.steam-fhsenv-without-steam
         systemd
         tbb
         vulkan-loader
@@ -7221,7 +7294,7 @@ in
   config = lib.mkIf config.swarselmodules.sway {
     programs.sway = {
       enable = true;
-      package = pkgs.dev.swayfx;
+      package = pkgs.swayfx;
       wrapperFeatures = {
         base = true;
         gtk = true;
@@ -11516,7 +11589,7 @@ in
     topology.self.services.${serviceName}.info = "https://${serviceDomain}";
     globals.services.${serviceName}.domain = serviceDomain;
 
-    swarselservices.${serviceName} = {
+    services.${serviceName} = {
       enable = true;
       package = pkgs.dev.homebox;
       database.createLocally = true;
@@ -12121,7 +12194,7 @@ in
       spice
       spice-gtk
       spice-protocol
-      win-virtio
+      virtio-win
       win-spice
 
       powershell
@@ -12178,8 +12251,8 @@ in
    -
    -
    3.2.5.11. microvm-host
    +
    +
    3.2.5.11. microvm-host

    Some standard options that should be set for every microvm host. @@ -12205,8 +12278,8 @@ Some standard options that should be set for every microvm host.

    -
    -
    3.2.5.12. microvm-guest
    +
    +
    3.2.5.12. microvm-guest

    Some standard options that should be set vor every microvm guest. We set the default @@ -12303,15 +12376,41 @@ in

    +
    +

    3.3.1. Steps to setup/upgrade home-manager only

    +
    +

    +Steps to get a home-manager only setup up and running: +

    + +
    +
    +- (Optional) Install openssh-server
+- Set hostname to the name specified in the home-manager configuration
+- Install nix, either:
+  - (if upgrading existing nix) Install nix version matching with version that `nix-plugins` is compiled against: `nix-env --install --file '<nixpkgs>' cacert -I nixpkgs=channel:nixpkgs-unstable --attr nixVersions.nix_x_yy`
+  - (or installing nix freshly):
+    - Grab the link to the install script of the needed nix version from https://releases.nixos.org/?prefix=nix, e.g. https://releases.nixos.org/nix/nix-2.30.1/install
+    - `bash <(curl -L https://releases.nixos.org/nix/nix-x-yy-y/install) --daemon`
+- add the following to /etc/nix/nix.conf to become a trusted user: `trusted-users = @wheel root swarsel`
+- For the first build:
+  1) Clone dotfile repo & change into it
+  2) `nix --extra-experimental-features 'nix-command flakes' develop`
+  3) `home-manager --extra-experimental-features 'nix-command flakes' switch --flake .#$(hostname) --show-trace`
+
+
    +
    +
    +
    -

    3.3.1. TODO Common

    +

    3.3.2. TODO Common

    TODO: split this into actual common and client sections

    -
    3.3.1.1. Imports
    +
    3.3.2.1. Imports

    This section sets up all the imports that are used in the home-manager section. @@ -12332,7 +12431,7 @@ in

    -
    3.3.1.2. Mirror home-manager shared options (automatically active)
    +
    3.3.2.2. Mirror home-manager shared options (automatically active)
    { lib, config, nixosConfig ? null, ... }:
@@ -12344,14 +12443,14 @@ let
 in
 {
   # config.swarselsystems = mirrorAttrs;
-  config.swarselsystems = lib.mkIf (nixosConfig != null) (mkDefaultCommonAttrs config.swarselsystems nixosConfig.swarselsystems);
+  config.swarselsystems = lib.mkIf (nixosConfig != null) (mkDefaultCommonAttrs config.swarselsystems (nixosConfig.swarselsystems or {}));
 }
    -
    3.3.1.3. General home-manager-settings
    +
    3.3.2.3. General home-manager-settings

    Again, we adapt nix to our needs, enable the home-manager command for non-NixOS machines (NixOS machines are using it as a module) and setting user information that I always keep the same. @@ -12360,81 +12459,99 @@ Again, we adapt nix to our needs, enable the home-manager command f 

    { self, lib, pkgs, config, ... }:
 let
-  inherit (config.swarselsystems) mainUser;
+  inherit (config.swarselsystems) mainUser flakePath isNixos isLinux;
 in
 {
   options.swarselmodules.general = lib.mkEnableOption "general nix settings";
-  config = lib.mkIf config.swarselmodules.general {
-    nix = lib.mkIf (!config.swarselsystems.isNixos) {
-      package = lib.mkForce pkgs.nixVersions.nix_2_28;
-      # extraOptions = ''
-      #   plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins
-      #   extra-builtins-file = ${self + /nix/extra-builtins.nix}
-      # '';
-      extraOptions = ''
-        plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: {
-          buildInputs = [config.nix.package pkgs.boost];
-          patches = o.patches or [];
-        })}/lib/nix/plugins
-        extra-builtins-file = ${self + /nix/extra-builtins.nix}
-      '';
-      settings = {
-        experimental-features = [
-          "nix-command"
-          "flakes"
-          "ca-derivations"
-          "cgroups"
-          "pipe-operators"
+  config =
+    let
+      nix-version = "2_30";
+    in
+    lib.mkIf config.swarselmodules.general {
+      nix = lib.mkIf (!config.swarselsystems.isNixos) {
+        package = lib.mkForce pkgs.nixVersions."nix_${nix-version}";
+        # extraOptions = ''
+        #   plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins
+        #   extra-builtins-file = ${self + /nix/extra-builtins.nix}
+        # '';
+        extraOptions =
+          let
+            nix-plugins = pkgs.nix-plugins.override {
+              nixComponents = pkgs.nixVersions."nixComponents_${nix-version}";
+            };
+          in
+          ''
+            plugin-files = ${nix-plugins}/lib/nix/plugins
+            extra-builtins-file = ${self + /nix/extra-builtins.nix}
+          '';
+        settings = {
+          experimental-features = [
+            "nix-command"
+            "flakes"
+            "ca-derivations"
+            "cgroups"
+            "pipe-operators"
+          ];
+          trusted-users = [ "@wheel" "${mainUser}" ];
+          connect-timeout = 5;
+          bash-prompt-prefix = "$SHLVL:\\w ";
+          bash-prompt = "$(if [[ $? -gt 0 ]]; then printf \"\"; else printf \"\"; fi)λ ";
+          fallback = true;
+          min-free = 128000000;
+          max-free = 1000000000;
+          auto-optimise-store = true;
+          warn-dirty = false;
+          max-jobs = 1;
+          use-cgroups = lib.mkIf isLinux true;
+        };
+      };
+
+      nixpkgs.overlays = lib.mkIf isNixos (lib.mkForce null);
+
+      programs = {
+        # home-manager.enable = lib.mkIf (!isNixos) true;
+        man = {
+          enable = true;
+          generateCaches = true;
+        };
+      };
+
+      targets.genericLinux.enable = lib.mkIf (!isNixos) true;
+
+      home = {
+        username = lib.mkDefault mainUser;
+        homeDirectory = lib.mkDefault "/home/${mainUser}";
+        stateVersion = lib.mkDefault "23.05";
+        keyboard.layout = "us";
+        sessionVariables = {
+          FLAKE = "/home/${mainUser}/.dotfiles";
+        };
+        extraOutputsToInstall = [
+          "doc"
+          "info"
+          "devdoc"
+        ];
+        packages = lib.mkIf (!isNixos) [
+          (pkgs.symlinkJoin {
+            name = "home-manager";
+            buildInputs = [ pkgs.makeWrapper ];
+            paths = [ pkgs.home-manager ];
+            postBuild = ''
+              wrapProgram $out/bin/home-manager \
+              --append-flags '--flake ${flakePath}#$(hostname)'
+            '';
+          })
         ];
-        trusted-users = [ "@wheel" "${mainUser}" ];
-        connect-timeout = 5;
-        bash-prompt-prefix = "$SHLVL:\\w ";
-        bash-prompt = "$(if [[ $? -gt 0 ]]; then printf \"\"; else printf \"\"; fi)λ ";
-        fallback = true;
-        min-free = 128000000;
-        max-free = 1000000000;
-        auto-optimise-store = true;
-        warn-dirty = false;
-        max-jobs = 1;
-        use-cgroups = lib.mkIf config.swarselsystems.isLinux true;
       };
     };
 
-    nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null);
-
-    programs = {
-      home-manager.enable = lib.mkIf (!config.swarselsystems.isNixos) true;
-      man = {
-        enable = true;
-        generateCaches = true;
-      };
-    };
-
-    targets.genericLinux.enable = lib.mkIf (!config.swarselsystems.isNixos) true;
-
-    home = {
-      username = lib.mkDefault mainUser;
-      homeDirectory = lib.mkDefault "/home/${mainUser}";
-      stateVersion = lib.mkDefault "23.05";
-      keyboard.layout = "us";
-      sessionVariables = {
-        FLAKE = "/home/${mainUser}/.dotfiles";
-      };
-      extraOutputsToInstall = [
-        "doc"
-        "info"
-        "devdoc"
-      ];
-    };
-  };
-
 }
    -
    3.3.1.4. nixGL
    +
    3.3.2.4. nixGL

    This integrates nixGL into home-manager. NixGL provies OpenGL and Vulkan APIs to nix installed utilities. This is needed for graphical applications on non-NixOS systems. @@ -12451,7 +12568,7 @@ It can be set to either:

    -
    { lib, config, nixgl, ... }:
+
    { lib, config, inputs, ... }:
 {
   options.swarselmodules.nixgl = lib.mkEnableOption "nixgl settings";
   options.swarselsystems = {
@@ -12463,11 +12580,11 @@ It can be set to either:
   };
   config = lib.mkIf config.swarselmodules.nixgl {
     nixGL = lib.mkIf (!config.swarselsystems.isNixos) {
-      inherit (nixgl) packages;
+      inherit (inputs.nixgl) packages;
       defaultWrapper = lib.mkDefault "mesa";
       vulkan.enable = lib.mkDefault false;
-      prime = lib.mkIf config.swarselsystem.isSecondaryGpu {
-        card = config.swarselsystem.secondaryGpuCard;
+      prime = lib.mkIf config.swarselsystems.isSecondaryGpu {
+        card = config.swarselsystems.secondaryGpuCard;
         installScript = "mesa";
       };
       offloadWrapper = lib.mkIf config.swarselsystem.isSecondaryGpu "mesaPrime";
@@ -12483,7 +12600,7 @@ It can be set to either:
    -
    3.3.1.5. Installed packages
    +
    3.3.2.5. Installed packages

    Here are defined some packages that I would like to use across all my machines. Most of these should not require further setup. Notably the cura package is severely outdated on nixpkgs, so I just fetch a more recent AppImage and run that instead. @@ -12498,7 +12615,7 @@ Programming languages and default lsp's are defined here: -

    3.3.1.5.1. Packaged
    +
    3.3.2.5.1. Packaged

    This holds packages that I can use as provided, or with small modifications (as in the texlive package that needs special configuration). @@ -12549,7 +12666,7 @@ This holds packages that I can use as provided, or with small modifications (as sshfs fuse # ventoy - poppler_utils + poppler-utils vdhcoapp # nix @@ -12637,7 +12754,7 @@ This holds packages that I can use as provided, or with small modifications (as unzip #nautilus - stable.nautilus + nautilus xfce.tumbler libgsf @@ -12654,7 +12771,7 @@ This holds packages that I can use as provided, or with small modifications (as # the following packages are used (in some way) by waybar # playerctl - stable.pavucontrol + pavucontrol # stable.pamixer # gnome.gnome-clocks # wlogout @@ -12676,15 +12793,15 @@ This holds packages that I can use as provided, or with small modifications (as # latex and related packages (texlive.combine { inherit (pkgs.texlive) scheme-full - dvisvgm dvipng# for preview and export as html - wrapfig amsmath ulem hyperref capt-of; + dvisvgm dvipng# for preview and export as html + wrapfig amsmath ulem hyperref capt-of; }) # font stuff nerd-fonts.fira-mono nerd-fonts.fira-code nerd-fonts.symbols-only - noto-fonts-emoji + noto-fonts-color-emoji font-awesome_5 noto-fonts noto-fonts-cjk-sans @@ -12696,7 +12813,7 @@ This holds packages that I can use as provided, or with small modifications (as

    -
    3.3.1.5.2. Self-defined
    +
    3.3.2.5.2. Self-defined

    This is just a separate container for derivations defined in Packages. This is a good idea so that I do not lose track of package names I have defined myself, as this was once a problem in the past already. @@ -12747,7 +12864,7 @@ This is just a separate container for derivations defined in -

    3.3.1.6. sops
    +
    3.3.2.6. sops

    I use sops-nix to handle secrets that I want to have available on my machines at all times. Procedure to add a new machine: @@ -12767,41 +12884,37 @@ Since we are using the home-manager implementation here, we need to specify the

    -
    { config, lib, ... }:
+
    { config, lib, inputs, ... }:
 let
   inherit (config.swarselsystems) homeDir;
 in
-{
-  options.swarselmodules.sops = lib.mkEnableOption "sops settings";
-  config = lib.mkIf config.swarselmodules.sops {
-    sops = {
-      age.sshKeyPaths = [ "${homeDir}/.ssh/sops" "${homeDir}/.ssh/ssh_host_ed25519_key" ];
-      defaultSopsFile = "${homeDir}/.dotfiles/secrets/general/secrets.yaml";
+  {
+    options.swarselmodules.sops = lib.mkEnableOption "sops settings";
+    config = lib.optionalAttrs (inputs ? sops)  {
+      sops = {
+        age.sshKeyPaths = [ "${homeDir}/.ssh/sops" "${homeDir}/.ssh/ssh_host_ed25519_key" ];
+        defaultSopsFile = "${homeDir}/.dotfiles/secrets/general/secrets.yaml";
 
-      validateSopsFiles = false;
+        validateSopsFiles = false;
+      };
     };
-  };
-}
+  }
    -
    3.3.1.7. Yubikey
    +
    3.3.2.7. Yubikey
    -
    { lib, config, nixosConfig ? config, ... }:
+
    { lib, config, inputs, nixosConfig ? config, ... }:
 let
   inherit (config.swarselsystems) homeDir;
 in
 {
   options.swarselmodules.yubikey = lib.mkEnableOption "yubikey settings";
 
-  config = lib.mkIf config.swarselmodules.yubikey {
-
-    sops.secrets = lib.mkIf (!config.swarselsystems.isPublic) {
-      u2f-keys = { path = "${homeDir}/.config/Yubico/u2f_keys"; };
-    };
+  config = lib.mkIf config.swarselmodules.yubikey ({
 
     pam.yubico.authorizedYubiKeys = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) {
       ids = [
@@ -12809,14 +12922,18 @@ in
         nixosConfig.repo.secrets.common.yubikeys.dev2
       ];
     };
-  };
+  } // lib.optionalAttrs (inputs ? sops) {
+    sops.secrets = lib.mkIf (!config.swarselsystems.isPublic) {
+      u2f-keys = { path = "${homeDir}/.config/Yubico/u2f_keys"; };
+    };
+  });
 }
    -
    3.3.1.8. SSH Machines
    +
    3.3.2.8. SSH Machines

    It is very convenient to have SSH aliases in place for machines that I use. This is mainly used for some server machines and some university clusters. We also enable agent forwarding to have our Yubikey SSH key accessible on the remote host. @@ -12855,6 +12972,10 @@ It is very convenient to have SSH aliases in place for machines that I use. This hostname = "192.168.1.136"; user = "root"; }; + "dgx" = { + hostname = "192.168.48.200"; + user = "swarsel"; + }; "winters" = { hostname = "192.168.178.24"; user = "root"; @@ -12888,7 +13009,7 @@ It is very convenient to have SSH aliases in place for machines that I use. This

    -
    3.3.1.9. Theme (stylix)
    +
    3.3.2.9. Theme (stylix)

    These section allows home-manager to allow theme settings, and handles some other appearance-related settings like cursor styles. Interestingly, system icons (adwaita) still need to be setup on system-level, and will break if defined here. @@ -12903,13 +13024,14 @@ This section has been notably empty ever since switching to stylix. Only Emacs i

    -
    { lib, config, vars, ... }:
+
    { self, lib, config, vars, ... }:
 {
   options.swarselmodules.stylix = lib.mkEnableOption "stylix settings";
   config = lib.mkIf config.swarselmodules.stylix {
-    stylix = lib.mkIf (!config.swarselsystems.isNixos) (lib.recursiveUpdate
+    stylix = lib.mkIf (!config.swarselsystems.isNixos && config.swarselmodules.stylix) (lib.recursiveUpdate
       {
-        image = config.swarselsystems.wallpaper;
+        enable = true;
+        base16Scheme = "${self}/files/stylix/swarsel.yaml";
         targets = vars.stylixHomeTargets;
       }
       vars.stylix);
@@ -12920,7 +13042,7 @@ This section has been notably empty ever since switching to stylix. Only Emacs i
    -
    3.3.1.10. Desktop Entries, MIME types (xdg)
    +
    3.3.2.10. Desktop Entries, MIME types (xdg)

    Some programs lack a dmenu launcher - I define them myself here. @@ -13043,7 +13165,7 @@ TODO: Non-NixOS machines (=sp3) should not use these by default, but instead the

    -
    3.3.1.11. Linking dotfiles (Symlinks home.file)
    +
    3.3.2.11. Linking dotfiles (Symlinks home.file)

    This section should be used in order to symlink already existing configuration files using `home.file` and setting session variables using `home.sessionVariables`. @@ -13096,7 +13218,7 @@ Also in firefox `about:config > toolkit.legacyUserProfileCustomizations.style

    -
    3.3.1.13. General Programs: bottom, imv, less, lesspipe, sioyek, bat, carapace, wlogout, swayr, yt-dlp, mpv, jq, nix-index, ripgrep, pandoc, fzf, zoxide, timidity
    +
    3.3.2.13. General Programs: bottom, imv, less, lesspipe, sioyek, bat, carapace, wlogout, swayr, yt-dlp, mpv, jq, nix-index, ripgrep, pandoc, fzf, zoxide, timidity

    This section is for programs that require no further configuration. zsh Integration is enabled by default for these. @@ -13152,96 +13274,103 @@ This section is for programs that require no further configuration. zsh Integrat 

    { lib, config, pkgs, ... }:
-    {
-      options.swarselmodules.programs = lib.mkEnableOption "programs settings";
-      config = lib.mkIf config.swarselmodules.programs {
-        programs = {
-          bat = {
-            enable = true;
-            extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
-          };
-          bottom.enable = true;
-          carapace.enable = true;
-          fzf = {
-            enable = true;
-            enableBashIntegration = false;
-            enableZshIntegration = false;
-          };
-          imv.enable = true;
-          jq.enable = true;
-          less.enable = true;
-          lesspipe.enable = true;
-          mpv.enable = true;
-          pandoc.enable = true;
-          rclone.enable = true;
-          ripgrep.enable = true;
-          sioyek.enable = true;
-          swayr.enable = true;
-          timidity.enable = true;
-          wlogout ={
-            enable = true;
-            layout = [
-              {
-                label = "lock";
-                action = "loginctl lock-session";
-                text = "Lock";
-                keybind = "l";
-                circular = true;
-              }
-              {
-                label = "hibernate";
-                action = "systemctl hibernate";
-                text = "Hibernate";
-                keybind = "h";
-                circular = true;
-              }
-              {
-                label = "logout";
-                action = "loginctl terminate-user $USER";
-                text = "Logout";
-                keybind = "u";
-                circular = true;
-              }
-              {
-                label = "shutdown";
-                action = "systemctl poweroff";
-                text = "Shutdown";
-                keybind = "p";
-                circular = true;
-              }
-              {
-                label = "suspend";
-                action = "systemctl suspend";
-                text = "Suspend";
-                keybind = "s";
-                circular = true;
-              }
-              {
-                label = "reboot";
-                action = "systemctl reboot";
-                text = "Reboot";
-                keybind = "r";
-                circular = true;
-              }
-            ];
-          };
-          yt-dlp.enable = true;
-          zoxide = {
-            enable = true;
-            enableZshIntegration = true;
-            options = [
-              "--cmd cd"
-            ];
-          };
-        };
+{
+  options.swarselmodules.programs = lib.mkEnableOption "programs settings";
+  config = lib.mkIf config.swarselmodules.programs {
+    programs = {
+      bat = {
+        enable = true;
+        extraPackages = [
+          pkgs.bat-extras.batdiff
+          pkgs.bat-extras.batman
+          pkgs.bat-extras.batwatch
+        ] ++ [
+          pkgs.stable.bat-extras.batgrep
+        ];
+        # extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
       };
-    }
+      bottom.enable = true;
+      carapace.enable = true;
+      fzf = {
+        enable = true;
+        enableBashIntegration = false;
+        enableZshIntegration = false;
+      };
+      imv.enable = true;
+      jq.enable = true;
+      less.enable = true;
+      lesspipe.enable = true;
+      mpv.enable = true;
+      pandoc.enable = true;
+      rclone.enable = true;
+      ripgrep.enable = true;
+      sioyek.enable = true;
+      swayr.enable = true;
+      timidity.enable = true;
+      wlogout = {
+        enable = true;
+        layout = [
+          {
+            label = "lock";
+            action = "loginctl lock-session";
+            text = "Lock";
+            keybind = "l";
+            circular = true;
+          }
+          {
+            label = "hibernate";
+            action = "systemctl hibernate";
+            text = "Hibernate";
+            keybind = "h";
+            circular = true;
+          }
+          {
+            label = "logout";
+            action = "loginctl terminate-user $USER";
+            text = "Logout";
+            keybind = "u";
+            circular = true;
+          }
+          {
+            label = "shutdown";
+            action = "systemctl poweroff";
+            text = "Shutdown";
+            keybind = "p";
+            circular = true;
+          }
+          {
+            label = "suspend";
+            action = "systemctl suspend";
+            text = "Suspend";
+            keybind = "s";
+            circular = true;
+          }
+          {
+            label = "reboot";
+            action = "systemctl reboot";
+            text = "Reboot";
+            keybind = "r";
+            circular = true;
+          }
+        ];
+      };
+      yt-dlp.enable = true;
+      zoxide = {
+        enable = true;
+        enableZshIntegration = true;
+        options = [
+          "--cmd cd"
+        ];
+      };
+    };
+  };
+}
    -
    3.3.1.14. nix-index
    +
    3.3.2.14. nix-index

    nix-index provides a way to find out which packages are provided by which derivations. By default it also comes with a replacement for command-not-found.sh, however, the implementation is based on a channel based setup. I like consistency, so I replace the command with one that provides a flakes-based output. @@ -13263,22 +13392,22 @@ nix-index provides a way to find out which packages are provided by which deriva ''; in - { - enable = true; - package = pkgs.symlinkJoin { - name = "nix-index"; - paths = [ commandNotFound ]; + { + enable = true; + package = pkgs.symlinkJoin { + name = "nix-index"; + paths = [ commandNotFound ]; + }; }; - }; }; }

    -
    -
    3.3.1.15. nix-your-shell
    -
    +
    +
    3.3.2.15. nix-your-shell
    +
    { lib, config, ... }:
 let
@@ -13298,7 +13427,7 @@ in
    -
    3.3.1.16. password-store
    +
    3.3.2.16. password-store

    Enables password store with the pass-otp extension which allows me to store and generate one-time-passwords. @@ -13323,7 +13452,7 @@ Enables password store with the pass-otp extension which allows me

    -
    3.3.1.17. direnv
    +
    3.3.2.17. direnv

    Enables direnv, which I use for nearly all of my nix dev flakes. @@ -13346,7 +13475,7 @@ Enables direnv, which I use for nearly all of my nix dev flakes.

    -
    3.3.1.18. eza
    +
    3.3.2.18. eza

    Eza provides me with a better ls command and some other useful aliases. @@ -13373,7 +13502,7 @@ Eza provides me with a better ls command and some other useful alia

    -
    3.3.1.19. atuin
    +
    3.3.2.19. atuin
    { lib, config, globals, ... }:
@@ -13399,7 +13528,7 @@ in
    -
    3.3.1.20. git
    +
    3.3.2.20. git

    Here I set up my git config, automatic signing of commits, useful aliases for my ost used commands (for when I am not using Magit) as well as a git template defined in Linking dotfiles. @@ -13419,26 +13548,29 @@ in programs.git = { enable = true; } // lib.optionalAttrs (!minimal) { - aliases = { - a = "add"; - c = "commit"; - cl = "clone"; - co = "checkout"; - b = "branch"; - i = "init"; - m = "merge"; - s = "status"; - r = "restore"; - p = "pull"; - pp = "push"; + settings = { + alias = { + a = "add"; + c = "commit"; + cl = "clone"; + co = "checkout"; + b = "branch"; + i = "init"; + m = "merge"; + s = "status"; + r = "restore"; + p = "pull"; + pp = "push"; + }; + user = { + email = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) (lib.mkDefault address1); + name = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) fullName; + }; }; signing = { key = "0x76FD3810215AE097"; signByDefault = true; }; - userEmail = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) (lib.mkDefault address1); - userName = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) fullName; - difftastic.enable = true; lfs.enable = true; includes = [ { @@ -13453,6 +13585,7 @@ in } ]; }; + programs.difftastic.enable = lib.mkIf (!minimal) true; }; } @@ -13460,7 +13593,7 @@ in

    -
    3.3.1.21. Fuzzel
    +
    3.3.2.21. Fuzzel

    Here I only need to set basic layout options - the rest is being managed by stylix. @@ -13489,7 +13622,7 @@ Here I only need to set basic layout options - the rest is being managed by styl

    -
    3.3.1.22. Starship
    +
    3.3.2.22. Starship

    Starship makes my zsh look cooler! I have symbols for most programming languages and toolchains, also I build my own powerline. @@ -13625,7 +13758,7 @@ Starship makes my zsh look cooler! I have symbols for most programm

    -
    3.3.1.23. Kitty
    +
    3.3.2.23. Kitty

    Kitty is the terminal emulator of choice for me, it is nice to configure using nix, fast, and has a nice style. @@ -13656,7 +13789,7 @@ The theme is handled by stylix.

    -
    3.3.1.24. zsh
    +
    3.3.2.24. zsh

    zsh is the most convenient shell for me and it happens to be super neat to configure within home manager. @@ -13700,9 +13833,9 @@ Currently I only use it as before with initExtra though.

    -
    { config, pkgs, lib, minimal, globals, nixosConfig ? config, ... }:
+
    { config, pkgs, lib, minimal, inputs, globals, nixosConfig ? config, ... }:
 let
-  inherit (config.swarselsystems) flakePath;
+  inherit (config.swarselsystems) flakePath isNixos;
   crocDomain = globals.services.croc.domain;
 in
 {
@@ -13714,12 +13847,7 @@ in
     };
   };
   config = lib.mkIf config.swarselmodules.zsh
-    {
-
-      sops.secrets = lib.mkIf (!config.swarselsystems.isPublic && !config.swarselsystems.isNixos) {
-        croc-password = { };
-        github-nixpkgs-review-token = { };
-      };
+    ({
 
       programs.zsh = {
         enable = true;
@@ -13728,12 +13856,10 @@ in
         shellAliases = lib.recursiveUpdate
           {
             hg = "history | grep";
-            hmswitch = "home-manager --flake ${flakePath}#$(whoami)@$(hostname) switch |& nom";
-            # nswitch = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) --show-trace --log-format internal-json -v switch |& nom --json";
-            nswitch = "cd ${flakePath}; swarsel-deploy $(hostname) switch; cd -;";
-            nboot = "cd ${flakePath}; swarsel-deploy $(hostname) boot; cd -;";
-            ndry = "cd ${flakePath}; swarsel-deploy $(hostname) dry-activate; cd -;";
-            # nboot = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) --show-trace --log-format internal-json -v boot |& nom --json";
+            hmswitch = lib.mkIf (!isNixos) "${lib.getExe pkgs.home-manager} --flake ${flakePath}#$(hostname) switch |& nom";
+            nswitch = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) switch; cd -;";
+            nboot = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) boot; cd -;";
+            ndry = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) dry-activate; cd -;";
             magit = "emacsclient -nc -e \"(magit-status)\"";
             config = "git --git-dir=$HOME/.cfg/ --work-tree=$HOME";
             g = "git";
@@ -13755,7 +13881,7 @@ in
             cc = "wl-copy";
             build-topology = "nix build .#topology.x86_64-linux.config.output";
             build-iso = "nix build --print-out-paths .#live-iso";
-            nix-review- = "nix run nixpkgs#nixpkgs-review -- rev HEAD";
+            nix-review-local = "nix run nixpkgs#nixpkgs-review -- rev HEAD";
             nix-review-post = "nix run nixpkgs#nixpkgs-review -- pr --post-result --systems linux";
           }
           config.swarselsystems.shellAliases;
@@ -13831,20 +13957,27 @@ in
         '';
         sessionVariables = lib.mkIf (!config.swarselsystems.isPublic) {
           CROC_RELAY = crocDomain;
-          CROC_PASS = "$(cat ${nixosConfig.sops.secrets.croc-password.path})";
-          GITHUB_TOKEN = "$(cat ${nixosConfig.sops.secrets.github-nixpkgs-review-token.path})";
+          CROC_PASS = "$(cat ${nixosConfig.sops.secrets.croc-password.path or ""})";
+          GITHUB_TOKEN = "$(cat ${nixosConfig.sops.secrets.github-nixpkgs-review-token.path or ""})";
           QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.libsForQt5.qt5.qtbase.bin}/lib/qt-${pkgs.libsForQt5.qt5.qtbase.version}/plugins";
           # QTWEBENGINE_CHROMIUM_FLAGS = "--no-sandbox";
         };
       };
-    };
+    } // lib.optionalAttrs (inputs ? sops) {
+
+      sops.secrets = lib.mkIf (!config.swarselsystems.isPublic && !config.swarselsystems.isNixos) {
+        croc-password = { };
+        github-nixpkgs-review-token = { };
+      };
+
+      });
 }
    -
    3.3.1.25. zellij
    +
    3.3.2.25. zellij
    { self, lib, config, pkgs, ... }:
@@ -13872,7 +14005,7 @@ in
    -
    3.3.1.26. tmux
    +
    3.3.2.26. tmux
    { lib, config, pkgs, ... }:
@@ -13981,14 +14114,14 @@ in
    -
    3.3.1.27. Mail
    +
    3.3.2.27. Mail

    Normally I use 4 mail accounts - here I set them all up. Three of them are Google accounts (sadly), which are a chore to setup. The last is just a sender account that I setup SMTP for here.

    -
    { lib, config, nixosConfig ? config, ... }:
+
    { lib, config, inputs, nixosConfig ? config, ... }:
 let
   inherit (nixosConfig.repo.secrets.common.mail) address1 address2 address2-name address3 address3-name address4 address4-user address4-host;
   inherit (nixosConfig.repo.secrets.common) fullName;
@@ -13996,195 +14129,196 @@ let
 in
 {
   options.swarselmodules.mail = lib.mkEnableOption "mail settings";
-  config = lib.mkIf config.swarselmodules.mail {
+  config = lib.mkIf config.swarselmodules.mail
+    ({
 
-    sops.secrets = lib.mkIf (!config.swarselsystems.isPublic && !config.swarselsystems.isNixos) {
-      address1-token = { path = "${xdgDir}/secrets/address1-token"; };
-      address2-token = { path = "${xdgDir}/secrets/address2-token"; };
-      address3-token = { path = "${xdgDir}/secrets/address3-token"; };
-      address4-token = { path = "${xdgDir}/secrets/address4-token"; };
-    };
-
-    programs = {
-      mbsync = {
-        enable = true;
-      };
-      msmtp = {
-        enable = true;
-      };
-      mu = {
-        enable = true;
-      };
-    };
-
-    services.mbsync = {
-      enable = true;
-    };
-    # this is needed so that mbsync can use the passwords from sops
-    systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
-
-    programs.thunderbird = {
-      enable = true;
-      profiles.default = {
-        isDefault = true;
-        withExternalGnupg = true;
-        settings = {
-          "mail.identity.default.archive_enabled" = true;
-          "mail.identity.default.archive_keep_folder_structure" = true;
-          "mail.identity.default.compose_html" = false;
-          "mail.identity.default.protectSubject" = true;
-          "mail.identity.default.reply_on_top" = 1;
-          "mail.identity.default.sig_on_reply" = false;
-          "mail.identity.default.sig_bottom" = false;
-
-          "gfx.webrender.all" = true;
-          "gfx.webrender.enabled" = true;
+      programs = {
+        mbsync = {
+          enable = true;
+        };
+        msmtp = {
+          enable = true;
+        };
+        mu = {
+          enable = true;
         };
       };
 
-      settings = {
-        "mail.server.default.allow_utf8_accept" = true;
-        "mail.server.default.max_articles" = 1000;
-        "mail.server.default.check_all_folders_for_new" = true;
-        "mail.show_headers" = 1;
-        "mail.identity.default.auto_quote" = true;
-        "mail.identity.default.attachPgpKey" = true;
-        "mailnews.default_sort_order" = 2;
-        "mailnews.default_sort_type" = 18;
-        "mailnews.default_view_flags" = 0;
-        "mailnews.sort_threads_by_root" = true;
-        "mailnews.headers.showMessageId" = true;
-        "mailnews.headers.showOrganization" = true;
-        "mailnews.headers.showReferences" = true;
-        "mailnews.headers.showUserAgent" = true;
-        "mail.imap.expunge_after_delete" = true;
-        "mail.server.default.delete_model" = 2;
-        "mail.warn_on_delete_from_trash" = false;
-        "mail.warn_on_shift_delete" = false;
-        "toolkit.telemetry.enabled" = false;
-        "toolkit.telemetry.rejected" = true;
-        "toolkit.telemetry.prompted" = 2;
-        "app.update.auto" = false;
-        "privacy.donottrackheader.enabled" = true;
+      services.mbsync = {
+        enable = true;
       };
-    };
+      # this is needed so that mbsync can use the passwords from sops
+      systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
 
-    xdg.mimeApps.defaultApplications = {
-      "x-scheme-handler/mailto" = [ "thunderbird.desktop" ];
-      "x-scheme-handler/mid" = [ "thunderbird.desktop" ];
-      "message/rfc822" = [ "thunderbird.desktop" ];
-    };
+      programs.thunderbird = {
+        enable = true;
+        profiles.default = {
+          isDefault = true;
+          withExternalGnupg = true;
+          settings = {
+            "mail.identity.default.archive_enabled" = true;
+            "mail.identity.default.archive_keep_folder_structure" = true;
+            "mail.identity.default.compose_html" = false;
+            "mail.identity.default.protectSubject" = true;
+            "mail.identity.default.reply_on_top" = 1;
+            "mail.identity.default.sig_on_reply" = false;
+            "mail.identity.default.sig_bottom" = false;
 
-    accounts = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) {
-      email =
-        let
-          defaultSettings = {
-            imap = {
-              host = "imap.gmail.com";
-              port = 993;
-              tls.enable = true; # SSL/TLS
-            };
-            smtp = {
-              host = "smtp.gmail.com";
-              port = 465;
-              tls.enable = true; # SSL/TLS
-            };
-            thunderbird = {
-              enable = true;
-              profiles = [ "default" ];
-            };
-            mu.enable = true;
-            msmtp = {
-              enable = true;
-            };
-            mbsync = {
-              enable = true;
-              create = "maildir";
-              expunge = "both";
-              patterns = [ "*" "![Gmail]*" "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" ];
-              extraConfig = {
-                channel = {
-                  Sync = "All";
-                };
-                account = {
-                  Timeout = 120;
-                  PipelineDepth = 1;
-                  AuthMechs = "LOGIN";
-                };
-              };
-            };
+            "gfx.webrender.all" = true;
+            "gfx.webrender.enabled" = true;
           };
-        in
-        {
-          maildirBasePath = "Mail";
-          accounts = {
-            swarsel = {
-              address = address4;
-              userName = address4-user;
-              realName = fullName;
-              passwordCommand = "cat ${nixosConfig.sops.secrets.address4-token.path}";
-              smtp = {
-                host = address4-host;
-                port = 587;
-                tls = {
-                  enable = true;
-                  useStartTls = true;
-                };
+        };
+
+        settings = {
+          "mail.server.default.allow_utf8_accept" = true;
+          "mail.server.default.max_articles" = 1000;
+          "mail.server.default.check_all_folders_for_new" = true;
+          "mail.show_headers" = 1;
+          "mail.identity.default.auto_quote" = true;
+          "mail.identity.default.attachPgpKey" = true;
+          "mailnews.default_sort_order" = 2;
+          "mailnews.default_sort_type" = 18;
+          "mailnews.default_view_flags" = 0;
+          "mailnews.sort_threads_by_root" = true;
+          "mailnews.headers.showMessageId" = true;
+          "mailnews.headers.showOrganization" = true;
+          "mailnews.headers.showReferences" = true;
+          "mailnews.headers.showUserAgent" = true;
+          "mail.imap.expunge_after_delete" = true;
+          "mail.server.default.delete_model" = 2;
+          "mail.warn_on_delete_from_trash" = false;
+          "mail.warn_on_shift_delete" = false;
+          "toolkit.telemetry.enabled" = false;
+          "toolkit.telemetry.rejected" = true;
+          "toolkit.telemetry.prompted" = 2;
+          "app.update.auto" = false;
+          "privacy.donottrackheader.enabled" = true;
+        };
+      };
+
+      xdg.mimeApps.defaultApplications = {
+        "x-scheme-handler/mailto" = [ "thunderbird.desktop" ];
+        "x-scheme-handler/mid" = [ "thunderbird.desktop" ];
+        "message/rfc822" = [ "thunderbird.desktop" ];
+      };
+
+      accounts = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) {
+        email =
+          let
+            defaultSettings = {
+              imap = {
+                host = "imap.gmail.com";
+                port = 993;
+                tls.enable = true; # SSL/TLS
               };
-              mu.enable = false;
+              smtp = {
+                host = "smtp.gmail.com";
+                port = 465;
+                tls.enable = true; # SSL/TLS
+              };
+              thunderbird = {
+                enable = true;
+                profiles = [ "default" ];
+              };
+              mu.enable = true;
               msmtp = {
                 enable = true;
               };
               mbsync = {
-                enable = false;
+                enable = true;
+                create = "maildir";
+                expunge = "both";
+                patterns = [ "*" "![Gmail]*" "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" ];
+                extraConfig = {
+                  channel = {
+                    Sync = "All";
+                  };
+                  account = {
+                    Timeout = 120;
+                    PipelineDepth = 1;
+                    AuthMechs = "LOGIN";
+                  };
+                };
               };
             };
-
-            leon = lib.recursiveUpdate
-              {
-                primary = true;
-                address = address1;
-                userName = address1;
+          in
+          {
+            maildirBasePath = "Mail";
+            accounts = {
+              swarsel = {
+                address = address4;
+                userName = address4-user;
                 realName = fullName;
-                passwordCommand = "cat ${nixosConfig.sops.secrets.address1-token.path}";
-                gpg = {
-                  key = "0x76FD3810215AE097";
-                  signByDefault = true;
+                passwordCommand = "cat ${nixosConfig.sops.secrets.address4-token.path}";
+                smtp = {
+                  host = address4-host;
+                  port = 587;
+                  tls = {
+                    enable = true;
+                    useStartTls = true;
+                  };
                 };
-              }
-              defaultSettings;
+                mu.enable = false;
+                msmtp = {
+                  enable = true;
+                };
+                mbsync = {
+                  enable = false;
+                };
+              };
 
-            nautilus = lib.recursiveUpdate
-              {
-                primary = false;
-                address = address2;
-                userName = address2;
-                realName = address2-name;
-                passwordCommand = "cat ${nixosConfig.sops.secrets.address2-token.path}";
-              }
-              defaultSettings;
+              leon = lib.recursiveUpdate
+                {
+                  primary = true;
+                  address = address1;
+                  userName = address1;
+                  realName = fullName;
+                  passwordCommand = "cat ${nixosConfig.sops.secrets.address1-token.path}";
+                  gpg = {
+                    key = "0x76FD3810215AE097";
+                    signByDefault = true;
+                  };
+                }
+                defaultSettings;
 
-            mrswarsel = lib.recursiveUpdate
-              {
-                primary = false;
-                address = address3;
-                userName = address3;
-                realName = address3-name;
-                passwordCommand = "cat ${nixosConfig.sops.secrets.address3-token.path}";
-              }
-              defaultSettings;
+              nautilus = lib.recursiveUpdate
+                {
+                  primary = false;
+                  address = address2;
+                  userName = address2;
+                  realName = address2-name;
+                  passwordCommand = "cat ${nixosConfig.sops.secrets.address2-token.path}";
+                }
+                defaultSettings;
 
+              mrswarsel = lib.recursiveUpdate
+                {
+                  primary = false;
+                  address = address3;
+                  userName = address3;
+                  realName = address3-name;
+                  passwordCommand = "cat ${nixosConfig.sops.secrets.address3-token.path}";
+                }
+                defaultSettings;
+
+            };
           };
-        };
-    };
-  };
+      };
+    } // lib.optionalAttrs (inputs ? sops) {
+      sops.secrets = lib.mkIf (!config.swarselsystems.isPublic && !config.swarselsystems.isNixos) {
+        address1-token = { path = "${xdgDir}/secrets/address1-token"; };
+        address2-token = { path = "${xdgDir}/secrets/address2-token"; };
+        address3-token = { path = "${xdgDir}/secrets/address3-token"; };
+        address4-token = { path = "${xdgDir}/secrets/address4-token"; };
+      };
+    });
 }
    -
    3.3.1.28. Home-manager: Emacs
    +
    3.3.2.28. Home-manager: Emacs

    By using the emacs-overlay NixOS module, I can install all Emacs packages that I want to use right through NixOS. This is done by passing my init.el file to the configuration which will then be parsed upon system rebuild, looking for use-package sections in the Elisp code. Also I define here the style of Emacs that I want to run - I am going with native Wayland Emacs here (emacs-pgtk). All of the nice options such as tree-sitter support are enabled by default, so I do not need to adjust the build process. @@ -14202,23 +14336,8 @@ let in { options.swarselmodules.emacs = lib.mkEnableOption "emacs settings"; - config = lib.mkIf config.swarselmodules.emacs { + config = lib.mkIf config.swarselmodules.emacs ({ # needed for elfeed - sops = lib.mkIf (!isPublic && !isNixos) { - secrets = { - fever-pw = { path = "${homeDir}/.emacs.d/.fever"; }; - emacs-radicale-pw = { }; - }; - templates = { - authinfo = { - path = "${homeDir}/.emacs.d/.authinfo"; - content = '' - machine ${globals.services.radicale.domain} login ${radicaleUser} password ${config.sops.placeholder.emacs-radicale-pw} - ''; - }; - }; - }; - # enable emacs overlay for bleeding edge features # also read init.el file and install use-package packages programs.emacs = { @@ -14234,6 +14353,7 @@ in epkgs.lsp-bridge epkgs.doom-themes epkgs.vterm + # pkgs.stable.emacs.pkgs.elpaPackages.tramp # use the unstable version from elpa epkgs.treesit-grammars.with-all-grammars # build the rest of the packages myself @@ -14288,14 +14408,32 @@ in socketActivation.enable = false; startWithUserSession = "graphical"; }; - }; + + } // lib.optionalAttrs (inputs ? sops) { + + sops = lib.mkIf (!isPublic && !isNixos) { + secrets = { + fever-pw = { path = "${homeDir}/.emacs.d/.fever"; }; + emacs-radicale-pw = { }; + }; + templates = { + authinfo = { + path = "${homeDir}/.emacs.d/.authinfo"; + content = '' + machine ${globals.services.radicale.domain} login ${radicaleUser} password ${config.sops.placeholder.emacs-radicale-pw} + ''; + }; + }; + }; + + }); }

    -
    3.3.1.29. Waybar
    +
    3.3.2.29. Waybar

    Again I am just using the first bar option here that I was able to find good understandable documentation for. Of note is that the `cpu` section's `format` is not defined here, but in section 1 (since not every machine has the same number of cores) @@ -14318,7 +14456,7 @@ The rest of the related configuration is found here:

    -
    { self, config, lib, pkgs, ... }:
+
    { self, config, lib, inputs, pkgs, ... }:
 let
   inherit (config.swarselsystems) xdgDir;
   generateIcons = n: lib.concatStringsSep " " (builtins.map (x: "{icon" + toString x + "}") (lib.range 0 (n - 1)));
@@ -14372,7 +14510,7 @@ in
       internal = true;
     };
   };
-  config = lib.mkIf config.swarselmodules.waybar {
+  config = lib.mkIf config.swarselmodules.waybar ({
 
     swarselsystems = {
       waybarModules = lib.mkIf config.swarselsystems.isLaptop (modulesLeft ++ [
@@ -14380,16 +14518,12 @@ in
       ] ++ modulesRight);
     };
 
-    sops.secrets = lib.mkIf (!config.swarselsystems.isPublic && !config.swarselsystems.isNixos) {
-      github-notifications-token = { path = "${xdgDir}/secrets/github-notifications-token"; };
-    };
-
     services.playerctld.enable = true;
 
     programs.waybar = {
       enable = true;
       systemd = {
-        enable = true;
+        enable = false;
         # target = "sway-session.target";
         inherit (config.wayland.systemd) target;
       };
@@ -14644,14 +14778,18 @@ in
       };
       style = builtins.readFile (self + /files/waybar/style.css);
     };
-  };
+  } // lib.optionalAttrs (inputs ? sops) {
+    sops.secrets = lib.mkIf (!config.swarselsystems.isPublic && !config.swarselsystems.isNixos) {
+      github-notifications-token = { path = "${xdgDir}/secrets/github-notifications-token"; };
+    };
+  });
 }
    -
    3.3.1.30. Firefox
    +
    3.3.2.30. Firefox

    Setting up firefox along with some policies that are important to me (mostly disabling telemetry related stuff as well as Pocket). I also enable some integrations that enable super useful packages, namely tridactyl and browserpass. @@ -14830,14 +14968,14 @@ I used to build the firefox addon bypass-paywalls-clean myself here

    -
    3.3.1.31. Services
    +
    3.3.2.31. Services

    Services that can be defined through home-manager should be defined here.

    -
    3.3.1.31.1. gnome-keyring
    +
    3.3.2.31.1. gnome-keyring

    Used for storing sessions in e.g. Nextcloud @@ -14858,7 +14996,7 @@ Used for storing sessions in e.g. Nextcloud

    -
    3.3.1.31.2. KDE Connect
    +
    3.3.2.31.2. KDE Connect

    This enables phone/computer communication, including sending clipboard, files etc. Sadly on Wayland many of the features are broken (like remote control). @@ -14881,7 +15019,7 @@ This enables phone/computer communication, including sending clipboard, files et

    -
    3.3.1.31.3. Mako
    +
    3.3.2.31.3. Mako

    Desktop notifications! @@ -14902,7 +15040,7 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi border-radius = 15; border-size = 1; default-timeout = 5000; - ignore-timeout = 1; + ignore-timeout = false; icons = 1; layer = "overlay"; sort = "-time"; @@ -14922,6 +15060,9 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi default-timeout = 2000; group-by = "category"; }; + "mode=do-not-disturb" = { + invisible = true; + }; }; }; }; @@ -14932,7 +15073,7 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi

    -
    3.3.1.31.4. SwayOSD
    +
    3.3.2.31.4. SwayOSD
    { lib, pkgs, config, ... }:
@@ -14951,7 +15092,7 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
    -
    3.3.1.31.5. yubikey-touch-detector
    +
    3.3.2.31.5. yubikey-touch-detector
    { lib, config, pkgs, ... }:
@@ -14990,9 +15131,9 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
    -
    -
    3.3.1.31.6. blueman-applet
    -
    +
    +
    3.3.2.31.6. blueman-applet
    +
    { lib, config, ... }:
 {
@@ -15005,9 +15146,9 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
    -
    -
    3.3.1.31.7. network-manager-applet
    -
    +
    +
    3.3.2.31.7. network-manager-applet
    +
    { lib, config, ... }:
 {
@@ -15021,9 +15162,9 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
    -
    -
    3.3.1.31.8. obsidian service for tray
    -
    +
    +
    3.3.2.31.8. obsidian service for tray
    +
    { lib, config, ... }:
 {
@@ -15056,9 +15197,9 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
    -
    -
    3.3.1.31.9. anki service for tray
    -
    +
    +
    3.3.2.31.9. anki service for tray
    +

    Sets up a systemd user service for anki that does not stall the shutdown process. Note that the outcommented ExecStart does not work because the home-manager anki package builds a separate anki package that - I think - cannot be referenced as no such expression exists in the module.

    @@ -15104,9 +15245,9 @@ Sets up a systemd user service for anki that does not stall the shutdown process
    -
    -
    3.3.1.31.10. element service for tray
    -
    +
    +
    3.3.2.31.10. element service for tray
    +
    { lib, config, pkgs, ... }:
 {
@@ -15139,9 +15280,9 @@ Sets up a systemd user service for anki that does not stall the shutdown process
    -
    -
    3.3.1.31.11. vesktop service for tray
    -
    +
    +
    3.3.2.31.11. vesktop service for tray
    +
    { lib, config, pkgs, ... }:
 {
@@ -15176,7 +15317,7 @@ Sets up a systemd user service for anki that does not stall the shutdown process
    -
    3.3.1.32. Sway
    +
    3.3.2.32. Sway

    I am currently using SwayFX, which adds some nice effects to sway, like rounded corners and hiding the separator between title and content of a window. @@ -15187,7 +15328,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se

    -
    { config, lib, vars, ... }:
+
    { config, lib, vars, nixosConfig ? config, ... }:
   let
     eachOutput = _: monitor: {
       inherit (monitor) name;
@@ -15570,6 +15711,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
             export XDG_CURRENT_DESKTOP=sway;
             export XDG_SESSION_DESKTOP=sway;
             export _JAVA_AWT_WM_NONREPARENTING=1;
+            export GITHUB_NOTIFICATION_TOKEN_PATH=${nixosConfig.sops.secrets.github-notifications-token.path};
           '' + vars.waylandExports;
           # extraConfigEarly = "
           # exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
@@ -15619,7 +15761,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
    -
    3.3.1.33. Niri
    +
    3.3.2.33. Niri
    { config, pkgs, lib, vars, ... }:
@@ -15738,9 +15880,11 @@ Currently, I am too lazy to explain every option here, but most of it is very se
           "Mod+Shift+Escape".action = spawn "kitty" "-o" "confirm_os_window_close=0" "btm";
           "Mod+h".action = sh ''hyprpicker | wl-copy'';
           # "Mod+s".action = spawn "grim" "-g" "\"$(slurp)\"" "-t" "png" "-" "|" "wl-copy" "-t" "image/png";
-          "Mod+s".action = screenshot { show-pointer = false; };
+          # "Mod+s".action = screenshot { show-pointer = false; };
+          "Mod+s".action.screenshot = { show-pointer = false; };
           # "Mod+Shift+s".action = spawn "slurp" "|" "grim" "-g" "-" "Pictures/Screenshots/$(date +'screenshot_%Y-%m-%d-%H%M%S.png')";
-          "Mod+Shift+s".action = screenshot-window { write-to-disk = true; };
+          # "Mod+Shift+s".action = screenshot-window { write-to-disk = true; };
+          "Mod+Shift+s".action.screenshot-window = { write-to-disk = true; };
           # "Mod+Shift+v".action = spawn "wf-recorder" "-g" "'$(slurp -f %o -or)'" "-f" "~/Videos/screenrecord_$(date +%Y-%m-%d-%H%M%S).mkv";
 
           "Mod+e".action = sh "emacsclient -nquc -a emacs -e '(dashboard-open)'";
@@ -15831,7 +15975,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
    -
    3.3.1.34. Kanshi
    +
    3.3.2.34. Kanshi
    { self, lib, pkgs, config, ... }:
@@ -15941,7 +16085,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
    -
    3.3.1.35. gpg-agent
    +
    3.3.2.35. gpg-agent

    Settings that are needed for the gpg-agent. Also we are enabling emacs support for unlocking my Yubikey here. @@ -16012,7 +16156,7 @@ in

    -
    3.3.1.36. gammastep
    +
    3.3.2.36. gammastep

    This service changes the screen hue at night. I am not sure if that really does something, but I like the color anyways. @@ -16038,7 +16182,7 @@ in

    -
    3.3.1.37. Spicetify
    +
    3.3.2.37. Spicetify
    { inputs, lib, config, pkgs, ... }:
@@ -16052,7 +16196,7 @@ in
     programs.spicetify = {
       enable = true;
       # spotifyPackage = pkgs.stable24_11.spotify;
-      spotifyPackage = pkgs.stable.spotify;
+      spotifyPackage = pkgs.spotify;
       enabledExtensions = with spicePkgs.extensions; [
         fullAppDisplay
         shuffle
@@ -16068,9 +16212,9 @@ in
    -
    -
    3.3.1.38. Obsidian
    -
    +
    +
    3.3.2.38. Obsidian
    +
    { lib, config, pkgs, nixosConfig ? config, ... }:
 let
@@ -16088,8 +16232,9 @@ in
       "${config.programs.obsidian.vaults.${name}.target}/.obsidian/core-plugins.json".force = true;
     };
 
-    programs.obsidian =
-      {
+    programs.obsidian = let
+      pluginSource = pkgs.nur.repos.swarsel;
+      in {
         enable = true;
         package = pkgs.obsidian;
         defaultSettings = {
@@ -16136,7 +16281,8 @@ in
             "templates"
             "word-count"
           ];
-          communityPlugins = with pkgs.swarsel-nix; [
+          # communityPlugins = with pkgs.swarsel-nix; [
+          communityPlugins = with pluginSource; [
             advanced-tables
             calendar
             file-hider
@@ -16154,7 +16300,8 @@ in
               appearance = {
                 baseFontSize = lib.mkForce 19;
               };
-              communityPlugins = with pkgs.swarsel-nix; [
+              # communityPlugins = with pkgs.swarsel-nix; [
+              communityPlugins = with pluginSource; [
                 {
                   pkg = advanced-tables;
                   enable = true;
@@ -16226,82 +16373,83 @@ in
    -
    -
    3.3.1.39. Anki
    -
    +
    +
    3.3.2.39. Anki
    +
    -
    { lib, config, pkgs, globals, nixosConfig ? config, ... }:
+
    { lib, config, pkgs, globals, inputs, nixosConfig ? config, ... }:
 let
   moduleName = "anki";
   inherit (config.swarselsystems) isPublic isNixos;
 in
 {
   options.swarselmodules.${moduleName} = lib.mkEnableOption "enable ${moduleName} and settings";
-  config = lib.mkIf config.swarselmodules.${moduleName} {
+  config = lib.mkIf config.swarselmodules.${moduleName}
+    ({
 
-    sops = lib.mkIf (!isPublic && !isNixos) {
-      secrets = {
-        anki-user = { };
-        anki-pw = { };
+      programs.anki = {
+        enable = true;
+        # # package = pkgs.anki;
+        hideBottomBar = true;
+        hideBottomBarMode = "always";
+        hideTopBar = true;
+        hideTopBarMode = "always";
+        reduceMotion = true;
+        spacebarRatesCard = true;
+        # videoDriver = "opengl";
+        sync = {
+          autoSync = false; # sync on profile close will delay system shutdown
+          syncMedia = true;
+          autoSyncMediaMinutes = 5;
+          url = "https://${globals.services.ankisync.domain}";
+          usernameFile = nixosConfig.sops.secrets.anki-user.path;
+          # this is not the password but the syncKey
+          # get it by logging in or out, saving preferences and then
+          # show details on the "settings wont be saved" dialog
+          keyFile = nixosConfig.sops.secrets.anki-pw.path;
+        };
+        addons =
+          let
+            minimize-to-tray = pkgs.anki-utils.buildAnkiAddon
+              (finalAttrs: {
+                pname = "minimize-to-tray";
+                version = "2.0.1";
+                src = pkgs.fetchFromGitHub {
+                  owner = "simgunz";
+                  repo = "anki21-addons_minimize-to-tray";
+                  rev = finalAttrs.version;
+                  sparseCheckout = [ "src" ];
+                  hash = "sha256-xmvbIOfi9K0yEUtUNKtuvv2Vmqrkaa4Jie6J1s+FuqY=";
+                };
+                sourceRoot = "${finalAttrs.src.name}/src";
+              });
+          in
+          [
+            (minimize-to-tray.withConfig
+              {
+                config = {
+                  hide_on_startup = "true";
+                };
+              })
+          ];
       };
-    };
-
-    programs.anki = {
-      enable = true;
-      # # package = pkgs.anki;
-      hideBottomBar = true;
-      hideBottomBarMode = "always";
-      hideTopBar = true;
-      hideTopBarMode = "always";
-      reduceMotion = true;
-      spacebarRatesCard = true;
-      # videoDriver = "opengl";
-      sync = {
-        autoSync = false; # sync on profile close will delay system shutdown
-        syncMedia = true;
-        autoSyncMediaMinutes = 5;
-        url = "https://${globals.services.ankisync.domain}";
-        usernameFile = nixosConfig.sops.secrets.anki-user.path;
-        # this is not the password but the syncKey
-        # get it by logging in or out, saving preferences and then
-        # show details on the "settings wont be saved" dialog
-        keyFile = nixosConfig.sops.secrets.anki-pw.path;
+    } // lib.optionalAttrs (inputs ? sops) {
+      sops = lib.mkIf (!isPublic && !isNixos) {
+        secrets = {
+          anki-user = { };
+          anki-pw = { };
+        };
       };
-      addons =
-        let
-          minimize-to-tray = pkgs.anki-utils.buildAnkiAddon
-            (finalAttrs: {
-              pname = "minimize-to-tray";
-              version = "2.0.1";
-              src = pkgs.fetchFromGitHub {
-                owner = "simgunz";
-                repo = "anki21-addons_minimize-to-tray";
-                rev = finalAttrs.version;
-                sparseCheckout = [ "src" ];
-                hash = "sha256-xmvbIOfi9K0yEUtUNKtuvv2Vmqrkaa4Jie6J1s+FuqY=";
-              };
-              sourceRoot = "${finalAttrs.src.name}/src";
-            });
-        in
-        [
-          (minimize-to-tray.withConfig
-          {
-            config = {
-              hide_on_startup = "true";
-            };
-          })
-        ];
-    };
-  };
+    });
 
 }
    -
    -
    3.3.1.40. Element-desktop
    -
    +
    +
    3.3.2.40. Element-desktop
    +
    { lib, config, ... }:
 let
@@ -16336,9 +16484,9 @@ in
    -
    -
    3.3.1.41. Hexchat
    -
    +
    +
    3.3.2.41. Hexchat
    +
    { lib, config, nixosConfig ? config, ... }:
 let
@@ -16361,9 +16509,9 @@ in
    -
    -
    3.3.1.42. obs-studio
    -
    +
    +
    3.3.2.42. obs-studio
    +
    { lib, config, ... }:
 let
@@ -16382,9 +16530,9 @@ in
    -
    -
    3.3.1.43. spotify-player
    -
    +
    +
    3.3.2.43. spotify-player
    +
    { lib, config, ... }:
 let
@@ -16403,11 +16551,11 @@ in
    -
    -
    3.3.1.44. vesktop
    -
    +
    +
    3.3.2.44. vesktop
    +
    -
    { lib, config, ... }:
+
    { lib, pkgs, config, ... }:
 let
   moduleName = "vesktop";
 in
@@ -16416,6 +16564,7 @@ in
   config = lib.mkIf config.swarselmodules.${moduleName} {
     programs.${moduleName} = {
       enable = true;
+      package = pkgs.stable.vesktop;
       settings = {
         appBadge = false;
         arRPC = false;
@@ -16490,9 +16639,9 @@ in
    -
    -
    3.3.1.45. batsignal
    -
    +
    +
    3.3.2.45. batsignal
    +
    { lib, config, ... }:
 let
@@ -16505,11 +16654,11 @@ in
         enable = true;
         extraArgs = [
           "-W"
-          " Consider charging the battery"
+          "  Consider charging the battery"
           "-C"
-          " Battery is low; plug in charger now"
+          "  Battery is low; plug in charger now"
           "-D"
-          " Device will lose power in a few seconds"
+          "  Device will lose power in a few seconds"
           "-c"
           "10"
           "-d"
@@ -16523,9 +16672,9 @@ in
    -
    -
    3.3.1.46. autotiling
    -
    +
    +
    3.3.2.46. autotiling
    +
    { lib, config, ... }:
 let
@@ -16534,7 +16683,7 @@ in
 {
   options.swarselmodules.${moduleName} = lib.mkEnableOption "enable ${moduleName} and settings";
   config = lib.mkIf config.swarselmodules.${moduleName} {
-    swarselservices.${moduleName} = {
+    services.${moduleName} = {
       enable = true;
       systemdTarget = config.wayland.systemd.target;
     };
@@ -16545,9 +16694,9 @@ in
    -
    -
    3.3.1.47. swayidle
    -
    +
    +
    3.3.2.47. swayidle
    +
    { lib, config, pkgs, ... }:
 let
@@ -16587,9 +16736,9 @@ in
    -
    -
    3.3.1.48. swaylock
    -
    +
    +
    3.3.2.48. swaylock
    +
    { lib, config, pkgs, ... }:
 let
@@ -16618,14 +16767,14 @@ in
    -

    3.3.2. Server

    +

    3.3.3. Server

    This is again configuration that is mostly needed on servers. Most things should be done using the NixOS config instead, consider carefully if a home-manager config must be used.

    -
    3.3.2.1. Imports
    +
    3.3.3.1. Imports

    This section sets up all the imports that are used in the home-manager section. @@ -16647,7 +16796,7 @@ in

    -
    3.3.2.2. Symlinking dotfiles
    +
    3.3.3.2. Symlinking dotfiles

    This section should be used in order to symlink already existing configuration files using `home.file` and setting session variables using `home.sessionVariables`. @@ -16676,14 +16825,14 @@ As for the `home.sessionVariables`, it should be noted that environment variable

    -

    3.3.3. Darwin

    +

    3.3.4. Darwin

    Again, mostly a placeholder for future home-manager modules that run on darwin systems.

    -
    3.3.3.1. Imports
    +
    3.3.4.1. Imports

    This section sets up all the imports that are used in the home-manager section. @@ -16705,7 +16854,7 @@ This section sets up all the imports that are used in the home-manager section.

    -

    3.3.4. Optional

    +

    3.3.5. Optional

    Akin to the Optional NixOS modules. @@ -16723,7 +16872,7 @@ in

    -
    3.3.4.1. Gaming
    +
    3.3.5.1. Gaming

    The rest of the settings is at gaming. @@ -16794,7 +16943,7 @@ in

    -
    3.3.4.2. Work (pizauth)
    +
    3.3.5.2. Work (pizauth)

    The rest of the settings is at work. Here, I am setting up the different firefox profiles that I need for the SSO sites that I need to access at work as well as a few ssh shorthands. @@ -16830,7 +16979,7 @@ in postman # rclone libguestfs-with-appliance - stable.prometheus.cli + prometheus.cli tigervnc # openstackclient @@ -16955,7 +17104,7 @@ in # }; # }; }; - git.userEmail = lib.mkForce gitMail; + git.settings.user.email = lib.mkForce gitMail; zsh = { shellAliases = { @@ -17278,7 +17427,7 @@ in }; - swarselservices.pizauth = { + services.pizauth = { enable = true; extraConfig = '' auth_notify_cmd = "if [[ \"$(notify-send -A \"Open $PIZAUTH_ACCOUNT\" -t 30000 'pizauth authorisation')\" == \"0\" ]]; then open \"$PIZAUTH_URL\"; fi"; @@ -17450,7 +17599,7 @@ in

    -
    3.3.4.3. Uni
    +
    3.3.5.3. Uni
    { config, lib, nixosConfig ? config, ... }:
@@ -17458,7 +17607,7 @@ in
   options.swarselmodules.optional.uni = lib.mkEnableOption "optional uni settings";
   config = lib.mkIf config.swarselmodules.optional.uni
     {
-      swarselservices.pizauth = {
+      services.pizauth = {
         enable = true;
         accounts = {
           uni = {
@@ -17483,7 +17632,7 @@ in
    -
    3.3.4.4. Framework
    +
    3.3.5.4. Framework

    This holds configuration that is specific to framework laptops. @@ -17681,7 +17830,7 @@ In short, the options defined here are passed to the modules systems using -

    { name, writeShellApplication, wlr-randr, busybox, wl-mirror, ... }:
+
    { name, writeShellApplication, wlr-randr, busybox, wl-mirror, mako, ... }:
 
 writeShellApplication {
   inherit name;
-  runtimeInputs = [ wlr-randr busybox wl-mirror ];
+  runtimeInputs = [ wlr-randr busybox wl-mirror mako ];
   text = ''
+    makoctl mode -a do-not-disturb
     wlr-randr | grep "$2" | cut -d" " -f1 | xargs -I{} wl-present mirror "$1" --fullscreen-output {}
+    makoctl mode -r do-not-disturb
   '';
 }
 
    
@@ -19808,8 +19959,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. @@ -19830,8 +19981,8 @@ writeShellApplication {

    -
    -

    3.5.35. git-replace

    +
    +

    3.5.35. git-replace

    This script allows for quick git replace of a string. @@ -19845,8 +19996,62 @@ writeShellApplication { inherit name; runtimeInputs = [ git gnugrep findutils ]; text = '' - git grep -l "$1" | xargs sed -i "s/$1/$2/g" - ''; + + function help_and_exit() { + echo + echo "Remotely installs SwarselSystem on a target machine including secret deployment." + echo + echo "USAGE: $0 [-f/-t} <from> <to>" + echo + echo "ARGS:" + echo " -f | --filenames Replace in filenames." + echo " -d | --directory Replace text in files within this directory." + echo " -r | --repo Replace text in files in the entire git repo." + echo " -h | --help Print this help." + exit 0 + } + + target_files=false + target_repo=false + target_dirs=false + while [[ $# -gt 0 ]]; do + case "$1" in + -f | --filenames) + shift + target_files=true + ;; + -r | --repo) + shift + target_repo=rue + ;; + -d | --directory) + shift + target_dirs=rue + ;; + -h | --help) help_and_exit ;; + *) + echo "Invalid option detected." + help_and_exit + ;; + esac + shift + done + + + if [[ $target_files == "true" ]]; then + for file in $(git ls-files | grep "$1" | sed -e "s/\($1[^/]*\).*/\1/" | uniq); do + git mv "$file" "''${file//$1/$2}" + done + fi + + if [[ $target_repo == "true" ]]; then + git grep -l "$1" | xargs sed -i "s/$1/$2/g" + fi + + if [[ $target_dirs == "true" ]]; then + grep -rl "$1" . | xargs sed -i "s/$1/$2/g" + fi + ''; } @@ -19993,8 +20198,8 @@ in

    -
    -
    3.6.1.3. Optionals
    +
    +
    3.6.1.3. Optionals
    { lib, config, ... }:
@@ -20286,12 +20491,87 @@ in
 
 }
 
+
    +
    +
    +
    +
    +
    3.6.2.2. DGX Spark
    +
    +
    +
    { lib, config, ... }:
+{
+  options.swarselprofiles.dgxspark = lib.mkEnableOption "is this a dgx spark host";
+  config = lib.mkIf config.swarselprofiles.dgxspark {
+    swarselmodules = {
+      anki = lib.mkDefault false;
+      anki-tray = lib.mkDefault false;
+      atuin = lib.mkDefault true;
+      autotiling = lib.mkDefault false;
+      batsignal = lib.mkDefault false;
+      blueman-applet = lib.mkDefault true;
+      desktop = lib.mkDefault false;
+      direnv = lib.mkDefault true;
+      element-desktop = lib.mkDefault false;
+      element-tray = lib.mkDefault false;
+      emacs = lib.mkDefault false;
+      env = lib.mkDefault false;
+      eza = lib.mkDefault true;
+      firefox = lib.mkDefault true;
+      fuzzel = lib.mkDefault true;
+      gammastep = lib.mkDefault false;
+      general = lib.mkDefault true;
+      git = lib.mkDefault true;
+      gnome-keyring = lib.mkDefault false;
+      gpgagent = lib.mkDefault true;
+      hexchat = lib.mkDefault false;
+      kanshi = lib.mkDefault false;
+      kdeconnect = lib.mkDefault false;
+      kitty = lib.mkDefault true;
+      mail = lib.mkDefault false;
+      mako = lib.mkDefault false;
+      niri = lib.mkDefault false;
+      nix-index = lib.mkDefault true;
+      nixgl = lib.mkDefault true;
+      nix-your-shell = lib.mkDefault true;
+      nm-applet = lib.mkDefault true;
+      obs-studio = lib.mkDefault false;
+      obsidian = lib.mkDefault false;
+      obsidian-tray = lib.mkDefault false;
+      ownpackages = lib.mkDefault false;
+      packages = lib.mkDefault false;
+      passwordstore = lib.mkDefault false;
+      programs = lib.mkDefault false;
+      sops = lib.mkDefault true;
+      spicetify = lib.mkDefault false;
+      spotify-player = lib.mkDefault false;
+      ssh = lib.mkDefault false;
+      starship = lib.mkDefault true;
+      stylix = lib.mkDefault true;
+      sway = lib.mkDefault false;
+      swayidle = lib.mkDefault false;
+      swaylock = lib.mkDefault false;
+      swayosd = lib.mkDefault false;
+      symlink = lib.mkDefault false;
+      tmux = lib.mkDefault true;
+      vesktop = lib.mkDefault false;
+      vesktop-tray = lib.mkDefault false;
+      waybar = lib.mkDefault false;
+      yubikey = lib.mkDefault false;
+      yubikeytouch = lib.mkDefault false;
+      zellij = lib.mkDefault true;
+      zsh = lib.mkDefault true;
+    };
+  };
+
+}
+
    -
    3.6.2.2. Optionals
    +
    3.6.2.3. Optionals
    { lib, config, ... }:
@@ -20313,7 +20593,7 @@ in
    -
    3.6.2.3. Minimal
    +
    3.6.2.4. Minimal
    { lib, config, ... }:
@@ -20336,7 +20616,7 @@ in
    -
    3.6.2.4. Chaostheatre
    +
    3.6.2.5. Chaostheatre
    { lib, config, ... }:
@@ -20389,7 +20669,7 @@ in
    -
    3.6.2.5. toto
    +
    3.6.2.6. toto
    { lib, config, ... }:
@@ -20412,7 +20692,7 @@ in
    -
    3.6.2.6. Work
    +
    3.6.2.7. Work
    { lib, config, ... }:
@@ -20433,7 +20713,7 @@ in
    -
    3.6.2.7. Uni
    +
    3.6.2.8. Uni
    { lib, config, ... }:
@@ -20454,7 +20734,7 @@ in
    -
    3.6.2.8. Framework
    +
    3.6.2.9. Framework
    { lib, config, ... }:
@@ -20476,7 +20756,7 @@ in
    -
    -
    4.4.39.3. Work: Signing Mails (S/MIME, smime)
    +
    +
    4.4.39.3. Work: Signing Mails (S/MIME, smime)

    Used to automatically sign messages sent from my work email address using S/MIME certificate. @@ -24195,8 +24491,8 @@ Also see `prot-window-delete-popup-frame'." command) This sections is no longer used really. An introduction can be found in Structure of this file under the historical note. The little noweb-ref blocks that I still use are found in Hosts and Services.

    -
    -

    5.1. General steps when setting up a new machine

    +
    +

    5.1. General steps when setting up a new machine

    These general steps are needed when setting up a new machine and do not fit into another block well: @@ -24209,6 +24505,36 @@ These general steps are needed when setting up a new machine and do not fit into

    +
    +

    5.2. Current patches and fixes

    +
    +

    +These are current deviations from the standard settings that I take while some things are broken upstream +

    + +
    +
    - 202501102:
+  - flake:
+    - emacs-overlay:
+      - : version pinned because emacsclient is currently broken on latest
+    - niri-flake:
+      - currently not using the sugared version of screenshot-[,window], as it is currently broken
+  - home-manager:
+    - emacs-tramp:
+      - using stable version in extraPackages (broken in unstable)
+      - :ensure nil in emacs tramp settings to use package in extraPackages
+    - emacs-calfwL
+      - pinned to version not in nixpkgs (is in latest emacs-overlay, but that is broken)
+    - vesktop:
+      - running stable version (broken in unstable)
+    - batgrep:
+      - running stable version (broken in unstable)
+    - swayosd:
+      - pinned to version not in nixpkgs (fixes https://github.com/ErikReider/SwayOSD/issues/175)
+
    +
    +
    +

    6. Appendix B: Supplementary Files

    @@ -27140,7 +27466,7 @@ similarly, there exists an version that starts from the right.

    Author: Leon Schwarzäugl

    -

    Created: 2025-10-21 Di 21:55

    +

    Created: 2025-11-02 So 12:29

    Validate

    diff --git a/modules/home/common/autotiling.nix b/modules/home/common/autotiling.nix index 2cf7223..fdefa19 100644 --- a/modules/home/common/autotiling.nix +++ b/modules/home/common/autotiling.nix @@ -5,7 +5,7 @@ in { options.swarselmodules.${moduleName} = lib.mkEnableOption "enable ${moduleName} and settings"; config = lib.mkIf config.swarselmodules.${moduleName} { - swarselservices.${moduleName} = { + services.${moduleName} = { enable = true; systemdTarget = config.wayland.systemd.target; }; diff --git a/modules/home/common/emacs.nix b/modules/home/common/emacs.nix index f9443b0..95512fa 100644 --- a/modules/home/common/emacs.nix +++ b/modules/home/common/emacs.nix @@ -22,6 +22,7 @@ in epkgs.lsp-bridge epkgs.doom-themes epkgs.vterm + # pkgs.stable.emacs.pkgs.elpaPackages.tramp # use the unstable version from elpa epkgs.treesit-grammars.with-all-grammars # build the rest of the packages myself diff --git a/modules/home/common/git.nix b/modules/home/common/git.nix index 59035aa..1fb7ad8 100644 --- a/modules/home/common/git.nix +++ b/modules/home/common/git.nix @@ -11,26 +11,29 @@ in programs.git = { enable = true; } // lib.optionalAttrs (!minimal) { - aliases = { - a = "add"; - c = "commit"; - cl = "clone"; - co = "checkout"; - b = "branch"; - i = "init"; - m = "merge"; - s = "status"; - r = "restore"; - p = "pull"; - pp = "push"; + settings = { + alias = { + a = "add"; + c = "commit"; + cl = "clone"; + co = "checkout"; + b = "branch"; + i = "init"; + m = "merge"; + s = "status"; + r = "restore"; + p = "pull"; + pp = "push"; + }; + user = { + email = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) (lib.mkDefault address1); + name = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) fullName; + }; }; signing = { key = "0x76FD3810215AE097"; signByDefault = true; }; - userEmail = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) (lib.mkDefault address1); - userName = lib.mkIf (config.swarselsystems.isNixos && !config.swarselsystems.isPublic) fullName; - difftastic.enable = true; lfs.enable = true; includes = [ { @@ -45,5 +48,6 @@ in } ]; }; + programs.difftastic.enable = lib.mkIf (!minimal) true; }; } diff --git a/modules/home/common/niri.nix b/modules/home/common/niri.nix index e90219c..6e3814a 100644 --- a/modules/home/common/niri.nix +++ b/modules/home/common/niri.nix @@ -114,9 +114,11 @@ "Mod+Shift+Escape".action = spawn "kitty" "-o" "confirm_os_window_close=0" "btm"; "Mod+h".action = sh ''hyprpicker | wl-copy''; # "Mod+s".action = spawn "grim" "-g" "\"$(slurp)\"" "-t" "png" "-" "|" "wl-copy" "-t" "image/png"; - "Mod+s".action = screenshot { show-pointer = false; }; + # "Mod+s".action = screenshot { show-pointer = false; }; + "Mod+s".action.screenshot = { show-pointer = false; }; # "Mod+Shift+s".action = spawn "slurp" "|" "grim" "-g" "-" "Pictures/Screenshots/$(date +'screenshot_%Y-%m-%d-%H%M%S.png')"; - "Mod+Shift+s".action = screenshot-window { write-to-disk = true; }; + # "Mod+Shift+s".action = screenshot-window { write-to-disk = true; }; + "Mod+Shift+s".action.screenshot-window = { write-to-disk = true; }; # "Mod+Shift+v".action = spawn "wf-recorder" "-g" "'$(slurp -f %o -or)'" "-f" "~/Videos/screenrecord_$(date +%Y-%m-%d-%H%M%S).mkv"; "Mod+e".action = sh "emacsclient -nquc -a emacs -e '(dashboard-open)'"; diff --git a/modules/home/common/obsidian.nix b/modules/home/common/obsidian.nix index 4baa813..5020502 100644 --- a/modules/home/common/obsidian.nix +++ b/modules/home/common/obsidian.nix @@ -15,6 +15,9 @@ in }; programs.obsidian = + let + pluginSource = pkgs.nur.repos.swarsel; + in { enable = true; package = pkgs.obsidian; @@ -62,7 +65,8 @@ in "templates" "word-count" ]; - communityPlugins = with pkgs.swarsel-nix; [ + # communityPlugins = with pkgs.swarsel-nix; [ + communityPlugins = with pluginSource; [ advanced-tables calendar file-hider @@ -80,7 +84,8 @@ in appearance = { baseFontSize = lib.mkForce 19; }; - communityPlugins = with pkgs.swarsel-nix; [ + # communityPlugins = with pkgs.swarsel-nix; [ + communityPlugins = with pluginSource; [ { pkg = advanced-tables; enable = true; diff --git a/modules/home/common/packages.nix b/modules/home/common/packages.nix index b36b2c5..1695b95 100644 --- a/modules/home/common/packages.nix +++ b/modules/home/common/packages.nix @@ -42,7 +42,7 @@ sshfs fuse # ventoy - poppler_utils + poppler-utils vdhcoapp # nix @@ -130,7 +130,7 @@ unzip #nautilus - stable.nautilus + nautilus xfce.tumbler libgsf @@ -147,7 +147,7 @@ # the following packages are used (in some way) by waybar # playerctl - stable.pavucontrol + pavucontrol # stable.pamixer # gnome.gnome-clocks # wlogout @@ -177,7 +177,7 @@ nerd-fonts.fira-mono nerd-fonts.fira-code nerd-fonts.symbols-only - noto-fonts-emoji + noto-fonts-color-emoji font-awesome_5 noto-fonts noto-fonts-cjk-sans diff --git a/modules/home/common/programs.nix b/modules/home/common/programs.nix index 21f0cdf..26f53d3 100644 --- a/modules/home/common/programs.nix +++ b/modules/home/common/programs.nix @@ -5,7 +5,14 @@ programs = { bat = { enable = true; - extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; + extraPackages = [ + pkgs.bat-extras.batdiff + pkgs.bat-extras.batman + pkgs.bat-extras.batwatch + ] ++ [ + pkgs.stable.bat-extras.batgrep + ]; + # extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; }; bottom.enable = true; carapace.enable = true; diff --git a/modules/home/common/settings.nix b/modules/home/common/settings.nix index 9138a5e..7b1ba8d 100644 --- a/modules/home/common/settings.nix +++ b/modules/home/common/settings.nix @@ -1,6 +1,6 @@ { self, lib, pkgs, config, ... }: let - inherit (config.swarselsystems) mainUser; + inherit (config.swarselsystems) mainUser flakePath isNixos isLinux; in { options.swarselmodules.general = lib.mkEnableOption "general nix settings"; @@ -43,33 +43,21 @@ in auto-optimise-store = true; warn-dirty = false; max-jobs = 1; - use-cgroups = lib.mkIf config.swarselsystems.isLinux true; + use-cgroups = lib.mkIf isLinux true; }; }; - nixpkgs.overlays = lib.mkIf config.swarselsystems.isNixos (lib.mkForce null); + nixpkgs.overlays = lib.mkIf isNixos (lib.mkForce null); programs = { - home-manager = lib.mkIf (!config.swarselsystems.isNixos) - { - enable = true; - package = pkgs.symlinkJoin { - name = "home-manager"; - buildInputs = [ pkgs.makeWrapper ]; - paths = [ pkgs.home-manager ]; - postBuild = '' - wrapProgram $out/bin/home-manager \ - --append-flags '--flake .#$(hostname)' - ''; - }; - }; + # home-manager.enable = lib.mkIf (!isNixos) true; man = { enable = true; generateCaches = true; }; }; - targets.genericLinux.enable = lib.mkIf (!config.swarselsystems.isNixos) true; + targets.genericLinux.enable = lib.mkIf (!isNixos) true; home = { username = lib.mkDefault mainUser; @@ -84,6 +72,17 @@ in "info" "devdoc" ]; + packages = lib.mkIf (!isNixos) [ + (pkgs.symlinkJoin { + name = "home-manager"; + buildInputs = [ pkgs.makeWrapper ]; + paths = [ pkgs.home-manager ]; + postBuild = '' + wrapProgram $out/bin/home-manager \ + --append-flags '--flake ${flakePath}#$(hostname)' + ''; + }) + ]; }; }; diff --git a/modules/home/common/spicetify.nix b/modules/home/common/spicetify.nix index 69fab38..e043344 100644 --- a/modules/home/common/spicetify.nix +++ b/modules/home/common/spicetify.nix @@ -9,7 +9,7 @@ in programs.spicetify = { enable = true; # spotifyPackage = pkgs.stable24_11.spotify; - spotifyPackage = pkgs.stable.spotify; + spotifyPackage = pkgs.spotify; enabledExtensions = with spicePkgs.extensions; [ fullAppDisplay shuffle diff --git a/modules/home/common/stylix.nix b/modules/home/common/stylix.nix index 763c4d2..64c58a5 100644 --- a/modules/home/common/stylix.nix +++ b/modules/home/common/stylix.nix @@ -1,10 +1,11 @@ -{ lib, config, vars, ... }: +{ self, lib, config, vars, ... }: { options.swarselmodules.stylix = lib.mkEnableOption "stylix settings"; config = lib.mkIf config.swarselmodules.stylix { - stylix = lib.mkIf (!config.swarselsystems.isNixos) (lib.recursiveUpdate + stylix = lib.mkIf (!config.swarselsystems.isNixos && config.swarselmodules.stylix) (lib.recursiveUpdate { - image = config.swarselsystems.wallpaper; + enable = true; + base16Scheme = "${self}/files/stylix/swarsel.yaml"; targets = vars.stylixHomeTargets; } vars.stylix); diff --git a/modules/home/common/vesktop.nix b/modules/home/common/vesktop.nix index 2085653..772345c 100644 --- a/modules/home/common/vesktop.nix +++ b/modules/home/common/vesktop.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, pkgs, config, ... }: let moduleName = "vesktop"; in @@ -7,6 +7,7 @@ in config = lib.mkIf config.swarselmodules.${moduleName} { programs.${moduleName} = { enable = true; + package = pkgs.stable.vesktop; settings = { appBadge = false; arRPC = false; diff --git a/modules/home/common/zsh.nix b/modules/home/common/zsh.nix index 4626a77..b941eb1 100644 --- a/modules/home/common/zsh.nix +++ b/modules/home/common/zsh.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, minimal, inputs, globals, nixosConfig ? config, ... }: let - inherit (config.swarselsystems) flakePath; + inherit (config.swarselsystems) flakePath isNixos; crocDomain = globals.services.croc.domain; in { @@ -21,12 +21,10 @@ in shellAliases = lib.recursiveUpdate { hg = "history | grep"; - hmswitch = "home-manager --flake ${flakePath}#$(whoami)@$(hostname) switch |& nom"; - # nswitch = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) --show-trace --log-format internal-json -v switch |& nom --json"; - nswitch = "cd ${flakePath}; swarsel-deploy $(hostname) switch; cd -;"; - nboot = "cd ${flakePath}; swarsel-deploy $(hostname) boot; cd -;"; - ndry = "cd ${flakePath}; swarsel-deploy $(hostname) dry-activate; cd -;"; - # nboot = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) --show-trace --log-format internal-json -v boot |& nom --json"; + hmswitch = lib.mkIf (!isNixos) "${lib.getExe pkgs.home-manager} --flake ${flakePath}#$(hostname) switch |& nom"; + nswitch = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) switch; cd -;"; + nboot = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) boot; cd -;"; + ndry = lib.mkIf isNixos "cd ${flakePath}; swarsel-deploy $(hostname) dry-activate; cd -;"; magit = "emacsclient -nc -e \"(magit-status)\""; config = "git --git-dir=$HOME/.cfg/ --work-tree=$HOME"; g = "git"; @@ -48,7 +46,7 @@ in cc = "wl-copy"; build-topology = "nix build .#topology.x86_64-linux.config.output"; build-iso = "nix build --print-out-paths .#live-iso"; - nix-review- = "nix run nixpkgs#nixpkgs-review -- rev HEAD"; + nix-review-local = "nix run nixpkgs#nixpkgs-review -- rev HEAD"; nix-review-post = "nix run nixpkgs#nixpkgs-review -- pr --post-result --systems linux"; } config.swarselsystems.shellAliases; diff --git a/modules/home/optional/uni.nix b/modules/home/optional/uni.nix index 6fb253f..ef2d2c4 100644 --- a/modules/home/optional/uni.nix +++ b/modules/home/optional/uni.nix @@ -3,7 +3,7 @@ options.swarselmodules.optional.uni = lib.mkEnableOption "optional uni settings"; config = lib.mkIf config.swarselmodules.optional.uni { - swarselservices.pizauth = { + services.pizauth = { enable = true; accounts = { uni = { diff --git a/modules/home/optional/work.nix b/modules/home/optional/work.nix index 72df0b1..3e8c36e 100644 --- a/modules/home/optional/work.nix +++ b/modules/home/optional/work.nix @@ -16,7 +16,7 @@ in postman # rclone libguestfs-with-appliance - stable.prometheus.cli + prometheus.cli tigervnc # openstackclient @@ -141,7 +141,7 @@ in # }; # }; }; - git.userEmail = lib.mkForce gitMail; + git.settings.user.email = lib.mkForce gitMail; zsh = { shellAliases = { @@ -464,7 +464,7 @@ in }; - swarselservices.pizauth = { + services.pizauth = { enable = true; extraConfig = '' auth_notify_cmd = "if [[ \"$(notify-send -A \"Open $PIZAUTH_ACCOUNT\" -t 30000 'pizauth authorisation')\" == \"0\" ]]; then open \"$PIZAUTH_URL\"; fi"; diff --git a/modules/nixos/client/nix-ld.nix b/modules/nixos/client/nix-ld.nix index 4057dae..14f1186 100644 --- a/modules/nixos/client/nix-ld.nix +++ b/modules/nixos/client/nix-ld.nix @@ -33,7 +33,7 @@ gdk-pixbuf glew110 glib - stable.gnome2.GConf + gnome2.GConf pango gtk2 gtk3 @@ -82,8 +82,8 @@ pipewire pixman speex - stdenv.cc.cc - stable.steam-fhsenv-without-steam + # stable.cc.cc + stable25_05.steam-fhsenv-without-steam systemd tbb vulkan-loader diff --git a/modules/nixos/client/packages.nix b/modules/nixos/client/packages.nix index e54af5e..b4233eb 100644 --- a/modules/nixos/client/packages.nix +++ b/modules/nixos/client/packages.nix @@ -13,7 +13,7 @@ yubikey-touch-detector yubico-piv-tool cfssl - pcsctools + pcsc-tools pcscliteWithPolkit.out # ledger packages diff --git a/modules/nixos/client/sway.nix b/modules/nixos/client/sway.nix index 9717370..705048d 100644 --- a/modules/nixos/client/sway.nix +++ b/modules/nixos/client/sway.nix @@ -7,7 +7,7 @@ in config = lib.mkIf config.swarselmodules.sway { programs.sway = { enable = true; - package = pkgs.dev.swayfx; + package = pkgs.swayfx; wrapperFeatures = { base = true; gtk = true; diff --git a/modules/nixos/client/syncthing.nix b/modules/nixos/client/syncthing.nix index 3410f77..4d53550 100644 --- a/modules/nixos/client/syncthing.nix +++ b/modules/nixos/client/syncthing.nix @@ -8,7 +8,7 @@ in config = lib.mkIf config.swarselmodules.syncthing { services.syncthing = { enable = true; - package = pkgs.stable.syncthing; + package = pkgs.syncthing; user = mainUser; dataDir = homeDir; configDir = "${homeDir}/.config/syncthing"; diff --git a/modules/nixos/optional/work.nix b/modules/nixos/optional/work.nix index bc969f8..edec1bb 100644 --- a/modules/nixos/optional/work.nix +++ b/modules/nixos/optional/work.nix @@ -179,7 +179,7 @@ in spice spice-gtk spice-protocol - win-virtio + virtio-win win-spice powershell diff --git a/modules/nixos/server/homebox.nix b/modules/nixos/server/homebox.nix index 84aea83..56adac9 100644 --- a/modules/nixos/server/homebox.nix +++ b/modules/nixos/server/homebox.nix @@ -12,7 +12,7 @@ in topology.self.services.${serviceName}.info = "https://${serviceDomain}"; globals.services.${serviceName}.domain = serviceDomain; - swarselservices.${serviceName} = { + services.${serviceName} = { enable = true; package = pkgs.dev.homebox; database.createLocally = true; diff --git a/modules/shared/vars.nix b/modules/shared/vars.nix index 3cf6ee6..94f9993 100644 --- a/modules/shared/vars.nix +++ b/modules/shared/vars.nix @@ -53,7 +53,7 @@ name = "FiraCode Nerd Font Mono"; }; emoji = { - package = pkgs.noto-fonts-emoji; + package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; }; diff --git a/nix/hosts.nix b/nix/hosts.nix index d69f355..0310acf 100644 --- a/nix/hosts.nix +++ b/nix/hosts.nix @@ -91,6 +91,7 @@ minimal = false; }; modules = [ + inputs.stylix.homeModules.stylix inputs.niri-flake.homeModules.niri inputs.nix-index-database.homeModules.nix-index # inputs.sops-nix.homeManagerModules.sops diff --git a/nix/overlays.nix b/nix/overlays.nix index 7b9b055..fd98db0 100644 --- a/nix/overlays.nix +++ b/nix/overlays.nix @@ -9,7 +9,13 @@ in overlays = { default = final: prev: let - additions = final: _: import "${self}/pkgs" { pkgs = final; inherit self lib; }; + additions = final: _: import "${self}/pkgs" { pkgs = final; inherit self lib; } + // { + swarsel-nix = import inputs.swarsel-nix { + pkgs = prev; + }; + zjstatus = inputs.zjstatus.packages.${prev.system}.default; + }; modifications = final: prev: { # vesktop = prev.vesktop.override { @@ -40,63 +46,35 @@ in melonds # ds dolphin # gc/wii ]); + }; - nixpkgs-stable = final: _: { - stable = import inputs.nixpkgs-stable { - inherit (final) system; - config.allowUnfree = true; - }; - }; + nixpkgs-stable-versions = final: _: + let + nixpkgsInputs = + lib.filterAttrs + (name: _v: builtins.match "^nixpkgs-.*" name != null) + inputs; - nixpkgs-dev = final: _: { - dev = import inputs.nixpkgs-dev { - inherit (final) system; - config.allowUnfree = true; - }; - }; + rename = name: builtins.replaceStrings [ "nixpkgs-" ] [ "" ] name; - nixpkgs-kernel = final: _: { - kernel = import inputs.nixpkgs-kernel { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - nixpkgs-stable24_05 = final: _: { - stable24_05 = import inputs.nixpkgs-stable24_05 { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - nixpkgs-stable24_11 = final: _: { - stable24_11 = import inputs.nixpkgs-stable24_11 { - inherit (final) system; - config.allowUnfree = true; - }; - }; - - swarsel-nix = _: prev: { - swarsel-nix = import inputs.swarsel-nix { - pkgs = prev; - }; - }; - - zjstatus = _: prev: { - zjstatus = inputs.zjstatus.packages.${prev.system}.default; - }; + mkPkgs = src: + import src { + inherit (final) system; + config.allowUnfree = true; + }; + in + builtins.listToAttrs (map + (name: { + name = rename name; + value = mkPkgs nixpkgsInputs.${name}; + }) + (builtins.attrNames nixpkgsInputs)); in (additions final prev) // (modifications final prev) - // (nixpkgs-stable final prev) - // (nixpkgs-dev final prev) - // (nixpkgs-kernel final prev) - // (nixpkgs-stable24_05 final prev) - // (nixpkgs-stable24_11 final prev) - // (swarsel-nix final prev) - // (zjstatus final prev) + // (nixpkgs-stable-versions final prev) // (inputs.niri-flake.overlays.niri final prev) // (inputs.vbc-nix.overlays.default final prev) // (inputs.nur.overlays.default final prev)