restructure

This commit is contained in:
2021-05-14 08:00:37 +05:30
parent a1d0576a37
commit a3e2fa3b5a
25 changed files with 177 additions and 150 deletions

View File

@@ -1,30 +0,0 @@
{lib, config, pkgs, ... }:
let
nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
export __GLX_VENDOR_LIBRARY_NAME=nvidia
export __VK_LAYER_NV_optimus=NVIDIA_only
exec -a "$0" "$@"
'';
in
{
environment.systemPackages = with pkgs; [
nvidia-offload
];
hardware = {
opengl = {
driSupport32Bit = true;
#package = pkgs.mesa_drivers;
enable = true;
};
nvidia = {
prime = {
offload = { enable = true; };
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
modesetting = { enable = true; };
};
};
}

View File

@@ -1,8 +0,0 @@
{ config, ... }:
{
powerManagement = {
enable = true;
cpuFreqGovernor = "ondemand";
};
}

View File

@@ -1,62 +0,0 @@
xkb_keymap {
xkb_keycodes { include "evdev+aliases(qwerty)" };
xkb_types { include "complete" };
xkb_compat { include "complete" };
xkb_symbols
{
include "pc+us(colemak)+inet(evdev)+terminate(ctrl_alt_bksp)"
key <TLDE> { [ grave, asciitilde, dead_tilde, asciitilde ] };
key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
key <AE02> { [ 2, at, masculine, twosuperior ] };
key <AE03> { [ 3, numbersign, ordfeminine, threesuperior ] };
key <AE04> { [ 4, dollar, cent, sterling ] };
key <AE05> { [ 5, percent, EuroSign, yen ] };
key <AE06> { [ 6, asciicircum, hstroke, Hstroke ] };
key <AE07> { [ 7, ampersand, eth, ETH ] };
key <AE08> { [ 8, asterisk, thorn, THORN ] };
key <AE09> { [ 9, parenleft, leftsinglequotemark, leftdoublequotemark ] };
key <AE10> { [ 0, parenright, rightsinglequotemark, rightdoublequotemark ] };
key <AE11> { [ minus, underscore, endash, emdash ] };
key <AE12> { [ equal, plus, multiply, division ] };
key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
key <AD02> { [ w, W, aring, Aring ] };
key <AD03> { [ f, F, atilde, Atilde ] };
key <AD04> { [ p, P, oslash, Ooblique ] };
key <AD05> { [ b, B, dead_breve, asciitilde ] };
key <AD06> { [ j, J, dstroke, Dstroke ] };
key <AD07> { [ l, L, lstroke, Lstroke ] };
key <AD08> { [ u, U, uacute, Uacute ] };
key <AD09> { [ y, Y, udiaeresis, Udiaeresis ] };
key <AD10> { [ semicolon, colon, odiaeresis, Odiaeresis ] };
key <AD11> { [ bracketleft, braceleft, guillemotleft, 0x1002039 ] };
key <AD12> { [ bracketright, braceright, guillemotright, 0x100203a ] };
key <BKSL> { [ backslash, bar, asciitilde, asciitilde ] };
key <AC01> { [ a, A, aacute, Aacute ] };
key <AC02> { [ r, R, dead_grave, asciitilde ] };
key <AC03> { [ s, S, ssharp, asciitilde ] };
key <AC04> { [ t, T, dead_acute, dead_doubleacute ] };
key <AC05> { [ g, G, dead_ogonek, asciitilde ] };
key <AC06> { [ m, M, dead_macron, asciitilde ] };
key <AC07> { [ n, N, ntilde, Ntilde ] };
key <AC08> { [ e, E, eacute, Eacute ] };
key <AC09> { [ i, I, iacute, Iacute ] };
key <AC10> { [ o, O, oacute, Oacute ] };
key <AC11> { [ apostrophe, quotedbl, otilde, Otilde ] };
key <AB01> { [ z, Z, ae, AE ] };
key <AB02> { [ x, X, dead_circumflex, asciitilde ] };
key <AB03> { [ c, C, ccedilla, Ccedilla ] };
key <AB04> { [ d, D, dead_diaeresis, asciitilde ] };
key <AB05> { [ v, V, oe, OE ] };
key <AB06> { [ k, K, dead_abovering, asciitilde ] };
key <AB07> { [ h, H, dead_caron, asciitilde ] };
key <AB08> { [ comma, less, dead_cedilla, asciitilde ] };
key <AB09> { [ period, greater, dead_abovedot, asciitilde ] };
key <AB10> { [ slash, question, questiondown, asciitilde ] };
key <CAPS> { [ Caps_Lock, Caps_Lock, Caps_Lock, Caps_Lock ] };
key <LSGT> { [ minus, underscore, endash, emdash ] };
key <SPCE> { [ space, space, space, nobreakspace ] };
include "level3(ralt_switch)"
};
xkb_geometry { include "pc(pc104)" };
};

View File

@@ -1,33 +0,0 @@
{lib, config, ... }:
{
services.pipewire = {
enable = true;
alsa = {
enable = true;
support32Bit = true;
};
pulse = {
enable = true;
};
config.pipewire = {
context.properties = {
default.clock.min-quantum = 8;
};
};
config.pipewire-pulse = {
context.modules = {
pulse.min.req = "4/48000";
pulse.min.quantum = "4/24000";
};
stream.properties = {
node.latency = "4/24000";
};
};
};
sound.enable = true;
# hardware = {
# pulseaudio.enable = true;
# pulseaudio.support32Bit = true;
# };
}

View File

@@ -1,43 +0,0 @@
{ config, lib, ... }:
#let
# compiledLayout = pkgs.runCommand "keyboard-layout" {} ''
# ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${./colemak-dh.xkb} $out
# '';
#in
{
services = {
xserver = {
enable = true;
libinput= {
enable = true;
# mouse = {
# accelSpeed = "0";
# };
touchpad = {
middleEmulation = false;
clickMethod = "buttonareas";
tapping = true;
naturalScrolling =true;
};
};
displayManager = {
startx = {
enable = true;
};
# sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
};
# extraLayouts = {
# colemak-dh = {
# description = "Colemak with MOD-dh";
# languages = [ "eng" ];
# symbolsFile = ./colemak-dh;
# };
# };
videoDrivers = [ "nvidia" ];
layout = "us";
xkbVariant = "colemak";
};
};
}

View File

@@ -26,7 +26,7 @@
# useOSProber = true;
efiSupport = true;
device = "nodev";
splashImage = "/etc/cirno.png"; #hehe
splashImage = ../modules/cirno.png;
splashMode = "stretch";
configurationName = "nixbruh";
};

