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

22
modules/base.nix
View file

@ -1,20 +1,17 @@
{ pkgs, lib, config, inputs, ... }: { pkgs, lib, config, inputs, ... }:
with lib;
{ {
imports = [ ./cachix.nix ]; imports = [ ./cachix.nix ];
nix = { nix = {
extraOptions = "experimental-features = nix-command flakes"; extraOptions = "experimental-features = nix-command flakes";
gc = { gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
options = "--delete-older-than 20d"; options = "--delete-older-than 20d";
}; };
settings = { settings = { auto-optimise-store = true; };
auto-optimise-store = true; nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
};
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
}; };
# nixpkgs.config.allowUnFree = true; # nixpkgs.config.allowUnFree = true;
# pkgs.config.allowUnfree = true; # pkgs.config.allowUnfree = true;
@ -34,7 +31,8 @@ with lib;
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
time.timeZone = "America/Chicago"; 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 # Set default shell to be dash for speed
# Apparently this is bad because a lot of nix relies on bash # 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 = { nix = {
settings = { settings = {
substituters = [ substituters =
"https://nix-community.cachix.org" [ "https://nix-community.cachix.org" "https://cosmic.cachix.org/" ];
"https://cosmic.cachix.org/"
];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="

5
pkgs/desktop-packages.nix
View file

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

98
systems/syl/configuration.nix
View file

@ -1,16 +1,15 @@
{ lib, config, pkgs, callPackage, inputs, ... }: { lib, config, pkgs, callPackage, inputs, ... }:
{ {
imports = imports = [
[ ./hardware-configuration.nix
./hardware-configuration.nix ../../cachix/default.nix
../../cachix/default.nix ../../pkgs/base-packages.nix
../../pkgs/base-packages.nix ../../pkgs/desktop-packages.nix
../../pkgs/desktop-packages.nix ../../modules/base.nix
../../modules/base.nix ../../modules/emacs.nix
../../modules/emacs.nix ../../modules/desktop.nix
../../modules/desktop.nix ];
];
networking.hostName = "syl"; # Define your hostname. networking.hostName = "syl"; # Define your hostname.
boot.initrd.kernelModules = [ "i915" ]; boot.initrd.kernelModules = [ "i915" ];
@ -27,19 +26,27 @@
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
# }; # };
services.xserver.videoDrivers = ["intel"]; services.xserver.videoDrivers = [ "intel" ];
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD intel-media-driver # LIBVA_DRIVER_NAME=iHD
vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
libvdpau-va-gl libvdpau-va-gl
]; ];
}; };
systemd.services.display-manager = { systemd.services.display-manager = {
wants = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ]; wants = [
after = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ]; "systemd-user-sessions.service"
"multi-user.target"
"network-online.target"
];
after = [
"systemd-user-sessions.service"
"multi-user.target"
"network-online.target"
];
}; };
# Enable fingerprint # Enable fingerprint
@ -51,24 +58,24 @@
services.tlp = { services.tlp = {
enable = true; enable = true;
settings = { settings = {
CPU_SCALING_GOVERNOR_ON_AC="performance"; CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT="powersave"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_AC="balance_performance"; CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
CPU_ENERGY_PERF_POLICY_ON_BAT="power"; CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
PCIE_ASPM_ON_AC="default"; PCIE_ASPM_ON_AC = "default";
PCIE_ASPM_ON_BAT="powersupersave"; PCIE_ASPM_ON_BAT = "powersupersave";
SCHED_POWERSAVE_ON_AC=0; SCHED_POWERSAVE_ON_AC = 0;
SCHED_POWERSAVE_ON_BAT=1; SCHED_POWERSAVE_ON_BAT = 1;
START_CHARGE_THRESH_BAT1=70; START_CHARGE_THRESH_BAT1 = 70;
STOP_CHARGE_THRESH_BAT1=80; STOP_CHARGE_THRESH_BAT1 = 80;
USB_ALLOWLIST="32ac:0002"; USB_ALLOWLIST = "32ac:0002";
RUNTIME_PM_ON_AC="on"; RUNTIME_PM_ON_AC = "on";
RUNTIME_PM_ON_BAT="auto"; 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}=="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}=="1", RUN+="/usr/bin/at -M -f /lib/udev/power-profiles/performance now"
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
services.xserver.libinput.enable = true; services.xserver.libinput.enable = true;
@ -97,7 +104,38 @@
package = pkgs.plocate; package = pkgs.plocate;
localuser = null; localuser = null;
interval = "hourly"; 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. # Enable the OpenSSH daemon.