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

Switch Back To Bash & Separate Numbers For Waybar Into Variable

Browse Source
This commit is contained in:
Tyler Kelley 2024-02-28 16:48:04 -06:00
parent 561b1bf9a8
commit 60ed1efe0b
4 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/home/neovim.nix
View File

@ -56,7 +56,6 @@ in {
"<leader>lg" = "live_grep"; "<leader>lg" = "live_grep";
}; };
}; };
neo-tree.enable = true;
indent-blankline.enable = true; indent-blankline.enable = true;
nvim-colorizer.enable = true; nvim-colorizer.enable = true;
nvim-autopairs.enable = true; nvim-autopairs.enable = true;
@ -115,6 +114,8 @@ in {
}; };
}; };
extraPlugins = [ plugins.telescope-file-browser-nvim ];
# FOR NEOVIDE # FOR NEOVIDE
extraConfigLua = '' extraConfigLua = ''
vim.opt.guifont = "JetBrainsMono\\ NFM,Noto_Color_Emoji:h14" vim.opt.guifont = "JetBrainsMono\\ NFM,Noto_Color_Emoji:h14"
@ -187,9 +188,9 @@ in {
keymaps = [ keymaps = [
{ {
mode = "n"; mode = "n";
key = "<leader>fb"; key = "<space>fb";
action = "<cmd>Neotree reveal right<CR>"; action = ":Telescope file_browser<CR>";
options.silent = false; options.noremap = true;
} }
{ {
key = "<Tab>"; key = "<Tab>";

56
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 slickbar-num simplebar clock24h; inherit (import ../../options.nix) slickbar bar-number simplebar clock24h;
in with lib; { in with lib; {
# Configure & Theme Waybar # Configure & Theme Waybar
programs.waybar = { programs.waybar = {
@ -12,16 +12,12 @@ in with lib; {
layer = "top"; layer = "top";
position = "top"; position = "top";
modules-center = if simplebar == true then [ "hyprland/window" ] modules-center = [ "hyprland/workspaces" ] ;
else [ "custom/hyprbindings" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock" ]; modules-left = [ "custom/startmenu" "hyprland/window" "pulseaudio" "cpu" "memory"];
modules-left = if simplebar == true then ["custom/startmenu" "hyprland/workspaces" "cpu" "memory" "custom/hyprbindings" ] modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "pulseaudio" "clock" "tray" ];
else [ "custom/startmenu" "hyprland/window" ];
modules-right = if simplebar == true then [ "idle_inhibitor" "custom/themeselector" "custom/notification" "pulseaudio" "clock" "tray" ]
else [ "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "tray" ];
"hyprland/workspaces" = { "hyprland/workspaces" = {
format = if simplebar == true || format = if bar-number == true then "{name}" else "{icon}";
slickbar-num == true then "{name}" else "{icon}";
format-icons = { format-icons = {
default = " "; default = " ";
active = " "; active = " ";
@ -150,7 +146,7 @@ in with lib; {
font-weight: bold; font-weight: bold;
} }
window#waybar { window#waybar {
${if slickbar == true || slickbar-num == true then '' ${if slickbar == 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;
@ -168,7 +164,7 @@ in with lib; {
''} ''}
} }
#workspaces { #workspaces {
${if slickbar == true || slickbar-num == true then '' ${if slickbar == 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;
@ -193,7 +189,7 @@ in with lib; {
''} ''}
} }
#workspaces button { #workspaces button {
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
padding: 0px 5px; padding: 0px 5px;
margin: 4px 3px; margin: 4px 3px;
border-radius: 15px; border-radius: 15px;
@ -220,7 +216,7 @@ in with lib; {
''} ''}
} }
#workspaces button.active { #workspaces button.active {
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
padding: 0px 5px; padding: 0px 5px;
margin: 4px 3px; margin: 4px 3px;
border-radius: 15px; border-radius: 15px;
@ -249,7 +245,7 @@ in with lib; {
''} ''}
} }
#workspaces button:hover { #workspaces button:hover {
${if slickbar == true || slickbar-num == true then '' ${if slickbar == 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});
@ -276,7 +272,7 @@ in with lib; {
color: #${palette.base07}; color: #${palette.base07};
} }
#window { #window {
${if slickbar == true || slickbar-num == true then '' ${if slickbar == 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;
@ -296,7 +292,7 @@ in with lib; {
} }
#memory { #memory {
color: #${palette.base0F}; color: #${palette.base0F};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -314,7 +310,7 @@ in with lib; {
} }
#clock { #clock {
color: #${palette.base0B}; color: #${palette.base0B};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -332,7 +328,7 @@ in with lib; {
} }
#idle_inhibitor { #idle_inhibitor {
color: #${palette.base0A}; color: #${palette.base0A};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -350,7 +346,7 @@ in with lib; {
} }
#cpu { #cpu {
color: #${palette.base07}; color: #${palette.base07};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -368,7 +364,7 @@ in with lib; {
} }
#disk { #disk {
color: #${palette.base03}; color: #${palette.base03};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -386,7 +382,7 @@ in with lib; {
} }
#battery { #battery {
color: #${palette.base08}; color: #${palette.base08};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -404,7 +400,7 @@ in with lib; {
} }
#network { #network {
color: #${palette.base09}; color: #${palette.base09};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -422,7 +418,7 @@ in with lib; {
} }
#custom-hyprbindings { #custom-hyprbindings {
color: #${palette.base0E}; color: #${palette.base0E};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -440,7 +436,7 @@ in with lib; {
} }
#tray { #tray {
color: #${palette.base05}; color: #${palette.base05};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == 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;
@ -458,7 +454,7 @@ in with lib; {
} }
#pulseaudio { #pulseaudio {
color: #${palette.base0D}; color: #${palette.base0D};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 50px 15px 50px 15px; border-radius: 50px 15px 50px 15px;
margin: 5px; margin: 5px;
@ -476,7 +472,7 @@ in with lib; {
} }
#custom-notification { #custom-notification {
color: #${palette.base0C}; color: #${palette.base0C};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -494,7 +490,7 @@ in with lib; {
} }
#custom-themeselector { #custom-themeselector {
color: #${palette.base0D}; color: #${palette.base0D};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -512,7 +508,7 @@ in with lib; {
} }
#custom-startmenu { #custom-startmenu {
color: #${palette.base03}; color: #${palette.base03};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == 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;
@ -530,7 +526,7 @@ in with lib; {
} }
#idle_inhibitor { #idle_inhibitor {
color: #${palette.base09}; color: #${palette.base09};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;
@ -548,7 +544,7 @@ in with lib; {
} }
#custom-exit { #custom-exit {
color: #${palette.base0E}; color: #${palette.base0E};
${if slickbar == true || slickbar-num == true then '' ${if slickbar == true then ''
background: #${palette.base00}; background: #${palette.base00};
border-radius: 15px 50px 15px 50px; border-radius: 15px 50px 15px 50px;
margin: 5px; margin: 5px;

2
config/home/zsh.nix
View File

@ -44,7 +44,7 @@ lib.mkIf (theShell == "zsh") {
}; };
shellAliases = { shellAliases = {
sv="sudo vim"; sv="sudo nvim";
flake-rebuild="nh os switch --nom --hostname ${hostname}"; flake-rebuild="nh os switch --nom --hostname ${hostname}";
flake-update="nh os switch --nom --hostname ${hostname} --update"; flake-update="nh os switch --nom --hostname ${hostname} --update";
gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";

10
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 = "default"; # simplebar, slickbar, slickbar-num, or default waybarStyle = "default"; # simplebar, slickbar, or default
in { in {
# User Variables # User Variables
username = "${username}"; username = "${username}";
@ -17,8 +17,8 @@ in {
gitEmail = "tylerzanekelley@gmail.com"; gitEmail = "tylerzanekelley@gmail.com";
theme = "gigavolt"; theme = "gigavolt";
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;
bar-number = false; # Enable / Disable Workspace Numbers In Waybar
borderAnim = true; borderAnim = true;
browser = "firefox"; browser = "firefox";
wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git"; # This will give you my wallpapers wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git"; # This will give you my wallpapers
@ -28,7 +28,7 @@ in {
flakeDir = "${flakeDir}"; flakeDir = "${flakeDir}";
flakePrev = "${userHome}/.zaneyos-previous"; flakePrev = "${userHome}/.zaneyos-previous";
flakeBackup = "${userHome}/.zaneyos-backup"; flakeBackup = "${userHome}/.zaneyos-backup";
terminal = "wezterm"; # This sets the terminal that is used by the hyprland terminal keybinding terminal = "kitty"; # This sets the terminal that is used by the hyprland terminal keybinding
# System Settings # System Settings
clock24h = false; clock24h = false;
@ -38,7 +38,7 @@ in {
theKBDVariant = ""; theKBDVariant = "";
theLCVariables = "en_US.UTF-8"; theLCVariables = "en_US.UTF-8";
theTimezone = "America/Chicago"; theTimezone = "America/Chicago";
theShell = "zsh"; # Possible options: bash, zsh theShell = "bash"; # Possible options: bash, zsh
theKernel = "zen"; # Possible options: default, latest, lqx, xanmod, zen theKernel = "zen"; # Possible options: default, latest, lqx, xanmod, zen
sdl-videodriver = "x11"; # Either x11 or wayland ONLY. Games might require x11 set here sdl-videodriver = "x11"; # Either x11 or wayland ONLY. Games might require x11 set here
# For Hybrid Systems intel-nvidia # For Hybrid Systems intel-nvidia
@ -78,7 +78,7 @@ in {
# If You Disable All You Get Kitty # If You Disable All You Get Kitty
wezterm = true; wezterm = true;
alacritty = false; alacritty = false;
kitty = false; kitty = true;
# Enable Python & PyCharm # Enable Python & PyCharm
python = false; python = false;