View File

@@ -1,13 +0,0 @@
{ lib, config, ...}:
{
imports =
[
./hardware.nix
./stuff.nix
./pkgs.nix
./networking.nix
./boot.nix
];
system.stateVersion = "20.09";
}

View File

@@ -4,14 +4,12 @@
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
./Hardware/power.nix
./Hardware/graphicshit.nix
];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/4c02ddf5-d00e-4d84-856f-c327ae44d047";
fsType = "btrfs";
options = ["compress=zstd:9"];
options = ["compress=zstd:15"];
};
fileSystems."/boot/efi" =
@@ -46,4 +44,8 @@
};
swapDevices = [ {device = "/dev/nvme0n1p7";} ];
powerManagement = {
enable = true;
cpuFreqGovernor = "powersave";
};
}

View File

@@ -1,17 +1,16 @@
{lib, config, agenix, ... }:
{lib, config, agenix, pkgs, ... }:
{
imports = [
./Stuff/sound.nix
./Stuff/fonts.nix
./Stuff/users.nix
./Stuff/services.nix
./Stuff/xorg.nix
];
time.timeZone = "Asia/Kolkata";
environment = {
sessionVariables = {
QT_X11_NO_MITSHM="1";
EDITOR = "nvim";
QT_QPA_PLATFORMTHEME = "gtk3";
};
};
security={
@@ -31,6 +30,8 @@
automatic = false;
dates = "20:15";
};
nixpkgs.config.allowUnfree = true;
nixpkgs.config.allowBroken = true;
nixpkgs.config = {
allowUnfree = true;
allowBroken = true;
};
}