Merge branch 'master' of https://git.joshuabell.xyz/dotfiles
This commit is contained in:
commit
919873584e
15 changed files with 286 additions and 161 deletions
|
@ -10,9 +10,6 @@
|
|||
# Users this machine has
|
||||
(settings.usersDir + "/root/configuration.nix")
|
||||
(settings.usersDir + "/josh/configuration.nix")
|
||||
# Our custom stuff
|
||||
# ./stupid-keyboard.nix
|
||||
# ./stupid-keyboard-2.nix
|
||||
];
|
||||
|
||||
# My custom modules
|
||||
|
@ -79,12 +76,12 @@
|
|||
"nvme"
|
||||
"xhci_pci"
|
||||
"usbhid"
|
||||
"thunderbolt"
|
||||
# "thuFryuni/PolyMC/developnderbolt"
|
||||
];
|
||||
services.xserver.videoDrivers = [ "intel" ];
|
||||
hardware.opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
# driSupport = true;
|
||||
};
|
||||
# hardware.opengl.driSupport32Bit = true;
|
||||
# hardware.graphics.enable = true;
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
{ ... }:
|
||||
{
|
||||
services.keyd = {
|
||||
enable = true;
|
||||
# `keyd monitor` to get new keys to remap
|
||||
keyboards = {
|
||||
rgo_sino_keyboard = {
|
||||
ids = [ "04e8:7021" ];
|
||||
settings = {
|
||||
main = {
|
||||
"up" = "/";
|
||||
"/" = "up";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,34 +0,0 @@
|
|||
# This nix file is just a fix for a really stupid lay-outed keyboard I bought that I
|
||||
# only use with the gpd pocket 3. Probably not relevant to anyone else
|
||||
#
|
||||
# Keyboard in question: https://www.walmart.com/ip/R-Go-Split-Ergonomic-Keyboard-QWERTY-US-Black-Wired-USB-Keyboard-Spilt-Wired-Windows-Linux/452297950
|
||||
# R-Go Split Break Keyboard (maybe the walmart one is a fake since their real site does not have the same layout)
|
||||
# https://www.r-go-tools.com/ergonomic-keyboard/r-go-split-break/
|
||||
{ ... }:
|
||||
let
|
||||
rgo_keyboard_vid = "0911";
|
||||
rgo_keyboard_pid = "2188";
|
||||
rgo_hub_vid = "05e3";
|
||||
rgo_hub_pid = "0608";
|
||||
in
|
||||
{
|
||||
services.keyd = {
|
||||
enable = true;
|
||||
# `keyd monitor` to get new keys to remap
|
||||
keyboards = {
|
||||
rgo_sino_keyboard = {
|
||||
ids = [ "0911:2188" "05e3:0608" ];
|
||||
settings = {
|
||||
main = {
|
||||
# Backslash is in place of the enter key's normal position, so setting it to enter
|
||||
"\\" = "enter";
|
||||
# This keyboard has a strange extra key that outputs < and > characters. It has the
|
||||
# backslash key printed on it though, conveniently, so we will just map this to backslash
|
||||
# since it does not affect how I use left shift (which it takes half the space of)
|
||||
"102nd" = "\\";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -15,6 +15,7 @@
|
|||
shell_common.enable = true;
|
||||
# de_cosmic.enable = true;
|
||||
de_gnome_xorg.enable = true;
|
||||
# de_gnome_wayland.enable = true;
|
||||
audio_pulse.enable = true;
|
||||
neovim.enable = true;
|
||||
tty_caps_esc.enable = true;
|
||||
|
@ -25,6 +26,11 @@
|
|||
nebula.enable = true;
|
||||
};
|
||||
|
||||
# opening this port for dev purposes
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
5173 # Vite
|
||||
];
|
||||
|
||||
# machine specific configuration
|
||||
# ==============================
|
||||
hardware.enableAllFirmware = true;
|
||||
|
|
|
@ -1,30 +1,56 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/NIXROOT";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/NIXBOOT";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/NIXBOOT";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [];
|
||||
fileSystems."/mnt/nvme1tb" = {
|
||||
device = "/dev/disk/by-uuid/7ddb48bd-160c-4049-a4fa-a5ac2b6a5402";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/.swapfile";
|
||||
size = 64 * 1024; # 64GB
|
||||
}
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue