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

Compare commits

base: natto1784:cb779f9d356936ed4dc70c747d87ae4665492d73
Branches Tags
natto1784:nixos
...
compare: natto1784:969eb05a7a9605d4bc4b8265eb6a932f79391afa
Branches Tags
natto1784:nixos

3 Commits
cb779f9d35 ... 969eb05a7a

Author SHA1 Message Date
Amneesh Singh
969eb05a7a home/natto: add fcitx and misc changes 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
 2023-01-23 15:43:52 +05:30
Amneesh Singh
de2688145e home/natto: try hyprland 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
 2023-01-23 15:42:52 +05:30
Amneesh Singh
a18f8b7295 hosts/satori: remove fcitx and change the default kb layout 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
 2023-01-23 15:42:08 +05:30
21 changed files with 247 additions and 181 deletions
Expand all files Collapse all files

1
.envrc
View File

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

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
flake.lock linguist-generated

201
flake.lock generated
View File

@@ -22,11 +22,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1672740976,
"narHash": "sha256-r+th+iHy+nwnxH0OjyZynjA+3yP1m1yH7e6QLFFYw8Y=",
"lastModified": 1674359560,
"narHash": "sha256-gobqd75ujP/zFH6kSZNB3bA3YS4NMXWpZgMo1RAFEdk=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "0505d6fa58724b02898c3ca2b7373dcf699ae3b5",
"rev": "184ae9c371a6251564e0b07391f7e9aaf310f002",
"type": "github"
},
"original": {
@@ -51,16 +51,32 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1672616755,
"narHash": "sha256-dvwU2ORLpiP6ZMXL3CJ/qrqmtLBLF6VAc+Fois7Qfew=",
"lastModified": 1673362319,
"narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "87673d7c13a799d95ce25ff5dc7b9e15f01af2ea",
"rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f",
"type": "github"
},
"original": {
@@ -122,11 +138,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1672688183,
"narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=",
"lastModified": 1674250603,
"narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a",
"rev": "275ab728912006eecb549338a50f24f294a7cfb7",
"type": "github"
},
"original": {
@@ -135,9 +151,52 @@
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_2",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1674403405,
"narHash": "sha256-FPOER3tINOEI+oWQGeiWLkpCudVJC3V8wk5cvP9857s=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "cb98242ea7faff04dad3ae166aff7126184f17c5",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671839510,
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"mailserver": {
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
@@ -145,11 +204,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1671659164,
"narHash": "sha256-DbpT+v1POwFOInbrDL+vMbYV3mVbTkMxmJ5j50QnOcA=",
"lastModified": 1671738303,
"narHash": "sha256-PRgqtaWf2kMSYqVmcnmhTh+UsC0RmvXRTr+EOw5VZUA=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "bc667fb6afc45f6cc2d118ab77658faf2227cffd",
"rev": "6d0d9fb966cc565a3df74d3b686f924c7615118c",
"type": "gitlab"
},
"original": {
@@ -166,11 +225,11 @@
"utils": "utils_3"
},
"locked": {
"lastModified": 1672050722,
"narHash": "sha256-+6assS03GsJB5YpoUpBsh3irX5nBfLxLwB0EQzV2dlA=",
"lastModified": 1673620854,
"narHash": "sha256-kQruy/z1+82iq+7ySGdw6GScSXvILn91t/o+0tbRx9w=",
"owner": "nbfc-linux",
"repo": "nbfc-linux",
"rev": "e3cdbf5e59fdcd5693367179d53efa78ea3f4b44",
"rev": "c267469684d620e6055ec3382f247979704c90e9",
"type": "github"
},
"original": {
@@ -189,11 +248,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1672728900,
"narHash": "sha256-VroAlqUj2N5wgbXpf47qaPdyI075AA1cgReTHFhA2a8=",
"lastModified": 1674285754,
"narHash": "sha256-7EKYM0Cdd0AOSQ4+lyLgLSTLOS4yRCgWqJfgMrOss/I=",
"owner": "neovim",
"repo": "neovim",
"rev": "4dd793a256fefb481159f9f93bf7572391e266de",
"rev": "7ef5e363d360f86c5d8d403e90ed256f4de798ec",
"type": "github"
},
"original": {
@@ -225,16 +284,18 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1670047204,
"narHash": "sha256-5NcSGchQbl9DKMQ31qmgfscmrAg7qilJF/no2nBSRzs=",
"lastModified": 1673540789,
"narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "809f15f2e7fd66c3d3ba6aabffa946fbd67f93fc",
"rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-22_11": {
@@ -272,27 +333,27 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1672633908,
"narHash": "sha256-sP0BMp4DprVCBjcTYPsTPwkJMsc45vM0FxHdDx6qE8U=",
"owner": "nixos",
"lastModified": 1673540789,
"narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a4379d2b0deefedc8dba360897557707ea9ee9a7",
"rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1672633908,
"narHash": "sha256-sP0BMp4DprVCBjcTYPsTPwkJMsc45vM0FxHdDx6qE8U=",
"lastModified": 1674236650,
"narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a4379d2b0deefedc8dba360897557707ea9ee9a7",
"rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5",
"type": "github"
},
"original": {
@@ -304,15 +365,15 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1665296151,
"narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=",
"owner": "NixOS",
"lastModified": 1671983799,
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "14ccaaedd95a488dd7ae142757884d8e125b3363",
"rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -320,16 +381,16 @@
},
"nvim-overlay": {
"inputs": {
"flake-compat": "flake-compat",
"flake-compat": "flake-compat_2",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1672733667,
"narHash": "sha256-RHcgShzAHJhywtwCyz0woIUza8K78I31eZAo9AwZ8E8=",
"lastModified": 1674288814,
"narHash": "sha256-Mso2c8XcbMwL+r8BIuEU8WwVJiO6A0HVZHbRFQEd9og=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "adfef49a8d0c66eda55256a2b6d7b9d31e0bde29",
"rev": "4e7c0bc2a80f67e300906d090546f91b4c4c44db",
"type": "github"
},
"original": {
@@ -343,10 +404,11 @@
"emacs-overlay": "emacs-overlay",
"flake-parts": "flake-parts",
"home-manager": "home-manager",
"hyprland": "hyprland",
"mailserver": "mailserver",
"nbfc": "nbfc",
"nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nvim-overlay": "nvim-overlay",
"rust-overlay": "rust-overlay"
}
@@ -354,14 +416,16 @@
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1672712534,
"narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=",
"lastModified": 1674354556,
"narHash": "sha256-vUuhf6VTW2hIdBGgivUZiAVkzByHji8TsTQGwS8Wh+s=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f",
"rev": "a16fb5f08d16e33727c8303dabefd81f06cb64c7",
"type": "github"
},
"original": {
@@ -414,6 +478,49 @@
"repo": "flake-utils",
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1672824257,
"narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "5f264a7d6c8af27d41ff440c05262b022c055593",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673116118,
"narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
}
},
"root": "root",

15
flake.nix
View File

@@ -3,18 +3,19 @@
inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
flake-parts.url = github:hercules-ci/flake-parts;
home-manager = {
url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs";
};
flake-parts.url = github:hercules-ci/flake-parts;
nvim-overlay.url = github:nix-community/neovim-nightly-overlay;
mailserver = {
url = gitlab:simple-nixos-mailserver/nixos-mailserver;
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay.url = github:nix-community/emacs-overlay;
rust-overlay.url = github:oxalica/rust-overlay;
rust-overlay = {
url = github:oxalica/rust-overlay;
inputs.nixpkgs.follows = "nixpkgs";
};
nix-gaming = {
url = github:fufexan/nix-gaming;
inputs.nixpkgs.follows = "nixpkgs";
@@ -23,6 +24,12 @@
url = github:nbfc-linux/nbfc-linux;
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay.url = github:nix-community/emacs-overlay;
nvim-overlay = {
url = github:nix-community/neovim-nightly-overlay;
inputs.nixpkgs.url = github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836;
};
hyprland.url = github:hyprwm/Hyprland;
};
outputs = inputs@{ self, nixpkgs, ... }:

1
home/default.nix
View File

@@ -5,6 +5,7 @@
modules = [
./natto
./modules/secret.nix
inputs.hyprland.homeManagerModules.default
];
pkgs = self.legacyPackages.x86_64-linux;
extraSpecialArgs = {

2
home/natto/config/emacs/config.org
View File

@@ -263,6 +263,8 @@ For autocomplete
(use-package rustic)
(use-package wgsl-mode)
(use-package nix-mode
:mode "\\.nix\\'")
(add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))

10
home/natto/config/xmonad/xmonad.hs
View File

@@ -28,7 +28,7 @@ urgentWinColor = "#dc322f"
miscColor = inactiveWinColor
myBorderWidth = 2
myTerminal = "/usr/bin/env st"
myTerminal = "st"
myFocusFollowsMouse = True
myNormalBorderColor = bgColor
myModMask = mod4Mask
@@ -57,9 +57,6 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask, xK_d),
spawn "dmenu_run -l 20")
, ((shiftMask .|. mod1Mask, xK_v),
spawn "clipmenu")
, ((modMask, xK_s),
spawn "dmenu_websearch")
@@ -111,7 +108,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
spawn "light -U 5")
, ((modMask .|. shiftMask, xK_F1),
spawn "setxkbmap us-colemak")
spawn "setxkbmap us colemak_dh")
, ((modMask .|. shiftMask, xK_F2),
spawn "setxkbmap us basic")
@@ -122,6 +119,9 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask .|. shiftMask, xK_F4),
spawn "setxkbmap in guru")
, ((modMask .|. shiftMask, xK_F5),
spawn "setxkbmap colemak dhz")
, ((modMask, xK_space),
sendMessage NextLayout)

