nixpkgs-fmt

This commit is contained in:
Cyryl Płotnicki 2021-11-22 19:32:26 +00:00
parent e8f445923b
commit fe4d30f651
67 changed files with 1449 additions and 1404 deletions

View file

@ -19,12 +19,14 @@
}; };
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/28afab71-ff3d-4f1a-b7e4-2129572706dd"; {
device = "/dev/disk/by-uuid/28afab71-ff3d-4f1a-b7e4-2129572706dd";
fsType = "btrfs"; fsType = "btrfs";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5BFB-9E6B"; {
device = "/dev/disk/by-uuid/5BFB-9E6B";
fsType = "vfat"; fsType = "vfat";
}; };

View file

@ -1,6 +1,12 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim tmux htop atop btrfs-progs compsize fd vim
tmux
htop
atop
btrfs-progs
compsize
fd
]; ];
} }

View file

@ -1,10 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
nixpkgs.overlays = [ (self: super: { buildLinux = x: super.buildLinux ({ nixpkgs.overlays = [
(self: super: {
buildLinux = x: super.buildLinux ({
ignoreConfigErrors = true; ignoreConfigErrors = true;
enableParallelBuilding = true; enableParallelBuilding = true;
} // x); } ) ]; } // x);
})
];
boot.kernelPatches = [{ boot.kernelPatches = [{
name = "foureighty"; name = "foureighty";
patch = null; patch = null;

View file

@ -1,4 +1,3 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
time.timeZone = "Europe/London"; time.timeZone = "Europe/London";

View file

@ -9,7 +9,8 @@
locations."= /.well-known/matrix/server".extraConfig = locations."= /.well-known/matrix/server".extraConfig =
let let
server = { "m.server" = "cyplo.dev:443"; }; server = { "m.server" = "cyplo.dev:443"; };
in '' in
''
add_header Content-Type application/json; add_header Content-Type application/json;
return 200 '${builtins.toJSON server}'; return 200 '${builtins.toJSON server}';
''; '';
@ -20,7 +21,8 @@
"m.homeserver" = { "base_url" = "https://cyplo.dev"; }; "m.homeserver" = { "base_url" = "https://cyplo.dev"; };
"m.identity_server" = { "base_url" = "https://vector.im"; }; "m.identity_server" = { "base_url" = "https://vector.im"; };
}; };
in '' in
''
add_header Content-Type application/json; add_header Content-Type application/json;
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;
return 200 '${builtins.toJSON client}'; return 200 '${builtins.toJSON client}';

View file

@ -14,7 +14,20 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget git gnupg curl tmux htop atop home-manager pciutils powertop fd dnsutils usbutils veracrypt wget
git
gnupg
curl
tmux
htop
atop
home-manager
pciutils
powertop
fd
dnsutils
usbutils
veracrypt
]; ];
i18n.defaultLocale = "en_GB.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";

View file

@ -1,7 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
services = { services = { };
};
xsession = { xsession = {
enable = false; enable = false;

View file

@ -1,14 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
services = { services = { };
};
xsession = { xsession = {
enable = false; enable = false;
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
gnome-usage gnome3.gnome-tweaks gnome-usage
gnome3.gnome-tweaks
]; ];
programs.gnome-terminal = { programs.gnome-terminal = {

View file

@ -10,7 +10,10 @@
services.flatpak.enable = true; services.flatpak.enable = true;
services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf gcr ]; services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf gcr ];
users.users.cyryl.packages = with pkgs.gnomeExtensions; [ users.users.cyryl.packages = with pkgs.gnomeExtensions; [
caffeine clipboard-indicator sound-output-device-chooser gsconnect caffeine
clipboard-indicator
sound-output-device-chooser
gsconnect
]; ];
} }

View file

@ -123,6 +123,7 @@
version = "0.4.2"; version = "0.4.2";
sha256 = "1knspsc98cfw4mhc0yaz0f2185sxdf9kn9qsysfs6c82g9wjaqcj"; sha256 = "1knspsc98cfw4mhc0yaz0f2185sxdf9kn9qsysfs6c82g9wjaqcj";
} }
];}) ];
})
]; ];
} }

View file

@ -31,6 +31,7 @@
mercurial mercurial
nix-index nix-index
nix-top nix-top
nixpkgs-fmt
pciutils pciutils
powertop powertop
ranger ranger

View file

@ -13,8 +13,7 @@
gpg = { gpg = {
enable = true; enable = true;
settings = { settings = { };
};
}; };
taskwarrior.enable = true; taskwarrior.enable = true;
fzf.enable = true; fzf.enable = true;

View file

