From 7d3321fabc5577fb06922bff92d5c7f0f235da92 Mon Sep 17 00:00:00 2001 From: idcretard Date: Mon, 12 Apr 2021 01:16:03 +0530 Subject: [PATCH] static ip cuz yes? --- Hardware/xorg.nix | 26 ------------------- Packages/scripts | 2 +- Stuff/colemak-dh.xkb | 62 ++++++++++++++++++++++++++++++++++++++++++++ Stuff/sound.nix | 10 +++---- Stuff/xorg.nix | 43 ++++++++++++++++++++++++++++++ hardware.nix | 1 - networking.nix | 11 ++++++-- pkgs.nix | 3 ++- stuff.nix | 1 + 9 files changed, 123 insertions(+), 36 deletions(-) delete mode 100644 Hardware/xorg.nix create mode 100644 Stuff/colemak-dh.xkb create mode 100644 Stuff/xorg.nix diff --git a/Hardware/xorg.nix b/Hardware/xorg.nix deleted file mode 100644 index 6327722..0000000 --- a/Hardware/xorg.nix +++ /dev/null @@ -1,26 +0,0 @@ - -{ config, lib, pkgs, modulesPath, ... }: - -{ - services = { - xserver = { - enable = true; - libinput= { - enable = true; - # mouse = { - # accelSpeed = "0"; - # }; - touchpad = { - middleEmulation = false; - clickMethod = "buttonareas"; - tapping = true; - naturalScrolling =true; - }; - }; - displayManager = {startx = {enable = true; }; }; - videoDrivers = [ "nvidia" ]; - layout = "us"; - xkbVariant = "colemak"; - }; - }; -} diff --git a/Packages/scripts b/Packages/scripts index 207f4ca..177de3a 160000 --- a/Packages/scripts +++ b/Packages/scripts @@ -1 +1 @@ -Subproject commit 207f4ca68ecf797778ca9e2d4028ea96a1710e08 +Subproject commit 177de3a4726233317589a443aecc5aa048dc94b8 diff --git a/Stuff/colemak-dh.xkb b/Stuff/colemak-dh.xkb new file mode 100644 index 0000000..da76fd6 --- /dev/null +++ b/Stuff/colemak-dh.xkb @@ -0,0 +1,62 @@ +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 { [ grave, asciitilde, dead_tilde, asciitilde ] }; + key { [ 1, exclam, exclamdown, onesuperior ] }; + key { [ 2, at, masculine, twosuperior ] }; + key { [ 3, numbersign, ordfeminine, threesuperior ] }; + key { [ 4, dollar, cent, sterling ] }; + key { [ 5, percent, EuroSign, yen ] }; + key { [ 6, asciicircum, hstroke, Hstroke ] }; + key { [ 7, ampersand, eth, ETH ] }; + key { [ 8, asterisk, thorn, THORN ] }; + key { [ 9, parenleft, leftsinglequotemark, leftdoublequotemark ] }; + key { [ 0, parenright, rightsinglequotemark, rightdoublequotemark ] }; + key { [ minus, underscore, endash, emdash ] }; + key { [ equal, plus, multiply, division ] }; + key { [ q, Q, adiaeresis, Adiaeresis ] }; + key { [ w, W, aring, Aring ] }; + key { [ f, F, atilde, Atilde ] }; + key { [ p, P, oslash, Ooblique ] }; + key { [ b, B, dead_breve, asciitilde ] }; + key { [ j, J, dstroke, Dstroke ] }; + key { [ l, L, lstroke, Lstroke ] }; + key { [ u, U, uacute, Uacute ] }; + key { [ y, Y, udiaeresis, Udiaeresis ] }; + key { [ semicolon, colon, odiaeresis, Odiaeresis ] }; + key { [ bracketleft, braceleft, guillemotleft, 0x1002039 ] }; + key { [ bracketright, braceright, guillemotright, 0x100203a ] }; + key { [ backslash, bar, asciitilde, asciitilde ] }; + key { [ a, A, aacute, Aacute ] }; + key { [ r, R, dead_grave, asciitilde ] }; + key { [ s, S, ssharp, asciitilde ] }; + key { [ t, T, dead_acute, dead_doubleacute ] }; + key { [ g, G, dead_ogonek, asciitilde ] }; + key { [ m, M, dead_macron, asciitilde ] }; + key { [ n, N, ntilde, Ntilde ] }; + key { [ e, E, eacute, Eacute ] }; + key { [ i, I, iacute, Iacute ] }; + key { [ o, O, oacute, Oacute ] }; + key { [ apostrophe, quotedbl, otilde, Otilde ] }; + key { [ z, Z, ae, AE ] }; + key { [ x, X, dead_circumflex, asciitilde ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ d, D, dead_diaeresis, asciitilde ] }; + key { [ v, V, oe, OE ] }; + key { [ k, K, dead_abovering, asciitilde ] }; + key { [ h, H, dead_caron, asciitilde ] }; + key { [ comma, less, dead_cedilla, asciitilde ] }; + key { [ period, greater, dead_abovedot, asciitilde ] }; + key { [ slash, question, questiondown, asciitilde ] }; + key { [ Caps_Lock, Caps_Lock, Caps_Lock, Caps_Lock ] }; + key { [ minus, underscore, endash, emdash ] }; + key { [ space, space, space, nobreakspace ] }; + include "level3(ralt_switch)" + }; + + xkb_geometry { include "pc(pc104)" }; +}; diff --git a/Stuff/sound.nix b/Stuff/sound.nix index fba6924..9882ab3 100644 --- a/Stuff/sound.nix +++ b/Stuff/sound.nix @@ -3,10 +3,10 @@ { services.pipewire = { enable = true; -# alsa = { -# enable = true; -# support32Bit = true; -# }; + alsa = { + enable = true; + support32Bit = true; + }; pulse = { enable = true; }; @@ -17,7 +17,7 @@ }; config.pipewire-pulse = { context.modules = { - pulse.min.req = "4/24000"; + pulse.min.req = "4/48000"; pulse.min.quantum = "4/24000"; }; stream.properties = { diff --git a/Stuff/xorg.nix b/Stuff/xorg.nix new file mode 100644 index 0000000..684d866 --- /dev/null +++ b/Stuff/xorg.nix @@ -0,0 +1,43 @@ + +{ config, lib, pkgs, modulesPath, ... }: + +#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"; + }; + }; +} diff --git a/hardware.nix b/hardware.nix index 3e34bb8..75f0a92 100644 --- a/hardware.nix +++ b/hardware.nix @@ -5,7 +5,6 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ./Hardware/power.nix - ./Hardware/xorg.nix ./Hardware/graphicshit.nix ]; diff --git a/networking.nix b/networking.nix index 9438ae2..a7ac29f 100644 --- a/networking.nix +++ b/networking.nix @@ -4,10 +4,17 @@ networking = { hostName = "nixchod"; wireless.enable = true; # Enables wireless support via wpa_supplicant. - useDHCP = false; interfaces = { enp7s0.useDHCP = true; - wlp0s20f3.useDHCP = true; + wlp0s20f3 = { + useDHCP = true; + ipv4.addresses = [ { + prefixLength = 24; + address = "192.168.0.111"; + } ]; + }; }; + defaultGateway = "192.168.0.1"; + nameservers = [ "192.168.0.1" ]; }; } diff --git a/pkgs.nix b/pkgs.nix index 8077506..7f86825 100644 --- a/pkgs.nix +++ b/pkgs.nix @@ -7,6 +7,7 @@ environment.systemPackages = with pkgs; [ xclip dunst + xorg.xkbcomp glibc proxychains #qt5.qmake @@ -22,7 +23,7 @@ mono vim mpd - wineWowPackages.stable + wineWowPackages.staging neofetch tor-browser-bundle-bin w3m diff --git a/stuff.nix b/stuff.nix index f801aff..cd258eb 100644 --- a/stuff.nix +++ b/stuff.nix @@ -5,6 +5,7 @@ ./Stuff/fonts.nix ./Stuff/users.nix ./Stuff/services.nix + ./Stuff/xorg.nix ]; time.timeZone = "Asia/Kolkata"; environment = {