From 4d74d73e658cabd3c9720f9112696591dde1afc4 Mon Sep 17 00:00:00 2001 From: DarkGuibrine Date: Sun, 26 Apr 2026 20:45:55 -0300 Subject: [PATCH] . --- flake.lock | 234 +++++++++++++++++------ flake.nix | 2 + hosts/Alfa/conf/GM/DE/niri/dms.nix | 7 +- hosts/Alfa/conf/GM/configs/nixhelper.nix | 5 + hosts/Alfa/conf/GM/configs/patchs.nix | 7 +- hosts/Alfa/conf/HM/pkgs/pkgs.nix | 8 +- hosts/Alfa/configuration.nix | 5 +- hosts/Alfa/home.nix | 18 +- mods/home/kitty/kitty.conf | 3 +- 9 files changed, 211 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index 971b6b0..85d72ad 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774186997, - "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=", + "lastModified": 1777049909, + "narHash": "sha256-t06XtDZpzxLxsq7nVxeMqppllJd4E0RMykDK+k1+CMM=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd", + "rev": "7fa6541ef5e4d5c95d526a0c0dfb872648f85ab5", "type": "github" }, "original": { @@ -20,6 +20,38 @@ "type": "github" } }, + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1776881435, + "narHash": "sha256-j8AobLjMzeKJugseObrVC4O5k7/aZCWoft2sCS3jWYs=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "1c61dfd1c3ad7762faa0db8b06c6af6c59cc4340", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1777002108, + "narHash": "sha256-PIZCIf6xUTOUqLFbEGH0mSwu2O/YfeAmYlgdAbP4dhs=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "46476ae2538db486462aef8a9de37d19030cdaf2", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -45,11 +77,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1776476539, - "narHash": "sha256-4019TOLn63jzPZdWT5SoKQZezxZxXzHKcFamK3Oh1Io=", + "lastModified": 1777161418, + "narHash": "sha256-+H6YJckJZD+JaUWCUOTaVmx7S3JChrf0UzsrtQQ1Vcg=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "4c2c1937662b3973071ce3d3cac34436ee822e32", + "rev": "28f68ac702960b5179808db1a0870b16c5d5c3b3", "type": "github" }, "original": { @@ -65,11 +97,11 @@ ] }, "locked": { - "lastModified": 1776475494, - "narHash": "sha256-dVhxEzfB0McRmlZkJaDJVKEW5R5In2Vd295x7ZG5xO4=", + "lastModified": 1777168306, + "narHash": "sha256-ADeKQ14Nw5UO18tP5y07WxN7o9SfhcJ4/jq3jvZryyI=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "1728c7227d9b157e5d41501319def3c43959646d", + "rev": "c7acc54f58f3c81a5e19f5f9ceb3958702a3f597", "type": "github" }, "original": { @@ -110,6 +142,40 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -135,11 +201,11 @@ ] }, "locked": { - "lastModified": 1776562531, - "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=", + "lastModified": 1777236726, + "narHash": "sha256-ZTYDofOM3/PJhRF1EuBh6uibm+DmkhU7Wor6mMN7YTc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4", + "rev": "e82d4a4ecd18363aa2054cbaa3e32e4134c3dbf4", "type": "github" }, "original": { @@ -179,11 +245,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776602954, - "narHash": "sha256-C41nazGNIM/58ISKaIirq8/z1sDgS6CVJnWBwAzhaGQ=", + "lastModified": 1777240421, + "narHash": "sha256-ooPmu+8tqOGh4kozPW4rJC7Y7WM/FHtEY3OK1PoNW7g=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c175f415488243723dc1a5514b286abbea6f93c1", + "rev": "2bb22af2985e5f3cfd051b3d977ebfbf81126280", "type": "github" }, "original": { @@ -212,11 +278,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1776598536, - "narHash": "sha256-7Bbp0fDBJMDRpKfdHelMXbhY51bdCa5+Qn/+XONaOwk=", + "lastModified": 1777237919, + "narHash": "sha256-bZHBzo4EuW/xLzXnnMKsIMdZYqgY2O0mIMdplwDHB8Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "68bb942d2146cd2c8af69c0f16db18396b4388fe", + "rev": "a85b922919815c32a3ae34e0838830fe522d6a1c", "type": "github" }, "original": { @@ -225,6 +291,28 @@ "type": "github" } }, + "nix-cachyos-kernel": { + "inputs": { + "cachyos-kernel": "cachyos-kernel", + "cachyos-kernel-patches": "cachyos-kernel-patches", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1777227006, + "narHash": "sha256-A7GcOXjfo2xmZ3ERgN0j6GcqaVzqIf5zpYQcdfDaMr0=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "0f7e2bea4088227a80502557f6c0e3b74949d6b5", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1770841267, @@ -241,13 +329,28 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-master": { "locked": { - "lastModified": 1776624479, - "narHash": "sha256-LKIVvLzN+L+vKcG1wq7uIgqxSXyrY3MlcOP0COyppuI=", + "lastModified": 1777246344, + "narHash": "sha256-W3stiV/1owRrs4FqONa8DWbjbDplql7+rJdsRwYa/vo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5124f39e843b7799885f7b8b6c55d0d89e1fd33c", + "rev": "f5ed8a78b090e6e4f16b3a740ea678c030c74d65", "type": "github" }, "original": { @@ -258,11 +361,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1776434932, - "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", + "lastModified": 1777077449, + "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", + "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", "type": "github" }, "original": { @@ -274,11 +377,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1776434932, - "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", + "lastModified": 1777077449, + "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", + "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", "type": "github" }, "original": { @@ -338,11 +441,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -354,11 +457,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1776329215, - "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", + "lastModified": 1777187199, + "narHash": "sha256-RJlLGrl+xHndIVK1NbPkIsItePNB3X4PIe8UTk3AHnw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "facea5e538604efa4893c08770fe9fca5bf62c2f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1776949667, + "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b86751bc4085f48661017fa226dee99fab6c651b", + "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30", "type": "github" }, "original": { @@ -368,13 +487,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -392,11 +511,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776618193, - "narHash": "sha256-Gs4vQgD9+84qwP5WmlD1WJ4yOeX4M/a4ZdNUwrce6E0=", + "lastModified": 1777079905, + "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "b8781aef49e1e5f2c094bc4b73ca146a1665d9df", + "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", "type": "github" }, "original": { @@ -415,11 +534,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775957204, - "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", + "lastModified": 1776585574, + "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", + "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", "type": "github" }, "original": { @@ -431,7 +550,7 @@ "preload-ng": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1768356181, @@ -455,16 +574,16 @@ ] }, "locked": { - "lastModified": 1766725085, - "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", + "lastModified": 1776854048, + "narHash": "sha256-lLbV66V3RMNp1l8/UelmR4YzoJ5ONtgvEtiUMJATH/o=", "ref": "refs/heads/master", - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", - "revCount": 715, + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", + "revCount": 806, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, "original": { - "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "rev": "783c953987dc56ff0601abe6845ed96f1d00495a", "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" } @@ -476,11 +595,11 @@ ] }, "locked": { - "lastModified": 1776589301, - "narHash": "sha256-3g+BPNYwKrjOtBaQi1cLBEtLKtDLZAS01gFd6/ybtlE=", + "lastModified": 1777089709, + "narHash": "sha256-bZoy6qxL6Dbptt6PABvuhGKbyjuoyI7SQ1tzxM9g/QM=", "ref": "refs/heads/master", - "rev": "9a54119893bdd30fec628063322bc726f96afc1f", - "revCount": 803, + "rev": "11a71d233a566caba4ddffdca2e41d1fa79e45b1", + "revCount": 808, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -497,7 +616,8 @@ "dms-plugin-registry": "dms-plugin-registry", "home-manager": "home-manager", "niri": "niri", - "nixpkgs": "nixpkgs_6", + "nix-cachyos-kernel": "nix-cachyos-kernel", + "nixpkgs": "nixpkgs_7", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable_2", "noctalia": "noctalia", @@ -638,11 +758,11 @@ ] }, "locked": { - "lastModified": 1776616911, - "narHash": "sha256-k12p9yCvP6owKzpb9KHZAzPQA0FZGGnmvjcxlrFNIug=", + "lastModified": 1777218171, + "narHash": "sha256-+JGU5Cw6Zm3XVl3xBCkbY7/lTxfLQpjuuhF0IB4dJ8k=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "46f4f5d45de271f685d8fb64944ccbbdfbbf5dab", + "rev": "8a8e30610393c7f1a766a119dea37bf82d0ebcf6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a688260..7145852 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,7 @@ preload-ng.url = "github:miguel-b-p/preload-ng"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; disko.url = "github:nix-community/disko"; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; home-manager = { url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; @@ -49,6 +50,7 @@ noctalia, niri, disko, + nix-cachyos-kernel, ... }@inputs: { diff --git a/hosts/Alfa/conf/GM/DE/niri/dms.nix b/hosts/Alfa/conf/GM/DE/niri/dms.nix index 8ee3829..dffad0e 100644 --- a/hosts/Alfa/conf/GM/DE/niri/dms.nix +++ b/hosts/Alfa/conf/GM/DE/niri/dms.nix @@ -10,7 +10,7 @@ programs.dms-shell = { enable = true; package = inputs.dms.packages.${pkgs.stdenv.hostPlatform.system}.default; - #quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; + quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; systemd = { enable = true; # Systemd service for auto-start @@ -18,10 +18,7 @@ }; plugins = { - dankBitwarden.enable = true; - dankKDEConnect.enable = true; - linuxWallpaperEngine.enable = true; - nvidiaGpuMonitor.enable = true; + }; # Core features diff --git a/hosts/Alfa/conf/GM/configs/nixhelper.nix b/hosts/Alfa/conf/GM/configs/nixhelper.nix index 218dfa6..30e4999 100644 --- a/hosts/Alfa/conf/GM/configs/nixhelper.nix +++ b/hosts/Alfa/conf/GM/configs/nixhelper.nix @@ -28,6 +28,7 @@ ## Cache ccache.enable = true; ccache.cacheDir = "/var/cache/ccache"; + }; nix = { @@ -51,8 +52,12 @@ lib.filterAttrs (_: value: lib.isType "flake" value) inputs ); settings.flake-registry = ""; + + settings.substituters = [ "https://attic.xuyh0120.win/lantian" ]; + settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; }; + nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.pinned ]; services = { flatpak = { enable = true; diff --git a/hosts/Alfa/conf/GM/configs/patchs.nix b/hosts/Alfa/conf/GM/configs/patchs.nix index 4838fb5..253f5f4 100644 --- a/hosts/Alfa/conf/GM/configs/patchs.nix +++ b/hosts/Alfa/conf/GM/configs/patchs.nix @@ -17,9 +17,10 @@ boot = { modprobeConfig.enable = true; kernelModules = [ "tcp_bbr" ]; - extraModprobeConfig = "options nvidia NVreg_UsePageAttributeTable=1 \ - NVreg_InitializeSystemMemoryAllocations=0 \ - NVreg_DynamicPowerManagement=0x02"; + extraModprobeConfig = '' + options nvidia NVreg_UsePageAttributeTable=1 + NVreg_InitializeSystemMemoryAllocations=0 + NVreg_DynamicPowerManagement=0x02 ''; kernel.sysctl = { "kernel.split_lock_mitigate" = 0; "kernel.nmi_watchdog" = 0; diff --git a/hosts/Alfa/conf/HM/pkgs/pkgs.nix b/hosts/Alfa/conf/HM/pkgs/pkgs.nix index bbe72ae..ea000ae 100644 --- a/hosts/Alfa/conf/HM/pkgs/pkgs.nix +++ b/hosts/Alfa/conf/HM/pkgs/pkgs.nix @@ -13,12 +13,12 @@ telegram-desktop pear-desktop teams-for-linux - #(discord.override {withVencord = true;}) + #(discord.override { withVencord = true; }) (discord.override { withEquicord = true; }) jellyfin-desktop ## Jogos - lutris + #lutris faugus-launcher heroic prismlauncher @@ -66,6 +66,10 @@ libargon2 openssl_oqs icu + kdePackages.qt6ct + libsForQt5.qt5ct + pkgs.gnome-themes-extra + papirus-icon-theme ## Dev godot diff --git a/hosts/Alfa/configuration.nix b/hosts/Alfa/configuration.nix index 050d3d4..92146de 100644 --- a/hosts/Alfa/configuration.nix +++ b/hosts/Alfa/configuration.nix @@ -12,9 +12,10 @@ ./conf/GM/imp.nix ]; - ## Configuração do bootloader + ## Configuraçãao do bootloader boot = { kernelPackages = pkgs.linuxPackages_latest; + #kernelPackages = pkgs.linux-cachyos-latest-lto-x86_64-v3; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10; @@ -34,6 +35,8 @@ extraGroups = [ "networkmanager" "wheel" + "tailscale" + "docker" ]; packages = with pkgs; [ ]; }; diff --git a/hosts/Alfa/home.nix b/hosts/Alfa/home.nix index e889641..2fa7f0f 100644 --- a/hosts/Alfa/home.nix +++ b/hosts/Alfa/home.nix @@ -29,7 +29,7 @@ }; gtk = { - enable = true; + enable = false; theme = { name = "Adwaita-dark"; package = pkgs.gnome-themes-extra; @@ -48,14 +48,14 @@ }; }; - qt = { - enable = true; - style = { - name = "adwaita-dark"; - }; - }; + #qt = { + # enable = true; + # style = { + # name = "adwaita-dark"; + # }; + #}; - xdg.configFile."gtk-3.0/settings.ini".force = true; - xdg.configFile."gtk-4.0/settings.ini".force = true; + #xdg.configFile."gtk-3.0/settings.ini".force = true; + #xdg.configFile."gtk-4.0/settings.ini".force = true; } diff --git a/mods/home/kitty/kitty.conf b/mods/home/kitty/kitty.conf index edc0224..ac76f1c 100644 --- a/mods/home/kitty/kitty.conf +++ b/mods/home/kitty/kitty.conf @@ -29,7 +29,8 @@ window_margin_width 2.5 window_border_width 1 draw_minimal_borders no -background_opacity 0.9 +background_opacity 0.8 +background_blur 1 allow_remote_control yes