Configuration for waybar + sorting configs

This commit is contained in:
ari committed 2024-04-25 16:39:16 -04:00
1 parent d026be1709
commit 2995cd64db
6 files changed
+82 -71

No files matched your search

+9 -3
View File
@@ -93,7 +93,8 @@
"modules": [ "modules": [
"battery", "battery",
"backlight", "backlight",
"custom/quit" "custom/logout",
"custom/suspend"
] ]
}, },
"battery": { "battery": {
@@ -105,11 +106,16 @@
"format-icons": ["", "", "", "", ""], "format-icons": ["", "", "", "", ""],
"design-capacity": true "design-capacity": true
}, },
"custom/quit": { "custom/logout": {
"format": "󰗼", "format": "Logout",
"tooltip": false, "tooltip": false,
"on-click": "hyprctl dispatch exit" "on-click": "hyprctl dispatch exit"
}, },
"custom/suspend": {
"format": "Suspend",
"tooltip": false,
"on-click": "systemctl suspend"
},
"group/hardware": { "group/hardware": {
"orientation": "inherit", "orientation": "inherit",
"drawer": { "drawer": {
+5 -1
View File
@@ -5,6 +5,7 @@ let
fullName = "Ari Sosnovsky"; fullName = "Ari Sosnovsky";
email = "ariel@sosnovsky.ca"; email = "ariel@sosnovsky.ca";
}; };
dataDir = "/mnt/Data";
in in
{ {
imports = imports =
@@ -24,7 +25,7 @@ in
]; ];
hardware.framework.amd-7040.preventWakeOnAC = true; hardware.framework.amd-7040.preventWakeOnAC = true;
services.fwupd.enable = true; services.fwupd.enable = true;
fileSystems."/mnt/Data" = { fileSystems."${dataDir}" = {
device = "/dev/sda1"; device = "/dev/sda1";
fsType = "ext4"; fsType = "ext4";
options = [ options = [
@@ -32,4 +33,7 @@ in
"nofail" "nofail"
]; ];
}; };
# home-manager.users.${user.name}.zsh.extraEnv = ''
# export KUBECONFIG=${dataDir}/local/kube/config.yml
# '';
} }
+3 -5
View File
@@ -2,9 +2,10 @@
{ pkgs, ... }: { pkgs, ... }:
let let
gitconfigs = gitconfigs =
(builtins.filterSource (path: type: type != "directory") ../../gitconfigs); (builtins.filterSource (path: type: type != "directory") ../../configs/gitconfigs);
gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs); gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs);
in { in
{
home-manager.users.root = { home-manager.users.root = {
home.stateVersion = homeMangerVersion; home.stateVersion = homeMangerVersion;
programs.git = { programs.git = {
@@ -58,9 +59,6 @@ in {
zsh = { zsh = {
enable = true; enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
envExtra = ''
export KUBECONFIG=/run/media/ari/Data/local/kube/config.yml
'';
}; };
zsh.oh-my-zsh = { zsh.oh-my-zsh = {
enable = true; enable = true;
+1 -1
View File
@@ -55,7 +55,6 @@
# Fonts # Fonts
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
# (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
fira-code fira-code
fira-code-symbols fira-code-symbols
font-awesome font-awesome
@@ -65,6 +64,7 @@
noto-fonts noto-fonts
noto-fonts-emoji noto-fonts-emoji
proggyfonts proggyfonts
flatpak
]; ];
fontDir.enable = true; fontDir.enable = true;
fontconfig = { fontconfig = {
+62 -2
View File
@@ -3,11 +3,71 @@
{ {
# Firmware Updater # Firmware Updater
services.fwupd.enable = true; services.fwupd.enable = true;
services.fprintd = if enableFingerPrint then { services.fprintd =
if enableFingerPrint then {
enable = true; enable = true;
# tod.enable = true; # tod.enable = true;
# tod.driver = pkgs.libfprint-2-tod1-goodix; # tod.driver = pkgs.libfprint-2-tod1-goodix;
} else { } else { };
# Enable all license firmware
hardware.enableAllFirmware = true;
# enables support for Bluetooth
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
services.blueman.enable = true;
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
# Advance Power Management
powerManagement.powertop.enable = true;
powerManagement.enable = true;
services.thermald.enable = true;
services.power-profiles-daemon.enable = false;
services.tlp = {
enable = true;
settings = {
TLP_DEFAULT_MODE = "BAT";
TLP_PERSISTENT_DEFAULT = 1;
CPU_BOOST_ON_BAT = 0;
RUNTIME_PM_ON_BAT = "auto";
PLATFORM_PROFILE_ON_AC = "balanced";
PLATFORM_PROFILE_ON_BAT = "low-power";
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 20;
START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge
STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging
};
};
services.auto-cpufreq.enable = true;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
}; };
} }
+2 -59
View File
@@ -9,52 +9,11 @@
xkbVariant = ""; xkbVariant = "";
}; };
# Advance Power Management
powerManagement.powertop.enable = true;
powerManagement.enable = true;
services.thermald.enable = true;
services.power-profiles-daemon.enable = false;
services.tlp = {
enable = true;
settings = {
TLP_DEFAULT_MODE = "BAT";
TLP_PERSISTENT_DEFAULT = 1;
CPU_BOOST_ON_BAT = 0;
RUNTIME_PM_ON_BAT = "auto";
PLATFORM_PROFILE_ON_AC = "balanced";
PLATFORM_PROFILE_ON_BAT = "low-power";
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 20;
START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge
STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging
};
};
services.auto-cpufreq.enable = true;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
};
# Logind # Logind
services.logind = { services.logind = {
lidSwitchExternalPower = "suspend-then-hibernate";
lidSwitch = "suspend-then-hibernate"; lidSwitch = "suspend-then-hibernate";
powerKey = "lock";
extraConfig = '' extraConfig = ''
HandlePowerKey=suspend-then-hibernate HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate IdleAction=suspend-then-hibernate
@@ -65,25 +24,9 @@
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
# enables support for Bluetooth
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
services.blueman.enable = true;
# Yubikey # Yubikey
services.yubikey-agent.enable = true; services.yubikey-agent.enable = true;
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
# Special Cronjobs # Special Cronjobs
services.cron = { services.cron = {
enable = true; enable = true;