petrichor
/
boxen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meta: run nixfmt over everything else

This commit is contained in:
Jez Cope 2020-11-21 15:51:37 +00:00
parent 3f8d42e1d5
commit 8d18064f9b
14 changed files with 255 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bits/home-common.nix
View File

@ -1,4 +1,4 @@
{config, pkgs, lib, ...}:
{ config, pkgs, lib, ... }:
{
hardware.printers.ensurePrinters = let
@ -12,7 +12,8 @@
name = "Study-Laser";
location = "Study";
description = "Samsung CLX-6260 Laser";
deviceUri = "dnssd://Samsung%20laser%20printer%20(Study)._printer._tcp.local/";
deviceUri =
"dnssd://Samsung%20laser%20printer%20(Study)._printer._tcp.local/";
model = "samsung/CLX-6260.ppd";
ppdOptions = commonOptions // {
ColorMode = "False";
@ -23,11 +24,11 @@
name = "Study-Inkjet";
location = "Study";
description = "Epson XP-860 Inkjet";
deviceUri = "dnssd://EPSON%20XP-860%20Series._ipp._tcp.local/?uuid=cfe92100-67c4-11d4-a45f-44d244241018";
model = "epson-inkjet-printer-escpr/Epson-XP-860_Series-epson-escpr-en.ppd";
ppdOptions = commonOptions // {
MediaType = "PLAIN_NORMAL";
};
deviceUri =
"dnssd://EPSON%20XP-860%20Series._ipp._tcp.local/?uuid=cfe92100-67c4-11d4-a45f-44d244241018";
model =
"epson-inkjet-printer-escpr/Epson-XP-860_Series-epson-escpr-en.ppd";
ppdOptions = commonOptions // { MediaType = "PLAIN_NORMAL"; };
}
];
services.printing = {

60
home/jez/bits/desktop.nix
View File

@ -1,25 +1,51 @@
{ config, pkgs, lib, ... }:
let
util = import ../util.nix { inherit pkgs; };
in
{
home.packages = with pkgs;
let
gn = pkgs.gnome3;
let gn = pkgs.gnome3;
in [
wofi dmenu swayidle grim slurp light wl-clipboard j4-dmenu-desktop bemenu
wofi
dmenu
swayidle
grim
slurp
light
wl-clipboard
j4-dmenu-desktop
bemenu
keybase-gui
gn.gnome-tweaks gmrun
mate.atril mate.caja libreoffice-fresh abiword
inkscape gimp
gn.gnome-tweaks
gmrun
mate.atril
mate.caja
libreoffice-fresh
abiword
inkscape
gimp
openshot-qt blender gn.cheese vlc v4l-utils darktable
pamixer playerctl pavucontrol vorbis-tools audacity
pulseaudio jack2 cadence non
openshot-qt
blender
gn.cheese
vlc
v4l-utils
darktable
pamixer
playerctl
pavucontrol
vorbis-tools
audacity
pulseaudio
jack2
cadence
non
atom element-desktop slack zoom-us teams tdesktop
atom
element-desktop
slack
zoom-us
teams
tdesktop
];
home.file = {
@ -37,7 +63,7 @@ in
};
home.activation = {
updateFcCache = lib.hm.dag.entryAfter ["writeBoundary"] ''
updateFcCache = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
$DRY_RUN_CMD fc-cache -f
'';
};
@ -83,7 +109,7 @@ in
settings = {
font_size = "11.0";
allow_remote_control = true;
allow_remote_control = true;
listen_on = "unix:\${XDG_RUNTIME_DIR}/kitty.sock";
enable_audio_bell = false;
@ -144,9 +170,7 @@ in
plugins = with pkgs; [ obs-v4l2sink obs-wlrobs ];
};
programs.ncmpcpp.settings = {
user_interface = "alternative";
};
programs.ncmpcpp.settings = { user_interface = "alternative"; };
services.syncthing.enable = true;
}

6
home/jez/bits/emacs.nix
View File

@ -1,9 +1,7 @@
{ config, pkgs, lib, ... }:
{
home.packages = with pkgs; [
editorconfig-core-c
];
home.packages = with pkgs; [ editorconfig-core-c ];
home.file = let
spacemacs = builtins.fetchGit {
@ -40,6 +38,6 @@
programs.emacs.enable = true;
services.gpg-agent.extraConfig = ''
allow-emacs-pinentry
allow-emacs-pinentry
'';
}

4
home/jez/bits/firefox.nix
View File

@ -26,9 +26,7 @@
];
profiles.default = {
settings = {
"browser.aboutConfig.showWarning" = false;
};
settings = { "browser.aboutConfig.showWarning" = false; };
};
};
}

