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

hosts/satori: remove fcitx and change the default kb layout

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2023-01-23 15:42:08 +05:30
parent cb779f9d35
commit a18f8b7295
10 changed files with 44 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.envrc
View File

@@ -1 +0,0 @@
use flake

4
hosts/modules/nvim/default.nix
View File

@@ -4,10 +4,6 @@
programs.neovim = {
enable = true;
package = pkgs.neovim-nightly;
# package = inputs.nvim-overlay.packages.${pkgs.system}.default;
# package = pkgs.neovim-nightly.overrideAttrs (_:{
# nativeBuildInputs = with pkgs; [ unzip cmake pkgconfig gettext tree-sitter ];
# });
defaultEditor = false;
configure = {
customRC = ''

4
hosts/satori/boot.nix
View File

@@ -3,7 +3,7 @@
{
boot = {
supportedFilesystems = [ "zfs" ];
kernelPackages = pkgs.linuxPackages_5_15;
kernelPackages = pkgs.linuxPackages_latest;
initrd = {
availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci" ];
/* preDeviceCommands = ''
@@ -15,7 +15,7 @@
'';*/
kernelModules = [ ];
};
kernelParams = [ "intel_pstate=active" "intel_iommu=on" ];
kernelParams = [ "intel_pstate=active" "intel_iommu=on" "nvidia_drm.modeset=1" ];
kernelModules = [ "kvm-intel" "snd-seq" "snd-rawmidi" "joydev" ];
extraModulePackages = with config.boot.kernelPackages; [ nvidia_x11 v4l2loopback ];
loader = {

19
hosts/satori/colemak Normal file
View File

@@ -0,0 +1,19 @@
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)"
};

64
hosts/satori/colemak-dh
View File

@@ -1,64 +0,0 @@
default partial alphanumeric_keys modifier_keys
xkb_symbols "basic" {
name[Group1] = "English (US Colemak-DH)";
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)"
};
partial alphanumeric_keys
xkb_symbols "ganda-dh" {
include "us-colemak(basic)"
name[Group1] = "English (US Ganda-DH)";
key <CAPS> { [ BackSpace, BackSpace, BackSpace, BackSpace ] };
include "level3(ralt_switch)"
};

2
hosts/satori/networking.nix
View File

@@ -5,7 +5,7 @@
hostName = "satori";
hostId = "beca3df0";
defaultGateway = "192.168.1.1";
wireless.enable = true;
networkmanager.enable = true;
wireless.interfaces = [ "wlp0s20f3" ];
firewall = {
allowedTCPPorts = [ 22 18172 6600 8001 25565 ];

11
hosts/satori/pkgs.nix
View File

@@ -18,8 +18,8 @@
rnix-lsp
vulkan-tools
vulkan-headers
igrep
jq
dconf
];
programs = {
@@ -30,6 +30,7 @@
pinentryFlavor = "curses";
};
};
git = {
enable = true;
package = pkgs.git.override {
@@ -38,6 +39,7 @@
withManual = false;
};
};
zsh = {
enable = true;
histSize = 30000;
@@ -50,10 +52,9 @@
};
ohMyZsh.enable = true;
};
dconf.enable = true;
adb.enable = true;
light.enable = true;
proxychains = {
/* proxychains = {
enable = true;
chain.type = "dynamic";
proxyDNS = true;
@@ -65,8 +66,8 @@
port = 2217;
};
};
};
slock.enable = true;
}; */
gamemode.enable = true;
nm-applet.enable = true;
};
}

3
hosts/satori/services.nix
View File

@@ -3,7 +3,6 @@
{
services = {
tor.enable = true;
logmein-hamachi.enable = true;
openssh = {
enable = true;
permitRootLogin = "yes";
@@ -26,7 +25,7 @@
};
systemd.services = {
tor.wantedBy = lib.mkForce [ ];
logmein-hamachi.wantedBy = lib.mkForce [ ];
libvirtd.wantedBy = lib.mkForce [ ];
};
security.pki.certificateFiles = [ ../../cert.pem ];

37
hosts/satori/stuff.nix
View File

@@ -2,25 +2,8 @@
{
time.timeZone = "Asia/Kolkata";
environment = {
etc."current-system-packages".text =
let
packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
sortedUnique = builtins.sort builtins.lessThan (lib.unique packages);
formatted = builtins.concatStringsSep "\n" sortedUnique;
in
formatted;
sessionVariables = {
QT_X11_NO_MITSHM = "1";
HM_CONF_DIR = "/etc/nixos";
};
localBinInPath = true;
shellAliases = rec {
ec = "emacsclient";
ecc = ec + " -c";
ecnw = ec + " -nw";
};
};
environment.localBinInPath = true;
security = {
polkit.enable = true;
sudo.enable = true;
@@ -31,11 +14,12 @@
users = [ "natto" ];
keepEnv = true;
persist = true;
setEnv = [ "SSH_AUTH_SOCK" "PATH" "SHELL" "HOME" ];
setEnv = [ "SSH_AUTH_SOCK" "PATH" "SHELL" ];
}
];
};
};
fonts.fonts = with pkgs; [
fira-mono
fira-code
@@ -51,25 +35,20 @@
takao
liberation_ttf
];
users.users.natto = {
isNormalUser = true;
shell = pkgs.zsh;
home = "/home/natto";
extraGroups = [ "wheel" "adbusers" "video" "libvirtd" "docker" ];
};
i18n = {
inputMethod = {
# enabled = "fcitx5";
# fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
enabled = "fcitx";
fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ];
};
extraGroups = [ "wheel" "adbusers" "video" "libvirtd" "docker" "networkmanager" ];
};
virtualisation = {
podman = {
enable = true;
enableNvidia = true;
};
};
gtk.iconCache.enable = true;
}

10
hosts/satori/xorg.nix
View File

@@ -29,14 +29,14 @@
};
};
extraLayouts = {
us-colemak = {
description = "Colemak with MOD-dh";
colemak = {
description = "Colemak Layouts";
languages = [ "eng" ];
symbolsFile = ./colemak-dh;
symbolsFile = ./colemak;
};
};
layout = "us-colemak";
xkbVariant = "basic";
layout = "colemak";
xkbVariant = "dhz"; # trying to ditch DHz now
autoRepeatDelay = 320;
autoRepeatInterval = 30;
};