chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

formatting

Browse source
This commit is contained in:
Chris Cochrun 2024-10-29 13:48:51 -05:00
parent 9f406deb53
commit de213e7737
4 changed files with 84 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/base.nix
View file

@ -1,6 +1,5 @@
{ pkgs, lib, config, inputs, ... }:
with lib;
{
imports = [ ./cachix.nix ];
@ -11,9 +10,7 @@ with lib;
dates = "weekly";
options = "--delete-older-than 20d";
};
settings = {
auto-optimise-store = true;
};
settings = { auto-optimise-store = true; };
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
};
# nixpkgs.config.allowUnFree = true;
@ -34,7 +31,8 @@ with lib;
i18n.defaultLocale = "en_US.UTF-8";
time.timeZone = "America/Chicago";
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
networking.networkmanager.enable =
true; # Easiest to use and most distros use this by default.
# Set default shell to be dash for speed
# Apparently this is bad because a lot of nix relies on bash

7
modules/cachix/nix-community.nix
View file

@ -1,11 +1,8 @@
{
nix = {
settings = {
substituters = [
"https://nix-community.cachix.org"
"https://cosmic.cachix.org/"
];
substituters =
[ "https://nix-community.cachix.org" "https://cosmic.cachix.org/" ];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="

5
pkgs/desktop-packages.nix
View file

@ -1,6 +1,5 @@
{ pkgs, lib, config, ... }:
with lib;
{
environment.systemPackages = with pkgs; [
discover
@ -51,7 +50,9 @@ with lib;
tagutil
# python310Packages.mutagen
python310Packages.audiotools
(mpv.override {scripts = with pkgs.mpvScripts; [ mpris quality-menu sponsorblock ];})
(mpv.override {
scripts = with pkgs.mpvScripts; [ mpris quality-menu sponsorblock ];
})
ani-cli
# mov-cli
nerdfonts

80
systems/syl/configuration.nix
View file

@ -1,8 +1,7 @@
{ lib, config, pkgs, callPackage, inputs, ... }:
{
imports =
[
imports = [
./hardware-configuration.nix
../../cachix/default.nix
../../pkgs/base-packages.nix
@ -27,7 +26,7 @@
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
# };
services.xserver.videoDrivers = ["intel"];
services.xserver.videoDrivers = [ "intel" ];
hardware.graphics = {
enable = true;
extraPackages = with pkgs; [
@ -38,8 +37,16 @@
};
systemd.services.display-manager = {
wants = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ];
after = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ];
wants = [
"systemd-user-sessions.service"
"multi-user.target"
"network-online.target"
];
after = [
"systemd-user-sessions.service"
"multi-user.target"
"network-online.target"
];
};
# Enable fingerprint
@ -51,24 +58,24 @@
services.tlp = {
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_AC="performance";
CPU_SCALING_GOVERNOR_ON_BAT="powersave";
CPU_ENERGY_PERF_POLICY_ON_AC="balance_performance";
CPU_ENERGY_PERF_POLICY_ON_BAT="power";
PCIE_ASPM_ON_AC="default";
PCIE_ASPM_ON_BAT="powersupersave";
SCHED_POWERSAVE_ON_AC=0;
SCHED_POWERSAVE_ON_BAT=1;
START_CHARGE_THRESH_BAT1=70;
STOP_CHARGE_THRESH_BAT1=80;
USB_ALLOWLIST="32ac:0002";
RUNTIME_PM_ON_AC="on";
RUNTIME_PM_ON_BAT="auto";
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
PCIE_ASPM_ON_AC = "default";
PCIE_ASPM_ON_BAT = "powersupersave";
SCHED_POWERSAVE_ON_AC = 0;
SCHED_POWERSAVE_ON_BAT = 1;
START_CHARGE_THRESH_BAT1 = 70;
STOP_CHARGE_THRESH_BAT1 = 80;
USB_ALLOWLIST = "32ac:0002";
RUNTIME_PM_ON_AC = "on";
RUNTIME_PM_ON_BAT = "auto";
};
};
# SUBSYSTEM=="power_supply", ATTR{online}=="0", RUN+="/usr/bin/at -M -f /lib/udev/power-profiles/power-saver now"
# SUBSYSTEM=="power_supply", ATTR{online}=="1", RUN+="/usr/bin/at -M -f /lib/udev/power-profiles/performance now"
# SUBSYSTEM=="power_supply", ATTR{online}=="0", RUN+="/usr/bin/at -M -f /lib/udev/power-profiles/power-saver now"
# SUBSYSTEM=="power_supply", ATTR{online}=="1", RUN+="/usr/bin/at -M -f /lib/udev/power-profiles/performance now"
# Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true;
@ -97,7 +104,38 @@
package = pkgs.plocate;
localuser = null;
interval = "hourly";
prunePaths = [ "/tmp" "/nix/store" "/nix/var/log/nix" "/etc" "/bin" "/boot" "/usr" "/var" "/run" "/srv" "/sys" "/root" "/proc" "/opt" "/dev" "/home/chris/.emacs.d" "/home/chris/.config" "/home/chris/.nix-profile" "/home/chris/.profile" "/home/chris/dev/nixpkgs" "/home/chris/.cache" "/home/chris/.local" "/home/chris/.dotemacs" "/home/chris/.cargo" "/home/chris/.mozilla" "/home/chris/.var" "/home/chris/.dotfiles" "/home/chris/.dbus" "/home/chris/.android" "/var/lib"];
prunePaths = [
"/tmp"
"/nix/store"
"/nix/var/log/nix"
"/etc"
"/bin"
"/boot"
"/usr"
"/var"
"/run"
"/srv"
"/sys"
"/root"
"/proc"
"/opt"
"/dev"
"/home/chris/.emacs.d"
"/home/chris/.config"
"/home/chris/.nix-profile"
"/home/chris/.profile"
"/home/chris/dev/nixpkgs"
"/home/chris/.cache"
"/home/chris/.local"
"/home/chris/.dotemacs"
"/home/chris/.cargo"
"/home/chris/.mozilla"
"/home/chris/.var"
"/home/chris/.dotfiles"
"/home/chris/.dbus"
"/home/chris/.android"
"/var/lib"
];
};
# Enable the OpenSSH daemon.