@@ -23,3 +23,7 @@ else
         git checkout -b "$1"
     fi
 }
+
+gaf() {
+    git status --short | grep "^ M\|^ D\|^\?\?" | fzy | awk '{ print $2 }' | xargs git add
+}

@@ -17,3 +17,28 @@ require 'lsp.go'
 require 'lsp.lua'
 require 'lsp.json'
 
+-- plugins not in nixpkgs
+
+require 'packer'.startup(function(use)
+  use {
+    'Pocco81/true-zen.nvim',
+    ft = {'markdown'},
+    config = function()
+      require 'true-zen'.setup{
+        integrations = {
+          tmux = true,
+        },
+        modes = {
+          ataraxis = {
+            auto_padding = true,
+            custom_bg = {'darken', 0.54},
+            quit_untoggles = false
+          }
+        }
+      }
+    end
+  }
+
+  use 'kana/vim-textobj-user'
+  use 'preservim/vim-textobj-quote'
+end)

@@ -15,7 +15,6 @@ o.scrolloff = 12
 o.timeoutlen = 3000
 o.ttimeoutlen = 100
 o.undodir = '~/.cache/nvim/undodir'
-o.cursorline = false
 o.foldenable = false
 o.conceallevel = 2
 o.mouse = 'a'
@@ -24,7 +23,7 @@ o.tabstop = 4
 o.shiftwidth = 4
 o.softtabstop = 4
 o.showmode = true
-o.cursorline = true
+o.cursorline = false
 o.listchars='tab:│ ,nbsp:␣,trail:·,extends:>,precedes:<'
 o.hidden = true
 o.completeopt = { 'menuone', 'noselect', 'noinsert' }
@@ -97,31 +96,38 @@ end
   end,
 })
 
+-- keymap files are dts
+autocmd('BufEnter,BufNewFile,BufRead', {
+  pattern = '*.keymap',
+  callback = function()
+    vim.bo.filetype = 'dts'
+  end
+})
+
+-- vim-textobj-quote only in ~/docs/writing
+autocmd('BufEnter,BufNewFile,BufRead', {
+  pattern = '*.md',
+  callback = function()
+    local cwd = vim.fn.expand('%:p')
+    if cwd:find('/home/icy/docs/writing', 1, true) == 1 then
+      vim.fn['textobj#quote#init']()
+      vim.fn['pencil#init']({wrap = 'soft'})
+      vim.keymap.set('i', '--', '—', {silent = true})
+    end
+  end
+})
+
+-- mdx files are markdown
+autocmd('BufEnter,BufNewFile,BufRead', {
+  pattern = '*.mdx',
+  callback = function()
+    vim.bo.filetype = 'markdown'
+  end
+})
+
 -- filetype.nvim
 g.do_filetype_lua = 1
 g.did_load_filetypes = 0
