gwg313/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

new formatter

Browse source
This commit is contained in:
Glen Goodwin 2023-11-06 02:01:49 -05:00
parent 85aa90c2ac
commit 9fa59c1ba2
39 changed files with 556 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/programs/alacritty.nix
View file

@ -1,9 +1,11 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs.alacritty.enable = true;
programs.alacritty.settings = {
env = { TERM = "xterm-256color"; };
env = {TERM = "xterm-256color";};
colors = with config.colorScheme.colors; {
bright = {
black = "0x${base03}";

12
modules/programs/devenv/home.nix
View file

@ -1,5 +1,12 @@
{ config, lib, pkgs, user, devenv, inputs, ... }: {
{
config,
lib,
pkgs,
user,
devenv,
inputs,
...
}: {
home.packages = with pkgs; [
cachix
inputs.devenv.packages.${system}.devenv
@ -9,5 +16,4 @@
programs.direnv.nix-direnv.enable = true;
programs.zsh.enable = true;
}

8
modules/programs/kitty.nix
View file

@ -1,6 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}: {
home = {
packages = with pkgs; [
kitty
@ -74,4 +77,3 @@
};
};
}

8
modules/programs/mako.nix
View file

@ -1,7 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
services.mako = with config.colorScheme.colors; {
enable = true;
backgroundColor = "#${base01}";
@ -11,5 +12,4 @@
textColor = "#${base04}";
layer = "overlay";
};
}

6
modules/programs/thunar.nix
View file

@ -1,5 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs.thunar = {
enable = true;
plugins = with pkgs.xfce; [
@ -9,5 +12,4 @@
};
services.gvfs.enable = true; # Mount, trash, and other functionalities
services.tumbler.enable = true; # Thumbnail support for images
}

71
modules/programs/waybar.nix
View file

@ -1,6 +1,11 @@
{ config, lib, pkgs, host, user, ... }:
{
config,
lib,
pkgs,
host,
user,
...
}: {
environment.systemPackages = with pkgs; [
waybar
];
@ -97,20 +102,19 @@
# output = [
# "${mainMonitor}"
# ];
tray = { spacing = 5; };
tray = {spacing = 5;};
#modules-center = [ "clock" ];
modules-left = with config;
if programs.hyprland.enable == true then
[ "custom/menu" "hyprland/workspaces" ]
else if programs.sway.enable == true then
[ "sway/workspaces" "sway/window" "sway/mode" ]
else [ ];
if programs.hyprland.enable == true
then ["custom/menu" "hyprland/workspaces"]
else if programs.sway.enable == true
then ["sway/workspaces" "sway/window" "sway/mode"]
else [];
modules-right =
if hostName == "desktop" then
[ "custom/ds4" "custom/pad" "network" "cpu" "memory" "custom/pad" "pulseaudio" "custom/sink" "custom/pad" "clock" "tray" ]
else
[ "cpu" "memory" "custom/pad" "battery" "custom/pad" "backlight" "custom/pad" "pulseaudio" "custom/pad" "clock" "tray" ];
if hostName == "desktop"
then ["custom/ds4" "custom/pad" "network" "cpu" "memory" "custom/pad" "pulseaudio" "custom/sink" "custom/pad" "clock" "tray"]
else ["cpu" "memory" "custom/pad" "battery" "custom/pad" "backlight" "custom/pad" "pulseaudio" "custom/pad" "clock" "tray"];
"custom/pad" = {
format = " ";
@ -135,11 +139,11 @@
};
all-outputs = true;
persistent_workspaces = {
"1" = [ ];
"2" = [ ];
"3" = [ ];
"4" = [ ];
"5" = [ ];
"1" = [];
"2" = [];
"3" = [];
"4" = [];
"5" = [];
};
};
"wlr/workspaces" = {
@ -185,7 +189,7 @@
backlight = {
device = "intel_backlight";
format = "{percent}% <span font='11'>{icon}</span>";
format-icons = [ "" "" ];
format-icons = ["" ""];
on-scroll-down = "${pkgs.light}/bin/light -U 5";
on-scroll-up = "${pkgs.light}/bin/light -A 5";
};
@ -197,7 +201,7 @@
};
format = "{capacity}% <span font='11'>{icon}</span>";
format-charging = "{capacity}% <span font='11'></span>";
format-icons = [ "" "" "" "" "" ];
format-icons = ["" "" "" "" ""];
max-length = 25;
};
network = {
@ -219,7 +223,7 @@
format-source = "<span font='10'></span> ";
format-source-muted = "<span font='11'> </span> ";
format-icons = {
default = [ "" "" "" ];
default = ["" "" ""];
headphone = "";
#hands-free = "";
#headset = "";
@ -249,24 +253,26 @@
};
};
Sec =
if hostName == "desktop" || hostName == "work" then {
if hostName == "desktop" || hostName == "work"
then {
layer = "top";
position = "top";
height = 16;
output =
if hostName == "desktop" then [
if hostName == "desktop"
then [
"${secondMonitor}"
] else [
]
else [
"${secondMonitor}"
"${thirdMonitor}"
];
modules-left = [ "custom/menu" "wlr/workspaces" ];
modules-left = ["custom/menu" "wlr/workspaces"];
modules-right =
if hostName == "desktop" then
[ "custom/ds4" "custom/pad" "pulseaudio" "custom/sink" "custom/pad" "clock" ]
else
[ "cpu" "memory" "custom/pad" "battery" "custom/pad" "backlight" "custom/pad" "pulseaudio" "custom/pad" "clock" ];
if hostName == "desktop"
then ["custom/ds4" "custom/pad" "pulseaudio" "custom/sink" "custom/pad" "clock"]
else ["cpu" "memory" "custom/pad" "battery" "custom/pad" "backlight" "custom/pad" "pulseaudio" "custom/pad" "clock"];
"custom/pad" = {
format = " ";
@ -321,7 +327,7 @@
backlight = {
device = "intel_backlight";
format = "{percent}% <span font='11'>{icon}</span>";
format-icons = [ "" "" ];
format-icons = ["" ""];
on-scroll-down = "${pkgs.light}/bin/light -U 5";
on-scroll-up = "${pkgs.light}/bin/light -A 5";
};
@ -333,7 +339,7 @@
};
format = "{capacity}% <span font='11'>{icon}</span>";
format-charging = "{capacity}% <span font='11'></span>";
format-icons = [ "" "" "" "" "" ];
format-icons = ["" "" "" "" ""];
max-length = 25;
};
pulseaudio = {
@ -345,7 +351,7 @@
format-source = "<span font='10'></span> ";
format-source-muted = "<span font='11'></span> ";
format-icons = {
default = [ "" "" "" ];
default = ["" "" ""];
headphone = "";
#hands-free = "";
#headset = "";
@ -371,7 +377,8 @@
exec = "$HOME/.config/waybar/script/ds4.sh";
interval = 60;
};
} else { };
}
else {};
};
};
home.file = {

15
modules/programs/wofi.nix
View file

@ -1,10 +1,12 @@
{ config, lib, pkgs, ... }:
let
inherit (config.lib.formats.rasi) mkLiteral;# Theme.rasi alternative. Add Theme here
colors = import ../themes/colors.nix;
in
{
config,
lib,
pkgs,
...
}: let
inherit (config.lib.formats.rasi) mkLiteral; # Theme.rasi alternative. Add Theme here
colors = import ../themes/colors.nix;
in {
home = {
packages = with pkgs; [
wofi
@ -99,4 +101,3 @@ in
};
};
}

6
modules/programs/zathura.nix
View file

@ -1,6 +1,8 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
programs.zathura = {
enable = true;
extraConfig = ''