semi-major-ish cleanup throughout tree
This commit is contained in:
parent
610ae7c5fc
commit
25af328bfa
3 changed files with 170 additions and 107 deletions
|
|
@ -7,7 +7,11 @@
|
|||
}: {
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
nix.settings.auto-optimise-store = true;
|
||||
nix.package = pkgs.lixPackageSets.stable.lix;
|
||||
|
||||
nix.gc.automatic = true;
|
||||
nix.gc.dates = "weekly";
|
||||
nix.gc.options = "--delete-older-than 14d";
|
||||
nix.optimise.automatic = true;
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [
|
||||
|
|
@ -17,15 +21,6 @@
|
|||
config.allowUnfree = true;
|
||||
};
|
||||
})
|
||||
(final: prev: {
|
||||
inherit
|
||||
(prev.lixPackageSets.stable)
|
||||
nixpkgs-review
|
||||
nix-eval-jobs
|
||||
nix-fast-build
|
||||
colmena
|
||||
;
|
||||
})
|
||||
];
|
||||
|
||||
boot = {
|
||||
|
|
@ -33,10 +28,7 @@
|
|||
loader.systemd-boot.configurationLimit = 10;
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
loader.timeout = 2;
|
||||
kernelParams = ["quiet" "rd.udev.log_level=3" "rd.systemd.show_status=auto"];
|
||||
initrd.verbose = false;
|
||||
consoleLogLevel = 3;
|
||||
kernelPackages = pkgs.linuxPackages;
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
};
|
||||
|
||||
time.timeZone = "Asia/Jakarta";
|
||||
|
|
@ -48,7 +40,6 @@
|
|||
locate.enable = true;
|
||||
printing.enable = true;
|
||||
openssh.enable = false;
|
||||
pulseaudio.enable = false;
|
||||
|
||||
pipewire.enable = true;
|
||||
pipewire.alsa.enable = true;
|
||||
|
|
@ -102,16 +93,6 @@
|
|||
eza
|
||||
];
|
||||
|
||||
environment.shellAliases = {
|
||||
sudo = "doas";
|
||||
l = "eza --grid --all";
|
||||
ll = "eza --long --all";
|
||||
ls = "eza --long";
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
cat = "bat";
|
||||
};
|
||||
|
||||
programs = {
|
||||
fish.enable = true;
|
||||
|
||||
|
|
@ -119,22 +100,6 @@
|
|||
atuin.settings.sync_address = "https://api.atuin.sh";
|
||||
atuin.settings.enter_accept = true;
|
||||
|
||||
starship.enable = true;
|
||||
starship.transientPrompt.enable = true;
|
||||
starship.transientPrompt.left = "starship module character";
|
||||
starship.settings = {
|
||||
"$schema" = "https://starship.rs/config-schema.json";
|
||||
git_status = {
|
||||
ahead = ">";
|
||||
behind = "<";
|
||||
diverged = "<>";
|
||||
renamed = "r";
|
||||
deleted = "d";
|
||||
};
|
||||
character.success_symbol = "[λ](bold green)";
|
||||
character.error_symbol = "[λ](bold red)";
|
||||
};
|
||||
|
||||
git.enable = true;
|
||||
git.config = {
|
||||
init.defaultBranch = "main";
|
||||
|
|
@ -147,17 +112,26 @@
|
|||
# one-off options that would live in the Home Manager section if the
|
||||
# relevant modules existed there
|
||||
obs-studio.enableVirtualCamera = true;
|
||||
|
||||
# NOTE: services.openssh.enable = false above only disables the SSH *server*
|
||||
# This still starts the ssh-agent user service (SSH_AUTH_SOCK=%t/ssh-agent)
|
||||
ssh.startAgent = true;
|
||||
|
||||
nix-ld.enable = true;
|
||||
nix-ld.libraries = with pkgs; [fuse e2fsprogs];
|
||||
nix-ld.libraries = with pkgs; [
|
||||
fuse
|
||||
e2fsprogs
|
||||
stdenv.cc.cc
|
||||
zlib
|
||||
alsa-lib
|
||||
expat
|
||||
];
|
||||
};
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
# GUI fonts
|
||||
inter
|
||||
corefonts
|
||||
vista-fonts
|
||||
roboto
|
||||
cantarell-fonts
|
||||
# fonts for i18n
|
||||
|
|
@ -175,8 +149,9 @@
|
|||
|
||||
fonts.fontconfig.antialias = true;
|
||||
fonts.fontconfig.subpixel.rgba = "rgb";
|
||||
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.config.common.default = ["gtk"];
|
||||
xdg.portal.extraPortals = with pkgs; [xdg-desktop-portal-wlr];
|
||||
fonts.fontconfig.hinting.enable = true;
|
||||
fonts.fontconfig.defaultFonts = {
|
||||
sansSerif = ["Inter"];
|
||||
monospace = ["Iosevka Nerd Font"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,17 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
USER_ID = 1000;
|
||||
KEY_FILE = "id_ed25519";
|
||||
in {
|
||||
{pkgs, ...}: {
|
||||
# Password set imperatively via `passwd`
|
||||
# so `mutableUsers = false` doesn't accidentally lock out SDDM/TTY
|
||||
users.mutableUsers = true;
|
||||
|
||||
users.users.coyote = {
|
||||
isNormalUser = true;
|
||||
description = "coyote";
|
||||
extraGroups = ["wheel" "networkmanager" "lp" "scanner"];
|
||||
uid = USER_ID;
|
||||
extraGroups = ["wheel" "networkmanager" "lp" "scanner" "video" "render" "input" "audio" "kvm"];
|
||||
uid = 1000;
|
||||
};
|
||||
users.defaultUserShell = pkgs.unstable.fish;
|
||||
users.defaultUserShell = pkgs.fish;
|
||||
|
||||
# daemon blurb to get SSH for Git working
|
||||
environment.sessionVariables.SSH_AUTH_SOCK = "/run/user/${builtins.toString USER_ID}/ssh-agent";
|
||||
|
||||
systemd.user.services.ssh-add-key = {
|
||||
wantedBy = ["default.target"];
|
||||
after = ["ssh-agent.service"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStartPre = "${pkgs.coreutils-full}/bin/sleep 1";
|
||||
ExecStart = [
|
||||
"${pkgs.openssh}/bin/ssh-add ${config.users.users.coyote.home}/.ssh/${KEY_FILE}"
|
||||
];
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
};
|
||||
environment.sessionVariables = {
|
||||
NH_FLAKE = "/home/coyote/NixOS";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.backupFileExtension = "backup";
|
||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
||||
home-manager.users.coyote.imports = [../../../home/coyote];
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue