0xa/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nixpkgs-fmt

Browse source
This commit is contained in:
Grigory Shipunov 2022-06-11 23:28:31 +02:00
parent 3924624e75
commit f422ad701c
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
11 changed files with 61 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -38,11 +38,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1654593855, "lastModified": 1654682581,
"narHash": "sha256-c+SyXvj7THre87OyIdZfRVR+HhI/g1ZDrQ3VUtTuHkU=", "narHash": "sha256-Jb1PQCwKgwdNAp907eR5zPzuxV+kRroA3UIxUxCMJ9s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "033bd4fa9a8fbe0c68a88e925d9a884161044b25", "rev": "e0169d7a9d324afebf5679551407756c77af8930",
"type": "github" "type": "github"
}, },
"original": { "original": {

16
hosts/microwave/configuration.nix
View file

@ -34,7 +34,7 @@
services.fstrim.enable = true; services.fstrim.enable = true;
boot = { boot = {
supportedFilesystems = ["btrfs"]; supportedFilesystems = [ "btrfs" ];
# use systemd boot by default # use systemd boot by default
loader = { loader = {
@ -62,8 +62,16 @@
# Users # Users
users.users.grue = { users.users.grue = {
createHome = true; createHome = true;
extraGroups = [ "wheel" "networkmanager" "wireshark" "video" extraGroups = [
"libvirtd" "plugdev" "dialout" "bluetooth" ]; "wheel"
"networkmanager"
"wireshark"
"video"
"libvirtd"
"plugdev"
"dialout"
"bluetooth"
];
group = "users"; group = "users";
home = "/home/grue"; home = "/home/grue";
isNormalUser = true; isNormalUser = true;
@ -75,6 +83,8 @@
package = pkgs.wireshark; package = pkgs.wireshark;
}; };
programs.steam.enable = true;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave # on your system were taken. It‘s perfectly fine and recommended to leave

24
hosts/microwave/hardware-configuration.nix
View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@ -14,7 +15,8 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa"; {
device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=root" "noatime" "compress=zstd" ]; options = [ "subvol=root" "noatime" "compress=zstd" ];
}; };
@ -22,26 +24,30 @@
boot.initrd.luks.devices."nixos-crypt".device = "/dev/disk/by-uuid/dbee4082-85ae-40f0-9c80-034f3574688f"; boot.initrd.luks.devices."nixos-crypt".device = "/dev/disk/by-uuid/dbee4082-85ae-40f0-9c80-034f3574688f";
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/4B02-CE16"; {
device = "/dev/disk/by-uuid/4B02-CE16";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa"; {
device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home" "noatime" "compress=zstd" ]; options = [ "subvol=home" "noatime" "compress=zstd" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa"; {
device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" "noatime" "compress=zstd" ]; options = [ "subvol=nix" "noatime" "compress=zstd" ];
}; };
fileSystems."/tmp" = fileSystems."/tmp" =
{ device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa"; {
device = "/dev/disk/by-uuid/f9edd500-f47b-42e5-9b88-7b6d86f76caa";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=tmp" "noatime" "compress=zstd" ]; options = [ "subvol=tmp" "noatime" "compress=zstd" ];
}; };
# The global useDHCP flag is deprecated, therefore explicitly set to false here. # The global useDHCP flag is deprecated, therefore explicitly set to false here.

12
modules/basic-tools.nix
View file

@ -62,8 +62,8 @@
ls = "exa"; ls = "exa";
ll = "exa -l"; ll = "exa -l";
l = "exa -al"; l = "exa -al";
ssh="TERM=xterm-256color ssh"; ssh = "TERM=xterm-256color ssh";
mutt="neomutt"; mutt = "neomutt";
}; };
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;
@ -75,10 +75,10 @@
bindkey -e bindkey -e
''; '';
promptInit = '' promptInit = ''
source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt
if [[ -n "$IN_NIX_SHELL" ]]; then if [[ -n "$IN_NIX_SHELL" ]]; then
prompt_tag "(nix-shell)" prompt_tag "(nix-shell)"
fi fi
''; '';
}; };

4
modules/binary-caches.nix
View file