@ -14,7 +14,9 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m"; cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m";
buildInputs = [ buildInputs = [
openssl pkgconfig git openssl
pkgconfig
git
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,5 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
@ -10,16 +9,20 @@
expireDuplicatesFirst = true; expireDuplicatesFirst = true;
share = true; share = true;
}; };
enableAutosuggestions = true; enableAutosuggestions = true;
enableCompletion = true; enableCompletion = true;
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
plugins = [ "vi-mode" "git" "python" "history-substring-search" "tmux" ]; plugins = [ "vi-mode" "git" "python" "history-substring-search" "tmux" ];
}; };
initExtra = '' initExtra = ''
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=238' ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=238'
setopt HIST_IGNORE_ALL_DUPS setopt HIST_IGNORE_ALL_DUPS
''; '';
profileExtra = '' profileExtra = ''
export PATH="$HOME/programs:$PATH"; export PATH="$HOME/programs:$PATH";
export PATH="$HOME/tools:$PATH"; export PATH="$HOME/tools:$PATH";
@ -30,6 +33,7 @@ export PATH="$HOME/.rvm/bin:$PATH";
export PATH="$HOME/.cargo/bin:$PATH"; export PATH="$HOME/.cargo/bin:$PATH";
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"; export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH";
''; '';
envExtra = '' envExtra = ''
[ -s "/home/cyryl/.jabba/jabba.sh" ] && source "/home/cyryl/.jabba/jabba.sh" [ -s "/home/cyryl/.jabba/jabba.sh" ] && source "/home/cyryl/.jabba/jabba.sh"
tmux source-file ~/.config/tmux/tmux.conf tmux source-file ~/.config/tmux/tmux.conf
@ -42,6 +46,7 @@ if [[ ! -x "$nixos_version" ]]; then
echo "non-nixos patches loaded" echo "non-nixos patches loaded"
fi fi
''; '';
sessionVariables = { sessionVariables = {
TERM = "xterm-256color"; TERM = "xterm-256color";
EDITOR = "vim"; EDITOR = "vim";
@ -50,12 +55,14 @@ PAGER="less";
ZSH_TMUX_AUTOSTART = true; ZSH_TMUX_AUTOSTART = true;
GOPATH = "$HOME/go"; GOPATH = "$HOME/go";
}; };
shellAliases = { shellAliases = {
tmate = "tmux detach-client -E 'tmate;tmux'"; tmate = "tmux detach-client -E 'tmate;tmux'";
cat = "bat -p"; cat = "bat -p";
rg = "rga"; rg = "rga";
}; };
}; };
programs.direnv = { programs.direnv = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

View file

@ -40,8 +40,7 @@ in
gpg = { gpg = {
enable = true; enable = true;
settings = { settings = { };
};
}; };
taskwarrior.enable = true; taskwarrior.enable = true;
fzf.enable = true; fzf.enable = true;

View file

@ -1,4 +1,3 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
services.xserver = { services.xserver = {

View file

@ -7,7 +7,9 @@
users.extraUsers.cyryl.extraGroups = [ "kvm" ]; users.extraUsers.cyryl.extraGroups = [ "kvm" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
virtmanager qemu swtpm virtmanager
qemu
swtpm
]; ];
} }

View file

@ -11,7 +11,6 @@
paginate = never paginate = never
''; '';
aliases = aliases =
{ { };
};
}; };
} }

View file

@ -116,7 +116,12 @@ let
inherit pname version; inherit pname version;
sha256 = "1vq889jshlb3m13m2lgbjy440lph27ig53sfipkj7ds5sb5znhh5"; sha256 = "1vq889jshlb3m13m2lgbjy440lph27ig53sfipkj7ds5sb5znhh5";
}; };
propagatedBuildInputs = [ etesync radicale pyscrypt orderedmultidict furl propagatedBuildInputs = [
etesync
radicale
pyscrypt
orderedmultidict
furl
python37Packages.coverage python37Packages.coverage
python37Packages.pyasn1 python37Packages.pyasn1
python37Packages.appdirs python37Packages.appdirs

View file

@ -71,8 +71,10 @@ in
startup = [ startup = [
{ command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store"; } { command = "${pkgs.wl-clipboard}/bin/wl-paste -t text --watch ${pkgs.clipman}/bin/clipman store"; }
{ command = "${pkgs.clipman}/bin/clipman restore"; } { command = "${pkgs.clipman}/bin/clipman restore"; }
{ command = ''swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off" && systemctl suspend' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 657b83' {
''; } command = ''swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * dpms off" && systemctl suspend' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 657b83'
'';
}
]; ];
output.eDP-1.scale = "1.7"; output.eDP-1.scale = "1.7";
input."1:1:AT_Translated_Set_2_keyboard" = { input."1:1:AT_Translated_Set_2_keyboard" = {

View file

@ -2,7 +2,8 @@
let let
tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale; tailscale = inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".tailscale;
in { in
{
environment.systemPackages = [ tailscale ]; environment.systemPackages = [ tailscale ];
services.tailscale = { services.tailscale = {
enable = true; enable = true;