diff --git a/nixos/conf/GM/DE/dms.nix b/nixos/conf/GM/DE/dms.nix index 6de3358..62d8d5a 100644 --- a/nixos/conf/GM/DE/dms.nix +++ b/nixos/conf/GM/DE/dms.nix @@ -6,8 +6,8 @@ programs.dms-shell = { enable = true; - #package = inputs.dms.packages.${pkgs.stdenv.hostPlatform.system}.default; - #quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; + package = inputs.dms.packages.${pkgs.stdenv.hostPlatform.system}.default; + quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; systemd = { enable = true; # Systemd service for auto-start @@ -15,8 +15,9 @@ }; plugins = { - dankBitwarden.enable = true; - #DankKDEConnect.enable = true; + #dankBitwarden.enable = true; + dankKDEConnect.enable = true; + linuxWallpaperEngine.enable = true; }; # Core features @@ -29,7 +30,9 @@ imports = [ ./thunar.nix - #inputs.dms-plugin-registry.modules.default + inputs.dms.nixosModules.dank-material-shell + inputs.dms-plugin-registry.modules.default + inputs.dms.nixosModules.greeter ]; xdg.portal = { @@ -42,10 +45,12 @@ programs.xwayland.enable = true; programs.kdeconnect.enable = true; - services.displayManager.dms-greeter = { - enable = true; - compositor.name = "niri"; - }; + #services.displayManager.dms-greeter = { + # enable = true; + # compositor.name = "hyprland"; + # package = inputs.dms.packages.${pkgs.stdenv.hostPlatform.system}.default; + # quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; + #}; services = { greetd = @@ -60,13 +65,13 @@ settings = { terminal.vt = 1; default_session = session; - initial_session = session; + initial_session = session; }; }; - displayManager.autoLogin = { - user = "gui"; - enable = true; }; - }; -} \ No newline at end of file + environment.systemPackages = with pkgs; [ + dgop + ]; + +} \ No newline at end of file diff --git a/nixos/conf/GM/DE/impde.nix b/nixos/conf/GM/DE/impde.nix index 6a40adb..42e7c36 100644 --- a/nixos/conf/GM/DE/impde.nix +++ b/nixos/conf/GM/DE/impde.nix @@ -3,8 +3,8 @@ imports = [ #./cosmic.nix #./gnome.nix - ./kde.nix - #./dms.nix + #./kde.nix + ./dms.nix ]; } diff --git a/nixos/conf/GM/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix index f4715dc..838f1ba 100644 --- a/nixos/conf/GM/Pkgs/pkgs.nix +++ b/nixos/conf/GM/Pkgs/pkgs.nix @@ -45,6 +45,8 @@ adwaita-qt6 winboat xwayland-satellite + linux-wallpaperengine + ## inputs stable #inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system} diff --git a/nixos/conf/GM/Pkgs/pkgsconfig.nix b/nixos/conf/GM/Pkgs/pkgsconfig.nix index 18c0e8d..3032362 100644 --- a/nixos/conf/GM/Pkgs/pkgsconfig.nix +++ b/nixos/conf/GM/Pkgs/pkgsconfig.nix @@ -1,26 +1,20 @@ { config, lib, inputs, pkgs, ... }: { - ## configuraçao da steam - programs.steam = { + programs = { + steam = { enable = true; remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; localNetworkGameTransfers.openFirewall = true; - }; - - nixpkgs.config.allowUnfreePredicate = pkg: lib.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-unwrapped" - "steam-run" - ]; - programs = { + }; gamescope.enable = true; gamemode.enable = true; }; + + ## Configuraçoes do obs programs.obs-studio = { diff --git a/nixos/conf/HM/configs/cfhome.nix b/nixos/conf/HM/configs/cfhome.nix index de9370e..f64f0df 100644 --- a/nixos/conf/HM/configs/cfhome.nix +++ b/nixos/conf/HM/configs/cfhome.nix @@ -1,5 +1,5 @@ {config, lib, inputs, pkgs, ... }: { - + ## starship programs.starship = { enable = true; diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index fb269e2..aecdda1 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -6,7 +6,7 @@ telegram-desktop pear-desktop element-desktop - #(discord.override {withEquicord = true;}) + #(discord.override { withEquicord = true; }) equibop ## Jogos @@ -50,5 +50,4 @@ ]; - } \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix index bd0a903..6f5dc6c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -10,7 +10,7 @@ boot = { #kernelPackages = pkgs.linuxPackages_latest; #kernelPackages = pkgs.linuxPackages_cachyos; - kernelPackages = inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto; + kernelPackages = inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10; @@ -20,8 +20,8 @@ services = { xserver.enable = false; # Ativar sistema gráfico X11 - displayManager.autoLogin.enable = true; - displayManager.autoLogin.user = "gui"; + # displayManager.autoLogin.enable = true; + # displayManager.autoLogin.user = "gui"; printing.enable = false; }; diff --git a/nixos/flake.lock b/nixos/flake.lock index f2069b1..1c287df 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -39,11 +39,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1769420040, - "narHash": "sha256-OsO2Pi2oDE2hZoxCJ40mx9/wag9XXQ5FkcwIUcJN4Go=", + "lastModified": 1769587384, + "narHash": "sha256-fPOlnH9arzQLmkbaZ6p+otwLuH9YEf/t8Q2o9/Yq/YA=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "d2f1d070c0303b3b2bcb71df73c623a274258e22", + "rev": "5f061ab9733ad15eccf6b9995e9d56f572e67266", "type": "github" }, "original": { @@ -52,6 +52,45 @@ "type": "github" } }, + "dms": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1769798733, + "narHash": "sha256-ctY7pE186OilrdClbpQun5Oeo0eH6ABkjtZq5sZ6P0M=", + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "rev": "a90717b20c6fde1a3af51bce3eba8654d5deefa8", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "type": "github" + } + }, + "dms-plugin-registry": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769798437, + "narHash": "sha256-rXeQldt91F12ZpjvAxe3C19f/RfC7qaaulaT1LDNfY8=", + "owner": "AvengeMedia", + "repo": "dms-plugin-registry", + "rev": "c25ed3fb38645f6b242f84d2e36792efbc8ac78e", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "dms-plugin-registry", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -168,11 +207,11 @@ ] }, "locked": { - "lastModified": 1769450270, - "narHash": "sha256-pdVm/zJazDUAasTyHFX/Pbrlk9Upjxi0yzgn7GjGe4g=", + "lastModified": 1769813945, + "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "a10c1e8f5ad2589414407f4851c221cb66270257", + "rev": "475921375def3eb930e1f8883f619ff8609accb6", "type": "github" }, "original": { @@ -208,14 +247,14 @@ "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1769536613, - "narHash": "sha256-v1XqNPLHBb2rKiquxwDQU7lMmFbXVgYPDC8LMWcvVds=", + "lastModified": 1769709954, + "narHash": "sha256-giMeVSEYM80pRrpB95wwgvcGODbkKT3LKVnTpVTj8TA=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "9e9058ae652c374a26242bd034d82ed0c04ec53c", + "rev": "856b12c3db3cb7a2531d4f26eac6f2129284f7e1", "type": "github" }, "original": { @@ -258,11 +297,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1769542889, - "narHash": "sha256-SAdV/kXjT1kWx/oCWwpncnBvLGePTDWffnQDKQq8K3U=", + "lastModified": 1769819419, + "narHash": "sha256-gyUs8aTxhQF/ptJGh0HT21POr8wi6Y7YVUs7w+v6S4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23c1cd11b48117a954dec7e131f2f1705adf4148", + "rev": "6d70567773843ee381a1adbb212d452a43b078dc", "type": "github" }, "original": { @@ -273,11 +312,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769318308, - "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", + "lastModified": 1769598131, + "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c", + "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", "type": "github" }, "original": { @@ -305,11 +344,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769520429, - "narHash": "sha256-l+Ao9qDn8CdeNGXztaEW5gkAL5tQMwLxbyXiBDR8M9A=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1769694244, + "narHash": "sha256-y9iLxICVcfG0IS7neuCS+K/qtM1DexpRi4Dd5naIc5g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff8aa693ba368484135f76db7e119f79419e8065", + "rev": "e9dd4a0a603081bc77beda88510f873671d38859", "type": "github" }, "original": { @@ -319,13 +374,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1769433173, - "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=", + "lastModified": 1769740369, + "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "13b0f9e6ac78abbbb736c635d87845c4f4bee51b", + "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", "type": "github" }, "original": { @@ -335,13 +390,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1769170682, - "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5296fdd05cfa2c187990dd909864da9658df755", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -351,6 +406,21 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts_2", @@ -359,11 +429,11 @@ ] }, "locked": { - "lastModified": 1769543643, - "narHash": "sha256-9dO5RU+ten08OZVbyB99414HKr2RbtiXXkptS+KvSFI=", + "lastModified": 1769814311, + "narHash": "sha256-3vHLVsCZFnEOFfWE17vY02vL+BRJnQdQzEdAdRUysuI=", "owner": "nix-community", "repo": "NUR", - "rev": "ee8c20ce4cfc404aae54b052b23c0a204bb052c4", + "rev": "900e70bc0a9b647b5c2f8e573c84a35fa3961630", "type": "github" }, "original": { @@ -375,7 +445,7 @@ "preload-ng": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1768356181, @@ -391,17 +461,60 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "dms", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1766725085, + "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=", + "ref": "refs/heads/master", + "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "revCount": 715, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + }, + "original": { + "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff", + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + } + }, + "quickshell_2": { + "inputs": { + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1769593411, + "narHash": "sha256-WW00FaBiUmQyxvSbefvgxIjwf/WmRrEGBbwMHvW/7uQ=", + "ref": "refs/heads/master", + "rev": "1e4d804e7f3fa7465811030e8da2bf10d544426a", + "revCount": 732, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + } + }, "root": { "inputs": { "aagl": "aagl", + "dms": "dms", + "dms-plugin-registry": "dms-plugin-registry", "hayase": "hayase", "home-manager": "home-manager", "nix-cachyos-kernel": "nix-cachyos-kernel", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "preload-ng": "preload-ng", + "quickshell": "quickshell_2", "zen-browser": "zen-browser" } }, @@ -446,11 +559,11 @@ ] }, "locked": { - "lastModified": 1769491693, - "narHash": "sha256-bbqeCDML1yXI6kpy8q8BshKRV1szk3xV0StAbzw4Z+o=", + "lastModified": 1769748063, + "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "708e0f10aba5de7d0f55883d06fa08aa6a7cd462", + "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index f76151a..ea45b6c 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -9,6 +9,12 @@ #chaotic.url = "github:lonerOrz/nyx-loner"; 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"; + dms-plugin-registry = { + url = "github:AvengeMedia/dms-plugin-registry"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; @@ -26,7 +32,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,hayase ,preload-ng ,nix-cachyos-kernel ,aagl , ...} @ 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 , ...} @ inputs: { nixosConfigurations = { "Alfa" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/nixos/home.nix b/nixos/home.nix index a64c218..5b8c6d5 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -23,22 +23,25 @@ flakePath = "/etc/nixos"; }; - #gtk = { - # enable = true; - # theme = { - # name = "Adwaita-dark"; - # package = pkgs.gnome-themes-extra; - # }; - # gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; - # gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; - #}; + gtk = { + enable = true; + theme = { + name = "Adwaita-dark"; + package = pkgs.gnome-themes-extra; + }; + gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; + gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; + }; - #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; }