cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

formatting goes brrr

Browse source
This commit is contained in:
LavaDesu 2021-07-15 19:57:49 +07:00
parent 4e8e8f0fed
commit 0f37f09199
Signed by: cilly
GPG key ID: 6500251E087653C9
17 changed files with 110 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/system/hardware-configuration.nix
View file

@ -4,8 +4,8 @@
{ 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 = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
@ -13,55 +13,55 @@
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "rootfs"; device = "rootfs";
fsType = "tmpfs"; fsType = "tmpfs";
options = [ "defaults" "size=4G" "mode=755" ]; options = [ "defaults" "size=4G" "mode=755" ];
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/E8E8-E570"; device = "/dev/disk/by-uuid/E8E8-E570";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/butter" = fileSystems."/mnt/butter" = {
{ device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=5" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=5" ];
}; };
fileSystems."/nix" = fileSystems."/nix" = {
{ device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=258" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=258" ];
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=260" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=260" ];
}; };
fileSystems."/home/.snapshots" = fileSystems."/home/.snapshots" = {
{ device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=319" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=319" ];
}; };
fileSystems."/root" = fileSystems."/root" = {
{ device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=261" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=261" ];
}; };
fileSystems."/var" = fileSystems."/var" = {
{ device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d"; device = "/dev/disk/by-uuid/8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d";
fsType = "btrfs"; fsType = "btrfs";
options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=259" ]; options = [ "autodefrag" "compress=zstd:3" "nossd" "nossd_spread" "relatime" "subvolid=259" ];
}; };
fileSystems."/mnt/hdd" = fileSystems."/mnt/hdd" = {
{ device = "/dev/disk/by-uuid/d5e3cfe5-c73a-4695-b81b-fc0215d4cefe"; device = "/dev/disk/by-uuid/d5e3cfe5-c73a-4695-b81b-fc0215d4cefe";
fsType = "ext4"; fsType = "ext4";
}; };

12
modules/system/packages.nix
View file

@ -1,8 +1,7 @@
{ config, pkgs, ...}: { { config, enableGUI, lib, pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
efibootmgr efibootmgr
git git
gparted
htop htop
libarchive libarchive
lf lf
@ -11,11 +10,13 @@
neovim neovim
rsync rsync
wget wget
] ++ lib.optionals enableGUI [
gparted
gnome3.nautilus gnome3.nautilus
]; ];
environment.variables.EDITOR = "nvim"; environment.variables.EDITOR = "nvim";
}
// (if !enableGUI then {} else {
hardware.opengl.extraPackages = with pkgs; [ hardware.opengl.extraPackages = with pkgs; [
vaapiIntel vaapiIntel
vaapiVdpau vaapiVdpau
@ -29,5 +30,4 @@
programs.steam.enable = true; programs.steam.enable = true;
services.dbus.packages = [ pkgs.gnome3.dconf pkgs.gcr ]; services.dbus.packages = [ pkgs.gnome3.dconf pkgs.gcr ];
services.gnome.sushi.enable = true; services.gnome.sushi.enable = true;
# services.ipfs.enable = true; })
}

6
modules/user/xdg.nix
View file

@ -1,9 +1,11 @@
{ config, ... }: { config, ... }:
let let
genMimes = mimeTypes: builtins.listToAttrs (builtins.map (mimeType: { genMimes = mimeTypes: builtins.listToAttrs (
builtins.map (mimeType: {
name = mimeType; name = mimeType;
value = "brave-browser.desktop"; value = "brave-browser.desktop";
}) mimeTypes); }) mimeTypes
);
mimes = genMimes [ mimes = genMimes [
"x-scheme-handler/http" "x-scheme-handler/http"

2
overlays/mps-youtube.nix
View file

@ -1,5 +1,5 @@
self: super: { self: super: {
mps-youtube = super.mps-youtube.overrideAttrs(old: rec { mps-youtube = super.mps-youtube.overrideAttrs (old: {
src = super.fetchFromGitHub { src = super.fetchFromGitHub {
owner = "louisabraham"; owner = "louisabraham";
repo = "mps-youtube"; repo = "mps-youtube";

2
overlays/transcrypt.nix
View file

@ -1,5 +1,5 @@
self: super: { self: super: {
transcrypt = super.transcrypt.overrideAttrs(o: rec { transcrypt = super.transcrypt.overrideAttrs (old: rec {
version = "2.1.0"; version = "2.1.0";
patches = [ ./patches/transcrypt.patch ]; patches = [ ./patches/transcrypt.patch ];

4
overlays/xinit.nix
View file

@ -1,10 +1,10 @@
self: super: { self: super: {
xorg = super.xorg // { xorg = super.xorg // {
xinit = super.xorg.xinit.overrideAttrs(o: { xinit = super.xorg.xinit.overrideAttrs (old: {
# Some info: # Some info:
# - Make startx use $XAUTHORITY as server auth files instead of .serverauth.$$ # - Make startx use $XAUTHORITY as server auth files instead of .serverauth.$$
# - Make startx respect $XINITRC and $XSERVERRC # - Make startx respect $XINITRC and $XSERVERRC
patches = o.patches ++ [ ./patches/startx.patch ]; patches = old.patches ++ [ ./patches/startx.patch ];
}); });
}; };
} }

11
packages/linux-lava/default.nix
View file

@ -1,9 +1,8 @@
{ { buildLinux
buildLinux, , callPackage
callPackage, , kernelPatches
kernelPatches, , lib
lib, , ...
...
} @ args: } @ args:
let let

15
packages/wine-osu/default.nix
View file

@ -1,13 +1,12 @@
{ { getPaths
getPaths, , winePackages
winePackages, , wineUnstable
wineUnstable, , wineStaging
wineStaging, , ...
...
}: }:
# TODO: Use winePackages.callPackage # TODO: Use winePackages.callPackage
(wineStaging.overrideDerivation(o: { (wineStaging.overrideDerivation (old: {
patches = (o.patches or []) ++ getPaths ./patches; patches = (old.patches or []) ++ getPaths ./patches;
})).override { })).override {
wineRelease = "staging"; wineRelease = "staging";
wineBuild = "wineWow"; wineBuild = "wineWow";