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

finally use xserver.extraLayouts correctly

Browse Source
This commit is contained in:
Amneesh Singh
2021-06-17 18:47:38 +05:30
parent d32d386248
commit ee5cd59841
13 changed files with 65 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
colemak-dh.xkm Normal file
View File

Binary file not shown.

7
home/config/xmonad/xmobar.hs
View File

@@ -15,13 +15,14 @@ Config {
Run Memory ["-t","<fn=1>\xf538</fn> <usedratio>%","-H","12288","-L","6144","-h","#D3869B","-l","#8EC07C","-n","#EBDBB2"] 20,
Run BatteryP ["BAT1","BAT0","BAT2"] ["-t", "<acstatus>", "-L", "10", "-H", "80", "-l", "#D3869B", "-h", "#8EC07C", "-n", "#EBDBB2", "--", "-O", "Charging", "-o", "<left>%", "-a", "notify-send -u critical 'Battery running out!'", "-A", "5", "--lows", "<fn=1>\xf243</fn> ", "--mediums", "<fn=1>\xf242</fn> ", "--highs", "<fn=1>\xf240</fn> "] 300,
Run Network "wlp0s20f3" ["-t","<fn=1>\xf1eb</fn> <fc=#fabd2f><rx>/<tx></fc>"] 10,
Run Date "<fn=1>\xf073 </fn>%a - %b, %_d ║%l:%M:%S " "date" 100,
Run MPD ["-t", "<fn=1>\xf001</fn> <statei><title>", "--", "-P", ">>: ", "-Z", "||: ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
Run Date "<fn=1>\xf073 </fn> %a - %b, %_d ║ %H:%M:%S " "date" 100,
Run MPD ["-t", "<statei><title>", "--", "-P", ">>: ", "-Z", "||: ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
-- Run Com "playerctl" ["--player", "playerctld", "metadata", "--format", "{{status}}: {{title}}"] "" 10,
Run Com "pamixer" ["--get-volume"] "" 600,
Run UnsafeStdinReader
],
sepChar = "*",
alignSep = "--",
template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* ║ *mpd* -- *multicpu* ║ *memory* ║ *wlp0s20f3* ║ *battery* ║ <fn=1></fn> <fc=#83a598>*pamixer*%</fc> ║ <fc=#ebdbb2>*date*</fc>"
template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* ║ <fn=1></fn> *mpd* -- *multicpu* ║ *memory* ║ *wlp0s20f3* ║ *battery* ║ <fn=1></fn> <fc=#83a598>*pamixer*%</fc> ║ <fc=#ebdbb2>*date*</fc>"
}

17
home/config/xmonad/xmonad.hs
View File

@@ -12,6 +12,7 @@ import XMonad.Layout.ThreeColumns
import XMonad.Layout.ResizableTile
import XMonad.Hooks.ManageDocks
import XMonad.Util.Run (spawnPipe)
import Graphics.X11.ExtraTypes.XF86
import qualified XMonad.StackSet as W
import qualified Data.Map as M
@@ -76,6 +77,22 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask .|. shiftMask, xK_q),
kill)
, ((modMask .|. mod1Mask, xK_0), spawn "light -A 5")
, ((modMask .|. mod1Mask, xK_9), spawn "light -U 5")
, ((modMask .|. shiftMask, xK_F1),
spawn "setxkbmap us-colemak")
, ((modMask .|. shiftMask, xK_F2),
spawn "setxkbmap us basic")
, ((modMask .|. shiftMask, xK_F3),
spawn "setxkbmap in deva")
, ((modMask .|. shiftMask, xK_F4),
spawn "setxkbmap in guru")
, ((modMask, xK_space),
sendMessage NextLayout)

3
home/natto.nix
View File

