mirror of
https://gitlab.com/Zaney/zaneyos.git
synced 2024-11-21 22:23:09 +01:00
Added back gtk, qt, and cursor options in home.nix and formatted everything
This commit is contained in:
parent
dbd394567f
commit
df588c8e39
@ -1,8 +1,14 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
palette = config.colorScheme.palette;
|
||||
in {
|
||||
in
|
||||
{
|
||||
programs.wlogout = {
|
||||
enable = true;
|
||||
layout = [
|
||||
|
@ -107,10 +107,13 @@ in
|
||||
mutableUsers = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = let
|
||||
sugar = pkgs.callPackage ../../pkgs/sddm-sugar-dark.nix {};
|
||||
tokyo-night = pkgs.libsForQt5.callPackage ../../pkgs/sddm-tokyo-night.nix {};
|
||||
in with pkgs; [
|
||||
environment.systemPackages =
|
||||
let
|
||||
sugar = pkgs.callPackage ../../pkgs/sddm-sugar-dark.nix { };
|
||||
tokyo-night = pkgs.libsForQt5.callPackage ../../pkgs/sddm-tokyo-night.nix { };
|
||||
in
|
||||
with pkgs;
|
||||
[
|
||||
vim
|
||||
wget
|
||||
git
|
||||
|
@ -50,6 +50,27 @@ in
|
||||
};
|
||||
home.file.".config/starship.toml".source = ../../config/starship.toml;
|
||||
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
|
||||
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
|
||||
home.packages = with pkgs; [
|
||||
(import ../../scripts/emopicker9000.nix { inherit pkgs; })
|
||||
(import ../../scripts/task-waybar.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/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/rofi-launcher.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 = {
|
||||
|
@ -24,7 +24,10 @@ in
|
||||
];
|
||||
shell = pkgs.bash;
|
||||
ignoreShellProgramCheck = true;
|
||||
packages = with pkgs; [ obs-studio zeroad ];
|
||||
packages = with pkgs; [
|
||||
obs-studio
|
||||
zeroad
|
||||
];
|
||||
};
|
||||
# "newuser" = {
|
||||
# homeMode = "755";
|
||||
|
@ -14,11 +14,8 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
nixpkgs.config.packageOverrides =
|
||||
pkgs: {
|
||||
vaapiIntel = pkgs.vaapiIntel.override {
|
||||
enableHybridCodec = true;
|
||||
};
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||
};
|
||||
|
||||
# OpenGL
|
||||
|
@ -13,7 +13,5 @@ in
|
||||
enable = mkEnableOption "Change Hardware Clock To Local Time";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
time.hardwareClockInLocalTime = true;
|
||||
};
|
||||
config = mkIf cfg.enable { time.hardwareClockInLocalTime = true; };
|
||||
}
|
||||
|
@ -1,9 +1,12 @@
|
||||
{ lib, qtbase, qtsvg
|
||||
, qtgraphicaleffects
|
||||
, qtquickcontrols2
|
||||
, wrapQtAppsHook
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
{
|
||||
lib,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qtgraphicaleffects,
|
||||
qtquickcontrols2,
|
||||
wrapQtAppsHook,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tokyo-night-sddm";
|
||||
@ -15,9 +18,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
rev = "320c8e74ade1e94f640708eee0b9a75a395697c6";
|
||||
sha256 = "sha256-JRVVzyefqR2L3UrEK2iWyhUKfPMUNUnfRZmwdz05wL0=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
qtbase
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ pkgs, host, ... }:
|
||||
|
||||
let
|
||||
inherit ( import ../hosts/${host}/variables.nix ) terminal browser;
|
||||
inherit (import ../hosts/${host}/variables.nix) terminal browser;
|
||||
in
|
||||
pkgs.writeShellScriptBin "list-hypr-bindings" ''
|
||||
yad --width=800 --height=650 \
|
||||
|
@ -1,23 +1,23 @@
|
||||
{ pkgs }:
|
||||
|
||||
pkgs.writeShellScriptBin "squirtle" ''
|
||||
echo "
|
||||
[38;2;0;0;0m ████████ ██████
|
||||
[38;2;0;0;0m ██[38;2;82;156;154m██[38;2;115;198;243m██████[38;2;0;0;0m████ ██[38;2;115;198;243m██████[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;115;200;243m████████████[38;2;85;137;157m██[38;2;8;0;0m██[38;2;0;0;0m██ ██[38;2;115;198;243m██████[38;2;79;159;151m████[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;115;200;243m████████████[38;2;123;206;235m██[38;2;46;69;78m██[38;2;189;107;37m██[38;2;0;0;0m████ ██[38;2;115;198;243m████[38;2;82;156;154m██[38;2;57;66;65m██[38;2;68;113;108m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m██[38;2;115;198;243m██[38;2;115;200;243m████[38;2;159;208;204m██[38;2;96;162;155m██[38;2;115;198;243m██████[38;2;82;156;154m██[38;2;66;61;66m██[38;2;214;132;38m██[38;2;198;119;38m██[38;2;0;0;0m██[38;2;86;146;154m██[38;2;107;214;243m██[38;2;82;156;154m██[38;2;66;66;66m██[38;2;82;156;154m████[38;2;0;0;0m██
|
||||
[38;2;0;0;0m██[38;2;115;198;243m██[38;2;115;200;243m████[38;2;33;115;105m██[38;2;222;255;254m██[38;2;0;0;0m██[38;2;115;198;243m████[38;2;82;156;154m██[38;2;66;61;66m██[38;2;140;96;52m██[38;2;198;119;38m████[38;2;66;78;66m██[38;2;86;146;154m██[38;2;82;156;154m██[38;2;66;66;66m██[38;2;82;156;154m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m██[38;2;115;198;243m██[38;2;115;200;243m████[38;2;77;144;162m██[38;2;0;4;0m██[38;2;41;8;1m██[38;2;123;214;235m██[38;2;82;156;154m████[38;2;66;66;66m██[38;2;255;255;255m██[38;2;140;82;44m██[38;2;214;140;46m██[38;2;90;103;88m██[38;2;49;111;121m██[38;2;85;159;151m██[38;2;46;80;76m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;115;200;243m████[38;2;115;214;243m██[38;2;0;4;0m██[38;2;68;77;79m██[38;2;96;145;157m██[38;2;82;156;154m██[38;2;66;66;66m██[38;2;192;192;192m██[38;2;255;255;255m██[38;2;140;82;44m██[38;2;214;140;46m██[38;2;173;86;21m██[38;2;90;103;88m██[38;2;85;159;151m██[38;2;8;0;0m██[38;2;0;0;0m
|
||||
[38;2;0;0;0m [38;2;8;0;0m██[38;2;49;77;76m██[38;2;82;156;154m████[38;2;99;132;115m████[38;2;57;74;81m██[38;2;118;129;107m██[38;2;66;66;66m██[38;2;148;198;220m██[38;2;255;255;255m██[38;2;140;82;44m██[38;2;189;103;37m██[38;2;66;66;66m██[38;2;82;156;154m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m [38;2;8;0;0m██[38;2;91;154;152m██[38;2;66;66;66m████[38;2;49;103;113m██[38;2;198;189;118m██[38;2;239;239;159m██[38;2;57;74;81m██[38;2;148;198;220m██[38;2;66;66;66m██[38;2;255;255;255m██[38;2;140;82;44m██[38;2;148;91;47m██[38;2;66;66;66m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ████[38;2;247;231;143m██████[38;2;66;66;66m██[38;2;115;198;243m██████[38;2;66;66;66m██[38;2;140;82;44m██[38;2;189;107;37m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;206;173;94m████[38;2;66;66;66m██[38;2;115;198;243m████[38;2;82;156;154m██[38;2;66;66;66m██[38;2;140;82;44m██[38;2;189;107;37m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;57;115;105m██[38;2;80;85;69m██[38;2;239;239;159m██[38;2;255;231;127m██[38;2;74;66;58m██[38;2;82;156;154m██[38;2;66;66;66m██[38;2;58;69;71m██[38;2;173;198;197m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;57;115;105m██[38;2;80;85;69m██[38;2;0;8;24m██[38;2;195;176;104m████[38;2;66;66;66m████[38;2;115;133;134m██[38;2;58;69;71m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ████ ██[38;2;66;66;66m██[38;2;115;206;243m██[38;2;76;151;151m██[38;2;82;156;154m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;76;151;151m██[38;2;57;123;105m██[38;2;82;156;154m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██████ [0m
|
||||
"
|
||||
echo "
|
||||
[38;2;0;0;0m ████████ ██████
|
||||
[38;2;0;0;0m ██[38;2;82;156;154m██[38;2;115;198;243m██████[38;2;0;0;0m████ ██[38;2;115;198;243m██████[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;115;200;243m████████████[38;2;85;137;157m██[38;2;8;0;0m██[38;2;0;0;0m██ ██[38;2;115;198;243m██████[38;2;79;159;151m████[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;115;200;243m████████████[38;2;123;206;235m██[38;2;46;69;78m██[38;2;189;107;37m██[38;2;0;0;0m████ ██[38;2;115;198;243m████[38;2;82;156;154m██[38;2;57;66;65m██[38;2;68;113;108m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m██[38;2;115;198;243m██[38;2;115;200;243m████[38;2;159;208;204m██[38;2;96;162;155m██[38;2;115;198;243m██████[38;2;82;156;154m██[38;2;66;61;66m██[38;2;214;132;38m██[38;2;198;119;38m██[38;2;0;0;0m██[38;2;86;146;154m██[38;2;107;214;243m██[38;2;82;156;154m██[38;2;66;66;66m██[38;2;82;156;154m████[38;2;0;0;0m██
|
||||
[38;2;0;0;0m██[38;2;115;198;243m██[38;2;115;200;243m████[38;2;33;115;105m██[38;2;222;255;254m██[38;2;0;0;0m██[38;2;115;198;243m████[38;2;82;156;154m██[38;2;66;61;66m██[38;2;140;96;52m██[38;2;198;119;38m████[38;2;66;78;66m██[38;2;86;146;154m██[38;2;82;156;154m██[38;2;66;66;66m██[38;2;82;156;154m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m██[38;2;115;198;243m██[38;2;115;200;243m████[38;2;77;144;162m██[38;2;0;4;0m██[38;2;41;8;1m██[38;2;123;214;235m██[38;2;82;156;154m████[38;2;66;66;66m██[38;2;255;255;255m██[38;2;140;82;44m██[38;2;214;140;46m██[38;2;90;103;88m██[38;2;49;111;121m██[38;2;85;159;151m██[38;2;46;80;76m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;115;200;243m████[38;2;115;214;243m██[38;2;0;4;0m██[38;2;68;77;79m██[38;2;96;145;157m██[38;2;82;156;154m██[38;2;66;66;66m██[38;2;192;192;192m██[38;2;255;255;255m██[38;2;140;82;44m██[38;2;214;140;46m██[38;2;173;86;21m██[38;2;90;103;88m██[38;2;85;159;151m██[38;2;8;0;0m██[38;2;0;0;0m
|
||||
[38;2;0;0;0m [38;2;8;0;0m██[38;2;49;77;76m██[38;2;82;156;154m████[38;2;99;132;115m████[38;2;57;74;81m██[38;2;118;129;107m██[38;2;66;66;66m██[38;2;148;198;220m██[38;2;255;255;255m██[38;2;140;82;44m██[38;2;189;103;37m██[38;2;66;66;66m██[38;2;82;156;154m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m [38;2;8;0;0m██[38;2;91;154;152m██[38;2;66;66;66m████[38;2;49;103;113m██[38;2;198;189;118m██[38;2;239;239;159m██[38;2;57;74;81m██[38;2;148;198;220m██[38;2;66;66;66m██[38;2;255;255;255m██[38;2;140;82;44m██[38;2;148;91;47m██[38;2;66;66;66m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ████[38;2;247;231;143m██████[38;2;66;66;66m██[38;2;115;198;243m██████[38;2;66;66;66m██[38;2;140;82;44m██[38;2;189;107;37m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;206;173;94m████[38;2;66;66;66m██[38;2;115;198;243m████[38;2;82;156;154m██[38;2;66;66;66m██[38;2;140;82;44m██[38;2;189;107;37m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;57;115;105m██[38;2;80;85;69m██[38;2;239;239;159m██[38;2;255;231;127m██[38;2;74;66;58m██[38;2;82;156;154m██[38;2;66;66;66m██[38;2;58;69;71m██[38;2;173;198;197m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;57;115;105m██[38;2;80;85;69m██[38;2;0;8;24m██[38;2;195;176;104m████[38;2;66;66;66m████[38;2;115;133;134m██[38;2;58;69;71m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ████ ██[38;2;66;66;66m██[38;2;115;206;243m██[38;2;76;151;151m██[38;2;82;156;154m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██[38;2;76;151;151m██[38;2;57;123;105m██[38;2;82;156;154m██[38;2;0;0;0m██
|
||||
[38;2;0;0;0m ██████ [0m
|
||||
"
|
||||
''
|
||||
|
@ -4,4 +4,3 @@ pkgs.writeShellScriptBin "task-waybar" ''
|
||||
sleep 0.1
|
||||
${pkgs.swaynotificationcenter}/bin/swaync-client -t &
|
||||
''
|
||||
|
||||
|
@ -1,4 +1,9 @@
|
||||
{ pkgs, host, username, ... }:
|
||||
{
|
||||
pkgs,
|
||||
host,
|
||||
username,
|
||||
...
|
||||
}:
|
||||
|
||||
pkgs.writeShellScriptBin "themechange" ''
|
||||
if [[ ! $@ ]];then
|
||||
|
Loading…
Reference in New Issue
Block a user