extern/zaneyos
1
0
Fork 1
mirror of https://gitlab.com/Zaney/zaneyos.git synced 2025-06-24 05:51:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed final conflicting obs file, improved install script, & added new waybar style

Browse Source
This commit is contained in:
Tyler Kelley 2024-02-18 01:29:24 -06:00
parent 76152d7c4e
commit cf79f8153e
4 changed files with 26 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
config/home/files/obs-studio/global.ini
View File

@ -1,87 +0,0 @@
[General]
Pre19Defaults=false
Pre21Defaults=false
Pre23Defaults=false
Pre24.1Defaults=false
MaxLogs=10
InfoIncrement=-1
ProcessPriority=Normal
EnableAutoUpdates=true
ConfirmOnExit=true
HotkeyFocusType=NeverDisableHotkeys
FirstRun=true
LastVersion=503316482
[Video]
Renderer=OpenGL
[BasicWindow]
PreviewEnabled=true
PreviewProgramMode=false
SceneDuplicationMode=true
SwapScenesMode=true
SnappingEnabled=true
ScreenSnapping=true
SourceSnapping=true
CenterSnapping=false
SnapDistance=10
SpacingHelpersEnabled=true
RecordWhenStreaming=false
KeepRecordingWhenStreamStops=false
SysTrayEnabled=true
SysTrayWhenStarted=false
SaveProjectors=false
ShowTransitions=true
ShowListboxToolbars=true
ShowStatusBar=true
ShowSourceIcons=true
ShowContextToolbars=true
StudioModeLabels=true
VerticalVolControl=false
MultiviewMouseSwitch=true
MultiviewDrawNames=true
MultiviewDrawAreas=true
MediaControlsCountdownTimer=true
gridMode=false
geometry=AdnQywADAAAAAAeAAAAAAAAADusAAAP5AAAHgAAAAAAAAA7rAAAEHQAAAAECAAAAB4AAAAeAAAAAAAAADusAAAP5
DockState=AAAA/wAAAAD9AAAAAQAAAAMAAAdsAAABAfwBAAAABvsAAAAUAHMAYwBlAG4AZQBzAEQAbwBjAGsBAAAAAAAAAXQAAACgAP////sAAAAWAHMAbwB1AHIAYwBlAHMARABvAGMAawEAAAF4AAABbwAAAKAA////+wAAABIAbQBpAHgAZQByAEQAbwBjAGsBAAAC6wAAAd4AAADeAP////sAAAAeAHQAcgBhAG4AcwBpAHQAaQBvAG4AcwBEAG8AYwBrAQAABM0AAAE7AAAAlgD////7AAAAGABjAG8AbgB0AHIAbwBsAHMARABvAGMAawEAAAYMAAABYAAAAJ4A////+wAAABIAcwB0AGEAdABzAEQAbwBjAGsCAAACYgAAAbgAAAK8AAAAyAAAB2wAAAK5AAAABAAAAAQAAAAIAAAACPwAAAAA
AlwaysOnTop=false
EditPropertiesMode=false
DocksLocked=false
SideDocks=false
[Basic]
Profile=ZaneyOS
ProfileDir=ZaneyOS
SceneCollection=Untitled
SceneCollectionFile=Untitled
ConfigOnNewProfile=true
[OBSWebSocket]
FirstLoad=false
ServerEnabled=false
ServerPort=4455
AlertsEnabled=false
AuthRequired=true
ServerPassword=Cwu5v7LS9JDS3gsG
[ScriptLogWindow]
geometry=AdnQywADAAAAAAeBAAAAGQAACy4AAAQUAAAHgQAAABkAAAsuAAAEFAAAAAECAAAAB4AAAAeBAAAAGQAACy4AAAQU
[Accessibility]
SelectRed=255
SelectGreen=65280
SelectBlue=16744192
MixerGreen=2522918
MixerYellow=2523007
MixerRed=2500223
MixerGreenActive=5046092
MixerYellowActive=5046271
MixerRedActive=5000447
[PropertiesWindow]
cx=720
cy=580
[scripts-tool]
prevScriptRow=-1

43
config/home/waybar.nix
View File

