riley/config
1
0
Fork 0
Code Issues 10 Pull requests Projects Releases Wiki Activity

Reformat

Browse source
This commit is contained in:
Riley Apeldoorn 2022-05-23 10:16:05 +02:00
parent a59a56da09
commit 5247a535b1
2 changed files with 165 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
env.nix
View file

@ -1,15 +1,15 @@
# Packages I tend to use # Packages I tend to use
{ pkgs }: pkgs.buildEnv { { pkgs }: pkgs.buildEnv {
name = "riley-user-utils"; name = "riley-user-utils";
paths = with pkgs; [ paths = with pkgs; [
ripgrep ripgrep
bottom bottom
delta delta
skim skim
exa exa
bat bat
lf lf
fd fd
]; ];
} }

293
modules/default.nix
View file

@ -3,120 +3,121 @@
{ config, lib, pkgs, home-manager, ... }: { config, lib, pkgs, home-manager, ... }:
with lib; with types; with lib; with types;
let named = submodule { let themeType =
options = { let named = submodule {
normal = mkOption { type = str; }; options = {
bright = mkOption { type = str; }; normal = mkOption { type = str; };
pastel = mkOption { type = str; }; bright = mkOption { type = str; };
}; pastel = mkOption { type = str; };
}; };
special = submodule { };
options = { special = submodule {
primary = mkOption { type = str; }; options = {
normal = mkOption { type = str; }; primary = mkOption { type = str; };
slight = mkOption { type = str; }; normal = mkOption { type = str; };
}; slight = mkOption { type = str; };
}; };
themeType = submodule { };
options = { in submodule {
foreground = mkOption { type = special; }; options = {
background = mkOption { type = special; }; foreground = mkOption { type = special; };
grayscales = mkOption { type = listOf str; }; background = mkOption { type = special; };
red = mkOption { type = named; }; grayscales = mkOption { type = listOf str; };
green = mkOption { type = named; }; red = mkOption { type = named; };
blue = mkOption { type = named; }; green = mkOption { type = named; };
yellow = mkOption { type = named; }; blue = mkOption { type = named; };
purple = mkOption { type = named; }; yellow = mkOption { type = named; };
cyan = mkOption { type = named; }; purple = mkOption { type = named; };
pink = mkOption { type = named; }; cyan = mkOption { type = named; };
orange = mkOption { type = named; }; pink = mkOption { type = named; };
misc = mkOption { type = attrsOf str; }; orange = mkOption { type = named; };
hex = mkOption { type = themeType; }; misc = mkOption { type = attrsOf str; };
}; hex = mkOption { type = themeType; };
}; };
};
utils = import ../env.nix { inherit pkgs; }; utils = import ../env.nix { inherit pkgs; };
in { in {
options.riley = with lib; { options.riley = with lib; {
theme = mkOption { theme = mkOption {
type = themeType; type = themeType;
description = '' description = ''
The theme used across the installation. Not used if gui is disabled. The theme used across the installation. Not used if gui is disabled.
''; '';
}; };
}; };
options.devices = mkOption { options.devices = mkOption {
type = with types; submodule { type = with types; submodule {
options = { options = {
audio = mkOption { audio = mkOption {
type = nullOr (submodule { type = nullOr (submodule {
options = { options = {
speakers = mkOption { type = str; }; speakers = mkOption { type = str; };
external = mkOption { type = str; }; external = mkOption { type = str; };
headset = mkOption { type = nullOr str; }; headset = mkOption { type = nullOr str; };
main-mic = mkOption { type = nullOr str; }; main-mic = mkOption { type = nullOr str; };
}; };
}); });
description = '' description = ''
Known audio devices: outputs & microphones. Known audio devices: outputs & microphones.
Each string should be a pulseaudio sink or source. Each string should be a pulseaudio sink or source.
''; '';
}; };
video = mkOption { video = mkOption {
type = submodule { type = submodule {
options = { options = {
displays = let output = submodule { displays = let output = submodule {
options = { options = {
primary = mkOption { primary = mkOption {
type = bool; type = bool;
default = false; default = false;
}; };
position = mkOption { position = mkOption {
type = nullOr (listOf int); type = nullOr (listOf int);
default = null; default = null;
}; };
rotate = mkOption { rotate = mkOption {
type = enum [ "normal" "left" "right" "inverted" ]; type = enum [ "normal" "left" "right" "inverted" ];
default = "normal"; default = "normal";
}; };
}; };
}; in mkOption { }; in mkOption {
type = attrsOf output; type = attrsOf output;
description = '' description = ''
A list of outputs with information on how to place them. A list of outputs with information on how to place them.
''; '';
}; };
}; };
}; };
description = '' description = ''
Define the video devices (just the displays, for now). Define the video devices (just the displays, for now).
''; '';
}; };
}; };
}; };
}; };
imports = [ imports = [
home-manager.nixosModule home-manager.nixosModule
./kak ./kak
./gui ./gui
./fonts.nix ./fonts.nix
./git.nix ./git.nix
./ssh.nix ./ssh.nix
]; ];
config = { config = {
@ -127,78 +128,78 @@ in {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Web utils # Web utils
wget wget
curl curl
git git
# Common utils (rg, sk, fd, etc.) # Common utils (rg, sk, fd, etc.)
utils utils
]; ];
environment.shellAliases = { environment.shellAliases = {
# Born to VIM # Born to VIM
":q" = "exit"; ":q" = "exit";
# Sike I use kakoune # Sike I use kakoune
":e" = "kak"; ":e" = "kak";
# Launch [T]erminal # Launch [T]erminal
"t" = "alacritty"; "t" = "alacritty";
# [D]isown # [D]isown
"d" = "disown"; "d" = "disown";
}; };
programs.bash.interactiveShellInit = '' programs.bash.interactiveShellInit = ''
# [G]o to the directory. Create the directory if it does not exist # [G]o to the directory. Create the directory if it does not exist
# yet, and if the directory contains a shell.nix file, source it. # yet, and if the directory contains a shell.nix file, source it.
g () { g () {
[ -d "$1" ] || mkdir -p "$1"; [ -d "$1" ] || mkdir -p "$1";
cd "$1"; cd "$1";
[ -e "shell.nix" ] && nix-shell; [ -e "shell.nix" ] && nix-shell;
} }
# [M]ake a directory and immediately enter it. # [M]ake a directory and immediately enter it.
m () { mkdir -p "$1" && cd "$1"; } m () { mkdir -p "$1" && cd "$1"; }
# [R]eplace the current process with the given one. # [R]eplace the current process with the given one.
r () { $1 & disown; exit; } r () { $1 & disown; exit; }
# [J]ump to the directory by means of fuzzy search. If the fuzzy finder # [J]ump to the directory by means of fuzzy search. If the fuzzy finder
# is aborted, the jump is also aborted. # is aborted, the jump is also aborted.
j () { t=`sk` && cd $t; } j () { t=`sk` && cd $t; }
# Enter a temporary [d]irectory. # Enter a temporary [d]irectory.
d () { cd "$(mktemp -d)"; } d () { cd "$(mktemp -d)"; }
''; '';
boot = { boot = {
loader.systemd-boot = { loader.systemd-boot = {
enable = true; enable = true;
editor = false; editor = false;
configurationLimit = 10; configurationLimit = 10;
}; };
loader.efi = { loader.efi = {
canTouchEfiVariables = true; canTouchEfiVariables = true;
}; };
}; };
networking = { networking = {
firewall.enable = false; firewall.enable = false;
useDHCP = false; useDHCP = false;
}; };
security.rtkit.enable = true; security.rtkit.enable = true;
users.users."riley" = { users.users."riley" = {
isNormalUser = true; isNormalUser = true;