-
--- tabout.nvim
-require('tabout').setup {
-  tabkey = '<Tab>',
-  backwards_tabkey = '<S-Tab>',
-  act_as_tab = true,
-  act_as_shift_tab = false,
-  default_tab = '<C-t>',
-  default_shift_tab = '<C-d>',
-  enable_backwards = true,
-  completion = true,
-  tabouts = {
-    {open = "'", close = "'"},
-    {open = '"', close = '"'},
-    {open = '`', close = '`'},
-    {open = '(', close = ')'},
-    {open = '[', close = ']'},
-    {open = '{', close = '}'}
-  },
-  ignore_beginning = true,
-  exclude = {}
-}
 
 -- disable built-in plugins
 local disabled_built_ins = {

@@ -23,11 +23,11 @@ -framerate 60 \
       -vcodec libx264 \
       -threads 4 \
       -y \
-      /home/np/tmp/x.mkv
+      /home/icy/tmp/x.mkv
 
     ${ffmpeg} \
-      -i /home/np/tmp/x.mkv \
+      -i /home/icy/tmp/x.mkv \
       -pix_fmt yuv420p \
       -vf scale=-2:1080 \
-      "/home/np/vids/rec/$1"
+      "/home/icy/vids/rec/$1"
   ''

@@ -81,11 +81,11 @@ "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1654113405,
-        "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
+        "lastModified": 1656169755,
+        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
+        "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@ "neovim-flake": "neovim-flake",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1656058113,
-        "narHash": "sha256-xJgKKXrz/r63/YMB/yke3g/yduX7tXE5xJBPfgqV+rM=",
+        "lastModified": 1659168488,
+        "narHash": "sha256-UIhemfmjXfV+EOpM7wWMgIPkss+fZk/kdewUj/VxzXc=",
         "owner": "icyphox",
         "repo": "neovim-nightly-overlay",
-        "rev": "0acd78711280c2cc066e7ab6599b448c10e8d3ec",
+        "rev": "5669f07851612ba17d660281cd390d2c086bafc4",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@ ]
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1656032696,
-        "narHash": "sha256-GFGsaJqnmtCdfmB1ptJ9jJJ7Ro2yS2NYYHapGHZZMQM=",
+        "lastModified": 1659102441,
+        "narHash": "sha256-lo2FFXnvbHnMkaTwveAiILiVpmdHsCkgsTNEcRa5Ihc=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "3a4fa22badc5595afc0a994ead965ff32ccf6c76",
+        "rev": "e59bc078de624a5f3220bfd2713be3f8978c5672",
         "type": "github"
       },
       "original": {
@@ -141,11 +141,11 @@ }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1655789751,
-        "narHash": "sha256-DbL2gn7YwkuX10OdlWfZ/A7zEJztwHh9NMeau1JMTdk=",
+        "lastModified": 1658401027,
+        "narHash": "sha256-z/sDfzsFOoWNO9nZGfxDCNjHqXvSVZLDBDSgzr9qDXE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f9d8dff4e621f2d7f2b84d9e84bc6359715f971c",
+        "rev": "83009edccc2e24afe3d0165ed98b60ff7471a5f8",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@ }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1655895887,
-        "narHash": "sha256-AbihSVmPKFcQmaVgzNSLQ8sLAaVTTELPSzZ+/gRVfyk=",
+        "lastModified": 1659077768,
+        "narHash": "sha256-P0XIHBVty6WIuIrk2DZNvLcYev9956y1prT4zL212H8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e1e08fe28bf0588a41cd556eac40b98d2793da99",
+        "rev": "2a93ea177c3d7700b934bf95adfe00c435f696b8",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@ }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1655983783,
-        "narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=",
+        "lastModified": 1659077768,
+        "narHash": "sha256-P0XIHBVty6WIuIrk2DZNvLcYev9956y1prT4zL212H8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68",
+        "rev": "2a93ea177c3d7700b934bf95adfe00c435f696b8",
         "type": "github"
       },
       "original": {

@@ -64,16 +64,5 @@ pictures = "\$HOME/pics";
       videos = "\$HOME/vids";
     };
   };
-
-  xsession = {
-    enable = true;
-    windowManager.command = "cwm";
-    initExtra = ''
-      ${pkgs.xorg.setxkbmap}/bin/setxkbmap us,ru -option grp:ctrls_toggle
-      ${pkgs.xorg.xrdb}/bin/xrdb -load $HOME/.Xresources
-      bar &
-      st &
-    '';
-  };
 }
 

@@ -69,6 +69,9 @@ ../../patches/st/bright.diff
         ../../patches/st/ligatures.diff
       ];
     };
+    chromium = {
+      commandLineArgs = "--ozone-platform=wayland";
+    };
   };
 
   nixpkgs.overlays = with self.overlays; [
@@ -154,7 +157,11 @@ };
     xserver = {
       enable = true;
       layout = "us";
-      displayManager.startx.enable = true;
+      desktopManager.plasma5.enable = true;
+      displayManager.sddm = {
+        enable = true;
+        enableHidpi = true;
+      };
       dpi = 192;
       videoDrivers = [ "nvidia" ];
       screenSection = ''

@@ -42,10 +42,11 @@ 
       TERM = "xterm-256color-italic";
       EDITOR = "nvim";
       MANPAGER = "nvim +Man!";
-      BROWSER = "firefox";
+      BROWSER = "chromium";
       PW_DIR = "$HOME/.pw";
       PW_KEY = "x@icyphox.sh";
       PATH = "$PATH:$HOME/go/bin:$HOME/bin";
+      NIX_OZONE_WL = "1";
 
     };
 

