From d0f432b717fce32132d7e9a144aa69afe39f1e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Mon, 15 Sep 2025 15:55:39 +0200 Subject: [PATCH] chore: update flake --- SwarselSystems.org | 486 ++--- files/firefox/chrome/userChrome.css | 231 +-- flake.lock | 2521 ++++++++++++++++++++--- flake.nix | 3 +- hosts/nixos/winters/secrets/pii.nix.enc | 6 +- index.html | 427 ++-- install/installer-config.nix | 8 +- modules/home/common/packages.nix | 2 +- modules/home/common/settings.nix | 8 +- modules/home/common/spicetify.nix | 3 +- modules/home/common/ssh.nix | 14 +- modules/home/common/sway.nix | 2 +- modules/nixos/client/lid.nix | 6 +- modules/nixos/client/nvd-rebuild.nix | 14 +- modules/nixos/client/xdg-portal.nix | 10 +- modules/nixos/common/settings.nix | 8 +- modules/nixos/server/immich.nix | 3 +- modules/nixos/server/kanidm.nix | 2 +- modules/nixos/server/nginx.nix | 1 - modules/nixos/server/settings.nix | 8 +- modules/nixos/server/shlink.nix | 14 +- modules/nixos/server/slink.nix | 1 - modules/shared/vars.nix | 4 +- nix/devshell.nix | 2 +- nix/overlays.nix | 2 +- 25 files changed, 2787 insertions(+), 999 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index e640727..54c2b9c 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -454,7 +454,8 @@ A short overview over each input and what it does: url = "github:dj95/zjstatus"; }; fw-fanctrl = { - url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + # url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + url = "github:Swarsel/fw-fanctrl/packaging/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { @@ -1207,7 +1208,7 @@ Lastly, in the =perSystem= attribute set, we see that it is actually passed some devshells.default = { packages = [ - (builtins.trace "alarm: we pinned nix_2_24 because of https://github.com/shlevy/nix-plugins/issues/20" pkgs.nixVersions.nix_2_24) # 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: 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. pkgs.git pkgs.just pkgs.age @@ -1476,7 +1477,7 @@ On the structure of overlays: as you notice, all of the attributes within overla nativeMessagingHosts = [ prev.tridactyl-native prev.browserpass - prev.plasma5Packages.plasma-browser-integration + # prev.plasma5Packages.plasma-browser-integration ]; }; @@ -3318,10 +3319,14 @@ TODO: cleanup this mess nix = { channel.enable = false; package = pkgs.nixVersions.nix_2_28; + # extraOptions = '' + # plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins + # extra-builtins-file = ${../nix/extra-builtins.nix} + # ''; extraOptions = '' plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: { - buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost]; - patches = (o.patches or []) ++ [ ../nix/nix-plugins.patch ]; + buildInputs = [config.nix.package pkgs.boost]; + patches = o.patches or []; })}/lib/nix/plugins extra-builtins-file = ${../nix/extra-builtins.nix} ''; @@ -4109,13 +4114,15 @@ A breakdown of the flags being set: trusted-users = [ "@wheel" "${config.swarselsystems.mainUser}" ]; }; # extraOptions = '' - # plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins + # 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 = [pkgs.nixVersions.nix_2_28 pkgs.boost]; - patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"]; + buildInputs = [config.nix.package pkgs.boost]; + patches = o.patches or []; })}/lib/nix/plugins extra-builtins-file = ${self + /nix/extra-builtins.nix} '' + lib.optionalString (!minimal) '' @@ -5838,13 +5845,13 @@ This snipped is added to the activation script that is run after every rebuild a pkgs.nvd ]; - system.activationScripts.diff = { - supportsDryActivation = true; - text = '' - ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \ - /run/current-system "$systemConfig" - ''; - }; + # system.activationScripts.diff = { + # supportsDryActivation = true; + # text = '' + # ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \ + # /run/current-system "$systemConfig" + # ''; + # }; }; } #+end_src @@ -5913,11 +5920,11 @@ This allows me to use screen sharing on Wayland. The implementation is a bit cru config = lib.mkIf config.swarselmodules.xdg-portal { xdg.portal = { enable = true; - # config = { - # common = { - # default = "wlr"; - # }; - # }; + config = { + common = { + default = "wlr"; + }; + }; wlr.enable = true; wlr.settings.screencast = { output_name = "eDP-1"; @@ -5987,9 +5994,9 @@ This turns off the display when the lid is closed. { options.swarselmodules.lid = lib.mkEnableOption "lid config"; config = lib.mkIf config.swarselmodules.lid { - services.logind = { - lidSwitch = "suspend"; - lidSwitchDocked = "ignore"; + services.logind.settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchDocked = "ignore"; }; services.acpid = { enable = true; @@ -6193,40 +6200,38 @@ Here we just define some aliases for rebuilding the system, and we allow some in let inherit (config.swarselsystems) flakePath; in - { + { - options.swarselmodules.server.general = lib.mkEnableOption "general setting on server"; - options.swarselsystems = { - shellAliases = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = { }; + options.swarselmodules.server.general = lib.mkEnableOption "general setting on server"; + options.swarselsystems = { + shellAliases = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + }; }; - }; - config = lib.mkIf config.swarselmodules.server.general { + config = lib.mkIf config.swarselmodules.server.general { - environment.shellAliases = lib.recursiveUpdate - { - npswitch = "cd ${flakePath}; git pull; sudo nixos-rebuild --flake .#$(hostname) switch; cd -;"; - nswitch = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) switch;"; - npiswitch = "cd ${flakePath}; git pull; sudo nixos-rebuild --flake .#$(hostname) switch --impure; cd -;"; - nipswitch = "cd ${flakePath}; git pull; sudo nixos-rebuild --flake .#$(hostname) switch --impure; cd -;"; - niswitch = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) switch --impure;"; - } - config.swarselsystems.shellAliases; + environment.shellAliases = lib.recursiveUpdate + { + 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 -;"; + } + config.swarselsystems.shellAliases; - nixpkgs.config.permittedInsecurePackages = [ - # matrix - "olm-3.2.16" - # sonarr - "aspnetcore-runtime-wrapped-6.0.36" - "aspnetcore-runtime-6.0.36" - "dotnet-sdk-wrapped-6.0.428" - "dotnet-sdk-6.0.428" - # - "SDL_ttf-2.0.11" - ]; - }; - } + nixpkgs.config.permittedInsecurePackages = [ + # matrix + "olm-3.2.16" + # sonarr + "aspnetcore-runtime-wrapped-6.0.36" + "aspnetcore-runtime-6.0.36" + "dotnet-sdk-wrapped-6.0.428" + "dotnet-sdk-6.0.428" + # + "SDL_ttf-2.0.11" + ]; + }; + } #+end_src **** System Packages @@ -6347,7 +6352,6 @@ Here we just define some aliases for rebuilding the system, and we allow some in security.acme = { acceptTerms = true; - preliminarySelfsigned = false; defaults = { inherit dnsProvider; email = address3; @@ -7319,7 +7323,7 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t :END: #+begin_src nix-ts :tangle modules/nixos/server/immich.nix - { lib, config, globals, ... }: + { lib, pkgs, config, globals, ... }: let servicePort = 3001; serviceUser = "immich"; @@ -7340,6 +7344,7 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t services.${serviceName} = { enable = true; + package = pkgs.stable.immich; host = "0.0.0.0"; port = servicePort; openFirewall = true; @@ -8719,7 +8724,7 @@ To get other URLs (token, etc.), use https:///oauth2/openid//oauth2/openid//oauth2/openid/ [panelopen]:not(#ask-chat-shortcuts)) ~ toolbox #urlbar[popover], -#navigator-toolbox:is(:hover,:focus-within) #urlbar[popover], +#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel)) ~ toolbox #urlbar[popover], +#navigator-toolbox:is(:hover,:focus-within,[movingtab]) #urlbar[popover], #urlbar-container > #urlbar[popover]:is([focused],[open]){ - pointer-events: auto; - opacity: 1; - transition-delay: 0ms; - transform: rotateX(0deg); + pointer-events: auto; + opacity: 1; + transition-delay: 33ms; + transform: rotateX(0deg); } -#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts)) ~ toolbox, +#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel)) ~ toolbox, #navigator-toolbox:has(#urlbar:is([open],[focus-within])), -#navigator-toolbox:hover, -#navigator-toolbox:focus-within{ - transition-delay: 0ms !important; - transform: rotateX(0); - opacity: 1; +#navigator-toolbox:is(:hover,:focus-within,[movingtab]){ + transition-delay: 33ms !important; + transform: rotateX(0); + opacity: 1; } /* This makes things like OS menubar/taskbar show the toolbox when hovered in maximized windows. * Unfortunately it also means that other OS native surfaces (such as context menu on macos) * and other always-on-top applications will trigger toolbox to show up. */ -@media (-moz-bool-pref: "userchrome.autohide-toolbox.unhide-by-native-ui.enabled"){ - :root[sizemode="maximized"]:not(:hover){ - #navigator-toolbox:not(:-moz-window-inactive), +@media (-moz-bool-pref: "userchrome.autohide-toolbox.unhide-by-native-ui.enabled"), + -moz-pref("userchrome.autohide-toolbox.unhide-by-native-ui.enabled"){ + :root[sizemode="maximized"]:not(:hover){ + #navigator-toolbox:not(:-moz-window-inactive), #urlbar[popover]:not(:-moz-window-inactive){ - transition-delay: 0ms !important; - transform: rotateX(0); - opacity: 1; - } + transition-delay: 33ms !important; + transform: rotateX(0); + opacity: 1; } + } } #navigator-toolbox > *{ line-height: normal; pointer-events: auto } -#navigator-toolbox, -#navigator-toolbox > *{ - width: 100vw; - -moz-appearance: none !important; -} - -/* These two exist for oneliner compatibility */ -#nav-bar{ width: var(--uc-navigationbar-width,100vw) } -#TabsToolbar -{ - visibility: collapse; -} /* Don't apply transform before window has been fully created */ :root:not([sessionrestored]) #navigator-toolbox{ transform:none !important } :root[customizing] #navigator-toolbox{ - position: relative !important; - transform: none !important; - opacity: 1 !important; + position: relative !important; + transform: none !important; + opacity: 1 !important; } #navigator-toolbox[inFullscreen] > #PersonalToolbar, -#PersonalToolbar[collapsed="true"]{ display: none } +#PersonalToolbar:is([collapsed=""],[collapsed="true"]){ display: none } + +/* This is a bit hacky fix for an issue that will make urlbar zero pixels tall after you enter customize mode */ +#urlbar[breakout][breakout-extend] > .urlbar-input-container{ + padding-block: calc(min(4px,(var(--urlbar-container-height) - var(--urlbar-height)) / 2) + var(--urlbar-container-padding)) !important; +} /* Uncomment this if tabs toolbar is hidden with hide_tabs_toolbar.css */ /*#titlebar{ margin-bottom: -9px }*/ @@ -22957,101 +22986,6 @@ See the above repository for updates as well as full license text. */ #navigator-toolbox{ flex-direction: column; display: flex; } #titlebar{ order: 2 } */ -#sidebar-header { - display: none; -} -#sidebar-header { - /* display: none; */ - visibility: collapse !important; -} -/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0 -See the above repository for updates as well as full license text. */ - -/* Show sidebar only when the cursor is over it */ -/* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ - -#sidebar-box{ - --uc-sidebar-width: 30px; - --uc-sidebar-hover-width: 210px; - --uc-autohide-sidebar-delay: 0ms; /* Wait 0.6s before hiding sidebar */ - --uc-autohide-transition-duration: 0ms; - --uc-autohide-transition-type: linear; - --browser-area-z-index-sidebar: 3; - position: relative; - min-width: var(--uc-sidebar-width) !important; - width: var(--uc-sidebar-width) !important; - max-width: var(--uc-sidebar-width) !important; - z-index: var(--browser-area-z-index-sidebar,3); -} -#sidebar-box[positionend]{ direction: rtl } -#sidebar-box[positionend] > *{ direction: ltr } - -#sidebar-box[positionend]:-moz-locale-dir(rtl){ direction: ltr } -#sidebar-box[positionend]:-moz-locale-dir(rtl) > *{ direction: rtl } - -#main-window[sizemode="fullscreen"] #sidebar-box{ --uc-sidebar-width: 1px; } - -#sidebar-splitter{ display: none } - -#sidebar-header{ - overflow: hidden; - color: var(--chrome-color, inherit) !important; - padding-inline: 0 !important; -} - -#sidebar-header::before, -#sidebar-header::after{ - content: ""; - display: flex; - padding-left: 8px; -} - -#sidebar-header, -#sidebar{ - transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important; - min-width: var(--uc-sidebar-width) !important; - will-change: min-width; -} -#sidebar-box:hover > #sidebar-header, -#sidebar-box:hover > #sidebar{ - min-width: var(--uc-sidebar-hover-width) !important; - transition-delay: 0ms !important; -} - -.sidebar-panel{ - background-color: transparent !important; - color: var(--newtab-text-primary-color) !important; -} - -.sidebar-panel #search-box{ - -moz-appearance: none !important; - background-color: rgba(249,249,250,0.1) !important; - color: inherit !important; -} - -/* Add sidebar divider and give it background */ - -#sidebar, -#sidebar-header{ - background-color: inherit !important; - border-inline: 1px solid rgb(80,80,80); - border-inline-width: 0px 1px; -} - -#sidebar-box:not([positionend]) > :-moz-locale-dir(rtl), -#sidebar-box[positionend] > *{ - border-inline-width: 1px 0px; -} - -/* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */ - -#sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel{ - inset-inline: auto 0px !important; -} -#sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel-label{ - margin-inline: 0px !important; - border-left-style: solid !important; -} #+end_src ** Default Flake Template diff --git a/files/firefox/chrome/userChrome.css b/files/firefox/chrome/userChrome.css index 3427fa9..a3f46b1 100644 --- a/files/firefox/chrome/userChrome.css +++ b/files/firefox/chrome/userChrome.css @@ -6,114 +6,108 @@ See the above repository for updates as well as full license text. */ */ :root{ - --uc-autohide-toolbox-delay: 0ms; /* Wait 0.1s before hiding toolbars */ - --uc-toolbox-rotation: 107deg; /* This may need to be lower on mac - like 75 or so */ + --uc-autohide-toolbox-delay: 200ms; /* Wait 0.1s before hiding toolbars */ + --uc-toolbox-rotation: 82deg; /* This may need to be lower on mac - like 75 or so */ - --base00: #1D252C; - --base01: #171D23; - --base02: #5EC4FF; - --base03: #566C7D; - --base04: #5EC4FF; - --base05: #A0B3C5; - --base06: #C06ECE; - --base07: #A0B3C5; - --base08: #D95468; - --base09: #FFA880; - --base0A: #5EC4FF; - --base0B: #8BD49C; - --base0C: #008B94; - --base0D: #5EC4FF; - --base0E: #C06ECE; - --base0F: #5EC4FF; + --base00: #1D252C; + --base01: #171D23; + --base02: #5EC4FF; + --base03: #566C7D; + --base04: #5EC4FF; + --base05: #A0B3C5; + --base06: #C06ECE; + --base07: #A0B3C5; + --base08: #D95468; + --base09: #FFA880; + --base0A: #5EC4FF; + --base0B: #8BD49C; + --base0C: #008B94; + --base0D: #5EC4FF; + --base0E: #C06ECE; + --base0F: #5EC4FF; } :root[sizemode="maximized"]{ - --uc-toolbox-rotation: 88.5deg; + --uc-toolbox-rotation: 88.5deg; } @media (-moz-platform: windows){ - :root:not([lwtheme]) #navigator-toolbox{ background-color: -moz-dialog !important; } + :root:not([lwtheme]) #navigator-toolbox{ background-color: -moz-dialog !important; } } :root[sizemode="fullscreen"], :root[sizemode="fullscreen"] #navigator-toolbox{ margin-top: 0 !important; } #navigator-toolbox{ - --browser-area-z-index-toolbox: 3; - position: fixed !important; - background-color: var(--lwt-accent-color,black) !important; - transition: transform 0ms linear, opacity 0ms linear !important; - transition-delay: var(--uc-autohide-toolbox-delay) !important; - transform-origin: top; - transform: rotateX(var(--uc-toolbox-rotation)); - opacity: 0; - line-height: 0; - z-index: 1; - pointer-events: none; + --browser-area-z-index-toolbox: 3; + position: fixed !important; + background-color: var(--lwt-accent-color,black) !important; + transition: transform 82ms linear, opacity 82ms linear !important; + transition-delay: var(--uc-autohide-toolbox-delay) !important; + transform-origin: top; + transform: rotateX(var(--uc-toolbox-rotation)); + opacity: 0; + line-height: 0; + z-index: 1; + pointer-events: none; + width: 100vw; } :root[sessionrestored] #urlbar[popover]{ - pointer-events: none; - opacity: 0; - transition: transform 0ms linear var(--uc-autohide-toolbox-delay), opacity 0ms calc(var(--uc-autohide-toolbox-delay) + 0ms); - transform-origin: 0px calc(0px - var(--tab-min-height) - var(--tab-block-margin) * 2); - transform: rotateX(89.9deg); + pointer-events: none; + opacity: 0; + transition: transform 82ms linear var(--uc-autohide-toolbox-delay), opacity 0ms calc(var(--uc-autohide-toolbox-delay) + 82ms); + transform-origin: 0px calc(0px - var(--tab-min-height) - var(--tab-block-margin) * 2); + transform: rotateX(89.9deg); } -#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts)) ~ toolbox #urlbar[popover], -#navigator-toolbox:is(:hover,:focus-within) #urlbar[popover], +#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel)) ~ toolbox #urlbar[popover], +#navigator-toolbox:is(:hover,:focus-within,[movingtab]) #urlbar[popover], #urlbar-container > #urlbar[popover]:is([focused],[open]){ - pointer-events: auto; - opacity: 1; - transition-delay: 0ms; - transform: rotateX(0deg); + pointer-events: auto; + opacity: 1; + transition-delay: 33ms; + transform: rotateX(0deg); } -#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts)) ~ toolbox, +#mainPopupSet:has(> [panelopen]:not(#ask-chat-shortcuts,#selection-shortcut-action-panel,#chat-shortcuts-options-panel,#tab-preview-panel)) ~ toolbox, #navigator-toolbox:has(#urlbar:is([open],[focus-within])), -#navigator-toolbox:hover, -#navigator-toolbox:focus-within{ - transition-delay: 0ms !important; - transform: rotateX(0); - opacity: 1; +#navigator-toolbox:is(:hover,:focus-within,[movingtab]){ + transition-delay: 33ms !important; + transform: rotateX(0); + opacity: 1; } /* This makes things like OS menubar/taskbar show the toolbox when hovered in maximized windows. * Unfortunately it also means that other OS native surfaces (such as context menu on macos) * and other always-on-top applications will trigger toolbox to show up. */ -@media (-moz-bool-pref: "userchrome.autohide-toolbox.unhide-by-native-ui.enabled"){ - :root[sizemode="maximized"]:not(:hover){ - #navigator-toolbox:not(:-moz-window-inactive), +@media (-moz-bool-pref: "userchrome.autohide-toolbox.unhide-by-native-ui.enabled"), + -moz-pref("userchrome.autohide-toolbox.unhide-by-native-ui.enabled"){ + :root[sizemode="maximized"]:not(:hover){ + #navigator-toolbox:not(:-moz-window-inactive), #urlbar[popover]:not(:-moz-window-inactive){ - transition-delay: 0ms !important; - transform: rotateX(0); - opacity: 1; - } + transition-delay: 33ms !important; + transform: rotateX(0); + opacity: 1; } + } } #navigator-toolbox > *{ line-height: normal; pointer-events: auto } -#navigator-toolbox, -#navigator-toolbox > *{ - width: 100vw; - -moz-appearance: none !important; -} - -/* These two exist for oneliner compatibility */ -#nav-bar{ width: var(--uc-navigationbar-width,100vw) } -#TabsToolbar -{ - visibility: collapse; -} /* Don't apply transform before window has been fully created */ :root:not([sessionrestored]) #navigator-toolbox{ transform:none !important } :root[customizing] #navigator-toolbox{ - position: relative !important; - transform: none !important; - opacity: 1 !important; + position: relative !important; + transform: none !important; + opacity: 1 !important; } #navigator-toolbox[inFullscreen] > #PersonalToolbar, -#PersonalToolbar[collapsed="true"]{ display: none } +#PersonalToolbar:is([collapsed=""],[collapsed="true"]){ display: none } + +/* This is a bit hacky fix for an issue that will make urlbar zero pixels tall after you enter customize mode */ +#urlbar[breakout][breakout-extend] > .urlbar-input-container{ + padding-block: calc(min(4px,(var(--urlbar-container-height) - var(--urlbar-height)) / 2) + var(--urlbar-container-padding)) !important; +} /* Uncomment this if tabs toolbar is hidden with hide_tabs_toolbar.css */ /*#titlebar{ margin-bottom: -9px }*/ @@ -123,98 +117,3 @@ See the above repository for updates as well as full license text. */ #navigator-toolbox{ flex-direction: column; display: flex; } #titlebar{ order: 2 } */ -#sidebar-header { - display: none; -} -#sidebar-header { - /* display: none; */ - visibility: collapse !important; -} -/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0 -See the above repository for updates as well as full license text. */ - -/* Show sidebar only when the cursor is over it */ -/* The border controlling sidebar width will be removed so you'll need to modify these values to change width */ - -#sidebar-box{ - --uc-sidebar-width: 30px; - --uc-sidebar-hover-width: 210px; - --uc-autohide-sidebar-delay: 0ms; /* Wait 0.6s before hiding sidebar */ - --uc-autohide-transition-duration: 0ms; - --uc-autohide-transition-type: linear; - --browser-area-z-index-sidebar: 3; - position: relative; - min-width: var(--uc-sidebar-width) !important; - width: var(--uc-sidebar-width) !important; - max-width: var(--uc-sidebar-width) !important; - z-index: var(--browser-area-z-index-sidebar,3); -} -#sidebar-box[positionend]{ direction: rtl } -#sidebar-box[positionend] > *{ direction: ltr } - -#sidebar-box[positionend]:-moz-locale-dir(rtl){ direction: ltr } -#sidebar-box[positionend]:-moz-locale-dir(rtl) > *{ direction: rtl } - -#main-window[sizemode="fullscreen"] #sidebar-box{ --uc-sidebar-width: 1px; } - -#sidebar-splitter{ display: none } - -#sidebar-header{ - overflow: hidden; - color: var(--chrome-color, inherit) !important; - padding-inline: 0 !important; -} - -#sidebar-header::before, -#sidebar-header::after{ - content: ""; - display: flex; - padding-left: 8px; -} - -#sidebar-header, -#sidebar{ - transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important; - min-width: var(--uc-sidebar-width) !important; - will-change: min-width; -} -#sidebar-box:hover > #sidebar-header, -#sidebar-box:hover > #sidebar{ - min-width: var(--uc-sidebar-hover-width) !important; - transition-delay: 0ms !important; -} - -.sidebar-panel{ - background-color: transparent !important; - color: var(--newtab-text-primary-color) !important; -} - -.sidebar-panel #search-box{ - -moz-appearance: none !important; - background-color: rgba(249,249,250,0.1) !important; - color: inherit !important; -} - -/* Add sidebar divider and give it background */ - -#sidebar, -#sidebar-header{ - background-color: inherit !important; - border-inline: 1px solid rgb(80,80,80); - border-inline-width: 0px 1px; -} - -#sidebar-box:not([positionend]) > :-moz-locale-dir(rtl), -#sidebar-box[positionend] > *{ - border-inline-width: 1px 0px; -} - -/* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */ - -#sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel{ - inset-inline: auto 0px !important; -} -#sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel-label{ - margin-inline: 0px !important; - border-left-style: solid !important; -} diff --git a/flake.lock b/flake.lock index feca779..bde2c36 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -66,6 +66,22 @@ "type": "github" } }, + "base16-fish_4": { + "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": { @@ -83,6 +99,22 @@ } }, "base16-helix_2": { + "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_3": { "flake": false, "locked": { "lastModified": 1748408240, @@ -98,7 +130,7 @@ "type": "github" } }, - "base16-helix_3": { + "base16-helix_4": { "flake": false, "locked": { "lastModified": 1748408240, @@ -165,6 +197,23 @@ "type": "github" } }, + "base16-vim_4": { + "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" @@ -201,6 +250,24 @@ "type": "github" } }, + "base16_4": { + "inputs": { + "fromYaml": "fromYaml_4" + }, + "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, @@ -218,11 +285,11 @@ }, "crane_2": { "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": { @@ -291,6 +358,36 @@ "type": "github" } }, + "crane_7": { + "locked": { + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "owner": "ipetkov", + "repo": "crane", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_8": { + "locked": { + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "owner": "ipetkov", + "repo": "crane", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -420,6 +517,53 @@ "type": "github" } }, + "devshell_7": { + "inputs": { + "nixpkgs": [ + "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_8": { + "inputs": { + "nixpkgs": [ + "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" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -427,11 +571,11 @@ ] }, "locked": { - "lastModified": 1753140376, - "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "owner": "nix-community", "repo": "disko", - "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "type": "github" }, "original": { @@ -448,11 +592,11 @@ ] }, "locked": { - "lastModified": 1751854533, - "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", + "lastModified": 1753140376, + "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=", "owner": "nix-community", "repo": "disko", - "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", + "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c", "type": "github" }, "original": { @@ -483,6 +627,29 @@ "type": "github" } }, + "disko_4": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751854533, + "narHash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc=", + "owner": "nix-community", + "repo": "disko", + "rev": "16b74a1e304197248a1bc663280f2548dbfcae3c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "emacs-overlay": { "inputs": { "nixpkgs": [ @@ -491,11 +658,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "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": { @@ -513,11 +680,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "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": { @@ -533,7 +700,31 @@ "swarsel", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_6" + "nixpkgs-stable": "nixpkgs-stable_7" + }, + "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_4": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_9" }, "locked": { "lastModified": 1751908357, @@ -552,11 +743,11 @@ "firefox-gnome-theme": { "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": { @@ -597,6 +788,22 @@ "type": "github" } }, + "firefox-gnome-theme_4": { + "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": { @@ -661,6 +868,70 @@ "type": "github" } }, + "flake-compat_13": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_14": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "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": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_16": { + "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_2": { "flake": false, "locked": { @@ -760,11 +1031,11 @@ "flake-compat_8": { "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": { @@ -794,11 +1065,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "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": { @@ -816,11 +1087,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": { @@ -938,11 +1209,76 @@ "nixpkgs-lib": "nixpkgs-lib_7" }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_17": { + "inputs": { + "nixpkgs-lib": [ + "swarsel", + "swarsel", + "swarsel", + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_18": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_8" + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_19": { + "inputs": { + "nixpkgs-lib": [ + "swarsel", + "swarsel", + "swarsel", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -972,6 +1308,66 @@ "type": "github" } }, + "flake-parts_20": { + "inputs": { + "nixpkgs-lib": [ + "swarsel", + "swarsel", + "swarsel", + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_21": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_9" + }, + "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_22": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_10" + }, + "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_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -1018,11 +1414,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": { @@ -1036,11 +1432,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "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": { @@ -1058,11 +1454,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": { @@ -1128,6 +1524,60 @@ "type": "github" } }, + "flake-utils_10": { + "inputs": { + "systems": "systems_20" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "inputs": { + "systems": "systems_24" + }, + "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_12": { + "inputs": { + "systems": "systems_28" + }, + "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_2": { "inputs": { "systems": "systems_2" @@ -1184,7 +1634,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1726560853, @@ -1202,7 +1652,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1731533236, @@ -1220,14 +1670,14 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "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": { @@ -1238,7 +1688,7 @@ }, "flake-utils_8": { "inputs": { - "systems": "systems_16" + "systems": "systems_13" }, "locked": { "lastModified": 1731533236, @@ -1256,7 +1706,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_20" + "systems": "systems_17" }, "locked": { "lastModified": 1731533236, @@ -1320,6 +1770,22 @@ "type": "github" } }, + "fromYaml_4": { + "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", @@ -1328,15 +1794,15 @@ ] }, "locked": { - "lastModified": 1743661097, - "narHash": "sha256-ZSx9BdbW+/4k3Pmecl7ZhpHXnpreuAgYxrRaJC8VmuU=", - "owner": "TamtamHero", + "lastModified": 1757943948, + "narHash": "sha256-rvXWg0baAoSTj2FXghf11muq5rnI/N9QsHBAHwBAGyU=", + "owner": "Swarsel", "repo": "fw-fanctrl", - "rev": "473575cd1753cb4ec429ea085975e48d32970894", + "rev": "96c7d0b120f218eac27a472795cd50228e6447ce", "type": "github" }, "original": { - "owner": "TamtamHero", + "owner": "Swarsel", "ref": "packaging/nix", "repo": "fw-fanctrl", "type": "github" @@ -1389,6 +1855,31 @@ "type": "github" } }, + "fw-fanctrl_4": { + "inputs": { + "flake-compat": "flake-compat_13", + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743661097, + "narHash": "sha256-ZSx9BdbW+/4k3Pmecl7ZhpHXnpreuAgYxrRaJC8VmuU=", + "owner": "TamtamHero", + "repo": "fw-fanctrl", + "rev": "473575cd1753cb4ec429ea085975e48d32970894", + "type": "github" + }, + "original": { + "owner": "TamtamHero", + "ref": "packaging/nix", + "repo": "fw-fanctrl", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -1411,6 +1902,80 @@ "type": "github" } }, + "gitignore_10": { + "inputs": { + "nixpkgs": [ + "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_11": { + "inputs": { + "nixpkgs": [ + "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_12": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gitignore_2": { "inputs": { "nixpkgs": [ @@ -1644,6 +2209,23 @@ "type": "github" } }, + "gnome-shell_4": { + "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": [ @@ -1651,11 +2233,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": { @@ -1693,11 +2275,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": { @@ -1773,6 +2355,53 @@ "type": "github" } }, + "home-manager_7": { + "inputs": { + "nixpkgs": [ + "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_8": { + "inputs": { + "nixpkgs": [ + "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" + } + }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -1818,6 +2447,21 @@ "type": "github" } }, + "impermanence_4": { + "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", @@ -1828,11 +2472,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1754297745, - "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", + "lastModified": 1756744479, + "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", + "rev": "747b7912f49e2885090c83364d88cf853a020ac1", "type": "github" }, "original": { @@ -1851,11 +2495,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1751381593, - "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "lastModified": 1754297745, + "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", "type": "github" }, "original": { @@ -1887,6 +2531,29 @@ "type": "github" } }, + "lanzaboote_4": { + "inputs": { + "crane": "crane_4", + "flake-compat": "flake-compat_14", + "flake-parts": "flake-parts_17", + "nixpkgs": "nixpkgs_25", + "pre-commit-hooks-nix": "pre-commit-hooks-nix_4", + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1751381593, + "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lanzaboote", + "type": "github" + } + }, "niri-flake": { "inputs": { "niri-stable": "niri-stable", @@ -1898,6 +2565,32 @@ "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, + "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_2": { + "inputs": { + "niri-stable": "niri-stable_2", + "niri-unstable": "niri-unstable_2", + "nixpkgs": [ + "swarsel", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_5", + "xwayland-satellite-stable": "xwayland-satellite-stable_2", + "xwayland-satellite-unstable": "xwayland-satellite-unstable_2" + }, "locked": { "lastModified": 1754797984, "narHash": "sha256-t2WFkdB2qUyZt5rdqmJ340kqhvQWWOCJBJIc1nQ/Hg4=", @@ -1913,6 +2606,23 @@ } }, "niri-stable": { + "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_2": { "flake": false, "locked": { "lastModified": 1748151941, @@ -1930,6 +2640,22 @@ } }, "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1757832020, + "narHash": "sha256-SCdus7r4IS8l3jzF8mcMFMlDvACTdmDCcsPnGUEqll0=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "e6a8ad38479eb179dc7301755316f993e3e872ea", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable_2": { "flake": false, "locked": { "lastModified": 1754742008, @@ -1952,11 +2678,11 @@ ] }, "locked": { - "lastModified": 1751313918, - "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -2008,6 +2734,29 @@ "type": "github" } }, + "nix-darwin_4": { + "inputs": { + "nixpkgs": [ + "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": [ @@ -2080,12 +2829,59 @@ "type": "github" } }, + "nix-formatter-pack_4": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "nix-on-droid", + "nixpkgs" + ], + "nmd": "nmd_7", + "nmt": "nmt_4" + }, + "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": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, + "nix-index-database_2": { + "inputs": { + "nixpkgs": [ + "swarsel", + "nixpkgs" + ] + }, "locked": { "lastModified": 1754195341, "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=", @@ -2100,9 +2896,10 @@ "type": "github" } }, - "nix-index-database_2": { + "nix-index-database_3": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "nixpkgs" ] @@ -2121,9 +2918,10 @@ "type": "github" } }, - "nix-index-database_3": { + "nix-index-database_4": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "swarsel", "nixpkgs" @@ -2224,6 +3022,35 @@ "type": "github" } }, + "nix-on-droid_4": { + "inputs": { + "home-manager": "home-manager_8", + "nix-formatter-pack": "nix-formatter-pack_4", + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "nixpkgs" + ], + "nixpkgs-docs": "nixpkgs-docs_4", + "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap_4", + "nmd": "nmd_8" + }, + "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", @@ -2253,11 +3080,11 @@ "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1744142264, - "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=", + "lastModified": 1752093877, + "narHash": "sha256-P0TySh6sQl1EhfxjW9ZqGxEyUBSsEpdnchOe1QB0pLA=", "owner": "oddlama", "repo": "nix-topology", - "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa", + "rev": "6a536c4b686ee4bcf07a7b0f8b823584560e2633", "type": "github" }, "original": { @@ -2287,6 +3114,27 @@ "type": "github" } }, + "nix-topology_4": { + "inputs": { + "devshell": "devshell_8", + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_26", + "pre-commit-hooks": "pre-commit-hooks_7" + }, + "locked": { + "lastModified": 1744142264, + "narHash": "sha256-h5KyodobZm8dx/HSNN+basgdmjxrQxudjrss4gAQpZk=", + "owner": "oddlama", + "repo": "nix-topology", + "rev": "f49121cbbf4a86c560638ade406d99ee58deb7aa", + "type": "github" + }, + "original": { + "owner": "oddlama", + "repo": "nix-topology", + "type": "github" + } + }, "nixgl": { "inputs": { "flake-utils": "flake-utils_2", @@ -2311,6 +3159,25 @@ "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_11" }, + "locked": { + "lastModified": 1752054764, + "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "owner": "guibou", + "repo": "nixGL", + "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "type": "github" + }, + "original": { + "owner": "guibou", + "repo": "nixGL", + "type": "github" + } + }, + "nixgl_3": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_19" + }, "locked": { "lastModified": 1751696036, "narHash": "sha256-hXq4IOgSdAAaF/9q/2U8TBDL7aXZyQmtq4wl6USZjKo=", @@ -2325,10 +3192,10 @@ "type": "github" } }, - "nixgl_3": { + "nixgl_4": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_19" + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_27" }, "locked": { "lastModified": 1751696036, @@ -2389,6 +3256,21 @@ "type": "github" } }, + "nixlib_4": { + "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", @@ -2455,7 +3337,47 @@ "type": "github" } }, + "nixos-generators_4": { + "inputs": { + "nixlib": "nixlib_4", + "nixpkgs": [ + "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": 1757891025, + "narHash": "sha256-NfiTk59huy/YK9H4W4wVwRYyiP2u86QqROM5KK4f5F4=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "4c38a024fa32e61db2be8573e5282b15d9733a79", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixos-hardware_2": { "locked": { "lastModified": 1754564048, "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", @@ -2471,7 +3393,7 @@ "type": "github" } }, - "nixos-hardware_2": { + "nixos-hardware_3": { "locked": { "lastModified": 1751432711, "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", @@ -2487,7 +3409,7 @@ "type": "github" } }, - "nixos-hardware_3": { + "nixos-hardware_4": { "locked": { "lastModified": 1751432711, "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", @@ -2520,6 +3442,22 @@ } }, "nixpkgs-dev": { + "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_2": { "locked": { "lastModified": 1756088794, "narHash": "sha256-aBaRmk3lNNUm/1H1Jf6hA8miLg3HsYEhcuxUXTGa2gw=", @@ -2535,7 +3473,7 @@ "type": "github" } }, - "nixpkgs-dev_2": { + "nixpkgs-dev_3": { "locked": { "lastModified": 1752736260, "narHash": "sha256-90Gt98hmw/20aOAd7KaSW6otXu7MOBctRmI9RlXD/s0=", @@ -2551,7 +3489,7 @@ "type": "github" } }, - "nixpkgs-dev_3": { + "nixpkgs-dev_4": { "locked": { "lastModified": 1752440522, "narHash": "sha256-CInQkEG3f8XwIBQxYFhuFCT+T++JPstThfifAMD0yRk=", @@ -2615,6 +3553,22 @@ "type": "github" } }, + "nixpkgs-docs_4": { + "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, @@ -2663,6 +3617,22 @@ "type": "github" } }, + "nixpkgs-for-bootstrap_4": { + "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, @@ -2714,13 +3684,45 @@ "type": "github" } }, + "nixpkgs-kernel_4": { + "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": 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": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_10": { + "locked": { + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", "type": "github" }, "original": { @@ -2743,11 +3745,11 @@ }, "nixpkgs-lib_3": { "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": { @@ -2796,6 +3798,33 @@ } }, "nixpkgs-lib_7": { + "locked": { + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_8": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, + "nixpkgs-lib_9": { "locked": { "lastModified": 1753579242, "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", @@ -2874,6 +3903,22 @@ "type": "github" } }, + "nixpkgs-stable24_05_4": { + "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, @@ -2922,13 +3967,45 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable24_11_4": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_10": { + "locked": { + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "29e290002bfff26af1db6f64d070698019460302", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -2940,11 +4017,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -2972,11 +4049,11 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -2987,6 +4064,22 @@ } }, "nixpkgs-stable_6": { + "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_7": { "locked": { "lastModified": 1751274312, "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", @@ -3002,7 +4095,7 @@ "type": "github" } }, - "nixpkgs-stable_7": { + "nixpkgs-stable_8": { "locked": { "lastModified": 1751741127, "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", @@ -3018,6 +4111,22 @@ "type": "github" } }, + "nixpkgs-stable_9": { + "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_10": { "locked": { "lastModified": 1730531603, @@ -3051,11 +4160,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -3083,11 +4192,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { @@ -3115,11 +4224,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -3274,43 +4383,58 @@ }, "nixpkgs_25": { "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": "nixpkgs-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_26": { "locked": { - "lastModified": 1750865895, - "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_27": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1746378225, + "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "93e8cdce7afc64297cfec447c311470788131cd9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_28": { + "locked": { + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -3320,18 +4444,18 @@ "type": "github" } }, - "nixpkgs_28": { + "nixpkgs_29": { "locked": { - "lastModified": 1750865895, - "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", - "owner": "NixOS", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -3351,13 +4475,157 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_30": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_31": { + "locked": { + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_32": { + "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_33": { + "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_34": { + "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_35": { + "locked": { + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_36": { + "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_37": { + "locked": { + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_38": { + "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_4": { + "locked": { + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -3385,11 +4653,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -3401,11 +4669,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -3417,11 +4685,11 @@ }, "nixpkgs_8": { "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": { @@ -3433,11 +4701,11 @@ }, "nixpkgs_9": { "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": { @@ -3564,6 +4832,47 @@ "type": "sourcehut" } }, + "nmd_7": { + "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_8": { + "inputs": { + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "nix-on-droid", + "nixpkgs-docs" + ], + "scss-reset": "scss-reset_4" + }, + "locked": { + "lastModified": 1705050560, + "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", + "owner": "~rycee", + "repo": "nmd", + "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", + "type": "sourcehut" + }, + "original": { + "owner": "~rycee", + "repo": "nmd", + "type": "sourcehut" + } + }, "nmt": { "flake": false, "locked": { @@ -3612,6 +4921,22 @@ "type": "gitlab" } }, + "nmt_4": { + "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", @@ -3669,17 +4994,36 @@ "type": "github" } }, + "nswitch-rcm-nix_4": { + "inputs": { + "flake-parts": "flake-parts_18", + "nixpkgs": "nixpkgs_29" + }, + "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": 1754726338, - "narHash": "sha256-Zz4zAgAvgXwAzkJuhuoYFpQ9eJs/vtaYCso+rfwahsw=", + "lastModified": 1757935448, + "narHash": "sha256-dIk3hiBlSsHZJViknedzOyTb7VjHFmty6d2P59/DRi4=", "owner": "nix-community", "repo": "NUR", - "rev": "ab1e2e53a418b3907f87c24ce277975438f1bd78", + "rev": "b8ed69c1bcb6c358bb1df56e2a2e64323f6572c6", "type": "github" }, "original": { @@ -3700,11 +5044,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": { @@ -3719,11 +5063,11 @@ "nixpkgs": "nixpkgs_14" }, "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": { @@ -3743,15 +5087,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": { @@ -3793,6 +5136,57 @@ "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_7": { + "inputs": { + "flake-parts": "flake-parts_19", + "nixpkgs": "nixpkgs_30" + }, + "locked": { + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "nur_8": { + "inputs": { + "flake-parts": [ + "swarsel", + "swarsel", + "swarsel", + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "stylix", + "nixpkgs" + ], "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -3920,6 +5314,38 @@ "type": "github" } }, + "pre-commit-hooks-nix_4": { + "inputs": { + "flake-compat": [ + "swarsel", + "swarsel", + "swarsel", + "lanzaboote", + "flake-compat" + ], + "gitignore": "gitignore_10", + "nixpkgs": [ + "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_2": { "inputs": { "flake-compat": "flake-compat_4", @@ -3929,11 +5355,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": { @@ -3981,11 +5407,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": { @@ -4049,6 +5475,64 @@ "type": "github" } }, + "pre-commit-hooks_7": { + "inputs": { + "flake-compat": "flake-compat_15", + "gitignore": "gitignore_11", + "nixpkgs": [ + "swarsel", + "swarsel", + "swarsel", + "nix-topology", + "nixpkgs" + ], + "nixpkgs-stable": [ + "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_8": { + "inputs": { + "flake-compat": "flake-compat_16", + "gitignore": "gitignore_12", + "nixpkgs": [ + "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" + } + }, "root": { "inputs": { "devshell": "devshell", @@ -4080,10 +5564,10 @@ "spicetify-nix": "spicetify-nix", "stylix": "stylix", "swarsel": "swarsel", - "swarsel-modules": "swarsel-modules", - "systems": "systems_18", - "vbc-nix": "vbc-nix_3", - "zjstatus": "zjstatus_3" + "swarsel-modules": "swarsel-modules_2", + "systems": "systems_26", + "vbc-nix": "vbc-nix_4", + "zjstatus": "zjstatus_4" } }, "rust-overlay": { @@ -4116,11 +5600,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": { @@ -4157,16 +5641,17 @@ "nixpkgs": [ "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": { @@ -4178,6 +5663,8 @@ "rust-overlay_5": { "inputs": { "nixpkgs": [ + "swarsel", + "swarsel", "swarsel", "zjstatus", "nixpkgs" @@ -4200,6 +5687,8 @@ "rust-overlay_6": { "inputs": { "nixpkgs": [ + "swarsel", + "swarsel", "zjstatus", "nixpkgs" ] @@ -4218,6 +5707,49 @@ "type": "github" } }, + "rust-overlay_7": { + "inputs": { + "nixpkgs": [ + "swarsel", + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750905536, + "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_8": { + "inputs": { + "nixpkgs": [ + "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" + } + }, "scss-reset": { "flake": false, "locked": { @@ -4266,16 +5798,32 @@ "type": "github" } }, + "scss-reset_4": { + "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": 1754328224, - "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", + "lastModified": 1757847158, + "narHash": "sha256-TumOaykhZO8SOs/faz6GQhqkOcFLoQvESLSF1cJ4mZc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", + "rev": "ee6f91c1c11acf7957d94a130de77561ec24b8ab", "type": "github" }, "original": { @@ -4289,11 +5837,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1751606940, - "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", + "lastModified": 1754328224, + "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", + "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", "type": "github" }, "original": { @@ -4320,6 +5868,24 @@ "type": "github" } }, + "sops-nix_4": { + "inputs": { + "nixpkgs": "nixpkgs_31" + }, + "locked": { + "lastModified": 1751606940, + "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "spicetify-nix": { "inputs": { "nixpkgs": [ @@ -4327,6 +5893,28 @@ ], "systems": "systems_3" }, + "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_2": { + "inputs": { + "nixpkgs": [ + "swarsel", + "nixpkgs" + ], + "systems": "systems_7" + }, "locked": { "lastModified": 1754196919, "narHash": "sha256-0zATw65mNql9H8e7HWVBPpijMSbDVeK7JNivRBcUScM=", @@ -4360,11 +5948,11 @@ "tinted-zed": "tinted-zed" }, "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": { @@ -4384,7 +5972,7 @@ "gnome-shell": "gnome-shell_2", "nixpkgs": "nixpkgs_16", "nur": "nur_4", - "systems": "systems_7", + "systems": "systems_8", "tinted-foot": "tinted-foot_2", "tinted-kitty": "tinted-kitty_2", "tinted-schemes": "tinted-schemes_2", @@ -4392,11 +5980,11 @@ "tinted-zed": "tinted-zed_2" }, "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": { @@ -4416,7 +6004,7 @@ "gnome-shell": "gnome-shell_3", "nixpkgs": "nixpkgs_24", "nur": "nur_6", - "systems": "systems_10", + "systems": "systems_11", "tinted-foot": "tinted-foot_3", "tinted-kitty": "tinted-kitty_3", "tinted-schemes": "tinted-schemes_3", @@ -4437,6 +6025,38 @@ "type": "github" } }, + "stylix_4": { + "inputs": { + "base16": "base16_4", + "base16-fish": "base16-fish_4", + "base16-helix": "base16-helix_4", + "base16-vim": "base16-vim_4", + "firefox-gnome-theme": "firefox-gnome-theme_4", + "flake-parts": "flake-parts_20", + "gnome-shell": "gnome-shell_4", + "nixpkgs": "nixpkgs_32", + "nur": "nur_8", + "systems": "systems_14", + "tinted-foot": "tinted-foot_4", + "tinted-kitty": "tinted-kitty_4", + "tinted-schemes": "tinted-schemes_4", + "tinted-tmux": "tinted-tmux_4", + "tinted-zed": "tinted-zed_4" + }, + "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", @@ -4447,6 +6067,7 @@ "home-manager": "home-manager_3", "impermanence": "impermanence_2", "lanzaboote": "lanzaboote_2", + "niri-flake": "niri-flake_2", "nix-darwin": "nix-darwin_2", "nix-index-database": "nix-index-database_2", "nix-on-droid": "nix-on-droid_2", @@ -4457,25 +6078,27 @@ "nixpkgs": "nixpkgs_12", "nixpkgs-dev": "nixpkgs-dev_2", "nixpkgs-kernel": "nixpkgs-kernel_2", - "nixpkgs-stable": "nixpkgs-stable_5", + "nixpkgs-stable": "nixpkgs-stable_6", "nixpkgs-stable24_05": "nixpkgs-stable24_05_2", "nixpkgs-stable24_11": "nixpkgs-stable24_11_2", "nswitch-rcm-nix": "nswitch-rcm-nix_2", "nur": "nur_3", "pre-commit-hooks": "pre-commit-hooks_4", "sops-nix": "sops-nix_2", + "spicetify-nix": "spicetify-nix_2", "stylix": "stylix_2", "swarsel": "swarsel_2", - "systems": "systems_14", - "vbc-nix": "vbc-nix_2", - "zjstatus": "zjstatus_2" + "swarsel-modules": "swarsel-modules", + "systems": "systems_22", + "vbc-nix": "vbc-nix_3", + "zjstatus": "zjstatus_3" }, "locked": { - "lastModified": 1754349779, - "narHash": "sha256-7iNPObM2jj2vMW/vADukJv7v5/pm0Y06jE5AH4WBWYg=", + "lastModified": 1756257870, + "narHash": "sha256-Hd4fEVT1CMgcHezEIM0EEsB8oRXGbz24D4LbkVRtTHQ=", "owner": "Swarsel", "repo": ".dotfiles", - "rev": "9577cdf243bee1062bb05ca378f7bcf834569baa", + "rev": "0848f04326bc9630f8081f37582d3fa146e0ef94", "type": "github" }, "original": { @@ -4486,9 +6109,9 @@ }, "swarsel-modules": { "inputs": { - "flake-parts": "flake-parts_16", - "nixpkgs": "nixpkgs_27", - "systems": "systems_17" + "flake-parts": "flake-parts_21", + "nixpkgs": "nixpkgs_35", + "systems": "systems_21" }, "locked": { "lastModified": 1756088962, @@ -4505,6 +6128,27 @@ "type": "github" } }, + "swarsel-modules_2": { + "inputs": { + "flake-parts": "flake-parts_22", + "nixpkgs": "nixpkgs_37", + "systems": "systems_25" + }, + "locked": { + "lastModified": 1756090249, + "narHash": "sha256-agns3Ql6JdfJw6esJ7OX7302HWzE2mWOepm5ZDU0E4U=", + "owner": "Swarsel", + "repo": "swarsel-modules", + "rev": "43262a7b53ee0e0c9646e46f0a60cd50845e908d", + "type": "github" + }, + "original": { + "owner": "Swarsel", + "ref": "main", + "repo": "swarsel-modules", + "type": "github" + } + }, "swarsel_2": { "inputs": { "devshell": "devshell_5", @@ -4525,7 +6169,7 @@ "nixpkgs": "nixpkgs_20", "nixpkgs-dev": "nixpkgs-dev_3", "nixpkgs-kernel": "nixpkgs-kernel_3", - "nixpkgs-stable": "nixpkgs-stable_7", + "nixpkgs-stable": "nixpkgs-stable_8", "nixpkgs-stable24_05": "nixpkgs-stable24_05_3", "nixpkgs-stable24_11": "nixpkgs-stable24_11_3", "nswitch-rcm-nix": "nswitch-rcm-nix_3", @@ -4533,7 +6177,54 @@ "pre-commit-hooks": "pre-commit-hooks_6", "sops-nix": "sops-nix_3", "stylix": "stylix_3", - "systems": "systems_11", + "swarsel": "swarsel_3", + "systems": "systems_18", + "vbc-nix": "vbc-nix_2", + "zjstatus": "zjstatus_2" + }, + "locked": { + "lastModified": 1754349779, + "narHash": "sha256-7iNPObM2jj2vMW/vADukJv7v5/pm0Y06jE5AH4WBWYg=", + "owner": "Swarsel", + "repo": ".dotfiles", + "rev": "9577cdf243bee1062bb05ca378f7bcf834569baa", + "type": "github" + }, + "original": { + "owner": "Swarsel", + "repo": ".dotfiles", + "type": "github" + } + }, + "swarsel_3": { + "inputs": { + "devshell": "devshell_7", + "disko": "disko_4", + "emacs-overlay": "emacs-overlay_4", + "flake-parts": "flake-parts_16", + "fw-fanctrl": "fw-fanctrl_4", + "home-manager": "home-manager_7", + "impermanence": "impermanence_4", + "lanzaboote": "lanzaboote_4", + "nix-darwin": "nix-darwin_4", + "nix-index-database": "nix-index-database_4", + "nix-on-droid": "nix-on-droid_4", + "nix-topology": "nix-topology_4", + "nixgl": "nixgl_4", + "nixos-generators": "nixos-generators_4", + "nixos-hardware": "nixos-hardware_4", + "nixpkgs": "nixpkgs_28", + "nixpkgs-dev": "nixpkgs-dev_4", + "nixpkgs-kernel": "nixpkgs-kernel_4", + "nixpkgs-stable": "nixpkgs-stable_10", + "nixpkgs-stable24_05": "nixpkgs-stable24_05_4", + "nixpkgs-stable24_11": "nixpkgs-stable24_11_4", + "nswitch-rcm-nix": "nswitch-rcm-nix_4", + "nur": "nur_7", + "pre-commit-hooks": "pre-commit-hooks_8", + "sops-nix": "sops-nix_4", + "stylix": "stylix_4", + "systems": "systems_15", "vbc-nix": "vbc-nix", "zjstatus": "zjstatus" }, @@ -4598,16 +6289,16 @@ }, "systems_12": { "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" } }, @@ -4642,21 +6333,6 @@ } }, "systems_15": { - "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_16": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -4671,6 +6347,21 @@ "type": "github" } }, + "systems_16": { + "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_17": { "locked": { "lastModified": 1681028828, @@ -4746,6 +6437,126 @@ "type": "github" } }, + "systems_21": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_22": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_23": { + "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_24": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_25": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_26": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_27": { + "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_28": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -4902,6 +6713,23 @@ "type": "github" } }, + "tinted-foot_4": { + "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": { @@ -4950,14 +6778,30 @@ "type": "github" } }, + "tinted-kitty_4": { + "flake": false, + "locked": { + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", "type": "github" }, "original": { @@ -4969,11 +6813,11 @@ "tinted-schemes_2": { "flake": false, "locked": { - "lastModified": 1748180480, - "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -4998,14 +6842,30 @@ "type": "github" } }, + "tinted-schemes_4": { + "flake": false, + "locked": { + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", "type": "github" }, "original": { @@ -5017,11 +6877,11 @@ "tinted-tmux_2": { "flake": false, "locked": { - "lastModified": 1748740859, - "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -5046,14 +6906,30 @@ "type": "github" } }, + "tinted-tmux_4": { + "flake": false, + "locked": { + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", "type": "github" }, "original": { @@ -5065,11 +6941,11 @@ "tinted-zed_2": { "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": { @@ -5094,9 +6970,26 @@ "type": "github" } }, + "tinted-zed_4": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "stylix", "nur", @@ -5120,6 +7013,7 @@ "treefmt-nix_2": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "swarsel", "stylix", @@ -5144,11 +7038,12 @@ "vbc-nix": { "inputs": { "nixpkgs": [ + "swarsel", "swarsel", "swarsel", "nixpkgs" ], - "systems": "systems_12" + "systems": "systems_16" }, "locked": { "lastModified": 1742477270, @@ -5169,28 +7064,7 @@ "inputs": { "nixpkgs": [ "swarsel", - "nixpkgs" - ], - "systems": "systems_15" - }, - "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_3": { - "inputs": { - "nixpkgs": [ + "swarsel", "nixpkgs" ], "systems": "systems_19" @@ -5210,7 +7084,69 @@ "url": "ssh://git@github.com/vbc-it/vbc-nix.git" } }, + "vbc-nix_3": { + "inputs": { + "nixpkgs": [ + "swarsel", + "nixpkgs" + ], + "systems": "systems_23" + }, + "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_4": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_27" + }, + "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" + } + }, "xwayland-satellite-stable": { + "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_2": { "flake": false, "locked": { "lastModified": 1748488455, @@ -5228,6 +7164,22 @@ } }, "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1757179758, + "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "970728d0d9d1eada342bb8860af214b601139e58", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable_2": { "flake": false, "locked": { "lastModified": 1754533920, @@ -5245,10 +7197,10 @@ }, "zjstatus": { "inputs": { - "crane": "crane_4", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_25", - "rust-overlay": "rust-overlay_4" + "crane": "crane_5", + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_33", + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1750957292, @@ -5266,10 +7218,10 @@ }, "zjstatus_2": { "inputs": { - "crane": "crane_5", - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_26", - "rust-overlay": "rust-overlay_5" + "crane": "crane_6", + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_34", + "rust-overlay": "rust-overlay_6" }, "locked": { "lastModified": 1750957292, @@ -5287,10 +7239,10 @@ }, "zjstatus_3": { "inputs": { - "crane": "crane_6", - "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_28", - "rust-overlay": "rust-overlay_6" + "crane": "crane_7", + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_36", + "rust-overlay": "rust-overlay_7" }, "locked": { "lastModified": 1753722377, @@ -5305,6 +7257,27 @@ "repo": "zjstatus", "type": "github" } + }, + "zjstatus_4": { + "inputs": { + "crane": "crane_8", + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_38", + "rust-overlay": "rust-overlay_8" + }, + "locked": { + "lastModified": 1757256304, + "narHash": "sha256-qANK2Hwhi4Nbpcsy6lunncyt725gthaSX/0dLluBxtw=", + "owner": "dj95", + "repo": "zjstatus", + "rev": "e2ea91819408f0b0dd7ee15249341cace6eb09cc", + "type": "github" + }, + "original": { + "owner": "dj95", + "repo": "zjstatus", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d70ec01..73990b7 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,8 @@ url = "github:dj95/zjstatus"; }; fw-fanctrl = { - url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + # url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + url = "github:Swarsel/fw-fanctrl/packaging/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { diff --git a/hosts/nixos/winters/secrets/pii.nix.enc b/hosts/nixos/winters/secrets/pii.nix.enc index 96c8140..97cae9e 100644 --- a/hosts/nixos/winters/secrets/pii.nix.enc +++ b/hosts/nixos/winters/secrets/pii.nix.enc @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:ehwByZT896X/hKe5CgolapiScCrPj9yhc99mWJ8HCDvK/p5JsZcq/fISfnhNDtXw2mk9DzdCAOkOqaJ2K/ZQTkTogqKbO/992K23hXe6xF/HhjjELJuRf5mnVT8Z9T27Co9w1FyGQnzIMEJcj7NVfnwjZjOSRFJG9u2tjRy09gO6cNnRF4fKZzqy3BRKWo/2CCib+nIFTrUX/tE9gUm0kIkX9lEDFH4lEXdNnVZTPeGM8OTAhiClWzqWInFqW9CrXaXuZrkfa0XyaXG4pWr+J8rYjBGqCHU4h43FqkUU0UKbapTbnY7yxlnwA61dueGYYpXGjRuyY8rVD9GWd7FgPO7SrgbvOb6nSGBOdDsBa2ME3ysG2+9tQwOvKbllpD3BlK0ettpcdpqBtpFUrpf8PUJsmWdzVZTP0ZVM0k3OdqLIPzgB5mLrcN5MvJ6MvWXWo1i/yWKGFVSGNfD8cieI7avIXm9zwSouDz06fmq9cWtZ4oG+z+h0fjsw7Ns5/mmH8r298JIQmJKg8LhShA0PCC4Yptv8RCDJMv6DRVMCqIEc10rpg0jDZWPImeHh4eCY6qyXoDsDRXVIEEYVawQJIN7PJfV3fN8X+wCJJatARIrFapJFLGNRCyFrIG5h5IhACwaBmawZrJf9WQVaKCLVQ+NDyC6PMmsmuV5b6JukrPruTfXYLFdIODEr8qVYfvwaCN1mqa/iVLO3T9zNUEed7bSuLj0KAQdEdoxhrB/hU7EO3q9VfjZXMlnDyDQNAPKwpnsk18kCgVWL3S2BKwQbfFvKi9Aqx0WtBkn6K9UJ0tZyOywz1RdhH/CL+FxOU4PsG8piNgrvWEqMDFPaefaj9BNKIY8Mhb1wDgb5etVbT7vvhIGTZfUVUAOcXmySqqiDdSNwImDZAMJmzAoArzyUswq/dVzNmCfm7Or9/KAZxp5nqM/DrfPw2wLWpOxxyY6R/irzT9KyhHHtv59IROIDtU0wm6gzU3j+oEJ2MgnpRzgqknDM1K8j9Wk/kzPcT9Hqp9N95NfLApQHaKuDtmqFoa09mIQa5pGFacArWA0P8PjEsj5vJLZ1n/+HG0odU3fv5z54Azd1MmHu1lIvIRlbvKDmtvFW53IyLnD1sqRMCkntsuuef8bIobS6An8wy08tP+bKaPX4pMLUD9TpSkYgPOJEx9MVpUyUSGiBnVoN/DJr3ZrDY6cB9d+nOD9euQLv0F+dXteArvuxe2uTvetnmta+fW0+fQhLOoD2tNehOq3jyn1/JJlIzhx4K6go1toNeUKcZX/niYhzYjSw6+q6kQPcz+t+LhqyWdlWnLEDMc2auiJRpImGMjGYYF+pK6tPkBftmR5h0DcG7EYgL2XGEGprKRIIUuZ4a+DGGqb1aL99WenwU+Wtz/kvohuLZd1jsym0lhgqxlenx54GIzMDCu6UF5vYd1dnqfpKH0HjlBFRCZk/WXCp6BFrgtmhbUhfCi4xCUniDsN2zeIzH7rF+uIdqsTtm2bbSLBZh3RqeswqFMSs7ZnQRjmT3CdXS7F45vX2pMyo,iv:AtYXO4kgmOsMys8DFNe7aCq1PJ9sBzsaAmaNGVNMq4A=,tag:2ovss2xLfW3GgcdLfltwcQ==,type:str]", + "data": "ENC[AES256_GCM,data:lDbxvTQBbWAyHGx1a0TPXA6nIJ4crJICZaG/VYdeRl09NbJeF1dO2/UEquQxulE0IR+VkzIbfRiLPJ74kRcEsuFEBQ9LrF+gMEgwocQGCPGRTaWTfl84HfcX4qo+elOB5/W5lx1moOdYKFNFkxKbAj6wN0A8n0YBFqPDW/zeMO0DU6+MLW1XEb8zjG0hERocHb8svHVv2Xhu6sP2AX844vtN9u2xKil/kAR8XLPyuVCutsO+8GNfGkZh4hYdn5H+TYmWcWzzLujBt2H8+7UfdYsU4Q2PYcJ/Uokol8PAqMmPQDt9fF2S/IBbWZBmJY+ZmcxGHgYGY1+FeXZviIR37i8t9DS6isasDmGexDn4WyBq45XI/xo96qy0+GNHbeUoirAWWa+2YhLeqekG8q1luTbMh1uLw1n+ZmT3SexA20ens2sYmwjWdhyCR0cY3lcLhP/NVXgnbmOP61RUl7/RCPq0F3PCZ29LJG7oeDjD3JbJypRhTKnRMF+heEPrvmacWrkCMpEAkR8eB2WQmDxUTFyFTk/tv55GtHDuw5uA77pSmPIqVPppH2CupzDf+nBKyVIqON1jbpyxjlE8bBHtrEWEd0SioiTuC/CcoytzB8IiiEDgNjgoqNHfHYRyxGq0EKFtVcdqvkm3mbD0XyGG0UR3Arl8QSdHhIBSqedN7Y6rZJxef6VfLuxE13FWrZnSVGopAjMb/RTZbXLxjDNeHg6HwdBlrXMT7rps7jxbg39v5sOhGYhphF/L7KdCKVfmi8ubAfDVFZ3XRSuBzcHCW8FkxBWG+7Gnl3mMoNVw8loQwUjT+PbL1VHNQCr2fqS4wrv6ehQZIqOsqqlUF9JH9A3TgmHb4ioQ+jAEyOymTmrMzeaUBzcB9w54epkU+okDTO1LOvwC6gvEOQMoHv6fI2YCsQRCH3Mk3rhNBaotD3lQfuz1Pc3XL8t/9KGrCVwHLAoA+lt9g6o1KZoiBfcp3pFCWsPX3lrmUsJnKZHIVO+S9jOz+aJdOgaX/h5+cHp607bL8Zb296N4yK9yt5U+3mYONKn/hzGAmSghjfb/GTlMRJa5f6J9SerUvKqrjUVXJ2CmMAYojBt30Z1QRXIADRLLeyJglMZy9TwtoNsVr7iD2+rylU5TLJmPpxDbnQFriN0X4yhp1wYYBgjVkXV4SNGElDxjm0HFsBJkBaOpXeijCrcOJ5vmnuGLIhBTw+3qG4dEx/foUYRV1oJFrwH1U/f4oL9cOfdC0B9fv9yXJ/GORywOIlVb4FNLewSbu+PIAiZJLVQcBeBWNKQfoIb892ao2RXXJN6XZxp7IfEIBRBM/sfcfgtDk5ud+nuYPWYf09533t/ZjgbZ1en24MAwsit060IPROVwW3pIh2TSx/j1iMWbJ9ljaabBhivmGVo8CLVErGeSLwLL8eXLQ02D9i+LgY1oQavx3675Z7RDwQbdQxjLCKB5Fq77nPGuf2mzTLE/6NL7l6INCcuyg+Vp2zaxX87NMgh+0q9ZFW/ECL/+QzNeBaUmFJ2tXwMiVJAcm2vGiUvI,iv:emlV4hFKBALvzUiaDtu3CDX0Y8fd8TTQmPaR9WyqN4I=,tag:aFPEYachc1H0F+/q3FbuGA==,type:str]", "sops": { "age": [ { @@ -11,8 +11,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNeGtTZ0ZSV0trWlQrS2dV\nSFo0dytGYXhRTjl6cDZrUU0wZ1IybDVRaFZrCmZmRmxJNmdwS0xodHdEOGU4bldU\nR1JScHAvZHhlVTBJbWExb0VpR0h2MXMKLS0tIDYwQmZpMjdYRmpBeXFNOXArN0h5\nVGN1THljeCtVV0hXenMyRVJkMjlHNEEKm+yZTT48nYr3H0Bd1OKw/CYk1kwnrBzk\nTgSQHsGXhmOyDag9cSZ4wAOmqtqSjA9bouFBuhl2lSbgpjnarvFaXQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-08-12T18:21:56Z", - "mac": "ENC[AES256_GCM,data:6gxEKYRIefxE0DKWuc40wkOp/oCzKxg4jMz5WVqWHXUjOorz6A9TTLYo8UhYCVB8pwxC46iLCND3rDWudurz+2vl/tTDpuh04utB2f6GFy+g5f6Rs9x/KWWFR8pB/BwaG9tEW4UfF7bud6FYM9dY5fJADU6CPxpanOLdhzt7j8A=,iv:oxMFeIwbLFzvCZsmf/z5L3Wi4Quscx+zzD8dafEc66Y=,tag:hKfqVt2nZieQyqQAKexMiA==,type:str]", + "lastmodified": "2025-09-16T11:26:37Z", + "mac": "ENC[AES256_GCM,data:T87Y33N0Tu8IySeUgrV7lgMzG+8Cl0ezJkjZFHzmeXy7+TJ2JKrnTfy0nY2oXjVCRLC2CBRh6e9n6ITnAnQJxyS3ZDF/FaY1h5LSm4e6bklFxBZRTQhssVJHbRE4dm8VZL+NLli32VM5YG+E8Kn640YE0oUgBlxqS4qmH4/fLl4=,iv:37xHtgBX6nmgGUGhwSpLIItN8OMto5yLL+Xr+KA4h9E=,tag:Y4FU6/HYmu1IgLG4ChutZw==,type:str]", "pgp": [ { "created_at": "2025-08-24T23:36:17Z", diff --git a/index.html b/index.html index c915d7b..bd382c4 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 @@ -822,7 +822,7 @@

-This file has 93926 words spanning 24087 lines and was last revised on 2025-08-25 22:51:17 +0200. +This file has 94022 words spanning 24038 lines and was last revised on 2025-09-16 14:01:57 +0200.

@@ -891,7 +891,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-08-25 22:51:17 +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-09-16 14:01:57 +0200)

