diff --git a/nixos/conf/GM/DE/cosmic.nix b/nixos/conf/GM/DE/cosmic.nix index e55c3ec..2f35f0b 100644 --- a/nixos/conf/GM/DE/cosmic.nix +++ b/nixos/conf/GM/DE/cosmic.nix @@ -6,6 +6,7 @@ desktopManager.cosmic.xwayland.enable = true; }; + environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; environment.systemPackages = with pkgs; [ gnome-disk-utility ]; diff --git a/nixos/conf/GM/DE/impde.nix b/nixos/conf/GM/DE/impde.nix index 6472d7f..18703f5 100644 --- a/nixos/conf/GM/DE/impde.nix +++ b/nixos/conf/GM/DE/impde.nix @@ -6,4 +6,4 @@ ./kde.nix ]; -} \ No newline at end of file +} diff --git a/nixos/conf/GM/DE/kde.nix b/nixos/conf/GM/DE/kde.nix index 6427265..2e2c868 100644 --- a/nixos/conf/GM/DE/kde.nix +++ b/nixos/conf/GM/DE/kde.nix @@ -14,6 +14,7 @@ kdePackages.filelight kdePackages.qtmultimedia kdePackages.kcalc + kdePackages.sddm-kcm ]; environment.plasma6.excludePackages = with pkgs.kdePackages; [ diff --git a/nixos/conf/GM/Pkgs/obs.nix b/nixos/conf/GM/Pkgs/obs.nix index d373e9d..ee4b1e9 100644 --- a/nixos/conf/GM/Pkgs/obs.nix +++ b/nixos/conf/GM/Pkgs/obs.nix @@ -14,6 +14,6 @@ obs-gstreamer obs-vkcapture ]; - enableVirtualCamera = true; + #enableVirtualCamera = true; }; } diff --git a/nixos/conf/GM/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix index 050e1d1..c6bd005 100644 --- a/nixos/conf/GM/Pkgs/pkgs.nix +++ b/nixos/conf/GM/Pkgs/pkgs.nix @@ -5,9 +5,12 @@ environment.systemPackages = with pkgs; [ ## Aplicativos sociais + bitwarden-desktop + + ## inputs inputs.zen-browser.packages.${stdenv.hostPlatform.system}.default inputs.hayase.packages.${pkgs.stdenv.hostPlatform.system}.default - bitwarden-desktop + #inputs.chaotic.packages.${pkgs.stdenv.hostPlatform.system}.proton-cachyos_x86_64_v3 ## Utilitários do sistema e dev tools nh @@ -16,7 +19,6 @@ vulkan-loader vulkan-utility-libraries gcc - preload ethtool efibootmgr docker-compose @@ -25,6 +27,7 @@ distrobox freerdp dmidecode + i2c-tools #winboat gitFull kdePackages.partitionmanager @@ -32,11 +35,16 @@ openrgb winetricks wineWowPackages.staging + haguichi + logmein-hamachi + zerotierone ## inputs stable #inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system} ]; programs.gpu-screen-recorder.enable = true; + services.logmein-hamachi.enable = true; + programs.haguichi.enable = true; } diff --git a/nixos/conf/GM/cfgeral/flakeconfig.nix b/nixos/conf/GM/cfgeral/flakeconfig.nix index d4333a3..39c0bbc 100644 --- a/nixos/conf/GM/cfgeral/flakeconfig.nix +++ b/nixos/conf/GM/cfgeral/flakeconfig.nix @@ -3,11 +3,9 @@ nix = { ## ativar flakes settings.experimental-features = ["nix-command" "flakes"]; - ## chaotic-nix nixPath = lib.mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry; registry = lib.mapAttrs (_: value: {flake = value;}) (lib.filterAttrs (_: value: lib.isType "flake" value) inputs); settings.flake-registry = ""; }; - chaotic.nyx.cache.enable = true; } diff --git a/nixos/conf/GM/cfgeral/kernel.nix b/nixos/conf/GM/cfgeral/kernel.nix index a3cc6e7..e981c67 100644 --- a/nixos/conf/GM/cfgeral/kernel.nix +++ b/nixos/conf/GM/cfgeral/kernel.nix @@ -1,8 +1,8 @@ { config, lib, inputs, pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_cachyos.cachyOverride { - mArch = "GENERIC_V3"; + #boot.kernelPackages = pkgs.linuxPackages_cachyos.cachyOverride { + #mArch = "GENERIC_V3"; #useO3 = true; #withLTO = "full"; - }; + #}; } diff --git a/nixos/conf/GM/cfgeral/nixhelper.nix b/nixos/conf/GM/cfgeral/nixhelper.nix index 183b322..d2508f1 100644 --- a/nixos/conf/GM/cfgeral/nixhelper.nix +++ b/nixos/conf/GM/cfgeral/nixhelper.nix @@ -21,7 +21,7 @@ }; ## Configuração do gerenciador nix - nix.package = pkgs.lixPackageSets.latest.lix; + #nix.package = pkgs.lixPackageSets.latest.lix; #nix.package = inputs.nixpkgs-master.legacyPackages.${pkgs.system}.lix; ## compilaçao diff --git a/nixos/conf/GM/cfgeral/patchgames.nix b/nixos/conf/GM/cfgeral/patchgames.nix index 8b22b29..7941da4 100644 --- a/nixos/conf/GM/cfgeral/patchgames.nix +++ b/nixos/conf/GM/cfgeral/patchgames.nix @@ -16,11 +16,8 @@ }; }; - services = { - - preload.enable = true; - + earlyoom = { enable = true; freeSwapThreshold = 2; @@ -44,6 +41,43 @@ TEST=="power/control", ATTR{power/control}="on" ''; }; + + preload-ng = { + enable = true; + settings = { + cycle = 15; + memTotal = -5; + memFree = 70; + memCached = 10; + memBuffers = 50; + minSize = 1000000; + processes = 60; + sortStrategy = 0; + autoSave = 1800; + mapPrefix = "/nix/store/;/run/current-system/;!/"; + exePrefix = "/nix/store/;/run/current-system/;!/"; + }; + }; + }; + + systemd.services.set-min-free-mem = { + description = "Set vm.min_free_kbytes dynamically"; + wantedBy = [ "multi-user.target" ]; + after = [ "local-fs.target" ]; + serviceConfig = { + User = "root"; + RemainAfterExit = true; + }; + script = '' + TOTAL_MEM=$(${pkgs.gawk}/bin/awk '/MemTotal/ {printf "%.0f", $2 * 0.01}' /proc/meminfo) + if [ -z "$TOTAL_MEM" ] || [ "$TOTAL_MEM" -eq 0 ]; then + echo "Failed to calculate memory size" >&2 + exit 1 + fi + ${pkgs.sysctl}/bin/sysctl -w vm.min_free_kbytes=$TOTAL_MEM + ''; }; + + } diff --git a/nixos/conf/GM/cfgeral/zstd.nix b/nixos/conf/GM/cfgeral/zstd.nix index a76aced..1e175a2 100644 --- a/nixos/conf/GM/cfgeral/zstd.nix +++ b/nixos/conf/GM/cfgeral/zstd.nix @@ -10,7 +10,7 @@ ## zram zramSwap = { enable = true; - memoryPercent = 70; + memoryPercent = 40; algorithm = "zstd"; }; diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index b05da30..1133150 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -7,7 +7,6 @@ youtube-music element-desktop (discord.override {withEquicord = true;}) - #inputs.chaotic.legacyPackages.${pkgs.stdenv.hostPlatform.system}.proton-cachyos_x86_64_v3 ## Jogos lutris @@ -26,6 +25,7 @@ ## Utilitários do sistema e dev tools fastfetch + handbrake myxer qbittorrent cpu-x @@ -39,7 +39,8 @@ tree python3 unrar - droidcam + #droidcam + motrix ]; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3a66efe..c7cf01e 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -8,14 +8,13 @@ ## Configuração do bootloader boot = { + #kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10; }; - #boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_cachyos; - #boot.kernelPackages = pkgs.linuxPackages_latest; - networking.hostName = "Alfa"; # Defina o nome da sua máquina services = { diff --git a/nixos/flake.lock b/nixos/flake.lock index 2091256..90437cf 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762958586, - "narHash": "sha256-1MryKS54NVQld+xDvCN0OBmAC8Jk+HmplqWbuerrhlk=", + "lastModified": 1765245541, + "narHash": "sha256-Q4KU8bvFL3tJb1sTAPFG6qvi0KP8HvAfLG7mGqdSQV8=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "0d212e20bebe63b49b588323d37c0cc46bd7000f", + "rev": "f251969383969412b94a98c9378deaa114a76338", "type": "github" }, "original": { @@ -29,20 +29,76 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1763959064, - "narHash": "sha256-GL6i5fTfToGQ5Wby+3zuUpOXofSVJRLK+J3fmPELO0I=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "1708ebd1753a78439a8362a5c32d4e3c7addfa60", + "lastModified": 1765755974, + "narHash": "sha256-o2X//wTBu4Wz9g39YP9Yt3kW+QK1Ysw1xBxW6Bq6KBM=", + "owner": "lonerOrz", + "repo": "nyx-loner", + "rev": "e64e5ed34d3a950968faaade3cc7ea1f99144b9c", "type": "github" }, "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", + "owner": "lonerOrz", + "repo": "nyx-loner", "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1765254444, + "narHash": "sha256-kAO/ZeBnjaF+uqOP6qweXlRk2ylocLuv/9Dn8FsuPlU=", + "rev": "3ccc0297525e51ac3d7905509e0616c9c8350108", + "revCount": 316, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.14.0/019b0160-c5de-7941-9c26-cb47bc17eec3/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-6PWoqx52nvlWzlElTjcn7KAPKitfcKZYEFSsC3PoEoE=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-b1e25BUPL7Qf0QVbYlfZ/+QiClrP/SHIjMPtA47aOLc=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-8EI2f8IftPcRFlR6K4+cpIEAVf5UIeMCjHysEtVqDw0=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux" + } + }, "flake-compat": { "flake": false, "locked": { @@ -59,7 +115,44 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "revCount": 377, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur", @@ -94,6 +187,50 @@ "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": [ + "determinate", + "nix" + ], + "nixpkgs": [ + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "revCount": 1026, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" + } + }, "hayase": { "inputs": { "nixpkgs": [ @@ -101,11 +238,11 @@ ] }, "locked": { - "lastModified": 1763324421, - "narHash": "sha256-uTEPtsVv2UoGhSwIscrT6pNE3UqDz4Hc3YdZVzfU1OE=", + "lastModified": 1765654597, + "narHash": "sha256-LiYBFJNRPDS3sk4K8jHq85KNrQAkLUoZAUPaeKf17K0=", "owner": "darkguibrine", "repo": "hayase-nix", - "rev": "1684c23e2ead8912c95c0b18d201d3782bd4891a", + "rev": "b4201c99383b5589301bcee688d17d159ef4c367", "type": "github" }, "original": { @@ -122,11 +259,11 @@ ] }, "locked": { - "lastModified": 1763869804, - "narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -142,11 +279,11 @@ ] }, "locked": { - "lastModified": 1763997646, - "narHash": "sha256-hLIvcdKAtwt5eZchw+7AZFXx3NniHPbZ7puYruofsD8=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "b9c0dae3e474631d4813c685187f5b4e01c34d39", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -163,11 +300,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -185,11 +322,11 @@ ] }, "locked": { - "lastModified": 1763714684, - "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", + "lastModified": 1765526639, + "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", + "rev": "457a55ed77a105088a47cb55b9eccf7768559451", "type": "github" }, "original": { @@ -198,6 +335,27 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs_4", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1765252170, + "narHash": "sha256-p98D44tYJMgB5Qet5S8cTQFdffk/GmoaGkpQtZ3hqJU=", + "rev": "1ddd28880651054346c34009d7bb9de36f1db2c1", + "revCount": 23362, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.14.0/019b0159-8907-7fab-a120-9d287c7e6d2e/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" + } + }, "nix-flatpak": { "locked": { "lastModified": 1754777568, @@ -238,11 +396,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -252,13 +410,29 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-master": { "locked": { - "lastModified": 1763997539, - "narHash": "sha256-gWSc5WG63ohVPAwZrZ5TE6shJKcluN8/M66/8h8ZKq4=", + "lastModified": 1765813601, + "narHash": "sha256-pjvqJLfZnG00KnE8ge32LzBQTaGmx6Mhb8QMtpakyho=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52be777193b0e75ee664b2e686b74b2e3c05de79", + "rev": "9366497a8a50bf1d4fefa8c9a0316b3d5aeda1e4", "type": "github" }, "original": { @@ -267,18 +441,34 @@ "type": "github" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1765762245, + "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -301,11 +491,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -317,11 +507,39 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "revCount": 811874, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1764611609, + "narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=", + "rev": "8c29968b3a942f2903f90797f9623737c215737c", + "revCount": 905078, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -331,19 +549,35 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1763997822, - "narHash": "sha256-zRmmpYdMDC2kGxtqG2ZlLfaFis0YNDe9g3/YhEWhDW0=", + "lastModified": 1765813166, + "narHash": "sha256-ptpTSvnvTzTeETbyiaV5tDgvuZL2zXBb5Dt+qOOSUpo=", "owner": "nix-community", "repo": "NUR", - "rev": "ba0eb0e95a9561ac5cb25a2f396f4174655e02b0", + "rev": "4e2d7055e080a9f4367b4188760d22ffe5173cba", "type": "github" }, "original": { @@ -352,17 +586,38 @@ "type": "github" } }, + "preload-ng": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1765741297, + "narHash": "sha256-RY1qkoCD+E9mjhhrOKsISQXSUZHPx2/cEQj94OXlgWQ=", + "owner": "miguel-b-p", + "repo": "preload-ng", + "rev": "6e3d89bd09c07d221a8b54b1cc60a99c975652ec", + "type": "github" + }, + "original": { + "owner": "miguel-b-p", + "repo": "preload-ng", + "type": "github" + } + }, "root": { "inputs": { "aagl": "aagl", "chaotic": "chaotic", + "determinate": "determinate", "hayase": "hayase", "home-manager": "home-manager_2", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", + "preload-ng": "preload-ng", "zen-browser": "zen-browser" } }, @@ -371,11 +626,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1764470739, + "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", "type": "github" }, "original": { @@ -392,11 +647,11 @@ ] }, "locked": { - "lastModified": 1763865987, - "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", + "lastModified": 1765680428, + "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", + "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f", "type": "github" }, "original": { @@ -405,6 +660,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_3", @@ -413,11 +683,11 @@ ] }, "locked": { - "lastModified": 1763958868, - "narHash": "sha256-IOP3fAjawH68FL1RDakySNRK6XNYdZajX538Q3U58Y0=", + "lastModified": 1765764138, + "narHash": "sha256-Nb5y5xSDQLMeUYiA1bQkbmHffGm0d/XXWoJjFu8ovw0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "15db6bda557066f3525010209bde4ec5f968f2ba", + "rev": "bd8815d0a686267386268e7cc70315124e21362b", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index 7bc7e7a..b15fc22 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -2,11 +2,13 @@ description = "A very basic flake"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-master.url = "github:nixos/nixpkgs"; - chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; - nix-flatpak.url = "github:gmodena/nix-flatpak"; + nix-flatpak.url = "github:gmodena/nix-flatpak"; + preload-ng.url = "github:miguel-b-p/preload-ng"; + chaotic.url = "github:lonerOrz/nyx-loner"; + determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; home-manager = { url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; @@ -24,16 +26,19 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,chaotic ,zen-browser ,nur ,aagl ,hayase ,nix-flatpak , ...} @ inputs: { + outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,aagl ,hayase ,nix-flatpak ,preload-ng ,chaotic ,determinate , ...} @ inputs: { nixosConfigurations = { "Alfa" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; modules = [ ./configuration.nix - chaotic.nixosModules.default nur.modules.nixos.default nix-flatpak.nixosModules.nix-flatpak + preload-ng.nixosModules.default + chaotic.nixosModules.default + determinate.nixosModules.default + {services.preload-ng.enable = true;} {imports = [ aagl.nixosModules.default ]; nix.settings = aagl.nixConfig; # Set up Cachix programs.anime-game-launcher.enable = true;