natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

satori: yearly visit

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2024-02-25 17:07:30 +05:30
parent d4554d43ae
commit 855dd5d445
15 changed files with 307 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hosts/satori/boot.nix
View File

@@ -24,25 +24,10 @@
};
grub = {
enable = true;
# useOSProber = true;
efiSupport = true;
device = "nodev";
theme = pkgs.stdenvNoCC.mkDerivation rec {
version = "1.2.0";
name = "minegrub-theme";
src = pkgs.fetchFromGitHub {
owner = "Lxtharia";
repo = "minegrub-theme";
rev = "v${version}";
sha256 = "sha256-n/fJSFrrPPyTBS8/XHaARyCxccRZiqPhhNFq0x8Q2kA=";
};
installPhase = "cp -r . $out";
};
#splashImage = ./cirno.png;
splashMode = "stretch";
configurationName = "nixbruh";
};
};
binfmt.emulatedSystems = [ "aarch64-linux" ];
};
}

BIN
hosts/satori/cirno.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 34 KiB

19
hosts/satori/colemak
View File

@@ -1,19 +0,0 @@
default partial alphanumeric_keys modifier_keys
xkb_symbols "dhz" {
name[Group1] = "English (Colemak-DHz)";
include "us(colemak_dh)"
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 ] };
include "level3(ralt_switch)"
};
partial alphanumeric_keys
xkb_symbols "cta-dhz" {
include "colemak(dhz)"
name[Group1] = "English (cta-DHz)";
key <CAPS> { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
include "level3(ralt_switch)"
};

3
hosts/satori/default.nix
View File

@@ -9,9 +9,6 @@
./boot.nix
./services.nix
./graphics.nix
./xorg.nix
./wayland.nix
./nix.nix
];
system.stateVersion = "23.05";
}

14
hosts/satori/hardware.nix
View File

@@ -19,20 +19,6 @@
fsType = "vfat";
};
fileSystems."/media/real" =
{
device = "/dev/disk/by-uuid/8086be20-c770-46be-bd8f-5bd2d7735c7d";
fsType = "btrfs";
options = [ "rw" ];
};
fileSystems."/media/ntfs" =
{
device = "/dev/disk/by-uuid/A4CC66B6CC668282";
fsType = "ntfs";
options = [ "uid=natto" "gid=users" "umask=0022" "rw" ];
};
zramSwap = {
enable = true;
algorithm = "lz4";

17
hosts/satori/mesa-vulkan-layer-nvidia.patch
View File

@@ -1,17 +0,0 @@
diff --color -u -r b/src/vulkan/device-select-layer/device_select_layer.c a/src/vulkan/device-select-layer/device_select_layer.c
--- b/src/vulkan/device-select-layer/device_select_layer.c 2022-03-22 11:18:04.309569433 +0530
+++ a/src/vulkan/device-select-layer/device_select_layer.c 2022-03-22 11:18:17.944644235 +0530
@@ -454,12 +454,8 @@
exit(0);
} else {
unsigned selected_index = get_default_device(info, selection, physical_device_count, physical_devices);
- selected_physical_device_count = physical_device_count;
+ selected_physical_device_count = 1;
selected_physical_devices[0] = physical_devices[selected_index];
- for (unsigned i = 0; i < physical_device_count - 1; ++i) {
- unsigned this_idx = i < selected_index ? i : i + 1;
- selected_physical_devices[i + 1] = physical_devices[this_idx];
- }
}
if (selected_physical_device_count == 0) {

18
hosts/satori/networking.nix
View File

@@ -10,7 +10,7 @@
};
firewall = {
allowedTCPPorts = [ 22 18172 6600 8001 7590 25565 ];
allowedTCPPorts = [ 22 18172 6600 8001 7590 25565 9092 ];
allowedUDPPorts = [ 22 17840 18172 ];
trustedInterfaces = [ "docker0" ];
};
@@ -19,15 +19,13 @@
ips = [ satori ];
listenPort = 17840;
privateKeyFile = "/var/secrets/wg.key";
peers = [
{
#Oracle VM1
publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
allowedIPs = [ remilia ];
endpoint = "${lib'.network.addresses.domain.natto}:17840";
persistentKeepalive = 25;
}
];
peers = [{
#Oracle VM1
publicKey = "z0Y2VNEWcyVQVSqRHiwmiJ5/0MgSPM+HZfEcwIccSxM=";
allowedIPs = [ remilia ];
endpoint = "${lib'.network.addresses.domain.natto}:17840";
persistentKeepalive = 25;
}];
};
defaultGateway = "192.168.1.1";