80
home/jez/bits/shell.nix
View File

@ -14,12 +14,25 @@
};
home.packages = with pkgs; [
ripgrep fd fasd unzip rsync pv unison file tree
ripgrep
fd
fasd
unzip
rsync
pv
unison
file
tree
curl jq
curl
jq
shellcheck rmlint progress
colordiff screenfetch termdown
shellcheck
rmlint
progress
colordiff
screenfetch
termdown
];
programs.zsh = {
@ -39,8 +52,8 @@
nixupg = "nix-env --upgrade --leq";
nixq = "noglob nix-env --query --available";
e = "emacsclient -t"; # Terminal
ew = "emacsclient -c"; # New window (and wait)
e = "emacsclient -t"; # Terminal
ew = "emacsclient -c"; # New window (and wait)
en = "emacsclient -nc"; # New window (and return immediately)
};
@ -58,11 +71,15 @@
enable = true;
plugins = [
"vi-mode"
"git" "git-flow"
"fd" "fasd"
"virtualenv" "rvm"
"git"
"git-flow"
"fd"
"fasd"
"virtualenv"
"rvm"
"extract"
"vagrant" "docker"
"vagrant"
"docker"
"archlinux"
"kitty"
"zsh-syntax-highlighting"
@ -80,22 +97,47 @@
time.disabled = false;
hostname.ssh_only = false;
format = builtins.concatStringsSep "" [
"$username" "$hostname"
"$kubernetes" "$directory"
"$git_branch" "$git_commit" "$git_state" "$git_status"
"$username"
"$hostname"
"$kubernetes"
"$directory"
"$git_branch"
"$git_commit"
"$git_state"
"$git_status"
"$hg_branch"
"$docker_context"
"$package"
"$dotnet" "$elixir" "$elm" "$erlang" "$golang" "$java" "$julia" "$nim"
"$nodejs" "$ocaml" "$php" "$purescript" "$python" "$ruby" "$rust" "$terraform"
"$dotnet"
"$elixir"
"$elm"
"$erlang"
"$golang"
"$java"
"$julia"
"$nim"
"$nodejs"
"$ocaml"
"$php"
"$purescript"
"$python"
"$ruby"
"$rust"
"$terraform"
"$zig"
"$nix_shell" "$conda"
"$nix_shell"
"$conda"
"$memory_usage"
# "$aws"
"$env_var" "$crystal" "$cmd_duration"
"$custom" "$time"
"$env_var"
"$crystal"
"$cmd_duration"
"$custom"
"$time"
"$line_break"
"$jobs" "$battery" "$character"
"$jobs"
"$battery"
"$character"
];
};
};

4
home/jez/bits/vim.nix
View File

