diff --git a/configuration.nix b/configuration.nix index b189a11..e7220ba 100755 --- a/configuration.nix +++ b/configuration.nix @@ -92,10 +92,10 @@ home = "/home/game"; }; }; - groups.libvirtd.members = [ - "mrfluffy" - "work" - ]; + groups.libvirtd.members = [ + "mrfluffy" + "work" + ]; }; ############################################################################## @@ -126,7 +126,8 @@ # AMD_VULKAN_ICD = "RADV"; # VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; # XDG_CURRENT_DESKTOP = "hyprland"; - # QT_QPA_PLATFORMTHEME = "qt6ct"; + #QT_QPA_PLATFORMTHEME = "gtk3"; + #QT_QPA_PLATFORMTHEME_QT6 = "gtk3"; }; systemPackages = with pkgs; [ diff --git a/dots/caelestia.nix b/dots/caelestia.nix index 7877ee8..1105f79 100644 --- a/dots/caelestia.nix +++ b/dots/caelestia.nix @@ -8,7 +8,7 @@ { programs = { caelestia = { - enable = true; + enable = false; systemd = { enable = true; # if you prefer starting from your compositor target = "graphical-session.target"; diff --git a/dots/dankMeterialShell.nix b/dots/dankMeterialShell.nix new file mode 100644 index 0000000..6f35cd6 --- /dev/null +++ b/dots/dankMeterialShell.nix @@ -0,0 +1,26 @@ +{ + config, + lib, + pkgs, + inputs, + ... +}: + +{ + imports = [ + inputs.dms.homeModules.dankMaterialShell.default + ]; + + programs.dankMaterialShell = { + enable = true; + systemd = { + enable = true; # if you prefer starting from your compositor + }; + + default.settings = { + theme = "dark"; + dynamicTheming = true; + # Add any other settings here + }; + }; +} diff --git a/dots/foot.nix b/dots/foot.nix index b995abd..0968014 100755 --- a/dots/foot.nix +++ b/dots/foot.nix @@ -10,6 +10,7 @@ settings = { main = { pad = "5x5"; + include="/home/${config.home.username}/.config/foot/dank-colors.ini"; }; colors = { alpha = lib.mkForce (0.9); diff --git a/dots/hyprland.nix b/dots/hyprland.nix index be1d994..45541a0 100755 --- a/dots/hyprland.nix +++ b/dots/hyprland.nix @@ -15,7 +15,7 @@ let #hyprscrolling = inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprscrolling; mod = "Alt"; terminal = "footclient"; - fileManager = "dolphin"; + fileManager = "thunar"; #runner = "${lib.getExe caelestia-cli} shell drawers toggle launcher"; runner = "vicinae toggle"; # runner = "anyrun"; diff --git a/flake.lock b/flake.lock index 74fdc72..7fccac0 100644 --- a/flake.lock +++ b/flake.lock @@ -205,6 +205,50 @@ "type": "github" } }, + "dgop": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765583951, + "narHash": "sha256-QDCrQorCAesnsOQJk+cTszazGitf9NDqIEMxzUEtotE=", + "owner": "AvengeMedia", + "repo": "dgop", + "rev": "57279532bc932b93df79d866b0663b1753cefda1", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "dgop", + "type": "github" + } + }, + "dms": { + "inputs": { + "dgop": [ + "dgop" + ], + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell_3" + }, + "locked": { + "lastModified": 1765804469, + "narHash": "sha256-cYCzFgYax1Cu/qdao5TEpB4ep/yOxZ14W/Dvj9zfovs=", + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "rev": "42a2835929e346e65226876ce3032eef23953eaf", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -1138,6 +1182,28 @@ } }, "quickshell_3": { + "inputs": { + "nixpkgs": [ + "dms", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764663772, + "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", + "ref": "refs/heads/master", + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "revCount": 713, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + }, + "original": { + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" + } + }, + "quickshell_4": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -1161,6 +1227,8 @@ "inputs": { "caelestia": "caelestia", "caelestia-cli": "caelestia-cli_2", + "dgop": "dgop", + "dms": "dms", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-hyprsplit": "hyprland-hyprsplit", @@ -1172,7 +1240,7 @@ "nixcord": "nixcord", "nixpkgs": "nixpkgs_3", "qs-qml": "qs-qml", - "quickshell": "quickshell_3", + "quickshell": "quickshell_4", "stylix": "stylix", "vicinae": "vicinae", "zen-browser": "zen-browser" diff --git a/flake.nix b/flake.nix index 4d8a7d1..d9ebd3b 100755 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,15 @@ inputs.nixpkgs.follows = "nixpkgs"; }; #niri.url = "github:sodiboo/niri-flake"; + dgop = { + url = "github:AvengeMedia/dgop"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + dms = { + url = "github:AvengeMedia/DankMaterialShell"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.dgop.follows = "dgop"; + }; caelestia.url = "github:caelestia-dots/shell"; caelestia-cli.url = "github:caelestia-dots/cli"; quickshell = { diff --git a/home/homePkgs.nix b/home/homePkgs.nix index 4075af9..a02aec2 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -64,8 +64,8 @@ in # enableUpdateCheck = false; # enableExtensionUpdateCheck = false; }; - }; + }; services.vicinae = { enable = true; # default: false @@ -241,7 +241,7 @@ in gamemode goverlay (pkgs.heroic.override { - extraPkgs = pkgs: [ pkgs.gamescope ]; # pulls in the real package + extraPkgs = pkgs: [ pkgs.gamescope ]; # pulls in the real package }) prismlauncher protonup-qt @@ -253,6 +253,7 @@ in ############################ # KDE / File Management ############################ + kdePackages.qt6ct kdePackages.baloo # new kdePackages.baloo-widgets # new kdePackages.dolphin @@ -271,6 +272,9 @@ in hicolor-icon-theme qt6.qtsvg + adw-gtk3 + pywalfox-native + ############################ # Experimental (inputs) ############################ diff --git a/home/mrfluffy.nix b/home/mrfluffy.nix index 0b10351..10cb5ac 100755 --- a/home/mrfluffy.nix +++ b/home/mrfluffy.nix @@ -34,6 +34,7 @@ in ../dots/hyprland.nix ../dots/hyprpaper.nix ../dots/caelestia.nix + ../dots/dankMeterialShell.nix ]; # You can find color schemes at: https://github.com/tinted-theming/schemes diff --git a/home/stylix.nix b/home/stylix.nix index 47826b1..8172292 100755 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -21,16 +21,16 @@ in font-packages.enable = true; # fontconfig.enable = true; - gtk = { - enable = true; - flatpakSupport.enable = true; - }; - kde.enable = true; + #gtk = { + # enable = true; + # flatpakSupport.enable = true; + #}; + #kde.enable = true; - qt.enable = true; - vscode.enable = true; + #qt.enable = true; + #vscode.enable = true; lazygit.enable = true; - foot.enable = true; + #foot.enable = true; river.enable = true; hyprland.enable = true; waybar.enable = true; @@ -46,12 +46,12 @@ in }; }; - iconTheme = { - enable = true; - package = lib.mkForce (pkgs.reversal-icon-theme.override { allColorVariants = true; }); - light = "Reversal-black"; - dark = "Reversal-black-dark"; - }; + #iconTheme = { + # enable = true; + # #package = lib.mkForce (pkgs.reversal-icon-theme.override { allColorVariants = true; }); + # light = "Reversal-black"; + # dark = "Reversal-black-dark"; + #}; polarity = "dark"; image = ../assets/Wallpapers/001.jpg; diff --git a/home/work.nix b/home/work.nix index 9480db7..4a7f758 100755 --- a/home/work.nix +++ b/home/work.nix @@ -34,6 +34,8 @@ in ../dots/hyprland.nix ../dots/hyprpaper.nix ../dots/caelestia.nix + ../dots/dankMeterialShell.nix + ]; # You can find color schemes at: https://github.com/tinted-theming/schemes @@ -48,13 +50,13 @@ in home.stateVersion = "23.11"; # Please read the comment before changing. # Example GTK block (disabled) - # gtk = { - # enable = true; - # iconTheme = { - # name = "Dracula"; - # # package = pkgs.dracula-icon-theme; - # }; - # }; + gtk = { + enable = true; + iconTheme = { + name = "Reversal-black-dark"; + package = pkgs.reversal-icon-theme.override { allColorVariants = true; }; + }; + }; home.packages = with pkgs; [ ############################ diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 437b266..65c8743 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -145,9 +145,18 @@ in # NetworkManager applet nm-applet = { - enable = true; + enable = false; indicator = false; }; + thunar = { + enable = true; + plugins = with pkgs.xfce; [ + thunar-archive-plugin + thunar-volman + ]; + }; + xfconf.enable = true; + }; ############################