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

34
flake.nix
View file

@ -24,24 +24,24 @@
(builtins.attrNames (builtins.readDir root)); # Reads root path (builtins.attrNames (builtins.readDir root)); # Reads root path
modules = modules =
let let
getName = path: lib.removeSuffix ".nix" ( # Strip extension getName = path: lib.removeSuffix ".nix" ( # Strip extension
lib.last ( # Gets the last part (filename) lib.last ( # Gets the last part (filename)
lib.splitString "/" ( # Splits the path into components lib.splitString "/" ( # Splits the path into components
builtins.toString path # Converts the path into a string builtins.toString path # Converts the path into a string
)
) )
) );
); genModulePaths = basePath: builtins.listToAttrs (
genModulePaths = basePath: builtins.listToAttrs ( builtins.map (path: {
builtins.map (path: { name = getName path;
name = getName path; value = path;
value = path; }) (getPaths basePath)
}) (getPaths basePath) );
); in {
in { user = genModulePaths ./modules/user;
user = genModulePaths ./modules/user; system = genModulePaths ./modules/system;
system = genModulePaths ./modules/system; };
};
customPackages = pkgs: customPackages = pkgs:
let let

6
modules/system/gui.nix
View file

@ -3,9 +3,9 @@
enableDefaultFonts = true; enableDefaultFonts = true;
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
serif = ["NotoSerif"]; serif = [ "NotoSerif" ];
sansSerif = ["NotoSans"]; sansSerif = [ "NotoSans" ];
monospace = ["CascadiaCode"]; monospace = [ "CascadiaCode" ];
}; };
}; };
fonts = with pkgs; [ fonts = with pkgs; [

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

@ -4,66 +4,66 @@
{ 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" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
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";
}; };
swapDevices = [ ]; swapDevices = [];
} }

2
modules/system/kernel.nix
View file

@ -10,7 +10,7 @@
device = "nodev"; device = "nodev";
}; };
}; };
blacklistedKernelModules = ["uvcvideo"]; blacklistedKernelModules = [ "uvcvideo" ];
initrd = { initrd = {
includeDefaultModules = false; includeDefaultModules = false;
kernelModules = [ "i915" ]; kernelModules = [ "i915" ];

2
modules/system/networking.nix
View file

@ -17,5 +17,5 @@
prefixLength = 24; prefixLength = 24;
}]; }];
networking.defaultGateway = "192.168.100.1"; networking.defaultGateway = "192.168.100.1";
networking.nameservers = ["192.168.100.11"]; networking.nameservers = [ "192.168.100.11" ];
} }

24
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,23 +10,24 @@
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
libvdpau-va-gl libvdpau-va-gl
intel-ocl intel-ocl
rocm-opencl-icd rocm-opencl-icd
rocm-opencl-runtime rocm-opencl-runtime
]; ];
programs.light.enable = true; programs.light.enable = true;
hardware.opentabletdriver.enable = true; hardware.opentabletdriver.enable = true;
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; })
}

2
modules/system/security.nix
View file

@ -14,7 +14,7 @@
enable = true; enable = true;
extraRules = [ extraRules = [
{ {
groups = ["wheel"]; groups = [ "wheel" ];
keepEnv = true; keepEnv = true;
persist = true; persist = true;
} }

10
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 (
name = mimeType; builtins.map (mimeType: {
value = "brave-browser.desktop"; name = mimeType;
}) mimeTypes); value = "brave-browser.desktop";
}) mimeTypes
);
mimes = genMimes [ mimes = genMimes [
"x-scheme-handler/http" "x-scheme-handler/http"

2
modules/user/zsh.nix
View file

@ -125,7 +125,7 @@ in {
localVariables = { localVariables = {
KEYTIMEOUT = "1"; KEYTIMEOUT = "1";
#PS1 = "%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "; #PS1 = "%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b ";
ZSH_AUTOSUGGEST_STRATEGY = ["completion"]; ZSH_AUTOSUGGEST_STRATEGY = [ "completion" ];
ZSH_AUTOSUGGEST_USE_ASYNC = true; ZSH_AUTOSUGGEST_USE_ASYNC = true;
ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE = 40; ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE = 40;
}; };

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/picom.nix
View file

@ -1,5 +1,5 @@
self: super: { self: super: {
picom = super.picom.overrideAttrs(old: { picom = super.picom.overrideAttrs (old: {
src = super.fetchFromGitHub { src = super.fetchFromGitHub {
repo = "picom"; repo = "picom";

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 ];

2
overlays/winetricks.nix
View file

@ -1,5 +1,5 @@
self: super: { self: super: {
winetricks = super.winetricks.overrideAttrs(old: rec { winetricks = super.winetricks.overrideAttrs (old: rec {
name = "winetricks-20210528-073e2db"; name = "winetricks-20210528-073e2db";
src = super.fetchFromGitHub { src = super.fetchFromGitHub {
repo = "winetricks"; repo = "winetricks";

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";

2
users/rin.nix
View file

@ -57,7 +57,7 @@
GNUPGHOME = "${config.xdg.dataHome}/gnupg"; GNUPGHOME = "${config.xdg.dataHome}/gnupg";
GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc"; GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc";
LESSHISTFILE = "-"; LESSHISTFILE = "-";
NODE_REPL_HISTORY="${config.xdg.dataHome}/nodejs/repl_history"; NODE_REPL_HISTORY = "${config.xdg.dataHome}/nodejs/repl_history";
NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
PUB_CACHE = "${config.xdg.cacheHome}/dart"; PUB_CACHE = "${config.xdg.cacheHome}/dart";
WGETRC = "${config.xdg.configHome}/wgetrc"; WGETRC = "${config.xdg.configHome}/wgetrc";