21
hosts/satori/nix.nix
View File

@@ -1,21 +0,0 @@
{ config, pkgs, ... }:
{
nix = {
package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
settings = {
auto-optimise-store = true;
trusted-users = [ "root" "natto" ];
substituters = [
"https://nix-gaming.cachix.org"
"https://nix-community.cachix.org"
];
trusted-public-keys = [
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
};
}

37
hosts/satori/services.nix
View File

@@ -1,23 +1,4 @@
{ lib, config, pkgs, ... }:
let
udev-cypherock = pkgs.stdenvNoCC.mkDerivation {
name = "udev-cypher";
dontBuild = true;
dontConfigure = true;
dontUnpack = true;
installPhase = ''
mkdir -p $out/lib/udev/rules.d
touch $out/lib/udev/rules.d/21-cypherock.rules
cat << 'EOF' >> $out/lib/udev/rules.d/21-cypherock.rules
SUBSYSTEM=="input", GROUP="input", MODE="0666"
SUBSYSTEM=="usb", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="666", GROUP="plugdev"
KERNEL=="hidraw*", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="0666", GROUP="plugdev"
EOF
'';
};
in
{
services = {
tor.enable = true;
@@ -27,9 +8,6 @@ in
};
ratbagd.enable = true;
btrfs.autoScrub.enable = true;
udev = {
packages = [ pkgs.stlink udev-cypherock ];
};
gvfs.enable = true;
tlp = {
enable = true;
@@ -40,6 +18,20 @@ in
logind.extraConfig = "RuntimeDirectorySize=30%";
mysql.enable = true;
mysql.package = pkgs.mariadb;
/* nomad = {
enable = true;
enableDocker = true;
dropPrivileges = false;
extraPackages = with pkgs; [ consul cni-plugins ];
extraSettingsPaths = [ "/home/natto/hclconfigs/nomad/nomad.json" ];
};
consul = {
enable = true;
package = pkgs.consul;
extraConfigFiles = [ "/home/natto/hclconfigs/consul/consul.json" ];
};*/
};
systemd.services = {
@@ -52,7 +44,6 @@ in
docker = {
enable = true;
enableNvidia = true;
autoPrune.enable = true;
};
libvirtd = {
enable = true;

31
hosts/satori/stuff.nix
View File

@@ -22,7 +22,7 @@
};
console.useXkbConfig = true;
fonts.fonts = with pkgs; [
fonts.packages = with pkgs; [
fira-code
fira-mono
monoid
@@ -46,6 +46,7 @@
};
virtualisation = {
waydroid.enable = true;
podman = {
enable = true;
enableNvidia = true;
@@ -66,4 +67,32 @@
socketActivation = true;
wireplumber.enable = true;
};
/*
environment.etc =
let
json = pkgs.formats.json { };
in
{
"pipewire/pipewire.conf.d/50-noise.conf".source = json.generate "50-noise.conf" {
context.modules = [
{
name = "libpipewire-module-echo-cancel";
args = {
capture.props = {
node.name = "Echo Cancellation Capture";
};
source.props = {
node.name = "Echo Cancellation Source";
};
sink.props = {
node.name = "Echo Cancellation Sink";
};
playback.props = {
node.name = "Echo Cancellation Playback";
};
};
}
];
};
};*/
}

10
hosts/satori/wayland.nix
View File

@@ -1,10 +0,0 @@
{ inputs, pkgs, ... }:
{
xdg.portal = {
enable = true;
extraPortals = [
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
];
};
}

43
hosts/satori/xorg.nix
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";
# accelProfile = "flat";
};
touchpad = {
middleEmulation = false;
clickMethod = "buttonareas";
tapping = true;
naturalScrolling = true;
};
};
displayManager = {
startx = {
enable = true;
};
};
extraLayouts = {
colemak = {
description = "Colemak Layouts";
languages = [ "eng" ];
symbolsFile = ./colemak;
};
};
layout = "us";
xkbVariant = "colemak_dh"; # trying to ditch DHz now
autoRepeatDelay = 320;
autoRepeatInterval = 30;
};
};
}