diff --git a/nixos/conf/GM/DE/gnome.nix b/nixos/conf/GM/DE/gnome.nix index 70fadff..33720e3 100644 --- a/nixos/conf/GM/DE/gnome.nix +++ b/nixos/conf/GM/DE/gnome.nix @@ -17,6 +17,11 @@ gnomeExtensions.arc-menu gnomeExtensions.appindicator gnomeExtensions.valent + gnomeExtensions.forge + gnomeExtensions.clipboard-indicator + gnomeExtensions.media-controls + gnomeExtensions.sound-output-device-chooser + gnomeExtensions.quick-settings-audio-panel xdg-desktop-portal-gnome valent gnome-tweaks @@ -24,7 +29,7 @@ gnome-extension-manager refine alacarte - nautilus + dconf ]; environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ]; diff --git a/nixos/conf/GM/Pkgs/distrobox.nix b/nixos/conf/GM/Pkgs/distrobox.nix index 7df8d6e..e092b90 100644 --- a/nixos/conf/GM/Pkgs/distrobox.nix +++ b/nixos/conf/GM/Pkgs/distrobox.nix @@ -1,14 +1,14 @@ { config, lib, inputs, pkgs, ... }: { ## distro box - virtualisation.podman = { - enable = true; - dockerCompat = true; - }; + #virtualisation.podman = { + #enable = true; + #dockerCompat = true; + #}; users.users.gui.extraGroups = [ "docker" ]; users.groups.docker.gid = 131; - #virtualisation.docker = { - #enable = true; - #}; + virtualisation.docker = { + enable = true; + }; } diff --git a/nixos/conf/GM/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix index f6b336e..937e41d 100644 --- a/nixos/conf/GM/Pkgs/pkgs.nix +++ b/nixos/conf/GM/Pkgs/pkgs.nix @@ -10,7 +10,6 @@ ## inputs inputs.zen-browser.packages.${stdenv.hostPlatform.system}.default inputs.hayase.packages.${pkgs.stdenv.hostPlatform.system}.default - #inputs.chaotic.packages.${pkgs.stdenv.hostPlatform.system}.proton-cachyos_x86_64_v3 ## Utilitários do sistema e dev tools nh @@ -28,7 +27,6 @@ freerdp dmidecode i2c-tools - #winboat gitFull kdePackages.partitionmanager usbutils @@ -38,13 +36,14 @@ haguichi logmein-hamachi zerotierone - file-roller + kdePackages.ark loupe lazygit gnumake onlyoffice-desktopeditors adwaita-qt adwaita-qt6 + winboat ## inputs stable #inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system} diff --git a/nixos/conf/GM/Pkgs/thunar.nix b/nixos/conf/GM/Pkgs/thunar.nix index f37fbd0..2e36f40 100644 --- a/nixos/conf/GM/Pkgs/thunar.nix +++ b/nixos/conf/GM/Pkgs/thunar.nix @@ -5,7 +5,7 @@ programs.thunar = { enable = true; - plugins = with pkgs.xfce; [ + plugins = with pkgs; [ thunar-archive-plugin thunar-vcs-plugin thunar-volman diff --git a/nixos/conf/GM/cfgeral/impcf.nix b/nixos/conf/GM/cfgeral/impcf.nix index 1577a0f..f02dea5 100644 --- a/nixos/conf/GM/cfgeral/impcf.nix +++ b/nixos/conf/GM/cfgeral/impcf.nix @@ -12,7 +12,6 @@ ./wireless.nix ./zstd.nix ./fish.nix - ./kernel.nix ./udev.nix ./patchgames.nix ]; diff --git a/nixos/conf/GM/cfgeral/kernel.nix b/nixos/conf/GM/cfgeral/kernel.nix deleted file mode 100644 index bcf158b..0000000 --- a/nixos/conf/GM/cfgeral/kernel.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, inputs, pkgs, ... }: { - - boot = { - #kernelPackages = pkgs.linuxPackages_latest; - kernelPackages = inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto; - }; - - nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ]; - nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; -} diff --git a/nixos/conf/GM/cfgeral/nvidia.nix b/nixos/conf/GM/cfgeral/nvidia.nix index 48a5279..92c512e 100644 --- a/nixos/conf/GM/cfgeral/nvidia.nix +++ b/nixos/conf/GM/cfgeral/nvidia.nix @@ -1,10 +1,26 @@ { config, lib, inputs, pkgs, ... }: { + #services.xserver.videoDrivers = [ "nouveau" ]; + #hardware.graphics = { + # enable = true; + # extraPackages = with pkgs; [ + # mesa + # ]; + #}; + + #hardware.enableRedistributableFirmware = true; + #environment.variables = { + # MESA_VK_DRIVER_OVERRIDE = "nvk"; + # VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/nouveau_icd.x86_64.json"; + #}; + + services.xserver.videoDrivers = [ "nvidia" ]; - hardware = { + hardware = { graphics.enable = true; nvidia.open = false; - nvidia.package = config.boot.kernelPackages.nvidiaPackages.production; - #nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_580; + #nvidia.package = config.boot.kernelPackages.nvidiaPackages.production; + #nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_580; }; + #chaotic.mesa-git.enable = true; } diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index ec07252..869e8e0 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -4,7 +4,7 @@ ## aplicativos sociais telegram-desktop - youtube-music + pear-desktop element-desktop (discord.override {withEquicord = true;}) @@ -16,7 +16,8 @@ steam ryubing xclicker - mangojuice + #mangojuice + goverlay mangohud protonplus hydralauncher @@ -27,7 +28,7 @@ fastfetch flameshot handbrake - myxer + easyeffects qbittorrent cpu-x git diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3f20efe..4c8a3a7 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -8,6 +8,8 @@ ## Configuração do bootloader boot = { + #kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-lto; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10; diff --git a/nixos/flake.lock b/nixos/flake.lock index d623ecd..ed1bcf3 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -1,108 +1,28 @@ { "nodes": { - "aagl": { + "chaotic": { "inputs": { - "flake-compat": "flake-compat", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "jovian": "jovian", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766424259, - "narHash": "sha256-ikKwd1/8rLIz8I+B8kwLaNwW5Hh75bkgGRalC+gEpw0=", - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "rev": "37c289121c7ed44f723c326b6c079cd8aaeb35cf", + "lastModified": 1768148816, + "narHash": "sha256-Zu2rTNSHC8jchLArb9NvWHWDySGsRHDyfFJ5KKvVWso=", + "owner": "lonerOrz", + "repo": "nyx-loner", + "rev": "094948ff9e99f141d10342f5c8a8ee0b9c2d2c64", "type": "github" }, "original": { - "owner": "ezKEa", - "repo": "aagl-gtk-on-nix", - "type": "github" - } - }, - "cachyos-kernel": { - "flake": false, - "locked": { - "lastModified": 1766395826, - "narHash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM=", - "owner": "CachyOS", - "repo": "linux-cachyos", - "rev": "b68aded713a580df028543faea77c4ca5ec1226b", - "type": "github" - }, - "original": { - "owner": "CachyOS", - "repo": "linux-cachyos", - "type": "github" - } - }, - "cachyos-kernel-patches": { - "flake": false, - "locked": { - "lastModified": 1766372082, - "narHash": "sha256-kUCl6N3+e0CGn2tAci0WRr14L+01JYpcbN9HeCvWt3E=", - "owner": "CachyOS", - "repo": "kernel-patches", - "rev": "a0f67557573aa13c028aea2a84a7a68e0d5477e8", - "type": "github" - }, - "original": { - "owner": "CachyOS", - "repo": "kernel-patches", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1765121682, - "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", + "owner": "lonerOrz", + "repo": "nyx-loner", "type": "github" } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur", @@ -123,6 +43,20 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1721999734, + "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", + "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", + "revCount": 75, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -148,11 +82,11 @@ ] }, "locked": { - "lastModified": 1766554206, - "narHash": "sha256-49aSd+QZlT81KuVzf11P4v0mLi0OkkhavbJ+9fV8BXc=", + "lastModified": 1768158511, + "narHash": "sha256-FJgcWH2P5Lw3eyxyUO6PM0vLfcCpcj1tUB8id8ftbFY=", "owner": "darkguibrine", "repo": "hayase-nix", - "rev": "13aea815c3f7889b3451688af31812d8e612376a", + "rev": "c0eb8ac1f6ca41e6df5cb26a4af3ed190a727161", "type": "github" }, "original": { @@ -164,15 +98,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1766553851, - "narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=", + "lastModified": 1768068402, + "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7eca7f7081036a7b740090994c9ec543927f89a7", + "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", "type": "github" }, "original": { @@ -182,6 +117,26 @@ } }, "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768068402, + "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser", @@ -189,11 +144,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -202,36 +157,35 @@ "type": "github" } }, - "nix-cachyos-kernel": { + "jovian": { "inputs": { - "cachyos-kernel": "cachyos-kernel", - "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] }, "locked": { - "lastModified": 1766598373, - "narHash": "sha256-MwouBiMUwIOvrpRDa4Snqb7hvszFyvljJtE+6OI00vs=", - "owner": "xddxdd", - "repo": "nix-cachyos-kernel", - "rev": "42b263471fdc6d2b36d16d861cd95a37a6c16d2e", + "lastModified": 1767888166, + "narHash": "sha256-dfZKtAv2bTD8EsOxLQ6/a7zSZt8KTy+HuRq3wz1z3LA=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "3e0747d31474cdb182801518e39511eed2c84c91", "type": "github" }, "original": { - "owner": "xddxdd", - "ref": "release", - "repo": "nix-cachyos-kernel", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", "type": "github" } }, "nix-flatpak": { "locked": { - "lastModified": 1754777568, - "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", + "lastModified": 1768119771, + "narHash": "sha256-kbbmAfCXcgjdShTDDEn/pCoC5rKQMTd1BksXANn8D2A=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", + "rev": "2e49028cb29c76c8553c6099b19f11879db2cbd1", "type": "github" }, "original": { @@ -240,44 +194,52 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "nixos", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-master": { "locked": { - "lastModified": 1766607417, - "narHash": "sha256-3CHJmC5vWXssF1PqOgqj+Cd6L9BStEzPA03e7Opm6wg=", + "lastModified": 1768172390, + "narHash": "sha256-1k1do/SLVtdCFbJcfCdtrg5lDHy2kTOgsq2JkDGphVY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0997ad8d6e05dc6f66f6d32118bf7c8e5b33ad2a", + "rev": "024fe77153302c7abb1a8d5318f170ed96ce327e", "type": "github" }, "original": { @@ -288,11 +250,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1766473571, - "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=", + "lastModified": 1768028080, + "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76701a179d3a98b07653e2b0409847499b2a07d3", + "rev": "d03088749a110d52a4739348f39a63f84bb0be14", "type": "github" }, "original": { @@ -304,15 +266,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", + "lastModified": 1768032153, + "narHash": "sha256-6kD1MdY9fsE6FgSwdnx29hdH2UcBKs3/+JJleMShuJg=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -320,43 +282,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766556582, - "narHash": "sha256-RS9g4OmTRDemT1NffwtVk5i0Xk/J1H0Q7Ey3sfM7dfk=", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9f2c15ab976fe04b1ffad6986c5435cd1549491", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "github" }, "original": { @@ -368,17 +298,17 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1766604675, - "narHash": "sha256-rwMDGaPPuatTJ3turIiHZzH/RMDACHs3DSBKtivi/Ts=", + "lastModified": 1768168037, + "narHash": "sha256-zDQs6AHsI0KIRvATGg2cWJ3OUdZYIcXEdTbL4rbT9I0=", "owner": "nix-community", "repo": "NUR", - "rev": "89b8880d1fedaeba96f1ec2c7cd3b885aa356fe3", + "rev": "3c00a28071b83fb1bf97a3165ec7b45b8f3ba020", "type": "github" }, "original": { @@ -390,14 +320,14 @@ "preload-ng": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1766345677, - "narHash": "sha256-Mn6lF0G5r+xsgSIu+FW47djMRNG08UuTuwnRhxbZ+ek=", + "lastModified": 1767113149, + "narHash": "sha256-T4NvkU3N+2i41UENu9RuMYLJZSLE/CNuGGJEKsWXmrg=", "owner": "miguel-b-p", "repo": "preload-ng", - "rev": "ff0bdfe8f26ef7cbc2062cf4d076cd154beeaa9a", + "rev": "eb3c66a20d089ab2e3b8ff34c45c3d527584ed38", "type": "github" }, "original": { @@ -408,12 +338,11 @@ }, "root": { "inputs": { - "aagl": "aagl", + "chaotic": "chaotic", "hayase": "hayase", - "home-manager": "home-manager", - "nix-cachyos-kernel": "nix-cachyos-kernel", + "home-manager": "home-manager_2", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", @@ -423,14 +352,17 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1768100056, + "narHash": "sha256-2GWCrsoWIuEXrzdKR2DPnoDhA5SqW7CGNO+Absni054=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", + "rev": "71a69fd633552550de7cb05cc149e4a99ff6f3b6", "type": "github" }, "original": { @@ -456,17 +388,17 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1766586030, - "narHash": "sha256-t3IUR5E4+g9ICSfkXJG1wPsEosJBQblMcaxqfWnpjRY=", + "lastModified": 1768083628, + "narHash": "sha256-6M+vlMGur7UgzkHucgA61pjq3gtjGH9OywxJM/KHL8I=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "cf4840f1dece99a31571732cc535bbfea2f212ab", + "rev": "5c9624f3d0176727284678aebf677770dd1375b2", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index ba46c99..331cc53 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -1,13 +1,13 @@ { description = "A very basic flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + #nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixpkgs-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-master.url = "github:nixos/nixpkgs"; - aagl.url = "github:ezKEa/aagl-gtk-on-nix"; nix-flatpak.url = "github:gmodena/nix-flatpak"; preload-ng.url = "github:miguel-b-p/preload-ng"; - nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; + chaotic.url = "github:lonerOrz/nyx-loner"; home-manager = { url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; @@ -25,7 +25,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,aagl ,hayase ,nix-flatpak ,preload-ng ,nix-cachyos-kernel , ...} @ inputs: { + outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,hayase ,nix-flatpak ,preload-ng ,chaotic , ...} @ inputs: { nixosConfigurations = { "Alfa" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -36,11 +36,7 @@ nix-flatpak.nixosModules.nix-flatpak preload-ng.nixosModules.default {services.preload-ng.enable = true;} - #{imports = [ aagl.nixosModules.default ]; - #nix.settings = aagl.nixConfig; # Set up Cachix - #programs.anime-game-launcher.enable = true; - #programs.sleepy-launcher.enable = true; - #} + chaotic.nixosModules.default ]; }; };