diff --git a/configurations/host/materusPC/audio.nix b/configurations/host/materusPC/audio.nix index 4b137fe..ca1ef32 100644 --- a/configurations/host/materusPC/audio.nix +++ b/configurations/host/materusPC/audio.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: { - sound.enable = true; + #sound.enable = true; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/configurations/host/materusPC/containers/arch.nix b/configurations/host/materusPC/containers/arch.nix index 7681e6c..a589d74 100644 --- a/configurations/host/materusPC/containers/arch.nix +++ b/configurations/host/materusPC/containers/arch.nix @@ -82,7 +82,7 @@ in execConfig = { Boot = true; SystemCallFilter = [ "@known" ]; - Timezone = "bind"; + Timezone = "symlink"; Capability = "all"; PrivateUsers = "no"; ResolvConf = "copy-host"; @@ -103,6 +103,8 @@ in "/run/udev" + "/dev/fuse" + "/dev/snd" "/dev/input" "/dev/shm" "/dev/kfd" @@ -110,6 +112,9 @@ in "/dev/tty" "/dev/tty0" + "/var/lib/flatpak" + "/var/lib/containers" + "/tmp/.X11-unix" /materus diff --git a/configurations/host/materusPC/containers/default.nix b/configurations/host/materusPC/containers/default.nix index e997ef4..3f913d5 100644 --- a/configurations/host/materusPC/containers/default.nix +++ b/configurations/host/materusPC/containers/default.nix @@ -2,6 +2,7 @@ { imports = [ ./arch.nix + ./fedora.nix ]; virtualisation.lxc.enable = true; virtualisation.lxc.lxcfs.enable = true; diff --git a/configurations/host/materusPC/containers/fedora.nix b/configurations/host/materusPC/containers/fedora.nix new file mode 100644 index 0000000..063e750 --- /dev/null +++ b/configurations/host/materusPC/containers/fedora.nix @@ -0,0 +1,75 @@ +{ + config, + pkgs, + lib, + ... +}: +let + ttys = [ + 9 + 10 + ]; + +in +{ + systemd.nspawn."fedora" = { + enable = true; + execConfig = { + Boot = true; + SystemCallFilter = [ "@known" ]; + Timezone = "symlink"; + Capability = "all"; + PrivateUsers = "no"; + ResolvConf = "off"; + }; + + filesConfig = { + BindReadOnly = [ + "/nix" + + "/run/current-system" + "/run/booted-system" + "/run/opengl-driver" + "/run/opengl-driver-32" + + ]; + Bind = [ + "/:/run/host-root" + + "/run/udev" + + "/dev/fuse" + "/dev/snd" + "/dev/input" + "/dev/shm" + "/dev/kfd" + "/dev/dri" + "/dev/tty" + "/dev/tty0" + + "/var/lib/flatpak" + + "/tmp/.X11-unix" + + /materus + + ] ++ lib.lists.forEach ttys (x: "/dev/tty${builtins.toString x}"); + }; + networkConfig = { + Bridge="br0"; + }; + }; + systemd.services."systemd-nspawn@fedora" = { + enable = true; + overrideStrategy = "asDropin"; + serviceConfig = { + ConditionPathExists="/var/lib/machines/fedora"; + DeviceAllow = [ + "char-tty rwm" + "char-input rwm" + "char-drm rwm" + ]; + + }; + }; +} diff --git a/configurations/host/materusPC/default.nix b/configurations/host/materusPC/default.nix index 23d59eb..c31c86a 100644 --- a/configurations/host/materusPC/default.nix +++ b/configurations/host/materusPC/default.nix @@ -25,7 +25,7 @@ materus.profile.nix.enable = true; materus.profile.nixpkgs.enable = true; materus.profile.fonts.enable = true; - materus.profile.steam.enable = true; + materus.profile.steam.enable = false; services.logind.extraConfig = '' NAutoVTs=4 diff --git a/configurations/host/materusPC/hardware/boot.nix b/configurations/host/materusPC/hardware/boot.nix index 76e3b0a..00654f2 100644 --- a/configurations/host/materusPC/hardware/boot.nix +++ b/configurations/host/materusPC/hardware/boot.nix @@ -35,10 +35,11 @@ in "iommu=pt" "psi=1" ] ++ video; - boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci" ]; + boot.kernelModules = [ "pci-stub" "amdgpu" "i2c_dev" "kvm_amd" "vfio" "vfio_iommu_type1" "vfio-pci" "kvmfr" ]; boot.extraModprobeConfig = '' options kvm_amd nested=1 avic=1 npt=1 sev=0 options vfio_iommu_type1 allow_unsafe_interrupts=1 + options kvmfr static_size_mb=64 ''; boot.kernel.sysctl = { "vm.max_map_count" = 1000000; @@ -50,7 +51,7 @@ in boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ "amdgpu" ]; - boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback kvmfr ]; boot.supportedFilesystems = [ "ntfs" "btrfs" "vfat" "exfat" "ext4" ]; diff --git a/configurations/host/materusPC/hardware/default.nix b/configurations/host/materusPC/hardware/default.nix index 4c8de3b..79395d2 100644 --- a/configurations/host/materusPC/hardware/default.nix +++ b/configurations/host/materusPC/hardware/default.nix @@ -16,10 +16,10 @@ environment.variables = { DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1 = "1"; - VK_ICD_FILENAMES = "${pkgs.mesa.drivers}/share/vulkan/icd.d/radeon_icd.x86_64.json:${pkgs.driversi686Linux.mesa.drivers}/share/vulkan/icd.d/radeon_icd.i686.json"; + #VK_ICD_FILENAMES = "${pkgs.mesa.drivers}/share/vulkan/icd.d/radeon_icd.x86_64.json:${pkgs.driversi686Linux.mesa.drivers}/share/vulkan/icd.d/radeon_icd.i686.json"; AMD_VULKAN_ICD = "RADV"; RADV_PERFTEST = "gpl,rt,sam"; - OCL_ICD_VENDORS = "${pkgs.rocmPackages.clr.icd}/etc/OpenCL/vendors/"; + #OCL_ICD_VENDORS = "${pkgs.rocmPackages.clr.icd}/etc/OpenCL/vendors/"; }; hardware.cpu.amd.updateMicrocode = lib.mkForce true; diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix index 1462705..821b62a 100644 --- a/configurations/host/materusPC/home/materus/default.nix +++ b/configurations/host/materusPC/home/materus/default.nix @@ -17,7 +17,7 @@ enableTerminal = lib.mkDefault true; enableTerminalExtra = lib.mkDefault true; enableNixDevel = lib.mkDefault true; - editor.emacs.enable = true; + editor.emacs.enable = false; editor.code.fhs.enable = true; editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_18; in [ llvmpkgs.clang diff --git a/configurations/host/materusPC/network.nix b/configurations/host/materusPC/network.nix index a709151..7358b44 100644 --- a/configurations/host/materusPC/network.nix +++ b/configurations/host/materusPC/network.nix @@ -30,6 +30,7 @@ networking.firewall.allowedUDPPorts = [ (lib.strings.toInt materusArg.wireguard.port) 24800 5900 3702 4656 6000 9943 9944 22000 21027 # Syncthing + 17000 17001 # zomboid ]; networking.networkmanager.settings = { connectivity = { diff --git a/configurations/host/materusPC/other/apps.nix b/configurations/host/materusPC/other/apps.nix index cc801b7..a2ce3ba 100644 --- a/configurations/host/materusPC/other/apps.nix +++ b/configurations/host/materusPC/other/apps.nix @@ -6,13 +6,23 @@ }: { - services.jackett.enable = true; + #services.jackett.enable = true; programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; [ ]; + programs.chromium.enable = true; + programs.chromium.enablePlasmaBrowserIntegration = true; environment.systemPackages = with pkgs; [ + + (vivaldi.overrideAttrs + (oldAttrs: { + dontWrapQtApps = false; + dontPatchELF = true; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.kdePackages.wrapQtAppsHook]; + })) + #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; }) materusArg.pkgs.amdgpu-pro-libs.prefixes (pkgs.bottles.override { diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index 8df4d53..466b959 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -1,33 +1,29 @@ -{ config, pkgs, materusArg, ... }: +{ + config, + pkgs, + materusArg, + ... +}: { - programs.gamemode.enable = true; programs.corectrl.enable = true; - - services.teamviewer.enable = true; - systemd.tmpfiles.rules = [ - "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" - ]; + systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; services.flatpak.enable = true; services.gvfs.enable = true; - services.xserver.xkb.layout = "pl"; - services.xserver.enable = true; services.xserver.videoDrivers = [ "amdgpu" ]; services.dbus.enable = true; services.dbus.packages = [ pkgs.gcr ]; - - services.xserver.displayManager.startx.enable = false; services.xserver.exportConfiguration = true; @@ -44,15 +40,10 @@ ''; - - - services.printing.enable = true; services.libinput.enable = true; - - environment.sessionVariables = { XDG_CACHE_HOME = "\${HOME}/.cache"; XDG_CONFIG_HOME = "\${HOME}/.config"; @@ -64,11 +55,8 @@ XMODIFIERS = "@im=fcitx"; SDL_IM_MODULE = "fcitx"; - MOZ_USE_XINPUT2 = "1"; - PATH = [ - "\${XDG_BIN_HOME}" - ]; + PATH = [ "\${XDG_BIN_HOME}" ]; }; environment.shellInit = '' if ! [ -z "$DISPLAY" ]; then xhost +si:localuser:root &> /dev/null; fi; @@ -76,9 +64,13 @@ ''; i18n.inputMethod.enabled = "fcitx5"; - i18n.inputMethod.fcitx5.addons = [ pkgs.kdePackages.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.fcitx5-gtk pkgs.kdePackages.fcitx5-qt ]; - - + i18n.inputMethod.fcitx5.addons = [ + pkgs.kdePackages.fcitx5-configtool + pkgs.fcitx5-lua + pkgs.fcitx5-mozc + pkgs.fcitx5-gtk + pkgs.kdePackages.fcitx5-qt + ]; services.pcscd.enable = true; @@ -89,21 +81,21 @@ package = pkgs.sambaFull; securityType = "user"; openFirewall = true; - extraConfig = '' - workgroup = WORKGROUP - server string = smbmaterus - netbios name = smbmaterus - security = user - hosts allow = 192.168.122. 127.0.0.1 localhost - hosts deny = 0.0.0.0/0 - guest account = nobody - map to guest = bad user - allow insecure wide links = yes - ''; - shares = { + settings = { + global = { + "workgroup" = "WORKGROUP"; + "server string" = "smbmaterus"; + "netbios name " = "smbmaterus"; + "security" = "user"; + "hosts allow" = "192.168.122. 127.0.0.1 localhost"; + "hosts deny" = "0.0.0.0/0"; + "guest account" = "nobody"; + "map to guest" = "bad user"; + "allow insecure wide links" = "yes"; + }; windows = { - path = "/materus/data/VM/windows_shared"; - browseable = "yes"; + "path" = "/materus/data/VM/windows_shared"; + "browseable" = "yes"; "read only" = "no"; "guest ok" = "no"; "create mask" = "0644"; @@ -113,6 +105,7 @@ "follow symlinks" = "yes"; "wide links" = "yes"; }; + }; }; @@ -134,13 +127,21 @@ openFirewall = true; autoStart = false; }; - + hardware.sane.enable = true; hardware.sane.extraBackends = [ pkgs.hplipWithPlugin ]; environment.enableAllTerminfo = true; - environment.pathsToLink = [ "/share/zsh" "/share/bash-completion" "/share/fish" ]; - environment.shells = with pkgs; [ zsh bashInteractive fish ]; + environment.pathsToLink = [ + "/share/zsh" + "/share/bash-completion" + "/share/fish" + ]; + environment.shells = with pkgs; [ + zsh + bashInteractive + fish + ]; programs = { fish.enable = true; command-not-found.enable = false; @@ -149,9 +150,6 @@ materus.profile.browser.enable = true; - services.davfs2.enable = true; - - } diff --git a/configurations/host/materusPC/vm/win-vfio/default.nix b/configurations/host/materusPC/vm/win-vfio/default.nix index 610c5cc..6f7a57e 100644 --- a/configurations/host/materusPC/vm/win-vfio/default.nix +++ b/configurations/host/materusPC/vm/win-vfio/default.nix @@ -10,7 +10,7 @@ let startedHook = '' QEMU_PID=$(ps aux | grep qemu-system-x86_64 | grep "${VM_UUID}" | tr -s ' ' | cut -d " " -f 2) - for pid in $(cat /sys/fs/cgroup/cpu/machine.slice/machine-qemu*$1.scope/libvirt/vcpu*/tasks); do + for pid in $(ls /proc/$QEMU_PID/task); do renice -n "-15" -p "$pid"; done renice -n "-10" -p "$QEMU_PID"; @@ -47,7 +47,8 @@ let chmod 0 /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-render chmod 0 /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-card fuser -k /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-render - pkill Xwayland + fuser -k /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-card + #pkill Xwayland # Seems to fix reset bug for 7900 XTX echo "0" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/d3cold_allowed" @@ -64,9 +65,11 @@ let echo ''$VIRSH_GPU_VIDEO > /sys/bus/pci/drivers/amdgpu/bind sleep 1s - - chmod 0 /dev/dri/renderD128 - fuser -k /dev/dri/renderD128 + + chmod 0 /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-card + chmod 0 /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-render + fuser -k /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-render + fuser -k /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-card ##################################################################### echo ''$VIRSH_GPU_VIDEO > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/driver/unbind" @@ -152,7 +155,15 @@ in - + virtualisation.libvirtd.qemu.verbatimConfig = '' + cgroup_device_acl = [ + "/dev/null", "/dev/full", "/dev/zero", + "/dev/random", "/dev/urandom", + "/dev/ptmx", "/dev/kvm", "/dev/kqemu", + "/dev/rtc","/dev/hpet", "/dev/vfio/vfio", + "/dev/kvmfr0" + ] + ''; virtualisation.libvirtd.hooks.qemu = { "windows-vfio" = pkgs.writeShellScript "windows.sh" '' VIRSH_GPU_VIDEO="0000:03:00.0" diff --git a/configurations/host/valkyrie/default.nix b/configurations/host/valkyrie/default.nix index 9586372..52f7edf 100644 --- a/configurations/host/valkyrie/default.nix +++ b/configurations/host/valkyrie/default.nix @@ -165,12 +165,5 @@ dnsProvider = "ovh"; }; - security.acme.certs."podkos.xyz" = { - domain = "podkos.xyz"; - group = "nginx"; - extraDomainNames = [ "*.podkos.xyz" ]; - dnsProvider = "ovh"; - }; - } diff --git a/configurations/host/valkyrie/secrets/private/default.nix b/configurations/host/valkyrie/secrets/private/default.nix index 01dc9e3..7fa9535 100644 Binary files a/configurations/host/valkyrie/secrets/private/default.nix and b/configurations/host/valkyrie/secrets/private/default.nix differ diff --git a/configurations/host/valkyrie/services/dcbot.nix b/configurations/host/valkyrie/services/dcbot.nix index d861849..fef3d8d 100644 --- a/configurations/host/valkyrie/services/dcbot.nix +++ b/configurations/host/valkyrie/services/dcbot.nix @@ -1,10 +1,13 @@ -{ config, pkgs, lib, materusArg, ... }: +{ + config, + pkgs, + lib, + materusArg, + ... +}: { options.valkyrieService.dcbot.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable muse bot"; - - - config = let cfg = config.valkyrieService.dcbot; @@ -24,18 +27,12 @@ systemd.tmpfiles.rules = [ "d /var/lib/muse 0776 root root -" ]; - virtualisation.oci-containers.containers.dcbot = { image = "ghcr.io/museofficial/muse:latest"; - volumes = [ - "/var/lib/muse:/data" - ]; - environmentFiles = [ - config.sops.templates."muse.env".path - ]; + volumes = [ "/var/lib/muse:/data" ]; + environmentFiles = [ config.sops.templates."muse.env".path ]; }; }; - -} \ No newline at end of file +} diff --git a/configurations/host/valkyrie/services/default.nix b/configurations/host/valkyrie/services/default.nix index 33bc442..81436a1 100644 --- a/configurations/host/valkyrie/services/default.nix +++ b/configurations/host/valkyrie/services/default.nix @@ -10,7 +10,7 @@ services.adguardhome.enable = true; valkyrieService.pihole.enable = false; - valkyrieService.pleroma.enable = true; + valkyrieService.pleroma.enable = false; valkyrieService.dcbot.enable = true; valkyrieService.secureyoursoul.enable = true; diff --git a/configurations/host/valkyrie/services/pleroma.nix b/configurations/host/valkyrie/services/pleroma.nix index 9bf335a..e3bd2a1 100644 --- a/configurations/host/valkyrie/services/pleroma.nix +++ b/configurations/host/valkyrie/services/pleroma.nix @@ -50,7 +50,7 @@ in "L+ /var/lib/pleroma/static/frontends/soapbox/${soapbox.version} 0766 pleroma pleroma - ${soapbox}" ]; - services.nginx.virtualHosts."podkos.xyz" = { + s ervices.nginx.virtualHosts."podkos.xyz" = { http2 = true; useACMEHost = "podkos.xyz"; forceSSL = true; diff --git a/configurations/profile/common/private/default.nix b/configurations/profile/common/private/default.nix index 2a33b9c..c47d709 100644 Binary files a/configurations/profile/common/private/default.nix and b/configurations/profile/common/private/default.nix differ diff --git a/configurations/profile/home/editor/code.nix b/configurations/profile/home/editor/code.nix index 8502e91..3750d08 100644 --- a/configurations/profile/home/editor/code.nix +++ b/configurations/profile/home/editor/code.nix @@ -16,9 +16,9 @@ let vscode-marketplace.cs128.cs128-clang-tidy #Python - vscode-marketplace.ms-python.python - vscode-marketplace.ms-python.vscode-pylance - vscode-marketplace.ms-python.debugpy + #vscode-marketplace.ms-python.python + #vscode-marketplace.ms-python.vscode-pylance + #vscode-marketplace.ms-python.debugpy # CSharp open-vsx.muhammad-sammy.csharp @@ -51,15 +51,15 @@ let #Git open-vsx.donjayamanne.githistory - open-vsx.mhutchie.git-graph + #open-vsx.mhutchie.git-graph open-vsx.eamodio.gitlens #Other open-vsx.ms-azuretools.vscode-docker open-vsx.webfreak.debug open-vsx.mkhl.direnv - vscode-marketplace.ms-vscode-remote.remote-wsl - vscode-marketplace.ms-vscode-remote.remote-containers + #vscode-marketplace.ms-vscode-remote.remote-wsl + #vscode-marketplace.ms-vscode-remote.remote-containers open-vsx.esbenp.prettier-vscode open-vsx.formulahendry.code-runner open-vsx.leonardssh.vscord diff --git a/configurations/profile/home/editor/emacs/default.nix b/configurations/profile/home/editor/emacs/default.nix index b65b76c..c487090 100644 --- a/configurations/profile/home/editor/emacs/default.nix +++ b/configurations/profile/home/editor/emacs/default.nix @@ -7,7 +7,7 @@ ... }: let - emacs-pkg = materusCfg.configInputs.emacs-overlay.packages.x86_64-linux.emacs-unstable; + emacs-pkg = pkgs.emacs; materus-config = e: @@ -81,6 +81,7 @@ let org-present org-modern org-auto-tangle + ox-pandoc visual-fill-column csharp-mode markdown-mode @@ -112,7 +113,7 @@ let zones sudo-edit toc-org - empv + #empv volatile-highlights highlight elfeed @@ -150,6 +151,7 @@ let name = "emacs-env"; paths = with pkgs; [ luaformatter + pandoc (luajit.withPackages (p: [p.fennel p.lua-lsp])) fennel-ls fnlfmt @@ -280,7 +282,7 @@ in #withXwidgets = true; withGTK3 = true; withAlsaLib = true; - withGconf = true; + #withGconf = true; withImageMagick = true; }).overrideAttrs ( diff --git a/flake.lock b/flake.lock index 084ab9c..f715682 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1721224776, - "narHash": "sha256-iakVQHg2DSmdOc5dNBwrDt9JLRxX5MT+IIbxfZEpGdo=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "c89c8123310257f3ddc04cc59aa4b5573c6d515f", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "fromYaml": "fromYaml_2" }, "locked": { - "lastModified": 1721224776, - "narHash": "sha256-iakVQHg2DSmdOc5dNBwrDt9JLRxX5MT+IIbxfZEpGdo=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "c89c8123310257f3ddc04cc59aa4b5573c6d515f", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731517933, - "narHash": "sha256-j59F8M6LBre2Cc3QzxiYRlNe4wX/Jw1ziqPnbbmE3+Y=", + "lastModified": 1744967866, + "narHash": "sha256-jWHOSSZ03R1Dvru5rXEForMgkV1RAsCd+IjMmehpmFg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e074a4f54d88af0db5284d77e0b80bb1a8d2c80f", + "rev": "c54fd7dc3e696136c8257abfe12815274b42660e", "type": "github" }, "original": { @@ -179,14 +179,14 @@ "configInputs-stable", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1731517933, - "narHash": "sha256-j59F8M6LBre2Cc3QzxiYRlNe4wX/Jw1ziqPnbbmE3+Y=", + "lastModified": 1744967866, + "narHash": "sha256-jWHOSSZ03R1Dvru5rXEForMgkV1RAsCd+IjMmehpmFg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e074a4f54d88af0db5284d77e0b80bb1a8d2c80f", + "rev": "c54fd7dc3e696136c8257abfe12815274b42660e", "type": "github" }, "original": { @@ -196,35 +196,114 @@ "type": "github" } }, - "flake-compat": { - "flake": false, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "configInputs", + "nixerus", + "nur", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, - "flake-compat_2": { - "flake": false, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "configInputs", + "nur", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "configInputs-stable", + "nixerus", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "configInputs-stable", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, @@ -269,11 +348,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1721222302, - "narHash": "sha256-5vL4w9+tS9yd8WpIiDUtxN1IuxCVK2nebZMs/hCXXis=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "93bad85d1633b8b27287b438c0bd394094c24d06", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -285,11 +364,11 @@ "fromYaml_2": { "flake": false, "locked": { - "lastModified": 1721222302, - "narHash": "sha256-5vL4w9+tS9yd8WpIiDUtxN1IuxCVK2nebZMs/hCXXis=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "93bad85d1633b8b27287b438c0bd394094c24d06", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -357,16 +436,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1744743431, + "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -379,11 +458,11 @@ ] }, "locked": { - "lastModified": 1731535640, - "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", + "lastModified": 1744919155, + "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b055009afd0107b69c286fca34d2ad98940d57", + "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70", "type": "github" }, "original": { @@ -395,13 +474,13 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", - "path": "/nix/store/q1ss75nhmjiydyqw8lbzwbx7cqk8z0qq-source", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "lastModified": 1744117652, + "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "path": "/nix/store/avba4k04vxmknff9mjchmwyvr3vpzccz-source", + "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "type": "path" }, "original": { @@ -411,7 +490,6 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-compat": "flake-compat", "flake-utils": [ "configInputs", "flake-utils" @@ -422,11 +500,11 @@ ] }, "locked": { - "lastModified": 1731462465, - "narHash": "sha256-SL/d2lvJO+CDzQno7sOyUuktE7+o6kW1qpWsG8tBte4=", + "lastModified": 1744941256, + "narHash": "sha256-dCsDco+HQ0rwApyTmmyot9fUVIC0XeWOf/YpB8LZd18=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ac80fc4a7e7604c5699cbe61839af03bd55bf7bf", + "rev": "0dd8474f697c02ac1861a96f7626f8fb9e21f268", "type": "github" }, "original": { @@ -438,7 +516,6 @@ }, "nix-vscode-extensions_2": { "inputs": { - "flake-compat": "flake-compat_2", "flake-utils": [ "configInputs-stable", "flake-utils" @@ -449,11 +526,11 @@ ] }, "locked": { - "lastModified": 1731462465, - "narHash": "sha256-SL/d2lvJO+CDzQno7sOyUuktE7+o6kW1qpWsG8tBte4=", + "lastModified": 1744941256, + "narHash": "sha256-dCsDco+HQ0rwApyTmmyot9fUVIC0XeWOf/YpB8LZd18=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ac80fc4a7e7604c5699cbe61839af03bd55bf7bf", + "rev": "0dd8474f697c02ac1861a96f7626f8fb9e21f268", "type": "github" }, "original": { @@ -476,11 +553,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1729545139, - "narHash": "sha256-dyYxuBNdUOH5nvpbDAgwGJI4aN9CXv+m57VMuDYDGEg=", + "lastModified": 1744223916, + "narHash": "sha256-LHS51wl/LFzWvrplcL/LJ3eIqMRyiwXch4IxA1Pq1ig=", "owner": "materusPL", "repo": "Nixerus", - "rev": "c381bde8eab3998246dd7c31eb0047526a319224", + "rev": "2caaf0b89ebf8edb9a1b0400c774670d838ef12f", "type": "github" }, "original": { @@ -503,11 +580,11 @@ "nur": "nur_3" }, "locked": { - "lastModified": 1729545139, - "narHash": "sha256-dyYxuBNdUOH5nvpbDAgwGJI4aN9CXv+m57VMuDYDGEg=", + "lastModified": 1744223916, + "narHash": "sha256-LHS51wl/LFzWvrplcL/LJ3eIqMRyiwXch4IxA1Pq1ig=", "owner": "materusPL", "repo": "Nixerus", - "rev": "c381bde8eab3998246dd7c31eb0047526a319224", + "rev": "2caaf0b89ebf8edb9a1b0400c774670d838ef12f", "type": "github" }, "original": { @@ -519,11 +596,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -535,11 +612,11 @@ }, "nixos-hardware_2": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -551,107 +628,139 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716542732, - "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", - "owner": "NixOS", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.05", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_4": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_5": { - "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -661,12 +770,33 @@ "type": "github" } }, - "nur": { + "nixpkgs_7": { "locked": { - "lastModified": 1729516261, - "narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=", - "path": "/nix/store/yygrm3h9q9wslsdamcpahpzqzaag8rix-source", - "rev": "282dfd5c7da86c7315c231b95e95d71b36f22347", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1741294988, + "narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=", + "path": "/nix/store/hfzv9pkm0c6hzvkav8ii476s4cx9nph3-source", + "rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e", "type": "path" }, "original": { @@ -675,12 +805,17 @@ } }, "nur_2": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix_2" + }, "locked": { - "lastModified": 1731530667, - "narHash": "sha256-/EBYF3f2kAPX3IOwxcjP/KTvXeX9b2cZyxgxGvp+XWI=", + "lastModified": 1741294988, + "narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=", "owner": "nix-community", "repo": "NUR", - "rev": "481bba9ab4c2054b7cac86ee3be24f67e5256820", + "rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e", "type": "github" }, "original": { @@ -691,11 +826,16 @@ } }, "nur_3": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix_3" + }, "locked": { - "lastModified": 1729516261, - "narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=", - "path": "/nix/store/yygrm3h9q9wslsdamcpahpzqzaag8rix-source", - "rev": "282dfd5c7da86c7315c231b95e95d71b36f22347", + "lastModified": 1741294988, + "narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=", + "path": "/nix/store/hfzv9pkm0c6hzvkav8ii476s4cx9nph3-source", + "rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e", "type": "path" }, "original": { @@ -704,12 +844,17 @@ } }, "nur_4": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix_4" + }, "locked": { - "lastModified": 1731530667, - "narHash": "sha256-/EBYF3f2kAPX3IOwxcjP/KTvXeX9b2cZyxgxGvp+XWI=", + "lastModified": 1741294988, + "narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=", "owner": "nix-community", "repo": "NUR", - "rev": "481bba9ab4c2054b7cac86ee3be24f67e5256820", + "rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e", "type": "github" }, "original": { @@ -720,11 +865,16 @@ } }, "nur_5": { + "inputs": { + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_7", + "treefmt-nix": "treefmt-nix_5" + }, "locked": { - "lastModified": 1730720916, - "narHash": "sha256-sLuyisXE2KkcQ3gai2Y10e7vrddDCnR4n+op9n67AD0=", - "path": "/nix/store/n52f84spncfhpbgbx1gydvdqmwfkic3p-source", - "rev": "4a9ef04ed3048a17b50a11499e7f08d2ff00080c", + "lastModified": 1741294988, + "narHash": "sha256-3408u6q615kVTb23WtDriHRmCBBpwX7iau6rvfipcu4=", + "path": "/nix/store/hfzv9pkm0c6hzvkav8ii476s4cx9nph3-source", + "rev": "b30c245e2c44c7352a27485bfd5bc483df660f0e", "type": "path" }, "original": { @@ -744,11 +894,11 @@ ] }, "locked": { - "lastModified": 1731193165, - "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", + "lastModified": 1742765550, + "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "f33173b9d22e554a6f869626bc01808d35995257", + "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16", "type": "github" }, "original": { @@ -770,11 +920,11 @@ ] }, "locked": { - "lastModified": 1731193165, - "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", + "lastModified": 1742765550, + "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "f33173b9d22e554a6f869626bc01808d35995257", + "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16", "type": "github" }, "original": { @@ -806,8 +956,8 @@ "configInputs-stable": "configInputs-stable", "hm-stable": "hm-stable", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_5", + "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable_3", "nur": "nur_5", "private": "private" } @@ -817,15 +967,14 @@ "nixpkgs": [ "configInputs", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1744669848, + "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "61154300d945f0b147b30d24ddcafa159148026a", "type": "github" }, "original": { @@ -840,15 +989,14 @@ "nixpkgs": [ "configInputs-stable", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_4" + ] }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1744669848, + "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "61154300d945f0b147b30d24ddcafa159148026a", "type": "github" }, "original": { @@ -887,6 +1035,117 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "configInputs", + "nixerus", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "configInputs", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "configInputs-stable", + "nixerus", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_4": { + "inputs": { + "nixpkgs": [ + "configInputs-stable", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_5": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e1a8f20..4f6085a 100644 --- a/flake.nix +++ b/flake.nix @@ -29,14 +29,14 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-24.05"; + ref = "nixos-24.11"; }; hm-stable = { type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-24.05"; + ref = "release-24.11"; inputs.nixpkgs.follows = "nixpkgs-stable"; };