desktop: specify keyboard layout/options

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1656413262,
-        "narHash": "sha256-I8X1LaW/qoSWeBLK0N8GPOshIuXG9zyNyZUtKZYa0h4=",
+        "lastModified": 1656613796,
+        "narHash": "sha256-oQn4KFUjapGOK1ncsUD/SdArRIiX9hWRJIrj4n7+23E=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8772891c73e2809df5e5469d14535ea77e123d3e",
+        "rev": "3f21945eac3ef08d7f3fd329dbe3954fe52f3d10",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1656239181,
-        "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
+        "lastModified": 1656461576,
+        "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
+        "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1656440741,
-        "narHash": "sha256-Apn2V5plV2vNHj4JrwClsI67H+Ab/7QmVDXPVaf0L3I=",
+        "lastModified": 1656611551,
+        "narHash": "sha256-S1GkwCgMimVVU1nrwezTkoOqsoiXvvK1+pu4zplsqwo=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c77b7b770d126310e79a847e2ef06d6a8a2e4a19",
+        "rev": "b58e819d423cc525475b43bd06cf5f999feb5325",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -271,6 +271,11 @@ in {
     };
   };
 
+  programs.tmux = {
+    enable = true;
+    prefix = "`";
+  };
+
   services.keybase.enable = true;
   services.kbfs = {
     enable = true;

home/profiles/desktop/default.nix

@@ -3,6 +3,12 @@
 with lib;
 
 {
+  home.keyboard = {
+    layout = "us";
+    options = [ "ctrl:nocaps" "compose:ralt" ];
+  };
+
+  xsession.enable = true;
 
   home.packages = with pkgs;
     let
@@ -153,6 +159,14 @@ with lib;
   };
 
   services.gammastep = {
+    enable = false;
+    provider = "manual";
+    latitude = 54.0;
+    longitude = 1.0;
+    tray = true;
+  };
+
+  services.redshift = {
     enable = true;
     provider = "manual";
     latitude = 54.0;
@@ -179,17 +193,6 @@ with lib;
     '';
   };
 
-  programs.alacritty = {
-    enable = true;
-
-    settings = {
-      font = {
-        normal.family = "Iosevka";
-        size = 11;
-      };
-    };
-  };
-
   programs.rofi = {
     enable = true;
     plugins = [ pkgs.rofi-emoji pkgs.rofi-pass ];

home/profiles/emacs/default.nix

@@ -12,7 +12,7 @@ let
 in {
   programs.emacs = {
     enable = true;
-    package = pkgs.emacsPgtkNativeComp;
+    package = pkgs.emacsNativeComp;
   };
 
   home.packages = with pkgs;

home/profiles/emacs/doom.d/config.org

@@ -716,6 +716,29 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
       (org-clock-in select at-time)))
 #+end_src
 
+** Deft
+
+#+begin_src emacs-lisp
+  (use-package! deft
+    :custom
+    (deft-extensions '("md" "org" "txt"))
+    (deft-default-extension "md")
+    (deft-directory "~/Scratch/ZettelTest")
+    (deft-use-filename-as-title t))
+
+  (use-package! zetteldeft
+    :after deft
+    :config
+    (setq zetteldeft-link-indicator "[["
+          zetteldeft-link-suffix "]]"
+
+          zetteldeft-title-prefix "# "
+          zetteldeft-list-prefix "- ")
+    (font-lock-add-keywords 'markdown-mode
+                            `((,zetteldeft-id-regex
+                               . font-lock-warning-face))))
+#+end_src
+
 * Reading
 
 ** Web

home/profiles/emacs/doom.d/init.el

@@ -20,7 +20,7 @@
        (ivy +icons +prescient +childframe)
 
        :ui
-       ;;deft              ; notational velocity for Emacs
+       deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
        doom-quit         ; DOOM quit-message prompts when you quit Emacs

home/profiles/emacs/doom.d/packages.el

@@ -56,6 +56,8 @@
 (package! ob-http)
 (package! org-wc)
 
+(package! zetteldeft)
+
 (package! aggressive-indent)
 (package! symex)
 (package! prism)

home/profiles/i3/default.nix

@@ -8,25 +8,27 @@ let
   right = "s";
 
   cmds = rec {
-    alacritty = pkgs.alacritty + /bin/alacritty;
+    kitty = config.programs.kitty.package + /bin/kitty;
     rofi = config.programs.rofi.finalPackage + /bin/rofi;
     playerctl = pkgs.playerctl + /bin/playerctl;
     pamixer = pkgs.pamixer + /bin/pamixer;
 
-    term = "${alacritty}";
+    term = "${kitty}";
     menu = "${rofi} -show drun";
+    window-menu = "${rofi} -show window";
   };
 in {
+  imports = [ ./polybar.nix ];
+
+  home.packages = with pkgs; [ arandr autorandr ];
+
   xsession.windowManager.i3 = {
     enable = true;
 
     config = {
       inherit modifier;
 
-      window = {
-        titlebar = true;
-        border = 0;
-      };
+      window.border = 3;
 
       gaps.inner = 16;
       fonts = {
@@ -34,22 +36,18 @@ in {
         size = 12.0;
       };
 
-      bars = [{
-        mode = "dock";
-        position = "top";
-        workspaceButtons = true;
-        workspaceNumbers = true;
-        statusCommand = "${pkgs.i3status}/bin/i3status";
-        fonts = {
-          names = [ "Iosevka" ];
-          size = 11.0;
-        };
-      }];
+      bars = [ ];
+
+      floating.criteria = [
+        { window_role = "^EMsgComposer"; } # Evolution mail compose
+        { class = "^Yubico Authenticator$"; }
+      ];
 
       keybindings = let mod = config.xsession.windowManager.i3.config.modifier;
       in lib.mkOptionDefault {
         "${mod}+Return" = "exec ${cmds.term}";
         "${mod}+d" = "exec ${cmds.menu}";
+        "${mod}+Shift+d" = "exec ${cmds.window-menu}";
         "${mod}+Shift+c" = "kill";
 
         "${mod}+${left}" = "focus left";

home/profiles/i3/polybar.ini

@@ -0,0 +1,174 @@
+;==========================================================
+;
+;
+;   ██████╗  ██████╗ ██╗  ██╗   ██╗██████╗  █████╗ ██████╗
+;   ██╔══██╗██╔═══██╗██║  ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗
+;   ██████╔╝██║   ██║██║   ╚████╔╝ ██████╔╝███████║██████╔╝
+;   ██╔═══╝ ██║   ██║██║    ╚██╔╝  ██╔══██╗██╔══██║██╔══██╗
+;   ██║     ╚██████╔╝███████╗██║   ██████╔╝██║  ██║██║  ██║
+;   ╚═╝      ╚═════╝ ╚══════╝╚═╝   ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝
+;
+;
+;   To learn more about how to configure Polybar
+;   go to https://github.com/polybar/polybar
+;
+;   The README contains a lot of information
+;
+;==========================================================
+
+[colors]
+background = #282A2E
+background-alt = #373B41
+foreground = #C5C8C6
+primary = #F0C674
+secondary = #8ABEB7
+alert = #A54242
+disabled = #707880
+
+[bar/main]
+width = 100%
+height = 24pt
+; radius = 6
+
+; dpi = 96
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+line-size = 3pt
+
+border-size = 12pt
+border-bottom-size = 0pt
+border-color = #00000000
+
+padding-left = 0
+padding-right = 1
+
+module-margin = 1
+
+separator = |
+separator-foreground = ${colors.disabled}
+
+font-0 = monospace;2
+
+modules-left = xworkspaces xwindow
+modules-center = date
+modules-right = pulseaudio xkeyboard memory cpu wlan
+
+cursor-click = pointer
+cursor-scroll = ns-resize
+
+enable-ipc = true
+
+tray-position = right
+
+; wm-restack = generic
+; wm-restack = bspwm
+wm-restack = i3
+
+; override-redirect = true
+
+[module/xworkspaces]
+type = internal/xworkspaces
+
+label-active = %name%
+label-active-background = ${colors.background-alt}
+label-active-underline= ${colors.primary}
+label-active-padding = 1
+
+label-occupied = %name%
+label-occupied-padding = 1
+
+label-urgent = %name%
+label-urgent-background = ${colors.alert}
+label-urgent-padding = 1
+
+label-empty = %name%
+label-empty-foreground = ${colors.disabled}
+label-empty-padding = 1
+
+[module/xwindow]
+type = internal/xwindow
+label = %title:0:60:...%
+
+[module/filesystem]
+type = internal/fs
+interval = 25
+
+mount-0 = /
+
+label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%
+
+label-unmounted = %mountpoint% not mounted
+label-unmounted-foreground = ${colors.disabled}
+
+[module/pulseaudio]
+type = internal/pulseaudio
+
+format-volume-prefix = "VOL "
+format-volume-prefix-foreground = ${colors.primary}
+format-volume = <label-volume>
+
+label-volume = %percentage%%
+
+label-muted = muted
+label-muted-foreground = ${colors.disabled}
+
+[module/xkeyboard]
+type = internal/xkeyboard
+blacklist-0 = num lock
+
+label-layout = %layout%
+label-layout-foreground = ${colors.primary}
+
+label-indicator-padding = 2
+label-indicator-margin = 1
+label-indicator-foreground = ${colors.background}
+label-indicator-background = ${colors.secondary}
+
+[module/memory]
+type = internal/memory
+interval = 2
+format-prefix = "RAM "
+format-prefix-foreground = ${colors.primary}
+label = %percentage_used:2%%
+
+[module/cpu]
+type = internal/cpu
+interval = 2
+format-prefix = "CPU "
+format-prefix-foreground = ${colors.primary}
+label = %percentage:2%%
+
+[network-base]
+type = internal/network
+interval = 5
+format-connected = <label-connected>
+format-disconnected = <label-disconnected>
+label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
+
+[module/wlan]
+inherit = network-base
+interface-type = wireless
+label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
+
+[module/eth]
+inherit = network-base
+interface-type = wired
+label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
+
+[module/date]
+type = internal/date
+interval = 1
+
+date = %Y-%m-%d %H:%M
+date-alt = %H:%M:%S
+
+label = %date%
+label-foreground = ${colors.primary}
+
+[settings]
+screenchange-reload = true
+pseudo-transparency = true
+
+; vim:ft=dosini

home/profiles/i3/polybar.nix

@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services.polybar = {
+    enable = true;
+    package = pkgs.polybar.override {
+      pulseSupport = true;
+      mpdSupport = true;
+      i3GapsSupport = true;
+      iwSupport = true;
+    };
+    script = ''
+      polybar main &
+    '';
+    config = { };
+    extraConfig = lib.readFile ./polybar.ini;
+  };
+}