kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-10 04:49:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

project-wide: nixdirfmt

Browse source
This commit is contained in:
kat witch 2021-04-14 01:28:41 +01:00
parent af5514301a
commit 22668a402a
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
7 changed files with 45 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hosts/mabon/nixos/default.nix
View file

@ -1,14 +1,8 @@
{ config, pkgs, profiles, ... }: { config, pkgs, profiles, ... }:
{ {
imports = [ imports =
./hw.nix [ ./hw.nix profiles.gui profiles.sway profiles.kat profiles.laptop ];
profiles.gui
profiles.sway
profiles.kat
profiles.laptop
];
deploy.target = "mbp"; deploy.target = "mbp";

38
hosts/mabon/nixos/hw.nix
View file

@ -1,30 +1,38 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [
"uhci_hcd"
"ehci_pci"
"ahci"
"firewire_ohci"
"usbhid"
"usb_storage"
"sd_mod"
"sr_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" "wl" ]; boot.kernelModules = [ "kvm-intel" "wl" ];
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/236f9363-19ee-46e3-8db4-5dd1e28b742d"; device = "/dev/disk/by-uuid/236f9363-19ee-46e3-8db4-5dd1e28b742d";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/b0435b6c-fd76-44d0-8b63-2c2c059df814"; boot.initrd.luks.devices."cryptroot".device =
"/dev/disk/by-uuid/b0435b6c-fd76-44d0-8b63-2c2c059df814";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/84FB-4F88"; device = "/dev/disk/by-uuid/84FB-4F88";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/926c41d6-c06a-4dcc-b55d-f4cfaafe4bac"; } [{ device = "/dev/disk/by-uuid/926c41d6-c06a-4dcc-b55d-f4cfaafe4bac"; }];
];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
} }

10
hosts/ostara/nixos/default.nix
View file

@ -1,14 +1,8 @@
{ config, pkgs, profiles, ... }: { config, pkgs, profiles, ... }:
{ {
imports = [ imports =
./hw.nix [ ./hw.nix profiles.gui profiles.sway profiles.kat profiles.laptop ];
profiles.gui
profiles.sway
profiles.kat
profiles.laptop
];
deploy.target = "slow"; deploy.target = "slow";

18
hosts/ostara/nixos/hw.nix
View file

@ -1,22 +1,20 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules =
[ "uhci_hcd" "ehci_pci" "ahci" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/469a684b-eb8f-48a8-8f98-be58528312c4"; device = "/dev/disk/by-uuid/469a684b-eb8f-48a8-8f98-be58528312c4";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/2223e305-79c9-45b3-90d7-560dcc45775a"; } [{ device = "/dev/disk/by-uuid/2223e305-79c9-45b3-90d7-560dcc45775a"; }];
];
} }

6
pkgs/kat-tw-export/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, makeWrapper, perl, perlPackages }: { stdenv, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kat-tw-export"; pname = "kat-tw-export";
version = "0.0.1"; version = "0.0.1";
src = ./tw.pl; src = ./tw.pl;
buildInputs = [ perl perlPackages.JSON ]; buildInputs = [ perl perlPackages.JSON ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
unpackPhase = "true"; unpackPhase = "true";
installPhase = '' installPhase = ''
install -Dm0755 $src $out/bin/kat-tw-export install -Dm0755 $src $out/bin/kat-tw-export
wrapProgram $out/bin/kat-tw-export --set PERL5LIB $PERL5LIB wrapProgram $out/bin/kat-tw-export --set PERL5LIB $PERL5LIB
''; '';
} }

10
profiles/sway/home/sway.nix
View file

@ -67,11 +67,13 @@
config = let config = let
dmenu = dmenu =
"${pkgs.bemenu}/bin/bemenu --fn '${witch.style.font.name} ${witch.style.font.size}' --nb '${witch.style.base16.color0}' --nf '${witch.style.base16.color7}' --sb '${witch.style.base16.color1}' --sf '${witch.style.base16.color7}' -l 5 -m -1 -i"; "${pkgs.bemenu}/bin/bemenu --fn '${witch.style.font.name} ${witch.style.font.size}' --nb '${witch.style.base16.color0}' --nf '${witch.style.base16.color7}' --sb '${witch.style.base16.color1}' --sf '${witch.style.base16.color7}' -l 5 -m -1 -i";
lockCommand = "swaylock -i LVDS-1:${../../../private/files/wallpapers/main.png}-i eDP-1:${ lockCommand = "swaylock -i LVDS-1:${
../../../private/files/wallpapers/main.png ../../../private/files/wallpapers/main.png
} -i HDMI-A-1:${../../../private/files/wallpapers/main.png} -i DP-1:${ }-i eDP-1:${../../../private/files/wallpapers/main.png} -i HDMI-A-1:${
../../../private/files/wallpapers/left.jpg ../../../private/files/wallpapers/main.png
} -i DVI-D-1:${../../../private/files/wallpapers/right.jpg} -s fill"; } -i DP-1:${../../../private/files/wallpapers/left.jpg} -i DVI-D-1:${
../../../private/files/wallpapers/right.jpg
} -s fill";
in { in {
bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];

1
services/syncplay.nix
View file

@ -33,6 +33,7 @@
Group = "sync-cert"; Group = "sync-cert";
}; };
}; };
security.acme.certs."sync.kittywit.ch".postRun = '' security.acme.certs."sync.kittywit.ch".postRun = ''
cp key.pem privkey.pem cp key.pem privkey.pem
chown acme:voice-cert privkey.pem''; chown acme:voice-cert privkey.pem'';