Added back gtk, qt, and cursor options in home.nix and formatted everything

This commit is contained in:
Tyler Kelley 2024-05-14 18:36:40 -05:00
parent dbd394567f
commit df588c8e39
15 changed files with 317 additions and 231 deletions

View File

@ -1,8 +1,14 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
palette = config.colorScheme.palette; palette = config.colorScheme.palette;
in { in
{
programs.wlogout = { programs.wlogout = {
enable = true; enable = true;
layout = [ layout = [

View File

@ -107,10 +107,13 @@ in
mutableUsers = true; mutableUsers = true;
}; };
environment.systemPackages = let environment.systemPackages =
let
sugar = pkgs.callPackage ../../pkgs/sddm-sugar-dark.nix { }; sugar = pkgs.callPackage ../../pkgs/sddm-sugar-dark.nix { };
tokyo-night = pkgs.libsForQt5.callPackage ../../pkgs/sddm-tokyo-night.nix { }; tokyo-night = pkgs.libsForQt5.callPackage ../../pkgs/sddm-tokyo-night.nix { };
in with pkgs; [ in
with pkgs;
[
vim vim
wget wget
git git

View File

@ -50,6 +50,27 @@ in
}; };
home.file.".config/starship.toml".source = ../../config/starship.toml; home.file.".config/starship.toml".source = ../../config/starship.toml;
home.file.".emoji".source = ../../config/emoji; home.file.".emoji".source = ../../config/emoji;
home.file.".config/neofetch/config.conf".text = ''
print_info() {
prin "$(color 6) ZaneyOS $ZANEYOS_VERSION"
info underline
info "$(color 7) VER" kernel
info "$(color 2) UP " uptime
info "$(color 4) PKG" packages
info "$(color 6) DE " de
info "$(color 5) TER" term
info "$(color 3) CPU" cpu
info "$(color 7) GPU" gpu
info "$(color 5) MEM" memory
prin " "
prin "$(color 1) $(color 2) $(color 3) $(color 4) $(color 5) $(color 6) $(color 7) $(color 8)"
}
distro_shorthand="on"
memory_unit="gib"
cpu_temp="C"
separator=" $(color 4)>"
stdout="off"
'';
# Install & Configure Git # Install & Configure Git
programs.git = { programs.git = {
@ -73,19 +94,72 @@ in
}; };
}; };
# Configure Cursor Theme
home.pointerCursor = {
gtk.enable = true;
x11.enable = true;
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Ice";
size = 24;
};
# Theme GTK
gtk = {
enable = true;
font = {
name = "Ubuntu";
size = 12;
package = pkgs.ubuntu_font_family;
};
theme = {
name = "${config.colorScheme.slug}";
package = gtkThemeFromScheme {scheme = config.colorScheme;};
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;
};
gtk3.extraConfig = {
gtk-application-prefer-dark-theme=1;
};
gtk4.extraConfig = {
gtk-application-prefer-dark-theme=1;
};
};
# Theme QT -> GTK
qt = {
enable = true;
platformTheme = "gtk";
style = {
name = "adwaita-dark";
package = pkgs.adwaita-qt;
};
};
# Scripts # Scripts
home.packages = with pkgs; [ home.packages = with pkgs; [
(import ../../scripts/emopicker9000.nix { inherit pkgs; }) (import ../../scripts/emopicker9000.nix { inherit pkgs; })
(import ../../scripts/task-waybar.nix { inherit pkgs; }) (import ../../scripts/task-waybar.nix { inherit pkgs; })
(import ../../scripts/squirtle.nix { inherit pkgs; }) (import ../../scripts/squirtle.nix { inherit pkgs; })
(import ../../scripts/themechange.nix { inherit pkgs; inherit host; inherit username; }) (import ../../scripts/themechange.nix {
inherit pkgs;
inherit host;
inherit username;
})
(import ../../scripts/theme-selector.nix { inherit pkgs; }) (import ../../scripts/theme-selector.nix { inherit pkgs; })
(import ../../scripts/nvidia-offload.nix { inherit pkgs; }) (import ../../scripts/nvidia-offload.nix { inherit pkgs; })
(import ../../scripts/wallsetter.nix { inherit pkgs; inherit username; }) (import ../../scripts/wallsetter.nix {
inherit pkgs;
inherit username;
})
(import ../../scripts/web-search.nix { inherit pkgs; }) (import ../../scripts/web-search.nix { inherit pkgs; })
(import ../../scripts/rofi-launcher.nix { inherit pkgs; }) (import ../../scripts/rofi-launcher.nix { inherit pkgs; })
(import ../../scripts/screenshootin.nix { inherit pkgs; }) (import ../../scripts/screenshootin.nix { inherit pkgs; })
(import ../../scripts/list-hypr-bindings.nix { inherit pkgs; inherit host; }) (import ../../scripts/list-hypr-bindings.nix {
inherit pkgs;
inherit host;
})
]; ];
programs = { programs = {

View File

@ -24,7 +24,10 @@ in
]; ];
shell = pkgs.bash; shell = pkgs.bash;
ignoreShellProgramCheck = true; ignoreShellProgramCheck = true;
packages = with pkgs; [ obs-studio zeroad ]; packages = with pkgs; [
obs-studio
zeroad
];
}; };
# "newuser" = { # "newuser" = {
# homeMode = "755"; # homeMode = "755";

View File

@ -14,11 +14,8 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
nixpkgs.config.packageOverrides = nixpkgs.config.packageOverrides = pkgs: {
pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
vaapiIntel = pkgs.vaapiIntel.override {
enableHybridCodec = true;
};
}; };
# OpenGL # OpenGL

View File

@ -13,7 +13,5 @@ in
enable = mkEnableOption "Change Hardware Clock To Local Time"; enable = mkEnableOption "Change Hardware Clock To Local Time";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable { time.hardwareClockInLocalTime = true; };
time.hardwareClockInLocalTime = true;
};
} }

View File

@ -1,9 +1,12 @@
{ lib, qtbase, qtsvg {
, qtgraphicaleffects lib,
, qtquickcontrols2 qtbase,
, wrapQtAppsHook qtsvg,
, stdenvNoCC qtgraphicaleffects,
, fetchFromGitHub qtquickcontrols2,
wrapQtAppsHook,
stdenvNoCC,
fetchFromGitHub,
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "tokyo-night-sddm"; pname = "tokyo-night-sddm";
@ -15,9 +18,7 @@ stdenvNoCC.mkDerivation rec {
rev = "320c8e74ade1e94f640708eee0b9a75a395697c6"; rev = "320c8e74ade1e94f640708eee0b9a75a395697c6";
sha256 = "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0="; sha256 = "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ wrapQtAppsHook ];
wrapQtAppsHook
];
propagatedUserEnvPkgs = [ propagatedUserEnvPkgs = [
qtbase qtbase

View File

@ -4,4 +4,3 @@ pkgs.writeShellScriptBin "task-waybar" ''
sleep 0.1 sleep 0.1
${pkgs.swaynotificationcenter}/bin/swaync-client -t & ${pkgs.swaynotificationcenter}/bin/swaync-client -t &
'' ''

View File

@ -1,4 +1,9 @@
{ pkgs, host, username, ... }: {
pkgs,
host,
username,
...
}:
pkgs.writeShellScriptBin "themechange" '' pkgs.writeShellScriptBin "themechange" ''
if [[ ! $@ ]];then if [[ ! $@ ]];then