@@ -903,7 +903,7 @@ system-configuration-options 
---prefix=/nix/store/6gy60bnwvzbvvmg10vqcnhrjnnrpi4y8-emacs-git-pgtk-20250808.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets --with-dbus --with-selinux
+--prefix=/nix/store/4gbb3sfa5p6l3lhhnf0khvfj6w7qbqk5-emacs-git-pgtk-20250914.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --without-xwidgets --with-dbus --with-selinux
@@ -1380,7 +1380,8 @@ This provides devshell support for flake-parts url = "github:dj95/zjstatus"; }; fw-fanctrl = { - url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + # url = "github:TamtamHero/fw-fanctrl/packaging/nix"; + url = "github:Swarsel/fw-fanctrl/packaging/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { @@ -2209,7 +2210,7 @@ Lastly, in the perSystem attribute set, we see that it is actually devshells.default = { packages = [ - (builtins.trace "alarm: we pinned nix_2_24 because of https://github.com/shlevy/nix-plugins/issues/20" pkgs.nixVersions.nix_2_24) # 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: 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. pkgs.git pkgs.just pkgs.age @@ -2518,7 +2519,7 @@ in nativeMessagingHosts = [ prev.tridactyl-native prev.browserpass - prev.plasma5Packages.plasma-browser-integration + # prev.plasma5Packages.plasma-browser-integration ]; }; @@ -2945,7 +2946,6 @@ in ]; - swarselprofiles = { personal = lib.mkIf (!minimal) true; work = lib.mkIf (!minimal) true; @@ -4428,10 +4428,14 @@ in nix = { channel.enable = false; package = pkgs.nixVersions.nix_2_28; + # extraOptions = '' + # plugin-files = ${pkgs.dev.nix-plugins}/lib/nix/plugins + # extra-builtins-file = ${../nix/extra-builtins.nix} + # ''; extraOptions = '' plugin-files = ${pkgs.nix-plugins.overrideAttrs (o: { - buildInputs = [pkgs.nixVersions.nix_2_28 pkgs.boost]; - patches = (o.patches or []) ++ [ ../nix/nix-plugins.patch ]; + buildInputs = [config.nix.package pkgs.boost]; + patches = (o.patches or []); })}/lib/nix/plugins extra-builtins-file = ${../nix/extra-builtins.nix} ''; @@ -5241,13 +5245,15 @@ in trusted-users = [ "@wheel" "${config.swarselsystems.mainUser}" ]; }; # extraOptions = '' - # plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins + # 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 = [pkgs.nixVersions.nix_2_28 pkgs.boost]; - patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"]; + buildInputs = [config.nix.package pkgs.boost]; + patches = (o.patches or []); })}/lib/nix/plugins extra-builtins-file = ${self + /nix/extra-builtins.nix} '' + lib.optionalString (!minimal) '' @@ -7060,13 +7066,13 @@ This snipped is added to the activation script that is run after every rebuild a pkgs.nvd ]; - system.activationScripts.diff = { - supportsDryActivation = true; - text = '' - ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \ - /run/current-system "$systemConfig" - ''; - }; + # system.activationScripts.diff = { + # supportsDryActivation = true; + # text = '' + # ${pkgs.nvd}/bin/nvd --color=always --nix-bin-dir=${pkgs.nix}/bin diff \ + # /run/current-system "$systemConfig" + # ''; + # }; }; } @@ -7141,11 +7147,11 @@ This allows me to use screen sharing on Wayland. The implementation is a bit cru config = lib.mkIf config.swarselmodules.xdg-portal { xdg.portal = { enable = true; - # config = { - # common = { - # default = "wlr"; - # }; - # }; + config = { + common = { + default = "wlr"; + }; + }; wlr.enable = true; wlr.settings.screencast = { output_name = "eDP-1"; @@ -7222,9 +7228,9 @@ This turns off the display when the lid is closed. { options.swarselmodules.lid = lib.mkEnableOption "lid config"; config = lib.mkIf config.swarselmodules.lid { - services.logind = { - lidSwitch = "suspend"; - lidSwitchDocked = "ignore"; + services.logind.settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchDocked = "ignore"; }; services.acpid = { enable = true; @@ -7445,40 +7451,38 @@ Here we just define some aliases for rebuilding the system, and we allow some in let inherit (config.swarselsystems) flakePath; in -{ + { - options.swarselmodules.server.general = lib.mkEnableOption "general setting on server"; - options.swarselsystems = { - shellAliases = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - default = { }; + options.swarselmodules.server.general = lib.mkEnableOption "general setting on server"; + options.swarselsystems = { + shellAliases = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + }; }; - }; - config = lib.mkIf config.swarselmodules.server.general { + config = lib.mkIf config.swarselmodules.server.general { - environment.shellAliases = lib.recursiveUpdate - { - npswitch = "cd ${flakePath}; git pull; sudo nixos-rebuild --flake .#$(hostname) switch; cd -;"; - nswitch = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) switch;"; - npiswitch = "cd ${flakePath}; git pull; sudo nixos-rebuild --flake .#$(hostname) switch --impure; cd -;"; - nipswitch = "cd ${flakePath}; git pull; sudo nixos-rebuild --flake .#$(hostname) switch --impure; cd -;"; - niswitch = "sudo nixos-rebuild --flake ${flakePath}#$(hostname) switch --impure;"; - } - config.swarselsystems.shellAliases; + environment.shellAliases = lib.recursiveUpdate + { + 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 -;"; + } + config.swarselsystems.shellAliases; - nixpkgs.config.permittedInsecurePackages = [ - # matrix - "olm-3.2.16" - # sonarr - "aspnetcore-runtime-wrapped-6.0.36" - "aspnetcore-runtime-6.0.36" - "dotnet-sdk-wrapped-6.0.428" - "dotnet-sdk-6.0.428" - # - "SDL_ttf-2.0.11" - ]; - }; -} + nixpkgs.config.permittedInsecurePackages = [ + # matrix + "olm-3.2.16" + # sonarr + "aspnetcore-runtime-wrapped-6.0.36" + "aspnetcore-runtime-6.0.36" + "dotnet-sdk-wrapped-6.0.428" + "dotnet-sdk-6.0.428" + # + "SDL_ttf-2.0.11" + ]; + }; + } @@ -7599,7 +7603,6 @@ in security.acme = { acceptTerms = true; - preliminarySelfsigned = false; defaults = { inherit dnsProvider; email = address3; @@ -8573,7 +8576,7 @@ in
3.2.3.16. immich
-
{ lib, config, globals, ... }:
+
{ lib, pkgs, config, globals, ... }:
 let
   servicePort = 3001;
   serviceUser = "immich";
@@ -8594,6 +8597,7 @@ in
 
     services.${serviceName} = {
       enable = true;
+      package = pkgs.stable.immich;
       host = "0.0.0.0";
       port = servicePort;
       openFirewall = true;
@@ -9999,7 +10003,7 @@ in
 
     services = {
       ${serviceName} = {
-        package = pkgs.kanidmWithSecretProvisioning;
+        package = pkgs.kanidmWithSecretProvisioning_1_7;
         enableServer = true;
         serverSettings = {
           domain = serviceDomain;
@@ -11110,6 +11114,7 @@ let
   servicePort = 8081;
   serviceName = "shlink";
   serviceDomain = config.repo.secrets.common.services.domains.${serviceName};
+  serviceDir = "/var/lib/shlink";
 
   containerRev = "sha256:1a697baca56ab8821783e0ce53eb4fb22e51bb66749ec50581adc0cb6d031d7a";
 
@@ -11149,12 +11154,23 @@ in
         config.sops.templates.shlink-env.path
       ];
       ports = [ "${builtins.toString servicePort}:${builtins.toString servicePort}" ];
-      volumes = [ ];
+      volumes = [
+        "${serviceDir}/data:/etc/shlink/data"
+      ];
     };
 
+    systemd.tmpfiles.rules = [
+      "d ${serviceDir}/data 0750 1001 root - -"
+      "d ${serviceDir}/data/cache 0750 1001 root - -"
+      "d ${serviceDir}/data/locks 0750 1001 root - -"
+      "d ${serviceDir}/data/log 0750 1001 root - -"
+      "d ${serviceDir}/data/proxies 0750 1001 root - -"
+    ];
+
     networking.firewall.allowedTCPPorts = [ servicePort ];
 
     environment.persistence."/persist".directories = lib.mkIf config.swarselsystems.isImpermanence [
+      { directory = serviceDir; }
       { directory = "/var/lib/containers"; }
     ];
 
@@ -11272,7 +11288,6 @@ in
           locations = {
             "/" = {
               proxyPass = "http://${serviceName}";
-              setOauth2Headers = false;
             };
             "/image" = {
               proxyPass = "http://${serviceName}";
@@ -12102,10 +12117,14 @@ in
   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 = [pkgs.nixVersions.nix_2_28 pkgs.boost];
-          patches = (o.patches or []) ++ ["${self}/nix/nix-plugins.patch"];
+          buildInputs = [config.nix.package pkgs.boost];
+          patches = (o.patches or []);
         })}/lib/nix/plugins
         extra-builtins-file = ${self + /nix/extra-builtins.nix}
       '';
@@ -12307,7 +12326,7 @@ This holds packages that I can use as provided, or with small modifications (as
       # spotify
       vesktop # discord client
       # nextcloud-client # enables a systemd service that I do not want
-      stable.spotify-player
+      spotify-player
       element-desktop
       nicotine-plus
       stable.transmission_3
@@ -12546,12 +12565,24 @@ It is very convenient to have SSH aliases in place for machines that I use. This
   config = lib.mkIf config.swarselmodules.ssh {
     programs.ssh = {
       enable = true;
-      forwardAgent = 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";
@@ -14893,7 +14924,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
                 { app_id = "pavucontrol"; }
                 { app_id = "syncthingtray"; }
                 { app_id = "Element"; }
-                { class = "1Password"; }
+                { app_id = "1Password"; }
                 { app_id = "com.nextcloud.desktopclient.nextcloud"; }
                 { title = "(?:Open|Save) (?:File|Folder|As)"; }
                 { title = "^Add$"; }
@@ -15475,7 +15506,8 @@ in
   config = lib.mkIf config.swarselmodules.${moduleName} {
     programs.spicetify = {
       enable = true;
-      spotifyPackage = pkgs.stable24_11.spotify;
+      # spotifyPackage = pkgs.stable24_11.spotify;
+      spotifyPackage = pkgs.spotify;
       enabledExtensions = with spicePkgs.extensions; [
         fullAppDisplay
         shuffle
@@ -16474,7 +16506,7 @@ In short, the options defined here are passed to the modules systems using