@ -1,5 +1,9 @@
{ pkgs, lib, ... }: { { pkgs, lib, ... }: {
nix = { nix = {
extraOptions = ''
builders-use-substitutes = true
'';
registry.microvm = { registry.microvm = {
from = { from = {
type = "indirect"; type = "indirect";

2
modules/chromium.nix
View file

@ -1,4 +1,4 @@
{config, pkgs, ... }: { config, pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

2
modules/dvb-dump-nfs-automount.nix
View file

@ -16,7 +16,7 @@
systemd.automounts = [{ systemd.automounts = [{
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "wg-quick-wg-dvb.service" ]; requires = [ "wg-quick-wg-dvb.service" ];
automountConfig= { automountConfig = {
TimeoutIdleSec = "600"; TimeoutIdleSec = "600";
}; };
where = "/mnt/dvb"; where = "/mnt/dvb";

3
modules/entertainment.nix Normal file
View file

@ -0,0 +1,3 @@
{ pkgs, ... }
{
}

10
modules/graphical.nix
View file

@ -80,8 +80,8 @@
zeroconf.discovery.enable = true; zeroconf.discovery.enable = true;
extraClientConf = '' extraClientConf = ''
autospawn=yes autospawn=yes
''; '';
}; };
services.pipewire = { services.pipewire = {
enable = true; enable = true;
@ -133,5 +133,11 @@
programs.bash.vteIntegration = true; programs.bash.vteIntegration = true;
services.upower.enable = true; services.upower.enable = true;
services.udisks2.enable = true;
environment.shellAliases = {
mnt = "udisksctl mount -b";
umnt = "udisksctl unmount -b";
};
qt5.platformTheme = "gnome"; qt5.platformTheme = "gnome";
} }

4
modules/tlp.nix
View file

@ -3,10 +3,10 @@
{ {
powerManagement.cpuFreqGovernor = null; powerManagement.cpuFreqGovernor = null;
services.power-profiles-daemon.enable = false; services.power-profiles-daemon.enable = false;
services.tlp ={ services.tlp = {
enable = true; enable = true;
settings = { settings = {
USB_BLACKLIST="1d50:604b 1d50:6089 1d50:cc15 1fc9:000c"; USB_BLACKLIST = "1d50:604b 1d50:6089 1d50:cc15 1fc9:000c";
}; };
}; };
} }

10
modules/wireguard.nix
View file

@ -3,8 +3,8 @@
{ {
networking.wg-quick.interfaces = { networking.wg-quick.interfaces = {
wg-zw = { wg-zw = {
privateKeyFile=config.sops.secrets."wg/wg-zw-seckey".path; privateKeyFile = config.sops.secrets."wg/wg-zw-seckey".path;
address = ["172.20.76.226" ]; address = [ "172.20.76.226" ];
dns = [ "172.20.73.8" ]; dns = [ "172.20.73.8" ];
peers = [ peers = [
{ {
@ -15,7 +15,7 @@
]; ];
}; };
wg-dvb = { wg-dvb = {
privateKeyFile=config.sops.secrets."wg/wg-dvb-seckey".path; privateKeyFile = config.sops.secrets."wg/wg-dvb-seckey".path;
address = [ "10.13.37.3/32" ]; address = [ "10.13.37.3/32" ];
peers = [ peers = [
@ -29,11 +29,11 @@
}; };
mlwd-nl = { mlwd-nl = {
privateKeyFile=config.sops.secrets."wg/mlwd-nl-seckey".path; privateKeyFile = config.sops.secrets."wg/mlwd-nl-seckey".path;
address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ]; address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ];
dns = [ "193.138.218.74" ]; dns = [ "193.138.218.74" ];
peers = [ { peers = [{
publicKey = "StMPmol1+QQQQCJyAkm7t+l/QYTKe5CzXUhw0I6VX14="; publicKey = "StMPmol1+QQQQCJyAkm7t+l/QYTKe5CzXUhw0I6VX14=";
allowedIPs = [ "0.0.0.0/0" "::0/0" ]; allowedIPs = [ "0.0.0.0/0" "::0/0" ];
endpoint = "92.60.40.194:51820"; endpoint = "92.60.40.194:51820";