2
home/natto/emacs.nix
View File

@@ -3,7 +3,7 @@ let
mymacs = config: # with inputs.emacs-overlay.packages.${pkgs.system}; already resolved with overlay
with pkgs; emacsWithPackagesFromUsePackage {
inherit config;
package = emacsNativeComp;
package = emacsGit;
alwaysEnsure = true;
alwaysTangle = true;
extraEmacsPackages = epkgs: with epkgs; [

10
home/natto/pkgs.nix
View File

@@ -4,7 +4,6 @@
# A/V, codec and media stuff
ffmpeg-full
sox
pamixer
mpdas
mpv
@@ -12,9 +11,7 @@
pulseaudio
pavucontrol
spotify
noisetorch
imagemagick
(qjackctl.override { jackSession = true; })
# Utils
rage
@@ -30,7 +27,6 @@
xorg.xmodmap
p7zip
unrar
glxinfo
sxiv
vim
jmtpfs
@@ -39,9 +35,9 @@
(inputs.nbfc.packages.${pkgs.system}.nbfc-client-c)
(flake.packages.${pkgs.system}.customscripts)
translate-shell
w3m
powertop
cachix
undervolt
# GUI utils
(xfce.thunar.override {
@@ -66,17 +62,13 @@
arc-theme
arc-icon-theme
authy
calibre
gnome.zenity
stalonetray
obs-studio
# Wine and games and stuff
steam
wineWowPackages.stable
winetricks
citra
yuzu
# (inputs.nix-gaming.packages.${pkgs.system}.osu-stable)
(flake.packages.${pkgs.system}.tlauncher)
mangohud

1
home/natto/programs.nix
View File

@@ -24,5 +24,6 @@
go.enable = true;
password-store.enable = true;
direnv.enable = true;
foot.enable = false;
};
}

17
home/natto/stuff.nix
View File

@@ -9,7 +9,16 @@
LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
TERM = "st-24bits";
QT_QPA_PLATFORMTHEME = "gtk2";
QT_X11_NO_MITSHM = "1";
HM_CONF_DIR = "/etc/nixos";
};
shellAliases = rec {
ec = "emacsclient";
ecc = ec + " -c";
ecnw = ec + " -nw";
};
file = with config; {
stalonetray = {
source = ./config/stalonetrayrc;
@@ -35,4 +44,12 @@
};
};
};
i18n = {
inputMethod = {
# enabled = "fcitx5";
# fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
enabled = "fcitx";
fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ];
};
};
}

9
home/natto/wayland.nix
View File

@@ -5,6 +5,15 @@
sway = {
enable = true;
};
hyprland = {
enable = false;
xwayland = {
enable = true;
hidpi = true;
};
nvidiaPatches = true;
};
};
};
}

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)"
};

4
hosts/satori/networking.nix
View File

@@ -5,10 +5,10 @@
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];
allowedTCPPorts = [ 22 18172 6600 8001 25565 ];
allowedUDPPorts = [ 22 17840 18172 ];
trustedInterfaces = [ "docker0" ];
};

13
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;
}; */
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;
};