From 5cdb4e421a809de51c3ebe8404e50d732721238b Mon Sep 17 00:00:00 2001 From: Akshay Date: Sun, 26 Sep 2021 21:26:36 +0530 Subject: init --- .gitignore | 1 + flake.lock | 157 ++++++++++ flake.nix | 52 ++++ home.nix | 88 ++++++ hosts/olive/configuration.nix | 145 ++++++++++ hosts/olive/hardware-configuration.nix | 36 +++ mail.nix | 49 ++++ patches/2bwm/nerd-patch.diff | 47 +++ patches/st/bright.diff | 28 ++ patches/st/ligatures.diff | 308 ++++++++++++++++++++ patches/st/xres.diff | 185 ++++++++++++ programs/bash.nix | 88 ++++++ programs/chromium.nix | 18 ++ programs/default.nix | 51 ++++ programs/feh.nix | 14 + programs/fzf.nix | 7 + programs/git.nix | 48 ++++ programs/htop.nix | 11 + programs/init.vim | 191 +++++++++++++ programs/neovim.nix | 45 +++ programs/readline.nix | 22 ++ programs/st/config.h | 507 +++++++++++++++++++++++++++++++++ programs/tmux.nix | 85 ++++++ programs/zathura.nix | 37 +++ scripts/battery.nix | 60 ++++ scripts/default.nix | 26 ++ scripts/record.nix | 33 +++ scripts/up.nix | 24 ++ scripts/webcam.nix | 5 + services/battery.nix | 48 ++++ services/default.nix | 27 ++ services/dunst.nix | 71 +++++ services/mbsync.nix | 11 + services/picom.nix | 18 ++ services/redshift.nix | 18 ++ services/suspend.nix | 65 +++++ services/sxhkd.nix | 17 ++ theme.nix | 39 +++ x/2bwm.nix | 20 ++ x/default.nix | 14 + x/rofi.nix | 30 ++ x/rxvt.nix | 58 ++++ x/xft.nix | 16 ++ 43 files changed, 2820 insertions(+) create mode 100644 .gitignore create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 home.nix create mode 100644 hosts/olive/configuration.nix create mode 100644 hosts/olive/hardware-configuration.nix create mode 100644 mail.nix create mode 100644 patches/2bwm/nerd-patch.diff create mode 100644 patches/st/bright.diff create mode 100644 patches/st/ligatures.diff create mode 100644 patches/st/xres.diff create mode 100644 programs/bash.nix create mode 100644 programs/chromium.nix create mode 100644 programs/default.nix create mode 100644 programs/feh.nix create mode 100644 programs/fzf.nix create mode 100644 programs/git.nix create mode 100644 programs/htop.nix create mode 100644 programs/init.vim create mode 100644 programs/neovim.nix create mode 100644 programs/readline.nix create mode 100644 programs/st/config.h create mode 100644 programs/tmux.nix create mode 100644 programs/zathura.nix create mode 100644 scripts/battery.nix create mode 100644 scripts/default.nix create mode 100644 scripts/record.nix create mode 100644 scripts/up.nix create mode 100644 scripts/webcam.nix create mode 100644 services/battery.nix create mode 100644 services/default.nix create mode 100644 services/dunst.nix create mode 100644 services/mbsync.nix create mode 100644 services/picom.nix create mode 100644 services/redshift.nix create mode 100644 services/suspend.nix create mode 100644 services/sxhkd.nix create mode 100644 theme.nix create mode 100644 x/2bwm.nix create mode 100644 x/default.nix create mode 100644 x/rofi.nix create mode 100644 x/rxvt.nix create mode 100644 x/xft.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..83e07d2 --- /dev/null +++ b/flake.lock @@ -0,0 +1,157 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1629481132, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "997f7efcb746a9c140ce1f13c72263189225f482", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1631573611, + "narHash": "sha256-u2E/wstadWNcn6vOIoK1xY86QPOzzBZQfT1FbePfdaI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7d9ba15214004c979d2c8733f8be12ce6502cf8a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-21.05", + "repo": "home-manager", + "type": "github" + } + }, + "neovim": { + "inputs": { + "flake-compat": "flake-compat", + "neovim-flake": "neovim-flake", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1632643930, + "narHash": "sha256-7MGPPBLI/E8D+wLBBA+9AmZQ6O2JqMuCR9SDIEHHm7g=", + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "rev": "2abb3014b87c0b63bb30be4e199c7bf280d05807", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "neovim-nightly-overlay", + "type": "github" + } + }, + "neovim-flake": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "neovim", + "nixpkgs" + ] + }, + "locked": { + "dir": "contrib", + "lastModified": 1632620331, + "narHash": "sha256-6KqtlHdteNmeaPez9egvYebcytvT7PcGkIQ2giSNOEQ=", + "owner": "neovim", + "repo": "neovim", + "rev": "b3b02eb52943fdc8ba74af3b485e9d11655bc9c9", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1632267580, + "narHash": "sha256-AvNXdmaPHYs6idbfgu1H40vEw4Wq15xLAgCnpCN1l1A=", + "owner": "nixos", + "repo": "nixos-hardware", + "rev": "3cc8c47af31798040ea62499090540413279f832", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1632411313, + "narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1632639184, + "narHash": "sha256-fRLxre+gPxIkjFVj17O68pyAWU1cxT20XFOiulIWzRw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-21.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "neovim": "neovim", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_2" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..330ca03 --- /dev/null +++ b/flake.nix @@ -0,0 +1,52 @@ +{ + description = "nerdypepper's nixos config"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05"; + nixos-hardware.url = "github:nixos/nixos-hardware"; + home-manager = { + url = "github:nix-community/home-manager/release-21.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + neovim.url = "github:nix-community/neovim-nightly-overlay"; + }; + + outputs = + { self + , nixpkgs + , nixos-hardware + , home-manager + , neovim + , ... + } @ inputs: { + + overlays = { + nvim-nightly = neovim.overlay; + }; + + nixosConfigurations = { + olive = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + { + imports = [ ./hosts/olive/configuration.nix ]; + _module.args.self = self; + } + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.np = { + imports = [ ./home.nix ]; + _module.args.self = self; + _module.args.inputs = inputs; + _module.args.theme = import ./theme.nix; + }; + } + ]; + }; + }; + + }; + +} diff --git a/home.nix b/home.nix new file mode 100644 index 0000000..93f66ad --- /dev/null +++ b/home.nix @@ -0,0 +1,88 @@ +{ config +, pkgs +, theme +, ... +}: + +{ + + imports = [ + ./programs + ./services + # ./scripts + ./x + ./mail.nix + ]; + + home.stateVersion = "21.05"; + home.username = "np"; + home.homeDirectory = "/home/np"; + home.packages = with pkgs; [ + + vim + unzip + curl + tmux + weechat + rofi + firefox + xclip + ripgrep + ccls + miniserve + rnix-lsp + pfetch + st + arandr + imagemagick + ffmpeg + maim + wget + cmus + tree + rxvt-unicode + neomutt + mpv + nodePackages.bash-language-server + gitAndTools.delta + w3m + noto-fonts-emoji + ripgrep-all + urlview + slop + gimp + fd + du-dust + jq + + # meta + nixpkgs-review + nixpkgs-fmt + nix-prefetch-scripts + nix-bash-completions + + ]; + + xdg = { + userDirs = { + enable = true; + desktop = "\$HOME/desktop"; + documents = "\$HOME/docs"; + download = "\$HOME/dloads"; + music = "\$HOME/music"; + pictures = "\$HOME/pics"; + videos = "\$HOME/vids"; + }; + }; + + xsession = { + enable = true; + windowManager.command = "2bwm"; + initExtra = '' + ${pkgs.hsetroot}/bin/hsetroot -solid "#000" + xrdb -load $HOME/.Xresources + setxkbmap -option 'caps:swapescape' + ''; + }; + +} diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix new file mode 100644 index 0000000..68b7d99 --- /dev/null +++ b/hosts/olive/configuration.nix @@ -0,0 +1,145 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, lib, self, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + ../../services/battery.nix + ../../services/suspend.nix + ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.kernel.sysctl."net.ipv4.ip_forward" = 1; + + networking = { + hostName = "olive"; + wireless = { + enable = true; + interfaces = [ + "wlp2s0" + ]; + networks = { + Sanic = { + pskRaw = "03fbbe8c6b400af40c64ea475be59812ca1d13f40beaf0bf188c50a1e959c8fd"; + }; + Gopalan = { + pskRaw = "52f7f6548fa6f7f24965aae2bd7aa1a34d22a650cdc319d9d6a8567f91be85c8"; + }; + Srividhya = { + pskRaw = "f4302c17d20d0ac8791960495bb3ca4e790677d87d16a7d8c414350dd67c9713"; + }; + }; + extraConfig = '' + ctrl_interface=/run/wpa_supplicant + ctrl_interface_group=wheel + ''; + }; + useDHCP = false; + interfaces.wlp2s0.useDHCP = true; + }; + + #networking.nameservers = [ "1.1.1.1" "1.0.0.1" ]; + + i18n.defaultLocale = "en_US.UTF-8"; + time.timeZone = "Asia/Kolkata"; + + nixpkgs.config = { + "2bwm".patches = [ + ../../patches/2bwm/nerd-patch.diff + ]; + + st = { + conf = builtins.readFile ../../programs/st/config.h; + extraLibs = with pkgs; [ harfbuzz ]; + patches = [ + ../../patches/st/xres.diff + ../../patches/st/bright.diff + ../../patches/st/ligatures.diff + ]; + }; + }; + + nixpkgs.overlays = with self.overlays; [ + nvim-nightly + ]; + + environment.systemPackages = with pkgs; [ + _2bwm + manpages + ]; + + users.motd = with config; '' + Host ${networking.hostName} + OS NixOS ${system.nixos.release} (${system.nixos.codeName}) + Version ${system.nixos.version} + Kernel ${boot.kernelPackages.kernel.version} + ''; + + programs = { + light.enable = true; + adb.enable = true; + }; + + + sound.enable = true; + hardware.pulseaudio = { + enable = true; + package = pkgs.pulseaudioFull; + extraConfig = "load-module module-switch-on-connect"; + }; + + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + + # Enable the X11 windowing system. + services.xserver = { + enable = true; + layout = "us"; + xkbOptions = "caps:swapescape"; + displayManager.startx.enable = true; + libinput.enable = true; + }; + + services.batteryNotifier = { + enable = true; + notifyCapacity = 40; + suspendCapacity = 5; + }; + + users.users.np = { + isNormalUser = true; + home = "/home/np"; + extraGroups = [ "wheel" "users" "tty" "audio" "video" "input" "adbusers" "docker" ]; + }; + + documentation.man.generateCaches = true; + + nix = { + package = pkgs.nixUnstable; + extraOptions = '' + experimental-features = nix-command flakes ca-references ca-derivations + warn-dirty = false + keep-outputs = true + keep-derivations = true + ''; + }; + + nix.trustedUsers = + [ + "root" + "np" + ]; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "20.03"; # Did you read the comment? +} diff --git a/hosts/olive/hardware-configuration.nix b/hosts/olive/hardware-configuration.nix new file mode 100644 index 0000000..fc9ccb8 --- /dev/null +++ b/hosts/olive/hardware-configuration.nix @@ -0,0 +1,36 @@ +# 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, ... }: + +{ + imports = [ + "${modulesPath}/installer/scan/not-detected.nix" + ]; + + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/27a7c854-e674-411f-9d79-37084922c91d"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/882C-54D5"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 8; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; +} diff --git a/mail.nix b/mail.nix new file mode 100644 index 0000000..b62e51a --- /dev/null +++ b/mail.nix @@ -0,0 +1,49 @@ +{ config +, lib +, pkgs +, ... +}: + +{ + accounts.email.maildirBasePath = "mail"; + accounts.email.accounts."nerdy@peppe.rs" = { + address = "nerdy@peppe.rs"; + folders = { + drafts = "drafts"; + sent = "sent"; + trash = "trash"; + inbox = "inbox"; + }; + imap = { + host = "mail.postale.io"; + port = 993; + }; + maildir = { + path = "personal"; + }; + mbsync = { + enable = true; + create = "maildir"; + expunge = "maildir"; + }; + primary = true; + passwordCommand = "${pkgs.gnupg}/bin/gpg -q --for-your-eyes-only --no-tty -d /home/np/.password-store/email/personal.gpg"; + realName = "Akshay"; + signature = { + text = '' + -- + Akshay + + ''; + }; + smtp = { + host = "mail.postale.io"; + port = 587; + tls.useStartTls = true; + }; + userName = "nerdy@peppe.rs"; + notmuch.enable = true; + msmtp.enable = true; + + }; +} diff --git a/patches/2bwm/nerd-patch.diff b/patches/2bwm/nerd-patch.diff new file mode 100644 index 0000000..a47cc14 --- /dev/null +++ b/patches/2bwm/nerd-patch.diff @@ -0,0 +1,47 @@ +diff --git a/config.h b/config.h +index 0985d2e..baa77f8 100644 +--- a/config.h ++++ b/config.h +@@ -40,7 +40,10 @@ static const uint8_t borders[] = {3,5,5,4}; + #define LOOK_INTO "WM_NAME" + static const char *ignore_names[] = {"bar", "xclock"}; + ///--Menus and Programs---/// +-static const char *menucmd[] = { "", NULL }; ++// static const char *menucmd[] = { "", NULL }; ++static const char *terminal[] = { "st", NULL }; ++static const char *rofi_run[] = { "rofi", "-show", "run" }; ++static const char *rofi_window[] = { "rofi", "-show", "window" }; + ///--Custom foo---/// + static void halfandcentered(const Arg *arg) + { +@@ -193,7 +196,10 @@ static key keys[] = { + { MOD |SHIFT, XK_Right, cursor_move, {.i=TWOBWM_CURSOR_RIGHT}}, + { MOD |SHIFT, XK_Left, cursor_move, {.i=TWOBWM_CURSOR_LEFT}}, + // Start programs +- { MOD , XK_w, start, {.com = menucmd}}, ++ //{ MOD , XK_w, start, {.com = menucmd}}, ++ { MOD , XK_Return, start, {.com = terminal}}, ++ { MOD , XK_d, start, {.com = rofi_run}}, ++ { MOD , XK_i, start, {.com = rofi_window}}, + // Exit or restart 2bwm + { MOD |CONTROL, XK_q, twobwm_exit, {.i=0}}, + { MOD |CONTROL, XK_r, twobwm_restart, {.i=0}}, +@@ -215,7 +221,7 @@ static key keys[] = { + static Button buttons[] = { + { MOD ,XCB_BUTTON_INDEX_1, mousemotion, {.i=TWOBWM_MOVE}, false}, + { MOD ,XCB_BUTTON_INDEX_3, mousemotion, {.i=TWOBWM_RESIZE}, false}, +- { 0 ,XCB_BUTTON_INDEX_3, start, {.com = menucmd}, true}, ++ { 0 ,XCB_BUTTON_INDEX_3, start, {.com = terminal}, true}, + { MOD|SHIFT, XCB_BUTTON_INDEX_1, changeworkspace, {.i=0}, false}, + { MOD|SHIFT, XCB_BUTTON_INDEX_3, changeworkspace, {.i=1}, false}, + { MOD|ALT, XCB_BUTTON_INDEX_1, changescreen, {.i=1}, false}, +diff --git a/definitions.h b/definitions.h +index a380a3a..8aa8a45 100644 +--- a/definitions.h ++++ b/definitions.h +@@ -1,4 +1,4 @@ +-#define WORKSPACES 10 ++#define WORKSPACES 6 + #define BUTTONMASK XCB_EVENT_MASK_BUTTON_PRESS|XCB_EVENT_MASK_BUTTON_RELEASE + #define NET_WM_FIXED 0xffffffff // Value in WM hint which means this window is fixed on all workspaces. + #define TWOBWM_NOWS 0xfffffffe // This means we didn't get any window hint at all. diff --git a/patches/st/bright.diff b/patches/st/bright.diff new file mode 100644 index 0000000..77379d3 --- /dev/null +++ b/patches/st/bright.diff @@ -0,0 +1,28 @@ +From e8f3c86d93613eef5af187dfd2dba9ae9919a2ee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= +Date: Sun, 27 Jan 2019 13:31:28 +0800 +Subject: [PATCH] Show bold not as bright + +--- + x.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/x.c b/x.c +index 0422421..904e1dc 100644 +--- a/x.c ++++ b/x.c +@@ -1296,10 +1296,6 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i + bg = &dc.col[base.bg]; + } + +- /* Change basic system colors [0-7] to bright system colors [8-15] */ +- if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7)) +- fg = &dc.col[base.fg + 8]; +- + if (IS_SET(MODE_REVERSE)) { + if (fg == &dc.col[defaultfg]) { + fg = &dc.col[defaultbg]; +-- +2.20.1 + + diff --git a/patches/st/ligatures.diff b/patches/st/ligatures.diff new file mode 100644 index 0000000..354443c --- /dev/null +++ b/patches/st/ligatures.diff @@ -0,0 +1,308 @@ +diff --git a/Makefile b/Makefile +index 470ac86..38240da 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ + + include config.mk + +-SRC = st.c x.c ++SRC = st.c x.c hb.c + OBJ = $(SRC:.c=.o) + + all: options st +@@ -22,7 +22,8 @@ config.h: + $(CC) $(STCFLAGS) -c $< + + st.o: config.h st.h win.h +-x.o: arg.h config.h st.h win.h ++x.o: arg.h config.h st.h win.h hb.h ++hb.o: st.h + + $(OBJ): config.h config.mk + +diff --git a/config.mk b/config.mk +index beafc35..3df5c83 100644 +--- a/config.mk ++++ b/config.mk +@@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config + # includes and libs + INCS = -I$(X11INC) \ + `$(PKG_CONFIG) --cflags fontconfig` \ +- `$(PKG_CONFIG) --cflags freetype2` ++ `$(PKG_CONFIG) --cflags freetype2` \ ++ `$(PKG_CONFIG) --cflags harfbuzz` + LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ + `$(PKG_CONFIG) --libs fontconfig` \ +- `$(PKG_CONFIG) --libs freetype2` ++ `$(PKG_CONFIG) --libs freetype2` \ ++ `$(PKG_CONFIG) --libs harfbuzz` + + # flags + STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 +diff --git a/hb.c b/hb.c +new file mode 100644 +index 0000000..7df2828 +--- /dev/null ++++ b/hb.c +@@ -0,0 +1,136 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "st.h" ++ ++void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length); ++hb_font_t *hbfindfont(XftFont *match); ++ ++typedef struct { ++ XftFont *match; ++ hb_font_t *font; ++} HbFontMatch; ++ ++static int hbfontslen = 0; ++static HbFontMatch *hbfontcache = NULL; ++ ++void ++hbunloadfonts() ++{ ++ for (int i = 0; i < hbfontslen; i++) { ++ hb_font_destroy(hbfontcache[i].font); ++ XftUnlockFace(hbfontcache[i].match); ++ } ++ ++ if (hbfontcache != NULL) { ++ free(hbfontcache); ++ hbfontcache = NULL; ++ } ++ hbfontslen = 0; ++} ++ ++hb_font_t * ++hbfindfont(XftFont *match) ++{ ++ for (int i = 0; i < hbfontslen; i++) { ++ if (hbfontcache[i].match == match) ++ return hbfontcache[i].font; ++ } ++ ++ /* Font not found in cache, caching it now. */ ++ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 1)); ++ FT_Face face = XftLockFace(match); ++ hb_font_t *font = hb_ft_font_create(face, NULL); ++ if (font == NULL) ++ die("Failed to load Harfbuzz font."); ++ ++ hbfontcache[hbfontslen].match = match; ++ hbfontcache[hbfontslen].font = font; ++ hbfontslen += 1; ++ ++ return font; ++} ++ ++void ++hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y) ++{ ++ int start = 0, length = 1, gstart = 0; ++ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t)); ++ ++ for (int idx = 1, specidx = 1; idx < len; idx++) { ++ if (glyphs[idx].mode & ATTR_WDUMMY) { ++ length += 1; ++ continue; ++ } ++ ++ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) { ++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length); ++ ++ /* Reset the sequence. */ ++ length = 1; ++ start = specidx; ++ gstart = idx; ++ } else { ++ length += 1; ++ } ++ ++ specidx++; ++ } ++ ++ /* EOL. */ ++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length); ++ ++ /* Apply the transformation to glyph specs. */ ++ for (int i = 0, specidx = 0; i < len; i++) { ++ if (glyphs[i].mode & ATTR_WDUMMY) ++ continue; ++ ++ if (codepoints[i] != specs[specidx].glyph) ++ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA; ++ ++ specs[specidx++].glyph = codepoints[i]; ++ } ++ ++ free(codepoints); ++} ++ ++void ++hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length) ++{ ++ hb_font_t *font = hbfindfont(xfont); ++ if (font == NULL) ++ return; ++ ++ Rune rune; ++ ushort mode = USHRT_MAX; ++ hb_buffer_t *buffer = hb_buffer_create(); ++ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR); ++ ++ /* Fill buffer with codepoints. */ ++ for (int i = start; i < (start+length); i++) { ++ rune = string[i].u; ++ mode = string[i].mode; ++ if (mode & ATTR_WDUMMY) ++ rune = 0x0020; ++ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1); ++ } ++ ++ /* Shape the segment. */ ++ hb_shape(font, buffer, NULL, 0); ++ ++ /* Get new glyph info. */ ++ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL); ++ ++ /* Write new codepoints. */ ++ for (int i = 0; i < length; i++) { ++ hb_codepoint_t gid = info[i].codepoint; ++ codepoints[start+i] = gid; ++ } ++ ++ /* Cleanup. */ ++ hb_buffer_destroy(buffer); ++} +diff --git a/hb.h b/hb.h +new file mode 100644 +index 0000000..b3e02d0 +--- /dev/null ++++ b/hb.h +@@ -0,0 +1,7 @@ ++#include ++#include ++#include ++ ++void hbunloadfonts(); ++void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int); ++ +diff --git a/st.c b/st.c +index 2bf133f..747f7b4 100644 +--- a/st.c ++++ b/st.c +@@ -2599,7 +2599,8 @@ draw(void) + + drawregion(0, 0, term.col, term.row); + xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], +- term.ocx, term.ocy, term.line[term.ocy][term.ocx]); ++ term.ocx, term.ocy, term.line[term.ocy][term.ocx], ++ term.line[term.ocy], term.col); + term.ocx = cx; + term.ocy = term.c.y; + xfinishdraw(); +diff --git a/st.h b/st.h +index d978458..c9b279b 100644 +--- a/st.h ++++ b/st.h +@@ -11,7 +11,8 @@ + #define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d)) + #define DEFAULT(a, b) (a) = (a) ? (a) : (b) + #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) +-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \ ++#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \ ++ (a).fg != (b).fg || \ + (a).bg != (b).bg) + #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \ + (t1.tv_nsec-t2.tv_nsec)/1E6) +@@ -33,6 +34,7 @@ enum glyph_attribute { + ATTR_WRAP = 1 << 8, + ATTR_WIDE = 1 << 9, + ATTR_WDUMMY = 1 << 10, ++ ATTR_LIGA = 1 << 11, + ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, + }; + +diff --git a/win.h b/win.h +index a6ef1b9..bc0d180 100644 +--- a/win.h ++++ b/win.h +@@ -25,7 +25,7 @@ enum win_mode { + + void xbell(void); + void xclipcopy(void); +-void xdrawcursor(int, int, Glyph, int, int, Glyph); ++void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int); + void xdrawline(Line, int, int, int); + void xfinishdraw(void); + void xloadcols(void); +diff --git a/x.c b/x.c +index e5f1737..3334a83 100644 +--- a/x.c ++++ b/x.c +@@ -19,6 +19,7 @@ char *argv0; + #include "arg.h" + #include "st.h" + #include "win.h" ++#include "hb.h" + + /* types used in config.h */ + typedef struct { +@@ -1031,6 +1032,9 @@ xunloadfont(Font *f) + void + xunloadfonts(void) + { ++ /* Clear Harfbuzz font cache. */ ++ hbunloadfonts(); ++ + /* Free the loaded fonts in the font cache. */ + while (frclen > 0) + XftFontClose(xw.dpy, frc[--frclen].font); +@@ -1229,7 +1233,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x + mode = glyphs[i].mode; + + /* Skip dummy wide-character spacing. */ +- if (mode == ATTR_WDUMMY) ++ if (mode & ATTR_WDUMMY) + continue; + + /* Determine font for glyph if different from previous glyph. */ +@@ -1336,6 +1340,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x + numspecs++; + } + ++ /* Harfbuzz transformation for ligatures. */ ++ hbtransform(specs, glyphs, len, x, y); ++ + return numspecs; + } + +@@ -1485,14 +1492,17 @@ xdrawglyph(Glyph g, int x, int y) + } + + void +-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) ++xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len) + { + Color drawcol; + + /* remove the old cursor */ + if (selected(ox, oy)) + og.mode ^= ATTR_REVERSE; +- xdrawglyph(og, ox, oy); ++ ++ /* Redraw the line where cursor was previously. ++ * It will restore the ligatures broken by the cursor. */ ++ xdrawline(line, 0, oy, len); + + if (IS_SET(MODE_HIDE)) + return; + diff --git a/patches/st/xres.diff b/patches/st/xres.diff new file mode 100644 index 0000000..bac5373 --- /dev/null +++ b/patches/st/xres.diff @@ -0,0 +1,185 @@ +From 2752a599ee01305a435729bfacf43b1dde7cf0ef Mon Sep 17 00:00:00 2001 +From: Benji Encalada Mora +Date: Thu, 4 Jun 2020 00:41:10 -0500 +Subject: [PATCH] fix: replace xfps and actionfps variables + +--- + config.def.h | 36 ++++++++++++++++++++++++ + x.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 110 insertions(+), 4 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 6f05dce..9b99782 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -168,6 +168,42 @@ static unsigned int defaultattr = 11; + */ + static uint forcemousemod = ShiftMask; + ++/* ++ * Xresources preferences to load at startup ++ */ ++ResourcePref resources[] = { ++ { "font", STRING, &font }, ++ { "color0", STRING, &colorname[0] }, ++ { "color1", STRING, &colorname[1] }, ++ { "color2", STRING, &colorname[2] }, ++ { "color3", STRING, &colorname[3] }, ++ { "color4", STRING, &colorname[4] }, ++ { "color5", STRING, &colorname[5] }, ++ { "color6", STRING, &colorname[6] }, ++ { "color7", STRING, &colorname[7] }, ++ { "color8", STRING, &colorname[8] }, ++ { "color9", STRING, &colorname[9] }, ++ { "color10", STRING, &colorname[10] }, ++ { "color11", STRING, &colorname[11] }, ++ { "color12", STRING, &colorname[12] }, ++ { "color13", STRING, &colorname[13] }, ++ { "color14", STRING, &colorname[14] }, ++ { "color15", STRING, &colorname[15] }, ++ { "background", STRING, &colorname[256] }, ++ { "foreground", STRING, &colorname[257] }, ++ { "cursorColor", STRING, &colorname[258] }, ++ { "termname", STRING, &termname }, ++ { "shell", STRING, &shell }, ++ { "minlatency", INTEGER, &minlatency }, ++ { "maxlatency", INTEGER, &maxlatency }, ++ { "blinktimeout", INTEGER, &blinktimeout }, ++ { "bellvolume", INTEGER, &bellvolume }, ++ { "tabspaces", INTEGER, &tabspaces }, ++ { "borderpx", INTEGER, &borderpx }, ++ { "cwscale", FLOAT, &cwscale }, ++ { "chscale", FLOAT, &chscale }, ++}; ++ + /* + * Internal mouse shortcuts. + * Beware that overloading Button1 will disable the selection. +diff --git a/x.c b/x.c +index 210f184..76f167f 100644 +--- a/x.c ++++ b/x.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + char *argv0; + #include "arg.h" +@@ -45,6 +46,19 @@ typedef struct { + signed char appcursor; /* application cursor */ + } Key; + ++/* Xresources preferences */ ++enum resource_type { ++ STRING = 0, ++ INTEGER = 1, ++ FLOAT = 2 ++}; ++ ++typedef struct { ++ char *name; ++ enum resource_type type; ++ void *dst; ++} ResourcePref; ++ + /* X modifiers */ + #define XK_ANY_MOD UINT_MAX + #define XK_NO_MOD 0 +@@ -828,8 +842,8 @@ xclear(int x1, int y1, int x2, int y2) + void + xhints(void) + { +- XClassHint class = {opt_name ? opt_name : termname, +- opt_class ? opt_class : termname}; ++ XClassHint class = {opt_name ? opt_name : "st", ++ opt_class ? opt_class : "St"}; + XWMHints wm = {.flags = InputHint, .input = 1}; + XSizeHints *sizeh; + +@@ -1104,8 +1118,6 @@ xinit(int cols, int rows) + pid_t thispid = getpid(); + XColor xmousefg, xmousebg; + +- if (!(xw.dpy = XOpenDisplay(NULL))) +- die("can't open display\n"); + xw.scr = XDefaultScreen(xw.dpy); + xw.vis = XDefaultVisual(xw.dpy, xw.scr); + +@@ -1964,6 +1976,59 @@ run(void) + } + } + ++int ++resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst) ++{ ++ char **sdst = dst; ++ int *idst = dst; ++ float *fdst = dst; ++ ++ char fullname[256]; ++ char fullclass[256]; ++ char *type; ++ XrmValue ret; ++ ++ snprintf(fullname, sizeof(fullname), "%s.%s", ++ opt_name ? opt_name : "st", name); ++ snprintf(fullclass, sizeof(fullclass), "%s.%s", ++ opt_class ? opt_class : "St", name); ++ fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0'; ++ ++ XrmGetResource(db, fullname, fullclass, &type, &ret); ++ if (ret.addr == NULL || strncmp("String", type, 64)) ++ return 1; ++ ++ switch (rtype) { ++ case STRING: ++ *sdst = ret.addr; ++ break; ++ case INTEGER: ++ *idst = strtoul(ret.addr, NULL, 10); ++ break; ++ case FLOAT: ++ *fdst = strtof(ret.addr, NULL); ++ break; ++ } ++ return 0; ++} ++ ++void ++config_init(void) ++{ ++ char *resm; ++ XrmDatabase db; ++ ResourcePref *p; ++ ++ XrmInitialize(); ++ resm = XResourceManagerString(xw.dpy); ++ if (!resm) ++ return; ++ ++ db = XrmGetStringDatabase(resm); ++ for (p = resources; p < resources + LEN(resources); p++) ++ resource_load(db, p->name, p->type, p->dst); ++} ++ + void + usage(void) + { +@@ -2037,6 +2102,11 @@ run: + + setlocale(LC_CTYPE, ""); + XSetLocaleModifiers(""); ++ ++ if(!(xw.dpy = XOpenDisplay(NULL))) ++ die("Can't open display\n"); ++ ++ config_init(); + cols = MAX(cols, 1); + rows = MAX(rows, 1); + tnew(cols, rows); +-- +2.26.2 + + diff --git a/programs/bash.nix b/programs/bash.nix new file mode 100644 index 0000000..cbba2de --- /dev/null +++ b/programs/bash.nix @@ -0,0 +1,88 @@ +{ config +, pkgs +, ... +}: + +{ + programs.bash = { + enable = true; + historyControl = [ "erasedups" ]; + historyFile = "\$HOME/.bash_history"; + historyFileSize = 2000; + historyIgnore = [ "ls" "exit" "kill" ]; + historySize = 1000; + shellAliases = { + "..." = "cd -- ../.."; + grep = "grep --color=auto"; + l = "ls -CF"; + la = "ls -A"; + ll = "ls -alF"; + ls = "ls -F --color=always"; + o = "xdg-open"; + rless = "less -r"; + tmux = "tmux -u"; + tree = "tree -C"; + vim = "nvim"; + tb = "nc termbin.com 9999"; + + # git aliases + gb = "git branch -v"; + gc = "git commit --verbose"; + gd = "git diff --minimal"; + ggp = "git push"; + gl = "git log -p --abbrev-commit --pretty=medium"; + glo = "git log --pretty=oneline --abbrev-commit"; + gst = "git status --short"; + }; + shellOptions = [ + "histappend" + "autocd" + "globstar" + "checkwinsize" + "cdspell" + "dirspell" + "expand_aliases" + "dotglob" + "gnu_errfmt" + "histreedit" + "nocasematch" + ]; + sessionVariables = { + PROMPT_CHAR = "λ"; + PROMPT_CHAR_COLOR = "cyan"; + PROMPT_CHAR_ROOT = "#"; + PROMPT_CHAR_ROOT_COLOR = "magenta"; + SHORTEN_CWD = 1; + CWD_COLOR = "white"; + EXPAND_TILDE = 0; + GIT_CLEAN = "·"; + GIT_CLEAN_COLOR = "green"; + GIT_WT_MODIFIED = "×"; + GIT_WT_MODIFIED_COLOR = "red"; + GIT_INDEX_MODIFIED = "±"; + GIT_INDEX_MODIFIED_COLOR = "yellow"; + BRANCH_COLOR = "bright black"; + COMMIT_COLOR = "green"; + PF_INFO = "ascii title os kernel uptime pkgs shell "; + PF_SEP = " "; + PF_COL1 = 7; + PF_COL2 = 7; + PF_COL3 = 6; + PF_ALIGN = "9"; + PF_ASCII = "nixos"; + _JAVA_AWT_WM_NONREPARENTING = 1; + TERM = "xterm-256color-italic"; + EDITOR = "nvim"; + MANPAGER = "nvim +Man!"; + GPG_TTY = "\$(tty)"; + }; + initExtra = '' + [ -f $HOME/.github ] && . $HOME/.github + [ -f ~/.bash_aliases ] && . ~/.bash_aliases + [ -f ~/.fzf.bash ] && source ~/.fzf.bash + eval "$(direnv hook bash)" + export PS1='\n$(pista)' + export PATH=$PATH:"$HOME/scripts" + ''; + }; +} diff --git a/programs/chromium.nix b/programs/chromium.nix new file mode 100644 index 0000000..975e721 --- /dev/null +++ b/programs/chromium.nix @@ -0,0 +1,18 @@ +{ config +, pkgs +, ... +}: + +{ + programs.chromium = { + enable = true; + extensions = [ + "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin + "aapbdbdomjkkjkaonfhkkikfgjllcleb" # translate + "aghfnjkcakhmadgdomlmlhhaocbkloab" # just black + "pobhoodpcipjmedfenaigbeloiidbflp" # minimal twitter + "ennpfpdlaclocpomkiablnmbppdnlhoh" # rust search extension + ]; + }; +} diff --git a/programs/default.nix b/programs/default.nix new file mode 100644 index 0000000..ba67638 --- /dev/null +++ b/programs/default.nix @@ -0,0 +1,51 @@ +{ config +, pkgs +, theme +, ... +}: + +{ + + imports = [ + ./bash.nix + ./chromium.nix + ./feh.nix + ./git.nix + ./htop.nix + ./neovim.nix + ./readline.nix + ./tmux.nix + ./zathura.nix + ]; + + programs = { + msmtp.enable = true; + home-manager.enable = true; + mbsync.enable = true; + direnv = { + enable = true; + enableBashIntegration = true; + nix-direnv = { + enable = true; + useFlakes = true; + }; + }; + autojump = { + enable = true; + enableBashIntegration = true; + }; + password-store = { + enable = true; + settings = { + PASSWORD_STORE_DIR = ''$HOME/.password-store''; + PASSWORD_STORE_KEY = "21532E14CF0840E438C36DED7164B95E9556624A"; + PASSWORD_STORE_CLIP_TIME = "60"; + }; + }; + nix-index = { + enable = true; + enableBashIntegration = true; + }; + gpg.enable = true; + }; +} diff --git a/programs/feh.nix b/programs/feh.nix new file mode 100644 index 0000000..2e15fe4 --- /dev/null +++ b/programs/feh.nix @@ -0,0 +1,14 @@ +{ config +, pkgs +, ... +}: + +{ + programs.feh = { + enable = true; + buttons = { + zoom_in = "C-5"; + zoom_out = "C-4"; + }; + }; +} diff --git a/programs/fzf.nix b/programs/fzf.nix new file mode 100644 index 0000000..b02a07c --- /dev/null +++ b/programs/fzf.nix @@ -0,0 +1,7 @@ +{ + enable = true; + enableBashIntegration = true; + defaultOptions = ["--height 40%" "--layout=reverse" "--color=bw"]; + defaultCommand = "rg -L --files"; + changeDirWidgetCommand = "find . -type d"; +} diff --git a/programs/git.nix b/programs/git.nix new file mode 100644 index 0000000..1a2bc72 --- /dev/null +++ b/programs/git.nix @@ -0,0 +1,48 @@ +{ config +, pkgs +, theme +, ... +}: + +with theme; +{ + programs.git = { + enable = true; + ignores = [ ".envrc" ]; + userEmail = "nerdy@peppe.rs"; + userName = "Akshay"; + delta = { + enable = true; + options = { + features = "decorations labels"; + syntax-theme = "none"; + zero-style = "8"; + navigate = "true"; + keep-plus-minus-markers = "true"; + decorations = { + file-decoration-style = "none"; + whitespace-error-style = "22 reverse"; + minus-style = "${base08}"; + minus-emph-style = "${base08} bold"; + plus-style = "${base0B}"; + plus-emph-style = "${base0B} bold"; + file-style = "7 italic"; + hunk-header-style = "7"; + hunk-header-decoration-style = "8 ul"; + }; + labels = { + file-modified-label = " MODIFIED "; + file-removed-label = " REMOVED "; + file-added-label = " ADDED "; + file-renamed-label = " RENAMED "; + }; + }; + }; + extraConfig = { + commit.verbose = true; + core = { + hooksPath = "/home/np/.hooks"; + }; + }; + }; +} diff --git a/programs/htop.nix b/programs/htop.nix new file mode 100644 index 0000000..a48b70c --- /dev/null +++ b/programs/htop.nix @@ -0,0 +1,11 @@ +{ config +, pkgs +, ... +}: + +{ + programs.htop = { + enable = true; + settings.color_scheme = 1; # monochrome + }; +} diff --git a/programs/init.vim b/programs/init.vim new file mode 100644 index 0000000..38e5eef --- /dev/null +++ b/programs/init.vim @@ -0,0 +1,191 @@ +let &t_ZM = "\e[3m" + +call plug#begin('~/.local/share/nvim/plugged') + +" syntax and friends +Plug 'neovimhaskell/haskell-vim', {'for': ['haskell', 'cabal']} +Plug 'elmcast/elm-vim' + +" my stuff +Plug 'git@ferrn:vim/vim-colors-plain' +Plug 'git@ferrn:vim/better-text-objs' + +call plug#end() + + +" augroups + +augroup plaintext + autocmd! + autocmd FileType text,markdown setlocal ts=2 sts=2 sw=2 expandtab textwidth=60 +augroup END + +augroup webdev + autocmd! + autocmd FileType less,css,html,js?,ts? setlocal ts=2 sts=2 sw=2 expandtab + autocmd FileType less,css,html nnoremap s viB:sort +augroup END + +augroup lisp_stuff + autocmd! + autocmd BufReadPost *.lisp set filetype=scheme +augroup END + +augroup yankhl + autocmd! + autocmd TextYankPost * silent! lua require'vim.highlight'.on_yank() +augroup END + +augroup restorecursor + autocmd BufReadPost * + \ if line("'\"") > 1 && line("'\"") <= line("$") | + \ execute "normal! g`\"" | + \ endif +augroup END + +augroup fzfstatus + if has('nvim') && !exists('g:fzf_layout') + autocmd! FileType fzf + autocmd FileType fzf set laststatus=0 noshowmode noruler + \| autocmd BufLeave set laststatus=2 showmode ruler + endif +augroup END + +augroup completions + " Use completion-nvim in every buffer + autocmd! + autocmd BufEnter * lua require'completion'.on_attach() +augroup END + +" general settings +set nobackup +set nowritebackup +set noswapfile " get rid of swapfiles everywhere +set dir=/tmp + +syntax on + +set omnifunc=syntaxcomplete#Complete +set completefunc=LanguageClient#complete +set list +filetype off +filetype plugin indent on +set laststatus=2 +set nowrap +set noshowmode +set listchars=tab:┊\ ,nbsp:␣,trail:·,extends:>,precedes:< +set fillchars=vert:\│,stl:\ ,stlnc:\ +set ignorecase +set smartcase +set sidescroll=40 +set incsearch +set hlsearch +set undofile +set undodir=~/tmp +set path+=** +set backspace=indent,eol,start +set hidden +set wildmenu +set complete=.,w,b,i,u,t, +set background=dark +set mouse=a +set conceallevel=0 +set nonumber +set grepprg=rg\ --vimgrep\ --no-heading +set grepformat=%f:%l:%c:%m,%f:%l:%m +set cmdheight=2 +set shortmess+=c +set updatetime=300 +set signcolumn=yes +set inccommand=split +set showmatch +set diffopt+=vertical +set completeopt=menuone,noinsert,noselect +set exrc + +let g:netrw_browsex_viewer= "xdg-open" + +colorscheme plain + +set shiftwidth=4 " indent = 4 spaces +set expandtab +set tabstop=4 " tab = 4 spaces +set softtabstop=4 " backspace through spaces + +" Functions +function! GetTabber() " a lil function that integrates well with Tabular.vim + let c = nr2char(getchar()) + :execute 'Tabularize /' . c +endfunction + +" Ugh +command! WQ wq +command! Wq wq +command! Wqa wqa +command! WQa wqa +command! W w +command! Q q + +" abbreviations +abclear +iab #i #include +iab #d #define +cab dst put =strftime('%d %a, %b %Y') +cab vg vimgrep +cab vga vimgrepadd +cab bfd bufdo + +" man pages +let g:ft_man_open_mode = 'tab' + +let g:gitgutter_override_sign_column_highlight = 0 +let g:gitgutter_sign_added = '+' +let g:gitgutter_sign_modified = '~' +let g:gitgutter_sign_removed = '-' +let g:gitgutter_sign_removed_first_line = '-' +let g:gitgutter_sign_modified_removed = '~' + +let g:fzf_colors = + \ { 'fg': ['fg', 'Noise'], + \ 'bg': ['bg', 'Noise'], + \ 'hl': ['fg', 'Statement'], + \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], + \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], + \ 'hl+': ['fg', 'Statement'], + \ 'info': ['fg', 'PreProc'], + \ 'border': ['fg', 'Ignore'], + \ 'prompt': ['fg', 'Conditional'], + \ 'pointer': ['fg', 'Exception'], + \ 'marker': ['fg', 'Keyword'], + \ 'spinner': ['fg', 'Label'], + \ 'header': ['fg', 'Comment'] } +let g:fzf_layout = { 'down': '40%' } +let g:fzf_preview_window = [] + +highlight GitGutterAdd ctermfg=8 +highlight GitGutterChange ctermfg=8 +highlight GitGutterDelete ctermfg=8 + +let g:rustfmt_autosave = 1 + +let g:latex_view_general_viewer = "zathura" +let g:vimtex_view_method = "zathura" +let g:tex_flavor = 'latex' + +let g:elm_setup_keybindings = 0 + +let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy', 'all'] +let g:completion_trigger_on_delete = 1 + +sign define LspDiagnosticsSignError text=× texthl=LspDiagnosticsSignError linehl= numhl= +sign define LspDiagnosticsSignWarning text=\! texthl=LspDiagnosticsSignWarning linehl= numhl= +sign define LspDiagnosticsSignInformation text=i texthl=LspDiagnosticsSignInformation linehl= numhl= +sign define LspDiagnosticsSignHint text=\~ texthl=LspDiagnosticsSignHint linehl= numhl= + +let g:user_emmet_leader_key='' + +lua << EOF +require 'lsp' +require 'treesitter' +EOF + diff --git a/programs/neovim.nix b/programs/neovim.nix new file mode 100644 index 0000000..18baeac --- /dev/null +++ b/programs/neovim.nix @@ -0,0 +1,45 @@ +{ config +, pkgs +, ... +}: + +{ + programs.neovim = { + enable = true; + extraConfig = builtins.readFile ./init.vim; + withNodeJs = false; + vimAlias = true; + withPython3 = true; + extraPackages = with pkgs; [ + gcc + python37Packages.yapf + hlint + ocamlformat + ocamlPackages.ocaml-lsp + ]; + plugins = with pkgs.vimPlugins; [ + # neovim only + nvim-lspconfig + (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) + completion-nvim + + # tpope + vim-surround + vim-unimpaired + vim-repeat + # vim-fugitive + + # syntax + rust-vim + vim-nix + vimtex + + # handy + # vim-gitgutter + tabular + emmet-vim + vimwiki + fzf-vim + ]; + }; +} diff --git a/programs/readline.nix b/programs/readline.nix new file mode 100644 index 0000000..be43ace --- /dev/null +++ b/programs/readline.nix @@ -0,0 +1,22 @@ +{ config +, pkgs +, ... +}: + +{ + programs.readline = { + enable = true; + bindings = { + "\\C-o" = ''"$HOME/scripts/tmux-fzf.sh\n"''; + "\\t" = "menu-complete"; + "\\e[Z" = "menu-complete-backward"; + }; + variables = { + "completion-ignore-case" = "on"; + "show-all-if-ambiguous" = "on"; + "colored-stats" = "on"; + "completion-display-width" = 4; + "enable-bracketed-paste" = "on"; + }; + }; +} diff --git a/programs/st/config.h b/programs/st/config.h new file mode 100644 index 0000000..696b99f --- /dev/null +++ b/programs/st/config.h @@ -0,0 +1,507 @@ + +/* See LICENSE file for copyright and license details. */ + +/* + * appearance + * + * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html + */ +static char *font = "Nerd Input:pixelsize=12:antialias=true:autohint=true"; +static int borderpx = 30; + +/* + * What program is execed by st depends of these precedence rules: + * 1: program passed with -e + * 2: scroll and/or utmp + * 3: SHELL environment variable + * 4: value of shell in /etc/passwd + * 5: value of shell in config.h + */ +static char *shell = "/run/current-system/sw/bin/bash"; +char *utmp = NULL; +/* scroll program: to enable use a string like "scroll" */ +char *scroll = NULL; +char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; + +/* identification sequence returned in DA and DECID */ +char *vtiden = "\033[?6c"; + +/* Kerning / character bounding-box multipliers */ +static float cwscale = 0.9; +static float chscale = 1.0; + +/* + * word delimiter string + * + * More advanced example: L" `'\"()[]{}" + */ +wchar_t *worddelimiters = L" "; + +/* selection timeouts (in milliseconds) */ +static unsigned int doubleclicktimeout = 300; +static unsigned int tripleclicktimeout = 600; + +/* alt screens */ +int allowaltscreen = 1; + +/* allow certain non-interactive (insecure) window operations such as: + setting the clipboard text */ +int allowwindowops = 0; + +/* + * draw latency range in ms - from new content/keypress/etc until drawing. + * within this range, st draws when content stops arriving (idle). mostly it's + * near minlatency, but it waits longer for slow updates to avoid partial draw. + * low minlatency will tear/flicker more, as it can "detect" idle too early. + */ +static double minlatency = 8; +static double maxlatency = 33; + +/* + * blinking timeout (set to 0 to disable blinking) for the terminal blinking + * attribute. + */ +static unsigned int blinktimeout = 800; + +/* + * thickness of underline and bar cursors + */ +static unsigned int cursorthickness = 2; + +/* + * bell volume. It must be a value between -100 and 100. Use 0 for disabling + * it + */ +static int bellvolume = 0; + +/* default TERM value */ +char *termname = "xterm-256color-italic"; + +/* + * spaces per tab + * + * When you are changing this value, don't forget to adapt the »it« value in + * the st.info and appropriately install the st.info in the environment where + * you use this st version. + * + * it#$tabspaces, + * + * Secondly make sure your kernel is not expanding tabs. When running `stty + * -a` »tab0« should appear. You can tell the terminal to not expand tabs by + * running following command: + * + * stty tabs + */ +unsigned int tabspaces = 4; + +/* Terminal colors (16 first used in escape sequence) */ +static const char *colorname[] = { + /* 8 normal colors */ + "black", + "red3", + "green3", + "yellow3", + "blue2", + "magenta3", + "cyan3", + "gray90", + + /* 8 bright colors */ + "gray50", + "red", + "green", + "yellow", + "#5c5cff", + "magenta", + "cyan", + "white", + + [255] = 0, + + /* more colors can be added after 255 to use with DefaultXX */ + "#cccccc", + "#555555", +}; + + +/* + * Default colors (colorname index) + * foreground, background, cursor, reverse cursor + */ +unsigned int defaultfg = 7; +unsigned int defaultbg = 0; +static unsigned int defaultcs = 256; +static unsigned int defaultrcs = 257; + +/* + * Default shape of cursor + * 2: Block ("█") + * 4: Underline ("_") + * 6: Bar ("|") + * 7: Snowman ("☃") + */ +static unsigned int cursorshape = 2; + +/* + * Default columns and rows numbers + */ + +static unsigned int cols = 80; +static unsigned int rows = 24; + +/* + * Default colour and shape of the mouse cursor + */ +static unsigned int mouseshape = XC_xterm; +static unsigned int mousefg = 7; +static unsigned int mousebg = 0; + +/* + * Color used to display font attributes when fontconfig selected a font which + * doesn't match the ones requested. + */ +static unsigned int defaultattr = 11; + +/* + * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set). + * Note that if you want to use ShiftMask with selmasks, set this to an other + * modifier, set to 0 to not use it. + */ +static uint forcemousemod = ShiftMask; + +ResourcePref resources[] = { + { "font", STRING, &font }, + { "color0", STRING, &colorname[0] }, + { "color1", STRING, &colorname[1] }, + { "color2", STRING, &colorname[2] }, + { "color3", STRING, &colorname[3] }, + { "color4", STRING, &colorname[4] }, + { "color5", STRING, &colorname[5] }, + { "color6", STRING, &colorname[6] }, + { "color7", STRING, &colorname[7] }, + { "color8", STRING, &colorname[8] }, + { "color9", STRING, &colorname[9] }, + { "color10", STRING, &colorname[10] }, + { "color11", STRING, &colorname[11] }, + { "color12", STRING, &colorname[12] }, + { "color13", STRING, &colorname[13] }, + { "color14", STRING, &colorname[14] }, + { "color15", STRING, &colorname[15] }, + { "background", STRING, &colorname[0] }, + { "foreground", STRING, &colorname[7] }, + { "cursorColor", STRING, &colorname[7] }, + { "termname", STRING, &termname }, + { "shell", STRING, &shell }, + { "minlatency", INTEGER, &minlatency }, + { "maxlatency", INTEGER, &maxlatency }, + { "blinktimeout", INTEGER, &blinktimeout }, + { "bellvolume", INTEGER, &bellvolume }, + { "tabspaces", INTEGER, &tabspaces }, + { "borderpx", INTEGER, &borderpx }, + { "cwscale", FLOAT, &cwscale }, + { "chscale", FLOAT, &chscale }, +}; + +/* + * Internal mouse shortcuts. + * Beware that overloading Button1 will disable the selection. + */ +static MouseShortcut mshortcuts[] = { + /* mask button function argument release */ + { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, + { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, + { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, + { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, + { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, +}; + +/* Internal keyboard shortcuts. */ +#define MODKEY Mod1Mask +#define TERMMOD (ControlMask|ShiftMask) + +static Shortcut shortcuts[] = { + /* mask keysym function argument */ + { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, + { ControlMask, XK_Print, toggleprinter, {.i = 0} }, + { ShiftMask, XK_Print, printscreen, {.i = 0} }, + { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, + { TERMMOD, XK_Prior, zoom, {.f = +1} }, + { TERMMOD, XK_Next, zoom, {.f = -1} }, + { TERMMOD, XK_Home, zoomreset, {.f = 0} }, + { TERMMOD, XK_C, clipcopy, {.i = 0} }, + { TERMMOD, XK_V, clippaste, {.i = 0} }, + { TERMMOD, XK_Y, selpaste, {.i = 0} }, + { ShiftMask, XK_Insert, selpaste, {.i = 0} }, + { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, +}; + +/* + * Special keys (change & recompile st.info accordingly) + * + * Mask value: + * * Use XK_ANY_MOD to match the key no matter modifiers state + * * Use XK_NO_MOD to match the key alone (no modifiers) + * appkey value: + * * 0: no value + * * > 0: keypad application mode enabled + * * = 2: term.numlock = 1 + * * < 0: keypad application mode disabled + * appcursor value: + * * 0: no value + * * > 0: cursor application mode enabled + * * < 0: cursor application mode disabled + * + * Be careful with the order of the definitions because st searches in + * this table sequentially, so any XK_ANY_MOD must be in the last + * position for a key. + */ + +/* + * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) + * to be mapped below, add them to this array. + */ +static KeySym mappedkeys[] = { -1 }; + +/* + * State bits to ignore when matching key or button events. By default, + * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. + */ +static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; + +/* + * This is the huge key array which defines all compatibility to the Linux + * world. Please decide about changes wisely. + */ +static Key key[] = { + /* keysym mask string appkey appcursor */ + { XK_KP_Home, ShiftMask, "\033[2J", 0, -1}, + { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, + { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1}, + { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1}, + { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0}, + { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1}, + { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1}, + { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0}, + { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1}, + { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1}, + { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0}, + { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1}, + { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1}, + { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0}, + { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1}, + { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1}, + { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, + { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, + { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0}, + { XK_KP_End, ControlMask, "\033[J", -1, 0}, + { XK_KP_End, ControlMask, "\033[1;5F", +1, 0}, + { XK_KP_End, ShiftMask, "\033[K", -1, 0}, + { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0}, + { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0}, + { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, + { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0}, + { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, + { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0}, + { XK_KP_Insert, ControlMask, "\033[L", -1, 0}, + { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, + { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, + { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, + { XK_KP_Delete, ControlMask, "\033[M", -1, 0}, + { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, + { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, + { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, + { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, + { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, + { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, + { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, + { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0}, + { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0}, + { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0}, + { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0}, + { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0}, + { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0}, + { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0}, + { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0}, + { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0}, + { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0}, + { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0}, + { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0}, + { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0}, + { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0}, + { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0}, + { XK_Up, ShiftMask, "\033[1;2A", 0, 0}, + { XK_Up, Mod1Mask, "\033[1;3A", 0, 0}, + { XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0}, + { XK_Up, ControlMask, "\033[1;5A", 0, 0}, + { XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0}, + { XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0}, + { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0}, + { XK_Up, XK_ANY_MOD, "\033[A", 0, -1}, + { XK_Up, XK_ANY_MOD, "\033OA", 0, +1}, + { XK_Down, ShiftMask, "\033[1;2B", 0, 0}, + { XK_Down, Mod1Mask, "\033[1;3B", 0, 0}, + { XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0}, + { XK_Down, ControlMask, "\033[1;5B", 0, 0}, + { XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0}, + { XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0}, + { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0}, + { XK_Down, XK_ANY_MOD, "\033[B", 0, -1}, + { XK_Down, XK_ANY_MOD, "\033OB", 0, +1}, + { XK_Left, ShiftMask, "\033[1;2D", 0, 0}, + { XK_Left, Mod1Mask, "\033[1;3D", 0, 0}, + { XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0}, + { XK_Left, ControlMask, "\033[1;5D", 0, 0}, + { XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0}, + { XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0}, + { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0}, + { XK_Left, XK_ANY_MOD, "\033[D", 0, -1}, + { XK_Left, XK_ANY_MOD, "\033OD", 0, +1}, + { XK_Right, ShiftMask, "\033[1;2C", 0, 0}, + { XK_Right, Mod1Mask, "\033[1;3C", 0, 0}, + { XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0}, + { XK_Right, ControlMask, "\033[1;5C", 0, 0}, + { XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0}, + { XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0}, + { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0}, + { XK_Right, XK_ANY_MOD, "\033[C", 0, -1}, + { XK_Right, XK_ANY_MOD, "\033OC", 0, +1}, + { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, + { XK_Return, Mod1Mask, "\033\r", 0, 0}, + { XK_Return, XK_ANY_MOD, "\r", 0, 0}, + { XK_Insert, ShiftMask, "\033[4l", -1, 0}, + { XK_Insert, ShiftMask, "\033[2;2~", +1, 0}, + { XK_Insert, ControlMask, "\033[L", -1, 0}, + { XK_Insert, ControlMask, "\033[2;5~", +1, 0}, + { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, + { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, + { XK_Delete, ControlMask, "\033[M", -1, 0}, + { XK_Delete, ControlMask, "\033[3;5~", +1, 0}, + { XK_Delete, ShiftMask, "\033[2K", -1, 0}, + { XK_Delete, ShiftMask, "\033[3;2~", +1, 0}, + { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, + { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, + { XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, + { XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, + { XK_Home, ShiftMask, "\033[2J", 0, -1}, + { XK_Home, ShiftMask, "\033[1;2H", 0, +1}, + { XK_Home, XK_ANY_MOD, "\033[H", 0, -1}, + { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1}, + { XK_End, ControlMask, "\033[J", -1, 0}, + { XK_End, ControlMask, "\033[1;5F", +1, 0}, + { XK_End, ShiftMask, "\033[K", -1, 0}, + { XK_End, ShiftMask, "\033[1;2F", +1, 0}, + { XK_End, XK_ANY_MOD, "\033[4~", 0, 0}, + { XK_Prior, ControlMask, "\033[5;5~", 0, 0}, + { XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, + { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, + { XK_Next, ControlMask, "\033[6;5~", 0, 0}, + { XK_Next, ShiftMask, "\033[6;2~", 0, 0}, + { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0}, + { XK_F1, XK_NO_MOD, "\033OP" , 0, 0}, + { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, + { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, + { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, + { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, + { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, + { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0}, + { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, + { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, + { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, + { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, + { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, + { XK_F3, XK_NO_MOD, "\033OR" , 0, 0}, + { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, + { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, + { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, + { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, + { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, + { XK_F4, XK_NO_MOD, "\033OS" , 0, 0}, + { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, + { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, + { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, + { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, + { XK_F5, XK_NO_MOD, "\033[15~", 0, 0}, + { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, + { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, + { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, + { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, + { XK_F6, XK_NO_MOD, "\033[17~", 0, 0}, + { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, + { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, + { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, + { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, + { XK_F7, XK_NO_MOD, "\033[18~", 0, 0}, + { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, + { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, + { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, + { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, + { XK_F8, XK_NO_MOD, "\033[19~", 0, 0}, + { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, + { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, + { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, + { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, + { XK_F9, XK_NO_MOD, "\033[20~", 0, 0}, + { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, + { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, + { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, + { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, + { XK_F10, XK_NO_MOD, "\033[21~", 0, 0}, + { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, + { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, + { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, + { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, + { XK_F11, XK_NO_MOD, "\033[23~", 0, 0}, + { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, + { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, + { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, + { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, + { XK_F12, XK_NO_MOD, "\033[24~", 0, 0}, + { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, + { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, + { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, + { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, + { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0}, + { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0}, + { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0}, + { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0}, + { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0}, + { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0}, + { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0}, + { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0}, + { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0}, + { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0}, + { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0}, + { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0}, + { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0}, + { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0}, + { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0}, + { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0}, + { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0}, + { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0}, + { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0}, + { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0}, + { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0}, + { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, + { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, +}; + +/* + * Selection types' masks. + * Use the same masks as usual. + * Button1Mask is always unset, to make masks match between ButtonPress. + * ButtonRelease and MotionNotify. + * If no match is found, regular selection is used. + */ +static uint selmasks[] = { + [SEL_RECTANGULAR] = Mod1Mask, +}; + +/* + * Printable characters in ASCII, used to estimate the advance width + * of single wide characters. + */ +static char ascii_printable[] = + " !\"#$%&'()*+,-./0123456789:;<=>?" + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" + "`abcdefghijklmnopqrstuvwxyz{|}~"; + diff --git a/programs/tmux.nix b/programs/tmux.nix new file mode 100644 index 0000000..58369da --- /dev/null +++ b/programs/tmux.nix @@ -0,0 +1,85 @@ +{ config +, pkgs +, ... +}: + +{ + programs.tmux = { + enable = true; + plugins = with pkgs; [ + tmuxPlugins.fingers + ]; + extraConfig = '' + set -g prefix C-a + setw -g mode-keys vi + unbind-key C-b + bind-key C-a send-prefix + + bind r source-file ~/.tmux.conf + + set-option -g default-terminal xterm-256color-italic + set escape-time 20 + + set -g mouse on + + set -g base-index 1 + setw -g pane-base-index 1 + + # pane binds + bind-key h select-pane -L + bind-key j select-pane -D + bind-key k select-pane -U + bind-key l select-pane -R + bind-key -r H resize-pane -L 5 + bind-key -r J resize-pane -D 5 + bind-key -r K resize-pane -U 5 + bind-key -r L resize-pane -R 5 + + # window binds + bind -n M-h previous-window + bind -n M-l next-window + bind-key "|" split-window -h -c "#{pane_current_path}" + bind-key "-" split-window -v -c "#{pane_current_path}" + bind-key s choose-session + bind-key c new-window -c "#{pane_current_path}" + bind-key ) swap-window -t +1 + bind-key ( swap-window -t -1 + bind-key [ copy-mode + + # statusline hide / unhide + bind -n M-down set -q status off + bind -n M-up set -q status on + + bind-key -r "<" swap-window -d -t -1 + bind-key -r ">" swap-window -d -t +1 + + bind-key -T copy-mode-vi v send-keys -X begin-selection + bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c " + bind-key -T copy-mode-vi r send-keys -X rectangle-toggle + bind P paste-buffer + + bind E command-prompt -p "Command:" \ + "run \"tmux list-panes -a -F '##{session_name}:##{window_index}.##{pane_index}' \ + | xargs -I PANE tmux send-keys -t PANE '%1' Enter\"" + + set-window-option -g allow-rename off + + set -g pane-border-style fg=colour11 + set -g pane-active-border-style fg=colour8 + + set -g status-justify right + set -g status-right "" + set -g status-style "bg=colour0" + set -ag status-style "fg=colour7" + + set -g window-status-current-format " #[fg=colour15]#W#{?window_zoomed_flag, #[fg=colour2]+,}#{?window_activity_flag, #[fg=colour3]!,}" + set -g window-status-format " #[fg=colour8]#W#{?window_zoomed_flag, #[fg=colour2]+,}" + + + set -g status-left-length 100 + set -g status-left "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs " + set -ag status-left "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y") " + set -ag status-left "#[fg=colour7]#(~/scripts/bat -q)#[fg=colour12]" + ''; + }; +} diff --git a/programs/zathura.nix b/programs/zathura.nix new file mode 100644 index 0000000..5e5c8ce --- /dev/null +++ b/programs/zathura.nix @@ -0,0 +1,37 @@ +{ config +, pkgs +, theme +, ... +}: + +with theme; +{ + programs.zathura = { + enable = true; + options = { + incremental-search = "true"; + recolor = "true"; + default-bg = base00; + default-fg = base05; + completion-bg = base00; + completion-fg = base05; + completion-highlight-bg = base0E; + completion-highlight-fg = base05; + statusbar-bg = base00; + statusbar-fg = base05; + inputbar-bg = base00; + inputbar-fg = base05; + recolor-darkcolor = base05; + recolor-lightcolor = base00; + window-height = "800"; + window-width = "600"; + adjust-open = "width"; + smooth-scroll = "true"; + statusbar-home-tilde = "true"; + statusbar-h-padding = "50"; + statusbar-v-padding = "50"; + guioptions = "s"; + font = "Input 10"; + }; + }; +} diff --git a/scripts/battery.nix b/scripts/battery.nix new file mode 100644 index 0000000..e75116b --- /dev/null +++ b/scripts/battery.nix @@ -0,0 +1,60 @@ + +{ pkgs, ...}: + +let + name = "bat"; +in + pkgs.writeScriptBin name + '' + red="\e[31m" + grn="\e[32m" + ylw="\e[33m" + cyn="\e[36m" + blu="\e[34m" + prp="\e[35m" + bprp="\e[35;1m" + rst="\e[0m" + + bat_status="" + bat_status=$( cat /sys/class/power_supply/BAT0/capacity ) + charging_status=$( cat /sys/class/power_supply/BAT0/status ) + + health() { + for i in {0..4} + do + if [[ $i -le $(( $bat_status/20 )) ]]; then + echo -ne "#[fg=colour1]· " + else + echo -ne "#[fg=colour8]· " + fi + done + echo + } + + bat_status_small() { + if [[ "$charging_status" = *Charging* ]]; then + echo -ne "+$bat_status%" + else + echo -ne "$bat_status%" + fi + } + + [ -z "$1" ] && { + bat_status_small + } + + while getopts qi options + do + case $options in + i) + bat_status_small + ;; + q) + if [[ "$charging_status" = *Charging* ]]; then + echo -ne "+ $(health)" + else + health + fi + esac + done + '' diff --git a/scripts/default.nix b/scripts/default.nix new file mode 100644 index 0000000..84fcff3 --- /dev/null +++ b/scripts/default.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: + +let + + # open a window with live video feed from the camera + webcam = pkgs.writeScriptBin "webcam" '' + ${pkgs.mpv}/bin/mpv av://v4l2:/dev/video0 --profile=low-latency --untimed + ''; + + # set git repo descriptions on cgit + git-set-desc = pkgs.writeScriptBin "git-set-desc" '' + remote=$(git remote get-url --push origin) + scp .git/description "$remote/description" + ''; + + # screen record with ffmpeg and slop + record = import ./record.nix pkgs; + + # file uploader + uploader = import ./up.nix pkgs; + + # battery script + battery = import ./battery.nix pkgs; + +in + [ webcam git-set-desc record uploader battery ] diff --git a/scripts/record.nix b/scripts/record.nix new file mode 100644 index 0000000..d5bfff5 --- /dev/null +++ b/scripts/record.nix @@ -0,0 +1,33 @@ +{ pkgs, ...}: + +let + name = "record"; + slop = "${pkgs.slop}/bin/slop"; + ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; +in + pkgs.writeScriptBin name + '' + echo starting recording ... + coords=$(${slop} -f "%x %y %w %h %g %i") || exit 1 + read -r X Y W H G ID < <(echo $coords) + ${ffmpeg} \ + -f x11grab \ + -s "$W"x"$H" \ + -i :0.0+$X,$Y \ + -f alsa \ + -thread_queue_size 512 \ + -ac 2 \ + -ar 48000 \ + -i hw:0 \ + -framerate 60 \ + -vcodec libx264 \ + -threads 4 \ + -y \ + /home/np/tmp/x.mkv + + ${ffmpeg} \ + -i /home/np/tmp/x.mkv \ + -pix_fmt yuv420p \ + -vf scale=-2:1080 \ + "/home/np/vids/rec/$1" + '' diff --git a/scripts/up.nix b/scripts/up.nix new file mode 100644 index 0000000..c4f7c7a --- /dev/null +++ b/scripts/up.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: +let + name = "up"; + xclip = "${pkgs.xclip}/bin/xclip"; +in +pkgs.writeScriptBin name + '' + id=$( cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 3 | head -n 1 ) + + if [ $# != 1 ]; then + echo "needs an arg" + else + if [ -f "$1" ]; then + ext="''${1##*.}" + id="$id.$ext" + scp "$1" ferrn:~/www/nerd/uploads/"$id" + echo "https://u.peppe.rs/$id" + echo "https://u.peppe.rs/$id" | ${xclip} -selection clipboard + echo "https://u.peppe.rs/$id" | ${xclip} -i + else + echo "file does not exist" + fi + fi + '' diff --git a/scripts/webcam.nix b/scripts/webcam.nix new file mode 100644 index 0000000..0658dab --- /dev/null +++ b/scripts/webcam.nix @@ -0,0 +1,5 @@ +#! /usr/bin/env bash + +mpv av://v4l2:/dev/video0 \ + --profile=low-latency \ + --untimed \ diff --git a/services/battery.nix b/services/battery.nix new file mode 100644 index 0000000..a871e8f --- /dev/null +++ b/services/battery.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.battery-alert; + bat = pkgs.writeScriptBin "bat" + '' + ''; +in +{ + options.services.battery-alert = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, NixOS will periodically check battery levels and report + if it is below a threshold value. + ''; + }; + }; + + config = { + systemd.user.timers.battery-alert = mkIf cfg.enable { + description = "Periodically check battery status and alert if required"; + timerConfig.OnBootSec = "1m"; + timerConfig.OnUnitInactiveSec = "1m"; + timerConfig.Unit = "battery-alert.service"; + wantedBy = [ "timers.target" ]; + }; + + systemd.user.services.battery-alert = { + description = "Check battery levels"; + path = [ pkgs.libnotify pkgs.coreutils ]; + serviceConfig = { + PassEnvironment = "DISPLAY XAUTHORITY"; + }; + script = '' + bat_status=$( ${pkgs.coreutils}/bin/cat /sys/class/power_supply/BAT0/capacity ) + charging_status=$( ${pkgs.coreutils}/bin/cat /sys/class/power_supply/BAT0/status ) + + # if [[ $bat_status -ge 10 ]]; then + ${pkgs.libnotify}/bin/notify-send "Battery low: $bat_status%" "$charging_status" + # fi + ''; + }; + + }; +} diff --git a/services/default.nix b/services/default.nix new file mode 100644 index 0000000..0e85cd9 --- /dev/null +++ b/services/default.nix @@ -0,0 +1,27 @@ +{ config +, pkgs +, theme +, ... +}: + +{ + + imports = [ + ./dunst.nix + ./picom.nix + ./redshift.nix + ./sxhkd.nix + ./mbsync.nix + ]; + + services = { + lorri.enable = true; + gpg-agent = { + enable = true; + defaultCacheTtl = 86400; + maxCacheTtl = 86400; + pinentryFlavor = "curses"; + }; + }; + +} diff --git a/services/dunst.nix b/services/dunst.nix new file mode 100644 index 0000000..8882ade --- /dev/null +++ b/services/dunst.nix @@ -0,0 +1,71 @@ +{ config +, pkgs +, theme +, ... +}: + +with theme; +{ + services.dunst = { + enable = true; + settings = { + global = { + font = "Input 9"; + allow_markup = "no"; + format = "%s\n%b"; + sort = "yes"; + indicate_hidden = "yes"; + alignment = "right"; + bounce_freq = "0"; + show_age_threshold = "60"; + word_wrap = "yes"; + ignore_newline = "no"; + geometry = "300x8-20+20"; + shrink = "yes"; + transparency = "0"; + idle_threshold = "120"; + monitor = "0"; + follow = "mouse"; + sticky_history = "yes"; + history_length = "20"; + show_indicators = "yes"; + line_height = "0"; + separator_height = "0"; + padding = "20"; + horizontal_padding = "20"; + separator_color = "auto"; + startup_notification = "true"; + }; + + urgency_normal = { + background = base00; + foreground = base05; + timeout = 10; + }; + + urgency_low = { + background = base00; + foreground = base05; + timeout = 2; + }; + + urgency_critical = { + background = base00; + foreground = base05; + timeout = 0; + }; + + frame = { + width = 2; + color = base01; + }; + + shortcuts = { + close = "ctrl+space"; + close_all = "ctrl+shift+space"; + history = "ctrl+grave"; + context = "ctrl+shift+period"; + }; + }; + }; +} diff --git a/services/mbsync.nix b/services/mbsync.nix new file mode 100644 index 0000000..168b7ec --- /dev/null +++ b/services/mbsync.nix @@ -0,0 +1,11 @@ +{ config +, pkgs +, ... +}: + +{ + services.mbsync = { + enable = true; + frequency = "*:0/15"; + }; +} diff --git a/services/picom.nix b/services/picom.nix new file mode 100644 index 0000000..67605d1 --- /dev/null +++ b/services/picom.nix @@ -0,0 +1,18 @@ +{ config +, pkgs +, ... +}: + +{ + services.picom = { + enable = true; + backend = "glx"; + fade = true; + fadeDelta = 10; + fadeSteps = [ "0.04" "0.04" ]; + inactiveDim = "0.0"; + shadow = false; + shadowOffsets = [ (-60) (-60) ]; + shadowOpacity = "0.20"; + }; +} diff --git a/services/redshift.nix b/services/redshift.nix new file mode 100644 index 0000000..5385fc1 --- /dev/null +++ b/services/redshift.nix @@ -0,0 +1,18 @@ +{ config +, pkgs +, ... +}: + +{ + services.redshift = { + enable = true; + temperature = { + day = 5000; + night = 4000; + }; + tray = false; + provider = "manual"; + latitude = "12"; + longitude = "77"; + }; +} diff --git a/services/suspend.nix b/services/suspend.nix new file mode 100644 index 0000000..445446b --- /dev/null +++ b/services/suspend.nix @@ -0,0 +1,65 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.batteryNotifier; +in +{ + options = { + services.batteryNotifier = { + enable = mkOption { + default = false; + description = '' + Whether to enable battery notifier. + ''; + }; + device = mkOption { + default = "BAT0"; + description = '' + Device to monitor. + ''; + }; + notifyCapacity = mkOption { + default = 10; + description = '' + Battery level at which a notification shall be sent. + ''; + }; + suspendCapacity = mkOption { + default = 5; + description = '' + Battery level at which a suspend unless connected shall be sent. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.user.timers."lowbatt" = { + description = "check battery level"; + timerConfig.OnBootSec = "1m"; + timerConfig.OnUnitInactiveSec = "1m"; + timerConfig.Unit = "lowbatt.service"; + wantedBy = [ "timers.target" ]; + }; + systemd.user.services."lowbatt" = { + description = "battery level notifier"; + serviceConfig.PassEnvironment = "DISPLAY"; + script = '' + export battery_capacity=$(${pkgs.coreutils}/bin/cat /sys/class/power_supply/${cfg.device}/capacity) + export battery_status=$(${pkgs.coreutils}/bin/cat /sys/class/power_supply/${cfg.device}/status) + if [[ $battery_capacity -le ${builtins.toString cfg.notifyCapacity} && $battery_status = "Discharging" ]]; then + ${pkgs.libnotify}/bin/notify-send --urgency=critical --hint=int:transient:1 --icon=battery_empty "Battery Low" "You should probably plug-in." + fi + if [[ $battery_capacity -le ${builtins.toString cfg.suspendCapacity} && $battery_status = "Discharging" ]]; then + ${pkgs.libnotify}/bin/notify-send --urgency=critical --hint=int:transient:1 --icon=battery_empty "Battery Critically Low" "Computer will suspend in 60 seconds." + sleep 60s + battery_status=$(${pkgs.coreutils}/bin/cat /sys/class/power_supply/${cfg.device}/status) + if [[ $battery_status = "Discharging" ]]; then + systemctl suspend + fi + fi + ''; + }; + }; +} diff --git a/services/sxhkd.nix b/services/sxhkd.nix new file mode 100644 index 0000000..8658875 --- /dev/null +++ b/services/sxhkd.nix @@ -0,0 +1,17 @@ +{ config +, pkgs +, theme +, ... +}: + +{ + services.sxhkd = { + enable = true; + keybindings = { + "XF86Audio{Lower,Raise}Volume" = "${pkgs.alsaUtils}/bin/amixer sset Master 2%{-,+}"; + "XF86AudioMute" = "${pkgs.alsaUtils}/bin/amixer sset Master toggle"; + "XF86MonBrightness{Down,Up}" = "${pkgs.light}/bin/light -{U,A} 5"; + "super + Escape" = "pkill -USR1 -x sxhkd"; + }; + }; +} diff --git a/theme.nix b/theme.nix new file mode 100644 index 0000000..24a8dac --- /dev/null +++ b/theme.nix @@ -0,0 +1,39 @@ +let + day = { + base00 = "#fafafa"; + base01 = "#f0f0f1"; + base02 = "#e5e5e6"; + base03 = "#a0a1a7"; + base04 = "#696c77"; + base05 = "#383a42"; + base06 = "#202227"; + base07 = "#090a0b"; + base08 = "#ca1243"; + base09 = "#d75f00"; + base0A = "#c18401"; + base0B = "#50a14f"; + base0C = "#29BC9B"; + base0D = "#4078f2"; + base0E = "#EB367F"; + base0F = "#986801"; + }; + night = { + base00 = "#000000"; + base01 = "#303030"; + base02 = "#353535"; + base03 = "#4A4A4A"; + base04 = "#787878"; + base05 = "#EEFFFF"; + base06 = "#EEFFFF"; + base07 = "#FFFFFF"; + base08 = "#F07178"; + base09 = "#F78C6C"; + base0A = "#FDF200"; + base0B = "#13CA91"; + base0C = "#79ffe1"; + base0D = "#7898FB"; + base0E = "#ff3299"; + base0F = "#FF5370"; + }; +in +night diff --git a/x/2bwm.nix b/x/2bwm.nix new file mode 100644 index 0000000..09d1a0c --- /dev/null +++ b/x/2bwm.nix @@ -0,0 +1,20 @@ +{ config +, pkgs +, theme +, ... +}: + +with theme; +{ + xresources.properties = { + "twobwm.border_width" = 8; + "twobwm.outer_border" = 2; + "twobwm.focus_color" = base01; + "twobwm.unfocus_color" = base01; + "twobwm.fixed_color" = base0D; + "twobwm.unkill_color" = base08; + "twobwm.fixed_unkill_color" = base0E; + "twobwm.outer_border_color" = base00; + "twobwm.inverted_colors" = true; + }; +} diff --git a/x/default.nix b/x/default.nix new file mode 100644 index 0000000..cd64f61 --- /dev/null +++ b/x/default.nix @@ -0,0 +1,14 @@ +{ config +, pkgs +, theme +, ... +}: + +{ + imports = [ + ./2bwm.nix + ./xft.nix + ./rofi.nix + ./rxvt.nix + ]; +} diff --git a/x/rofi.nix b/x/rofi.nix new file mode 100644 index 0000000..ff80b05 --- /dev/null +++ b/x/rofi.nix @@ -0,0 +1,30 @@ +{ config +, pkgs +, theme +, ... +}: + +with theme; +{ + xresources.properties = { + "rofi.color-enabled" = true; + + "rofi.color-window" = "${base00}, ${base00}, ${base00}, ${base00}, ${base03}"; + "rofi.color-normal" = "${base00}, ${base03}, ${base00}, ${base00}, ${base07}"; + "rofi.color-active" = "${base03}, ${base0E}, ${base00}, ${base0B}, ${base00}"; + "rofi.color-urgent" = "${base00}, ${base03}, ${base00}, ${base00}, ${base03}"; + + "rofi.fake-transparency" = true; + "rofi.font" = "Input 13"; + "rofi.columns" = 1; + "rofi.separator-style" = "none"; + "rofi.hide-scrollbar" = true; + "rofi.location" = 1; + "rofi.yoffset" = 20; + "rofi.xoffset" = 20; + "rofi.padding" = 32; + "rofi.fullscreen" = false; + "rofi.width" = 300; + "rofi.lines" = 6; + }; +} diff --git a/x/rxvt.nix b/x/rxvt.nix new file mode 100644 index 0000000..3498bd0 --- /dev/null +++ b/x/rxvt.nix @@ -0,0 +1,58 @@ +{ config +, pkgs +, theme +, ... +}: + +with theme; +{ + xresources.properties = { + "*foreground" = base05; + "*background" = base00; + "*cursorColor" = base05; + + "*color0" = base00; + "*color1" = base08; + "*color2" = base0B; + "*color3" = base0A; + "*color4" = base0D; + "*color5" = base0E; + "*color6" = base0C; + "*color7" = base05; + + "*color8" = base03; + "*color9" = base09; + "*color10" = base01; + "*color11" = base02; + "*color12" = base04; + "*color13" = base06; + "*color14" = base0F; + "*color15" = base07; + + "*.cursorBlink" = "on"; + "URxvt.font" = "xft:Nerd Input:size=11:style=Medium"; + "URxvt.italicFont" = "xft:Nerd Input:size=11:style=Medium"; + "URxvt.boldFont" = "xft:Nerd Input:size=11:style=Medium"; + "*font" = "Nerd Input:size=11:style=Regular"; + "*italicFont" = "Nerd Input:size=11:style=Italic"; + "*boldFont" = "Nerd Input:size=11:style=Bold"; + + "URxvt.lineSpace" = 0; + "URxvt.letterSpace" = 0; + "URxvt.scrollBar" = false; + "URxvt.internalBorder" = 25; + "URxvt.cursorUnderline" = false; + "URxvt.geometry" = "70x35"; + "URxvt.thickness" = 5; + "URxvt.titleBar" = false; + "URxvt.intensityStyles" = false; + + + "*.perl-ext-common" = "default,matcher,font-size"; + "URxvt.keysym.C-Up" = "perl:font-size:increase"; + "URxvt.keysym.C-Down" = "perl:font-size:decrease"; + "URxvt.keysym.C-equal" = "perl:font-size:reset"; + "*.url-launcher" = "firefox"; + "*.matcher.button" = 1; + }; +} diff --git a/x/xft.nix b/x/xft.nix new file mode 100644 index 0000000..74ea87d --- /dev/null +++ b/x/xft.nix @@ -0,0 +1,16 @@ +{ config +, pkgs +, ... +}: + +{ + xresources.properties = { + "Xft.autohint" = 1; + "Xft.antialias" = 1; + "Xft.lcdfilter" = "lcddefault"; + "Xft.hintstyle" = "hintslight"; + "Xft.hinting" = true; + "Xft.rgba" = "rgb"; + "Xft.dpi" = 110; + }; +} -- cgit v1.2.3