@@ -15,7 +15,7 @@ ./neovim.nix
     ./readline.nix
     ./tmux.nix
     ./zathura.nix
-    ./firefox.nix
+    # ./firefox.nix
   ];
 
   programs = {

@@ -33,6 +33,8 @@ extraConfig = ''
       runtime _init.lua
     '';
     plugins = with pkgs.vimPlugins; [
+      packer-nvim
+
       nvim-cmp
       cmp-buffer
       cmp_luasnip
@@ -53,6 +55,7 @@ nvim-treesitter-textobjects
       conflict-marker-vim
       tabout
       vim-jsonnet
+      vim-pencil
     ];
   };
 }

@@ -53,9 +53,9 @@ bind-key ) swap-window -t +2
       bind-key ( swap-window -t -1
 
       unbind -T copy-mode MouseDragEnd1Pane
-      bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -sel c"
+      bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy"
       bind-key -T copy-mode-vi v send-keys -X begin-selection
-      bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -sel c"
+      bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy"
       bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
       bind P paste-buffer
 

@@ -9,7 +9,6 @@ 
   imports = [
     ./dunst.nix
     ./picom.nix
-    ./redshift.nix
     ./sxhkd.nix
     ./mbsync.nix
   ];

@@ -1,10 +1,9 @@ 
 dotfiles
 --------
 
-· OS:     NixOS
-· WM:     cwm
-· Shell:  bash
-· Editor: nvim, with init.lua
-· IRC:    weechat
+    • OS:     NixOS
+    • WM:     cwm
+    • Shell:  bash
+    • Editor: nvim, with init.lua
 
 For my old, pre-NixOS configs, look at the 'old' branch.

@@ -12,12 +12,11 @@ TCPKeepAlive yes
     IdentityFile ~/.ssh/github-pantone
 
 Host fern
-    Hostname 152.67.182.105
+    Hostname fern
     User pi
-    Port 2222
 
 Host jade
-    Hostname 152.67.182.105
+    Hostname jade
     User ubuntu
     IdentityFile ~/.ssh/id_rsa
 

@@ -17,4 +17,4 @@ salt = on
 
 [data]
 __passphrase__ = on
-znc = "FF98D677A3058F3C1EF738A67E0DF87F2B4435EE1DB9CC666645C67950B0D14092D45D8FC473ED92804DD460A97F37940262E2"
+znc = "1C0334EF5FB460AC8AC9ABBBF378355CFB7769F96E1318F508142675DDA821AEB3A51AF098B2C3C899D0EAC78CA93389CDE07C"

@@ -407,6 +407,28 @@ default.buffer = "irc;rizon.#taigobot-test;5"
 default.buffer = "irc;rizon.#homescreen;6"
 default.buffer = "irc;rizon.#bullshit;7"
 default.buffer = "irc;rizon.*clientbuffer;8"
+default.buffer = "irc;server.libera;9"
+default.buffer = "irc;libera.#lobsters;10"
+default.buffer = "irc;libera.#openbsd;11"
+default.buffer = "irc;libera.##crustaceans;12"
+default.buffer = "irc;libera.#linux;13"
+default.buffer = "irc;libera.#python;14"
+default.buffer = "irc;libera.#go-nuts;15"
+default.buffer = "irc;libera.#kubernetes;16"
+default.buffer = "irc;libera.#kisslinux;17"
+default.buffer = "irc;libera.#neovim;18"
+default.buffer = "irc;libera.#nixers;19"
+default.buffer = "irc;libera.#security;20"
+default.buffer = "irc;libera.#opsec;21"
+default.buffer = "irc;libera.#plan9;22"
+default.buffer = "irc;libera.#libera;23"
+default.buffer = "irc;libera.##github;24"
+default.buffer = "irc;libera.#gnupg;25"
+default.buffer = "irc;libera.#c;26"
+default.buffer = "irc;libera.#xorg;27"
+default.buffer = "irc;libera.#docker;28"
+default.buffer = "irc;libera.#nixos;29"
+default.buffer = "irc;libera.*clientbuffer;30"
 default.window = "1;0;0;0;irc;rizon.Carp"
 default.current = on