@ -3,9 +3,7 @@
{
programs.vim = {
enable = true;
plugins = with pkgs.vimPlugins; [
julia-vim vim-toml
];
plugins = with pkgs.vimPlugins; [ julia-vim vim-toml ];
settings = {
expandtab = true;
tabstop = 2;

8
home/jez/config.nix
View File

@ -2,12 +2,8 @@
allowUnfree = true;
packageOverrides = pkgs:
let
util = import ./util.nix { inherit pkgs; };
in
{
kitty = util.nixGLWrapMaybe pkgs.kitty "kitty";
};
let util = import ./util.nix { inherit pkgs; };
in { kitty = util.nixGLWrapMaybe pkgs.kitty "kitty"; };
joypixels.acceptLicense = true;
}

120
home/jez/home.nix
View File

@ -6,8 +6,7 @@ let
hostname = lib.strings.fileContents /etc/hostname;
host-config = ./machines + "/${hostname}.nix";
h = "/home/jez";
in
{
in {
programs.home-manager.enable = true;
imports = [
@ -22,9 +21,10 @@ in
allowUnfree = true;
joypixels.acceptLicense = true;
packageOverrides = pkgs: {
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
inherit pkgs;
};
nur = import (builtins.fetchTarball
"https://github.com/nix-community/NUR/archive/master.tar.gz") {
inherit pkgs;
};
};
};
@ -34,29 +34,62 @@ in
home.stateVersion = "20.09";
home.packages = with pkgs;
let
py = pkgs.python38Packages;
let py = pkgs.python38Packages;
in [
nmap avahi iftop s3cmd dnsutils whois
nmap
avahi
iftop
s3cmd
dnsutils
whois
nixfmt
yubikey-manager yubioath-desktop yubikey-personalization yubikey-personalization-gui
gopass pass protonmail-bridge tor torsocks
transmission-gtk unison
yubikey-manager
yubioath-desktop
yubikey-personalization
yubikey-personalization-gui
gopass
pass
protonmail-bridge
tor
torsocks
transmission-gtk
unison
aspell aspellDicts.en aspellDicts.en-computers
aspell
aspellDicts.en
aspellDicts.en-computers
bpytop ranger vifm zeal
bpytop
ranger
vifm
zeal
gomuks
graphicsmagick qrencode
graphicsmagick
qrencode
mpc_cli
python3 pipenv pew py.ipython py.python-language-server
python3
pipenv
pew
py.ipython
py.python-language-server
pandoc texinfo graphviz zotero
pandoc
texinfo
graphviz
zotero
R rstudio gcc_latest sqlite gnumake cmake libtool libvterm
R
rstudio
gcc_latest
sqlite
gnumake
cmake
libtool
libvterm
## Actually, don't install these:
## Use direnv or nix-shell instead
@ -65,7 +98,9 @@ in
# ghc stack cabal-install hlint
# h5utils
virt-manager virt-viewer vagrant
virt-manager
virt-viewer
vagrant
];
home.sessionVariables = {
@ -79,10 +114,8 @@ in
EDITOR = pkgs.vim + /bin/vim;
TERMINFO_DIRS = lib.concatStringsSep ":" [
"${h}/.nix-profile/share/terminfo"
""
];
TERMINFO_DIRS =
lib.concatStringsSep ":" [ "${h}/.nix-profile/share/terminfo" "" ];
};
home.file = {
@ -130,16 +163,39 @@ in
m = "merge";
l = "log";
};
includes = [
{ path = "~/.config/git/local"; }
];
includes = [{ path = "~/.config/git/local"; }];
ignores = [
"*.pyc"
"*.log" "*.aux" "*.lol" "*.out" "*.toc" "*.bcf" "*.bbl" "*.blg" "*.nav" "*.run.xml" "*.snm" "*.fdb_latexmk"
"*.fls" "*.vrb"
"doc/tags" ".sass-cache" ".sconsign.dblite"
".*.sw[op]" ".DS_Store" "._*" "~$*" ".*.un~" "*~" "\\#*" ".\\#*" "*.bak" ".~lock.*\\#"
".ipynb_checkpoints" ".stfolder" ".vscode"
"*.log"
"*.aux"
"*.lol"
"*.out"
"*.toc"
"*.bcf"
"*.bbl"
"*.blg"
"*.nav"
"*.run.xml"
"*.snm"
"*.fdb_latexmk"
"*.fls"
"*.vrb"
"doc/tags"
".sass-cache"
".sconsign.dblite"
".*.sw[op]"
".DS_Store"
"._*"
"~$*"
".*.un~"
"*~"
"\\#*"
".\\#*"
"*.bak"
".~lock.*\\#"
".ipynb_checkpoints"
".stfolder"
".vscode"
".envrc"
];
extraConfig = {
@ -180,7 +236,9 @@ in
programs.texlive = {
enable = true;
extraPackages = tpkgs: { inherit (tpkgs) scheme-medium wrapfig capt-of multirow; };
extraPackages = tpkgs: {
inherit (tpkgs) scheme-medium wrapfig capt-of multirow;
};
};
}

4
home/jez/machines/arianrhod.nix
View File

@ -1,7 +1,5 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
steam
];
home.packages = with pkgs; [ steam ];
}

14
home/jez/machines/erwin.nix
View File

@ -2,12 +2,18 @@
with builtins;
let
nixGL = pkgs.callPackage (fetchTarball https://github.com/guibou/nixGL/archive/master.tar.gz) { inherit pkgs; };
nixGL = pkgs.callPackage
(fetchTarball "https://github.com/guibou/nixGL/archive/master.tar.gz") {
inherit pkgs;
};
h = config.home.homeDirectory;
in
{
in {
home.packages = with nixGL; [ (nixGLCommon nixGLIntel) nixGLIntel nixVulkanIntel ];
home.packages = with nixGL; [
(nixGLCommon nixGLIntel)
nixGLIntel
nixVulkanIntel
];
home.file = {
".pam_environment".text = ''

11
home/jez/machines/gwydion.nix
View File

@ -1,13 +1,8 @@
{ pkgs, config, ... }:
let
h = config.home.homeDirectory;
in
{
home.packages = with pkgs; [
steam minecraft
fahcontrol
];
let h = config.home.homeDirectory;
in {
home.packages = with pkgs; [ steam minecraft fahcontrol ];
services.mpd = {
enable = true;

30
home/jez/util.nix
View File

@ -2,23 +2,31 @@
let
lib = pkgs.lib;
nixGL = pkgs.callPackage (fetchTarball https://github.com/guibou/nixGL/archive/master.tar.gz) { inherit pkgs; };
in
{
nixGL = pkgs.callPackage
(fetchTarball "https://github.com/guibou/nixGL/archive/master.tar.gz") {
inherit pkgs;
};
in {
inherit nixGL;
nixGLWrapMaybe = let
makeGLWrapper = pkg: cmd: with nixGL; pkgs.writeScriptBin cmd ''
#!${pkgs.stdenv.shell}
exec ${nixGLCommon nixGLIntel}/bin/nixGL ${pkg}/bin/${cmd} "$@"
'';
nixGLWrap = pkg: cmd: let
wrapped = makeGLWrapper pkg cmd;
in pkgs.symlinkJoin { name = "nixGL-${pkg.name}"; paths = [ wrapped pkg ]; };
makeGLWrapper = pkg: cmd:
with nixGL;
pkgs.writeScriptBin cmd ''
#!${pkgs.stdenv.shell}
exec ${nixGLCommon nixGLIntel}/bin/nixGL ${pkg}/bin/${cmd} "$@"
'';
nixGLWrap = pkg: cmd:
let wrapped = makeGLWrapper pkg cmd;
in pkgs.symlinkJoin {
name = "nixGL-${pkg.name}";
paths = [ wrapped pkg ];
};
isNixOS = builtins.pathExists /etc/NIXOS;
in pkg: cmd: if isNixOS then pkg else (nixGLWrap pkg cmd);
capitalise = str:
let chars = lib.stringToCharacters str;
in lib.concatStrings ([(lib.toUpper (lib.head chars))] ++ (lib.tail chars));
in lib.concatStrings
([ (lib.toUpper (lib.head chars)) ] ++ (lib.tail chars));
}

6
machines/arianrhod.nix
View File

@ -1,9 +1,7 @@
{config, pkgs, lib, ...}:
{ config, pkgs, lib, ... }:
{
imports = [
../bits/home-common.nix
];
imports = [ ../bits/home-common.nix ];
networking.interfaces.enp0s25.useDHCP = true;
networking.interfaces.wlp2s0.useDHCP = true;

31
machines/gwydion.nix
View File

@ -1,11 +1,9 @@
{config, pkgs, lib, ...}:
{ config, pkgs, lib, ... }:
{
imports = [
../bits/home-common.nix
];
imports = [ ../bits/home-common.nix ];
boot.supportedFilesystems = ["zfs"];
boot.supportedFilesystems = [ "zfs" ];
boot.loader = {
efi = {
canTouchEfiVariables = false;
@ -30,18 +28,17 @@
networking.interfaces.enp39s0.useDHCP = true;
networking.firewall.allowedTCPPorts = [
6600 # mpd
6600 # mpd
];
boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ];
hardware.opengl.extraPackages = with pkgs; [
amdvlk
rocm-opencl-icd clang_11
];
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
amdvlk
rocm-opencl-icd
clang_11
];
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ amdvlk ];
services.foldingathome = {
enable = true;
@ -50,14 +47,14 @@
extraArgs = [
"--config"
(builtins.toFile "config.xml" ''
<config>
<!-- Network -->
<proxy v=':8080'/>
<config>
<!-- Network -->
<proxy v=':8080'/>
<!-- Folding Slots -->
<slot id='0' type='CPU'/>
<slot id='1' type='GPU'/>
</config>
<!-- Folding Slots -->
<slot id='0' type='CPU'/>
<slot id='1' type='GPU'/>
</config>
'')
];
};