diff --git a/nixos/conf/GM/DE/dms.nix b/nixos/conf/GM/DE/dms.nix index 62d8d5a..e860641 100644 --- a/nixos/conf/GM/DE/dms.nix +++ b/nixos/conf/GM/DE/dms.nix @@ -1,7 +1,9 @@ { config, lib, inputs, pkgs, ... }: { - programs.niri = { + nixpkgs.overlays = [ inputs.niri.overlays.niri ]; + programs.niri = { enable = true; + package = pkgs.niri-unstable; }; programs.dms-shell = { @@ -42,6 +44,7 @@ }; security.polkit.enable = true; + systemd.user.services.niri-flake-polkit.enable = false; programs.xwayland.enable = true; programs.kdeconnect.enable = true; @@ -52,26 +55,28 @@ # quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; #}; - services = { - greetd = - let - session = { - command = "${pkgs.niri}/bin/niri-session"; - user = "gui"; - }; - in - { - enable = true; - settings = { - terminal.vt = 1; - default_session = session; - initial_session = session; - }; - }; - }; + services = { + greetd = + let + session = { + #command = "${pkgs.hyprland}/bin/Hyprland"; + command = "${pkgs.niri}/bin/niri-session"; + user = "gui"; + }; + in + { + enable = true; + settings = { + terminal.vt = 1; + default_session = session; + initial_session = session; + }; + }; + }; environment.systemPackages = with pkgs; [ dgop ]; + } \ No newline at end of file diff --git a/nixos/conf/GM/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix index 838f1ba..46d5f54 100644 --- a/nixos/conf/GM/Pkgs/pkgs.nix +++ b/nixos/conf/GM/Pkgs/pkgs.nix @@ -46,6 +46,7 @@ winboat xwayland-satellite linux-wallpaperengine + kdePackages.polkit-qt-1 ## inputs stable diff --git a/nixos/conf/GM/Pkgs/pkgsconfig.nix b/nixos/conf/GM/Pkgs/pkgsconfig.nix index 3032362..3e35e89 100644 --- a/nixos/conf/GM/Pkgs/pkgsconfig.nix +++ b/nixos/conf/GM/Pkgs/pkgsconfig.nix @@ -14,25 +14,24 @@ }; - ## Configuraçoes do obs - programs.obs-studio = { - enable = true; - # optional Nvidia hardware acceleration - package = ( - pkgs.obs-studio.override { - cudaSupport = true; - } - ); - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-pipewire-audio-capture - obs-gstreamer - obs-vkcapture - ]; + #programs.obs-studio = { + # enable = true; + # # optional Nvidia hardware acceleration + # package = ( + # pkgs.obs-studio.override { + # cudaSupport = true; + # } + # ); + # plugins = with pkgs.obs-studio-plugins; [ + # wlrobs + # obs-pipewire-audio-capture + # obs-gstreamer + # obs-vkcapture + # ]; #enableVirtualCamera = true; - }; + #}; ## Configuraçoes do LACT environment.systemPackages = with pkgs; [lact]; diff --git a/nixos/conf/GM/configs/nvidia.nix b/nixos/conf/GM/configs/nvidia.nix index cbd6f3e..1f66fbb 100644 --- a/nixos/conf/GM/configs/nvidia.nix +++ b/nixos/conf/GM/configs/nvidia.nix @@ -1,6 +1,7 @@ { config, lib, inputs, pkgs, ... }: { ## Driver da nvidia proprietario + services.xserver.videoDrivers = [ "nvidia" ]; hardware = { graphics.enable = true; diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index aecdda1..29d9822 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -5,9 +5,8 @@ ## aplicativos sociais telegram-desktop pear-desktop - element-desktop - #(discord.override { withEquicord = true; }) - equibop + #element-desktop + (discord.override {withEquicord = true;}) ## Jogos lutris @@ -15,6 +14,7 @@ heroic prismlauncher steam + adwsteamgtk ryubing xclicker #mangojuice @@ -47,7 +47,9 @@ mission-center nodejs lxappearance + nwg-look ]; + } \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 6f5dc6c..181acf6 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -43,5 +43,5 @@ }; }; - system.stateVersion = "25.05"; # versao do nix + system.stateVersion = "25.11"; # versao do nix } diff --git a/nixos/flake.lock b/nixos/flake.lock index 1c287df..e570df6 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767520119, - "narHash": "sha256-+OmNQLA9Fv5WBaxYHlPghS9XmnYWDaLt+AatCGhG+hc=", + "lastModified": 1770327417, + "narHash": "sha256-WNS+wDUeqfegOXf5emDRnNs2bPiJ7rhdARo4jyd3+Yw=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "5720d3282844b6b23b26dfac075a5f1f58ea8844", + "rev": "26670347cca9feddb31e075d23b474149d8902e1", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1769435645, - "narHash": "sha256-xxIqw5x8U+13ya2BUcwmAW6BdpCpMhrMTn6Pd0bzocE=", + "lastModified": 1770408132, + "narHash": "sha256-H2J5KHGAfzmr/SBNqWDj52bS76n/IRijOA1A2XerS90=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "e8675eeb9b48a23167b3e43f84e3be76e321935e", + "rev": "94b35b638d970d70a354432d863e5fdf39238e44", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1769587384, - "narHash": "sha256-fPOlnH9arzQLmkbaZ6p+otwLuH9YEf/t8Q2o9/Yq/YA=", + "lastModified": 1770407844, + "narHash": "sha256-gDCdcoHtoaEuFP+aVvf43NaJW2RclTVIBZix548BdhQ=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "5f061ab9733ad15eccf6b9995e9d56f572e67266", + "rev": "c031bd5a91990f7eab3d8fb364836cf4e1960f31", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1769798733, - "narHash": "sha256-ctY7pE186OilrdClbpQun5Oeo0eH6ABkjtZq5sZ6P0M=", + "lastModified": 1770564094, + "narHash": "sha256-m0iXwkpaF2wHIv1aSZ5fKhqBPp75QPxrx+Qr8K5JYL8=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "a90717b20c6fde1a3af51bce3eba8654d5deefa8", + "rev": "5b8b7b04be165f7979bac9a42157ff054f1dcca8", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1769798437, - "narHash": "sha256-rXeQldt91F12ZpjvAxe3C19f/RfC7qaaulaT1LDNfY8=", + "lastModified": 1770574456, + "narHash": "sha256-8S8KnG9FLTAm9Q5rqK0st9kjaoxln02z+ttW5pXYp7U=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "c25ed3fb38645f6b242f84d2e36792efbc8ac78e", + "rev": "d89cf3bd0fadc6558c203276c11c8e1df53f6703", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -187,11 +187,11 @@ ] }, "locked": { - "lastModified": 1768363423, - "narHash": "sha256-5h5AD8gj22t4F7qoT3kVpXFAKOdmacCskwz9bqRMLuc=", + "lastModified": 1770482456, + "narHash": "sha256-wleMx+emBnNumPpOBtTP24UHByjxegkcSYAlsMVoIU4=", "owner": "darkguibrine", "repo": "hayase-nix", - "rev": "92c0c73c20b6361fabf2a69c9ff3b09f977bd9a0", + "rev": "162f14b72195eaef426d126a81771e83166cd4ba", "type": "github" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1769813945, - "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=", + "lastModified": 1770491427, + "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=", "owner": "nix-community", "repo": "home-manager", - "rev": "475921375def3eb930e1f8883f619ff8609accb6", + "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1768434960, - "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", + "lastModified": 1769872935, + "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", + "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "type": "github" }, "original": { @@ -241,20 +241,76 @@ "type": "github" } }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1770571272, + "narHash": "sha256-IUBQMceKisLf1aqo0OWIuEEJLYCQjpvfAJYNZCqu5wE=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "992922f59953b7f55f6b2de7f8bb661e93bc210e", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1770394936, + "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "549148d27779d024255a84535b42b947f1c2a113", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix-cachyos-kernel": { "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1769709954, - "narHash": "sha256-giMeVSEYM80pRrpB95wwgvcGODbkKT3LKVnTpVTj8TA=", + "lastModified": 1770535232, + "narHash": "sha256-hTJEqkAynKtjhGgty0ooDhMNvWxG9Dhdwdfz6EgO3Lw=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "856b12c3db3cb7a2531d4f26eac6f2129284f7e1", + "rev": "76f7c893e4ce83d3b488dcb512ba374b11e7197b", "type": "github" }, "original": { @@ -282,11 +338,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -297,11 +353,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1769819419, - "narHash": "sha256-gyUs8aTxhQF/ptJGh0HT21POr8wi6Y7YVUs7w+v6S4I=", + "lastModified": 1770575763, + "narHash": "sha256-2Ke5qHuzqKuGs7NDbVgtciew3MEuCwNXHmWSiGhD8sc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6d70567773843ee381a1adbb212d452a43b078dc", + "rev": "0e04b37b26a7a7f6245155840b8bcb3f20dadbff", "type": "github" }, "original": { @@ -312,11 +368,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "type": "github" }, "original": { @@ -360,11 +432,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769694244, - "narHash": "sha256-y9iLxICVcfG0IS7neuCS+K/qtM1DexpRi4Dd5naIc5g=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9dd4a0a603081bc77beda88510f873671d38859", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1770441824, + "narHash": "sha256-9iicOOWBXLKD6Yyph7w3+chmRZHJu2bJInh+PZEPu3o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "06b4256d6169bdc528ca347f1b14044c4e6c4e86", "type": "github" }, "original": { @@ -374,13 +462,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1769740369, - "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", + "lastModified": 1770537093, + "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "type": "github" }, "original": { @@ -390,35 +478,20 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_7": { "locked": { - "lastModified": 1768127708, - "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nur": { @@ -429,11 +502,11 @@ ] }, "locked": { - "lastModified": 1769814311, - "narHash": "sha256-3vHLVsCZFnEOFfWE17vY02vL+BRJnQdQzEdAdRUysuI=", + "lastModified": 1770574173, + "narHash": "sha256-ekK2BcDIXbBk1mnm//dv6asyfLiF9Ugfbb8kJRTdzOc=", "owner": "nix-community", "repo": "NUR", - "rev": "900e70bc0a9b647b5c2f8e573c84a35fa3961630", + "rev": "f10d820e7884f495b55729c081fef6c9b6046950", "type": "github" }, "original": { @@ -445,7 +518,7 @@ "preload-ng": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1768356181, @@ -485,20 +558,22 @@ }, "quickshell_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1769593411, - "narHash": "sha256-WW00FaBiUmQyxvSbefvgxIjwf/WmRrEGBbwMHvW/7uQ=", + "lastModified": 1770542768, + "narHash": "sha256-XzvFb2305PjC465D+ederTO27puG3S8GmDXcUB79J1w=", "ref": "refs/heads/master", - "rev": "1e4d804e7f3fa7465811030e8da2bf10d544426a", - "revCount": 732, + "rev": "395a1301a83e98dafc325289630ccacda5d69607", + "revCount": 733, "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, "original": { "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" } }, "root": { @@ -508,10 +583,11 @@ "dms-plugin-registry": "dms-plugin-registry", "hayase": "hayase", "home-manager": "home-manager", + "niri": "niri", "nix-cachyos-kernel": "nix-cachyos-kernel", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", "preload-ng": "preload-ng", "quickshell": "quickshell_2", @@ -551,6 +627,39 @@ "type": "github" } }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.7", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1770568598, + "narHash": "sha256-w7XGGbI3cxtJWK/B2n+yuhm1S3Vv21OPtIMFLTwbU20=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "e6dd3c05c098aef4e6a31fa95c04f129e9b52618", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -559,11 +668,11 @@ ] }, "locked": { - "lastModified": 1769748063, - "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", + "lastModified": 1770568363, + "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", + "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index ea45b6c..bc4a023 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -10,11 +10,15 @@ nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; dms.url = "github:AvengeMedia/DankMaterialShell"; - quickshell.url = "git+https://git.outfoxxed.me/quickshell/quickshell"; + niri.url = "github:sodiboo/niri-flake"; dms-plugin-registry = { url = "github:AvengeMedia/dms-plugin-registry"; inputs.nixpkgs.follows = "nixpkgs"; }; + quickshell = { + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; @@ -32,7 +36,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,hayase ,preload-ng ,nix-cachyos-kernel ,aagl ,dms ,dms-plugin-registry ,quickshell , ...} @ inputs: { + outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,hayase ,preload-ng ,nix-cachyos-kernel ,aagl ,dms ,dms-plugin-registry ,quickshell ,niri , ...} @ inputs: { nixosConfigurations = { "Alfa" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -41,6 +45,7 @@ ./configuration.nix nur.modules.nixos.default preload-ng.nixosModules.default + niri.nixosModules.niri {services.preload-ng.enable = true;} #chaotic.nixosModules.default {imports = [ aagl.nixosModules.default ]; diff --git a/nixos/home.nix b/nixos/home.nix index 5b8c6d5..14a6531 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -29,8 +29,18 @@ name = "Adwaita-dark"; package = pkgs.gnome-themes-extra; }; - gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; - gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; + cursorTheme = { + name = "Adwaita"; + # package = pkgs.Adwaita-awcursors; + }; + gtk3.extraConfig = { + gtk-application-prefer-dark-theme = 1; + "gtk-cursor-theme-name" = "Adwaita"; + }; + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = 1; + Settings = '' gtk-cursor-theme-name=Adwaita ''; + }; }; qt = {