From fb7e5cafce7f725599d1daf71f0423e2e5779afb Mon Sep 17 00:00:00 2001 From: idcretard Date: Thu, 29 Apr 2021 21:33:07 +0530 Subject: [PATCH] how does git work --- .gitmodules | 9 ---- Hardware/graphicshit.nix | 30 ------------- Hardware/power.nix | 7 --- Packages/customscripts.nix | 16 ------- Packages/dwm | 1 - Packages/mpd_discord_richpresence.nix | 26 ----------- Packages/override.nix | 8 ---- Packages/scripts | 1 - Packages/st | 1 - Stuff/colemak-dh.xkb | 62 --------------------------- Stuff/fonts.nix | 10 ----- Stuff/services.nix | 26 ----------- Stuff/sound.nix | 33 -------------- Stuff/users.nix | 10 ----- Stuff/xorg.nix | 43 ------------------- boot.nix | 41 ------------------ configuration.nix | 13 ------ hardware.nix | 48 --------------------- networking.nix | 20 --------- pkgs.nix | 58 ------------------------- stuff.nix | 42 ------------------ test.nix | 7 --- 22 files changed, 512 deletions(-) delete mode 100644 .gitmodules delete mode 100644 Hardware/graphicshit.nix delete mode 100644 Hardware/power.nix delete mode 100644 Packages/customscripts.nix delete mode 160000 Packages/dwm delete mode 100644 Packages/mpd_discord_richpresence.nix delete mode 100644 Packages/override.nix delete mode 160000 Packages/scripts delete mode 160000 Packages/st delete mode 100644 Stuff/colemak-dh.xkb delete mode 100644 Stuff/fonts.nix delete mode 100644 Stuff/services.nix delete mode 100644 Stuff/sound.nix delete mode 100644 Stuff/users.nix delete mode 100644 Stuff/xorg.nix delete mode 100644 boot.nix delete mode 100644 configuration.nix delete mode 100644 hardware.nix delete mode 100644 networking.nix delete mode 100644 pkgs.nix delete mode 100644 stuff.nix delete mode 100644 test.nix diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d1773ae..0000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "Packages/scripts"] - path = Packages/scripts - url = https://github.com/idcretard/custom-scripts -[submodule "Packages/dwm"] - path = Packages/dwm - url = https://github.com/natto1784/dwm -[submodule "Packages/st"] - path = Packages/st - url = https://github.com/natto1784/st diff --git a/Hardware/graphicshit.nix b/Hardware/graphicshit.nix deleted file mode 100644 index e86d7cf..0000000 --- a/Hardware/graphicshit.nix +++ /dev/null @@ -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; }; - }; - }; - } diff --git a/Hardware/power.nix b/Hardware/power.nix deleted file mode 100644 index 49bb493..0000000 --- a/Hardware/power.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - powerManagement = { - cpuFreqGovernor = lib.mkDefault "powersave"; - }; -} diff --git a/Packages/customscripts.nix b/Packages/customscripts.nix deleted file mode 100644 index 19048a2..0000000 --- a/Packages/customscripts.nix +++ /dev/null @@ -1,16 +0,0 @@ -{lib,stdenv,fetchFromGitHub}: -stdenv.mkDerivation rec{ - name = "customscripts"; - src = fetchFromGitHub { - owner = "idcretard"; - repo = "custom-scripts"; - rev = "a996a52831316cc2c282904352654bd20c82f7bd"; - sha256 = "sha256-nw21YmcmQMF8NADnuHOc7eF2Yaj/r/1mYBn77fYK7s8="; - }; - unpackPhase = ":"; - installPhase = '' - mkdir -p $out/bin - cp -r $src/* $out/bin - for x in $out/bin/*;do chmod +x "$x";done -''; -} diff --git a/Packages/dwm b/Packages/dwm deleted file mode 160000 index cd69bb0..0000000 --- a/Packages/dwm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cd69bb00b0ecd941cdb5d048df029f3b762eea8c diff --git a/Packages/mpd_discord_richpresence.nix b/Packages/mpd_discord_richpresence.nix deleted file mode 100644 index 8231559..0000000 --- a/Packages/mpd_discord_richpresence.nix +++ /dev/null @@ -1,26 +0,0 @@ -{lib, stdenv, fetchFromGitHub, discord-rpc, cmake, libmpdclient}: -with lib; -stdenv.mkDerivation rec{ - name = "mpd_discord_richpresence"; - src = fetchFromGitHub { - owner = "justas-d"; - repo = "mpd-rich-presence-discord"; - rev = "ced628d3eaf3f18c5eff286b0955c605616348ee"; - sha256 = "0vl31sdgxalbnc4d4fggzqs2vsssibn53pjm6wj596cfkfpdf4y3"; - }; - buildInputs = [ - libmpdclient - cmake - discord-rpc - ]; - configurePhase = '' - cmake . - ''; - buildPhase = '' - make - ''; - installPhase = '' - mkdir -p $out/bin - cp mpd_discord_richpresence $out/bin/ - ''; -} diff --git a/Packages/override.nix b/Packages/override.nix deleted file mode 100644 index 71877ce..0000000 --- a/Packages/override.nix +++ /dev/null @@ -1,8 +0,0 @@ -{lib, config, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - (callPackage ./customscripts.nix {}) - (callPackage ./mpd_discord_richpresence.nix {}) - ]; -} diff --git a/Packages/scripts b/Packages/scripts deleted file mode 160000 index a996a52..0000000 --- a/Packages/scripts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a996a52831316cc2c282904352654bd20c82f7bd diff --git a/Packages/st b/Packages/st deleted file mode 160000 index 0cd1e39..0000000 --- a/Packages/st +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0cd1e394e6d07c5f605ae23070c40de9690bafb1 diff --git a/Stuff/colemak-dh.xkb b/Stuff/colemak-dh.xkb deleted file mode 100644 index da76fd6..0000000 --- a/Stuff/colemak-dh.xkb +++ /dev/null @@ -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 { [ 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/fonts.nix b/Stuff/fonts.nix deleted file mode 100644 index c0b3caf..0000000 --- a/Stuff/fonts.nix +++ /dev/null @@ -1,10 +0,0 @@ -{lib, config, pkgs, ... }: - -{ - fonts.fonts = with pkgs; [ - fira-mono - font-awesome-ttf - powerline-fonts - vistafonts - ]; -} diff --git a/Stuff/services.nix b/Stuff/services.nix deleted file mode 100644 index 9a03923..0000000 --- a/Stuff/services.nix +++ /dev/null @@ -1,26 +0,0 @@ -{lib, config, pkgs, ... }: - -{ - systemd.services.nbfc = { - wantedBy = [ "multi-user.target" ]; - description = "Notebook Fancontrol"; - serviceConfig = { - Type = "forking"; - Restart = "on-failure"; - ExecStart = "${pkgs.mono}/bin/mono-service -l:/run/nbfc.pid -m:NbfcService /opt/nbfc/NbfcService.exe"; - ExecStop = "kill -SIGTERM $(cat /run/nbfc.pid)"; - PIDFile = "/run/nbfc.pid"; - }; - }; - services = { - tor.enable = true; - logmein-hamachi.enable = true; - }; - # services.picom = { - # enable = true; - # fade = true; - # shadow = true; - # activeOpacity = 0.96; - # inactiveOpacity = 0.86; - # }; -} diff --git a/Stuff/sound.nix b/Stuff/sound.nix deleted file mode 100644 index 9882ab3..0000000 --- a/Stuff/sound.nix +++ /dev/null @@ -1,33 +0,0 @@ -{lib, config, pkgs, ... }: - -{ - 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; -# }; -} diff --git a/Stuff/users.nix b/Stuff/users.nix deleted file mode 100644 index ca6c0fb..0000000 --- a/Stuff/users.nix +++ /dev/null @@ -1,10 +0,0 @@ -{lib, config, pkgs, ... }: - -{ - users.users.natto = { - isNormalUser = true; - shell = pkgs.fish; - home = "/home/natto"; - extraGroups = [ "wheel" "video" "audio" ]; - }; -} diff --git a/Stuff/xorg.nix b/Stuff/xorg.nix deleted file mode 100644 index 684d866..0000000 --- a/Stuff/xorg.nix +++ /dev/null @@ -1,43 +0,0 @@ - -{ 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/boot.nix b/boot.nix deleted file mode 100644 index d949aa9..0000000 --- a/boot.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot = { - kernelPackages = pkgs.linuxPackages_zen; - kernelPatches = [ - { - name = "zenwithmuqqs"; - patch = null; - structuredExtraConfig = with lib.kernel; { - SCHED_MUQSS = yes; - }; - ignoreConfigErrors = true; - } - ]; - initrd={ - availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"]; - kernelModules = [ ]; - }; - kernelModules = [ "kvm-intel"]; - extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; - loader = { - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; - }; - grub = { - enable = true; - useOSProber = true; - efiSupport = true; - device = "nodev"; - splashImage = "/etc/cirno.png"; #hehe - splashMode = "stretch"; - configurationName = "nixbruh"; - }; - }; - kernelParams = [ "nvidia-drm.modeset=1" "intel_pstate=active"]; - }; -} diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index b714563..0000000 --- a/configuration.nix +++ /dev/null @@ -1,13 +0,0 @@ -{lib, config, pkgs, ... }: - -{ - imports = - [ - ./hardware.nix - ./stuff.nix - ./pkgs.nix - ./networking.nix - ./boot.nix - ]; - system.stateVersion = "20.09"; -} diff --git a/hardware.nix b/hardware.nix deleted file mode 100644 index 75f0a92..0000000 --- a/hardware.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - 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"; - }; - - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/58B1-4631"; - fsType = "vfat"; - }; - - fileSystems."/home" = - { device = "/dev/nvme0n1p6"; - fsType = "ext4"; - }; - - fileSystems."/mnt/Stuff" = - { device = "/dev/sda2"; - fsType = "ntfs"; - options = ["uid=natto" "gid=users" "umask=0022" "rw"]; - }; - fileSystems."/mnt/Games" = - { device = "/dev/sda4"; - fsType = "ntfs"; - options = ["uid=natto" "gid=users" "umask=0022" "rw"]; - }; - fileSystems."/mnt/Extra" = - { device = "/dev/sda3"; - fsType = "ntfs"; - options = ["uid=natto" "gid=users" "umask=0022" "rw"]; - }; - fileSystems."/mnt/LinuxGames" = - { device = "/dev/sda5"; - fsType = "btrfs"; - options = ["rw"]; - }; - - swapDevices = [ {device = "/dev/nvme0n1p7";} ]; -} diff --git a/networking.nix b/networking.nix deleted file mode 100644 index 792b6d2..0000000 --- a/networking.nix +++ /dev/null @@ -1,20 +0,0 @@ -{lib, config, pkgs, ... }: - -{ - networking = { - hostName = "nixchod"; - wireless.enable = true; # Enables wireless support via wpa_supplicant. - interfaces = { - enp7s0.useDHCP = true; - wlp0s20f3 = { - useDHCP = true; - ipv4.addresses = [ { - prefixLength = 24; - address = "192.168.0.109"; - } ]; - }; - }; - defaultGateway = "192.168.0.1"; - nameservers = [ "192.168.0.1" ]; - }; -} diff --git a/pkgs.nix b/pkgs.nix deleted file mode 100644 index 4e13c06..0000000 --- a/pkgs.nix +++ /dev/null @@ -1,58 +0,0 @@ -{lib, config, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - xclip - dunst - xorg.xkbcomp - glibc - proxychains - #qt5.qmake - xorg.xmodmap - ffmpeg - p7zip - git - glxinfo - sox - libmpdclient - lxappearance - jq - mono - vim - mpd - wineWowPackages.staging - neofetch - tor-browser-bundle-bin - w3m - gnumake - pciutils - jdk - gcc - ntfs3g - python38 - luajit - neovim - htop - nodejs - wget - ripgrep - patchelf - doas - feh - sxiv - mpv - dwm - dmenu - st - kbd - picom - ncmpcpp - ]; - programs.steam.enable = true; - nix = { - package = pkgs.nixUnstable; - extraOptions = '' - experimental-features = nix-command flakes - ''; - }; -} diff --git a/stuff.nix b/stuff.nix deleted file mode 100644 index ff0703d..0000000 --- a/stuff.nix +++ /dev/null @@ -1,42 +0,0 @@ -{lib, config, pkgs, ... }: -{ - imports = [ - ./Stuff/sound.nix - ./Stuff/fonts.nix - ./Stuff/users.nix - ./Stuff/services.nix - ./Stuff/xorg.nix - ]; - time.timeZone = "Asia/Kolkata"; - environment = { - sessionVariables = { - QT_QPA_PLATFORMTHEME = "gtk3"; - QT_X11_NO_MITSHM="1"; - }; - }; - security={ - sudo.enable = false; - doas = { - enable = true; - extraRules = [ - { - users = [ "natto" ]; - keepEnv = true; - persist = true; - } - ]; - }; - }; - nix.gc = { - automatic = false; - dates = "20:15"; - }; - nixpkgs.config.allowUnfree = true; - programs = { - fish.enable = true; - dconf.enable = true; - }; - nixpkgs.config.allowBroken = true; - nix.extraOptions = ''experimental-features = nix-command flakes ca-references''; - -} diff --git a/test.nix b/test.nix deleted file mode 100644 index 2114399..0000000 --- a/test.nix +++ /dev/null @@ -1,7 +0,0 @@ -self: super: { - ncmpcpp = super.ncmpcpp.override { - visualizerSupport = true; - clockSupport = true; - }; -} -