@@ -8,7 +8,6 @@ in
./stuff/xsession.nix
./stuff/secret.nix
./stuff/services.nix
./stuff/gtk.nix
];
nixpkgs = {
config = {
@@ -77,6 +76,8 @@ in
neofetch
xmobar
xdotool
arc-theme
arc-icon-theme
];
file = {

19
home/stuff/gtk.nix
View File

@@ -1,19 +0,0 @@
{config, pkgs,...}:
{
gtk = {
enable = true;
iconTheme = {
name = "Gruvbox-Material-Dark";
package = pkgs.gruvbox-icons;
};
theme = {
name = "Equilux";
package = pkgs.equilux-theme;
};
/* gtk3 = {
bookmarks = [
"folder:///mnt/Stuff/Memes/Discord"
];
};*/
};
}

24
hosts/personal/common/colemak-dh.xkb → hosts/personal/common/colemak-dh
View File

@@ -1,11 +1,8 @@
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 <TLDE> { [ grave, asciitilde, dead_tilde, asciitilde ] };
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 ] };
@@ -56,7 +53,12 @@ xkb_keymap {
key <LSGT> { [ minus, underscore, endash, emdash ] };
key <SPCE> { [ space, space, space, nobreakspace ] };
include "level3(ralt_switch)"
};
xkb_geometry { include "pc(pc104)" };
};
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)"
};

26
hosts/personal/common/xorg.nix
View File

@@ -12,9 +12,9 @@
enable = true;
libinput= {
enable = true;
# mouse = {
# accelSpeed = "0";
# };
mouse = {
accelSpeed = "0";
};
touchpad = {
middleEmulation = false;
clickMethod = "buttonareas";
@@ -28,15 +28,17 @@
};
# sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
};
# extraLayouts = {
# colemak-dh = {
# description = "Colemak with MOD-dh";
# languages = [ "eng" ];
# symbolsFile = ./colemak-dh;
# };
# };
layout = "us";
xkbVariant = "colemak";
extraLayouts = {
us-colemak = {
description = "Colemak with MOD-dh";
languages = [ "eng" ];
symbolsFile = ./colemak-dh;
};
};
layout = "us-colemak";
xkbVariant = "basic";
autoRepeatDelay = 320;
autoRepeatInterval = 30;
};
};
}

2
hosts/personal/satori/boot.nix
View File

@@ -24,6 +24,6 @@
configurationName = "nixbruh";
};
};
kernelParams = [ "nvidia-drm.modeset=1" "intel_pstate=active"];
kernelParams = [ "nvidia-drm.modeset=1" "intel_pstate=active" ];
};
}

1
hosts/personal/satori/pkgs.nix
View File

@@ -69,6 +69,7 @@
};
dconf.enable = true;
adb.enable = true;
light.enable = true;
};
nix = {
package = pkgs.nixUnstable;

5
hosts/personal/satori/services.nix
View File

@@ -51,7 +51,10 @@
];
};
};
btrfs.autoScrub.enable = true;
udev.extraRules = ''
ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
'';
};
systemd.services = {
tor.wantedBy = lib.mkForce [];

8
hosts/personal/satori/stuff.nix
View File

@@ -32,6 +32,12 @@
isNormalUser = true;
shell = pkgs.zsh;
home = "/home/natto";
extraGroups = [ "wheel" "adbusers" ];
extraGroups = [ "wheel" "adbusers" "video" ];
};
i18n.inputMethod = {
# enabled = "fcitx5";
# fcitx5.addons = with pkgs; [ fcitx5-m17n fcitx5-mozc ];
enabled = "fcitx";
fcitx.engines = with pkgs.fcitx-engines; [ m17n mozc ];
};
}

2
overlays/customscripts/src/up
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p curl
for x in $@; do
curl -F file=@"$x" --header "key: $FILEHOST_KEY" https://f.weirdnatto.in
curl -F "file=@\"$x\"" --header "key: $FILEHOST_KEY" https://f.weirdnatto.in
echo " "
done

2
overlays/customscripts/src/x0
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p curl
for x in $@; do
curl -F file=@"$x" https://x0.at/
curl -F "file=@\"$x\"" https://x0.at/
echo " "
done