@ -2,7 +2,7 @@
let let
palette = config.colorScheme.palette; palette = config.colorScheme.palette;
inherit (import ../../options.nix) slickbar simplebar clock24h; inherit (import ../../options.nix) slickbar slickbar-num simplebar clock24h;
in with lib; { in with lib; {
# Configure & Theme Waybar # Configure & Theme Waybar
programs.waybar = { programs.waybar = {
@ -20,7 +20,8 @@ in with lib; {
else [ "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "tray" ]; else [ "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "tray" ];
"hyprland/workspaces" = { "hyprland/workspaces" = {
format = if simplebar == true then "{name}" else "{icon}"; format = if simplebar == true ||
slickbar-num == true then "{name}" else "{icon}";
format-icons = { format-icons = {
default = " "; default = " ";
active = " "; active = " ";
@ -140,7 +141,7 @@ in with lib; {
font-weight: bold; font-weight: bold;
} }
window#waybar { window#waybar {
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background-color: rgba(26,27,38,0); background-color: rgba(26,27,38,0);
border-bottom: 1px solid rgba(26,27,38,0); border-bottom: 1px solid rgba(26,27,38,0);
border-radius: 0px; border-radius: 0px;
@ -158,7 +159,7 @@ in with lib; {
''} ''}
} }
#workspaces { #workspaces {
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: linear-gradient(180deg, #${palette.base00}, #${palette.base01}); background: linear-gradient(180deg, #${palette.base00}, #${palette.base01});
margin: 5px; margin: 5px;
padding: 0px 1px; padding: 0px 1px;
@ -183,7 +184,7 @@ in with lib; {
''} ''}
} }
#workspaces button { #workspaces button {
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
padding: 0px 5px; padding: 0px 5px;
margin: 4px 3px; margin: 4px 3px;
border-radius: 15px; border-radius: 15px;
@ -210,7 +211,7 @@ in with lib; {
''} ''}
} }
#workspaces button.active { #workspaces button.active {
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
padding: 0px 5px; padding: 0px 5px;
margin: 4px 3px; margin: 4px 3px;
border-radius: 15px; border-radius: 15px;
@ -239,7 +240,7 @@ in with lib; {
''} ''}
} }
#workspaces button:hover { #workspaces button:hover {
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
border-radius: 15px; border-radius: 15px;
color: #${palette.base00}; color: #${palette.base00};
background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E}); background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E});
@ -266,7 +267,7 @@ in with lib; {
color: #${palette.base07}; color: #${palette.base07};
} }
#window { #window {
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
color: #${palette.base05}; color: #${palette.base05};
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
@ -286,7 +287,7 @@ in with lib; {
} }
#memory { #memory {
color: #${palette.base0F}; color: #${palette.base0F};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -304,7 +305,7 @@ in with lib; {
} }
#clock { #clock {
color: #${palette.base0B}; color: #${palette.base0B};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -322,7 +323,7 @@ in with lib; {
} }
#idle_inhibitor { #idle_inhibitor {
color: #${palette.base0A}; color: #${palette.base0A};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -340,7 +341,7 @@ in with lib; {
} }
#cpu { #cpu {
color: #${palette.base07}; color: #${palette.base07};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -358,7 +359,7 @@ in with lib; {
} }
#disk { #disk {
color: #${palette.base03}; color: #${palette.base03};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -376,7 +377,7 @@ in with lib; {
} }
#battery { #battery {
color: #${palette.base08}; color: #${palette.base08};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -394,7 +395,7 @@ in with lib; {
} }
#network { #network {
color: #${palette.base09}; color: #${palette.base09};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -412,7 +413,7 @@ in with lib; {
} }
#tray { #tray {
color: #${palette.base05}; color: #${palette.base05};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 0px 0px 50px; border-radius: 15px 0px 0px 50px;
margin: 5px 0px 5px 5px; margin: 5px 0px 5px 5px;
@ -430,7 +431,7 @@ in with lib; {
} }
#pulseaudio { #pulseaudio {
color: #${palette.base0D}; color: #${palette.base0D};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -448,7 +449,7 @@ in with lib; {
} }
#custom-notification { #custom-notification {
color: #${palette.base0C}; color: #${palette.base0C};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -466,7 +467,7 @@ in with lib; {
} }
#custom-themeselector { #custom-themeselector {
color: #${palette.base0D}; color: #${palette.base0D};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -484,7 +485,7 @@ in with lib; {
} }
#custom-startmenu { #custom-startmenu {
color: #${palette.base03}; color: #${palette.base03};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 0px 15px 50px 0px; border-radius: 0px 15px 50px 0px;
margin: 5px 5px 5px 0px; margin: 5px 5px 5px 0px;
@ -502,7 +503,7 @@ in with lib; {
} }
#idle_inhibitor { #idle_inhibitor {
color: #${palette.base09}; color: #${palette.base09};
${if slickbar == true then '' ${if slickbar == true || slickbar-num == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;

3
install-zaneyos.sh
View File

@ -70,7 +70,8 @@ sed -i "/^\s*theKBDLayout[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$kbdLayout\"
echo "-----" echo "-----"
read -p "Enter Your Timezone, Example> America/New_York : " timezone read -p "Enter Your Timezone, Example> America/New_York : " timezone
sed -i "/^\s*theTimezone[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$timezone\"/" ./options.nix escaped_timezone=$(echo "$timezone" | sed 's/\//\\\//g')
sed -i "/^\s*theTimezone[[:space:]]*=[[:space:]]*\"/s#\"\(.*\)\"#\"$escaped_timezone\"#" ./options.nix
echo "-----" echo "-----"

3
options.nix
View File

@ -8,7 +8,7 @@ let
hostname = "hyprnix"; hostname = "hyprnix";
userHome = "/home/${username}"; userHome = "/home/${username}";
flakeDir = "${userHome}/zaneyos"; flakeDir = "${userHome}/zaneyos";
waybarStyle = "slickbar"; # simplebar, slickbar, or default waybarStyle = "slickbar-num"; # simplebar, slickbar, slickbar-num, or default
in { in {
# User Variables # User Variables
username = "${username}"; username = "${username}";
@ -17,6 +17,7 @@ in {
gitEmail = "tylerzanekelley@gmail.com"; gitEmail = "tylerzanekelley@gmail.com";
theme = "atelier-cave"; theme = "atelier-cave";
slickbar = if waybarStyle == "slickbar" then true else false; slickbar = if waybarStyle == "slickbar" then true else false;
slickbar-num = if waybarStyle == "slickbar-num" then true else false;
simplebar = if waybarStyle == "simplebar" then true else false; simplebar = if waybarStyle == "simplebar" then true else false;
borderAnim = true; borderAnim = true;
browser = "firefox"; browser = "firefox";