niri: finally, real keyboards

flake.lock

@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770112394,
+        "lastModified": 1772137435,
-        "narHash": "sha256-H8d0WplmDeuvOM4bsHNt77T6OWiSJMaTP6UG1XyMNxA=",
+        "narHash": "sha256-dqkfxxpIiIs4wdWhT4lfQi1lfA0CgIftPiYGvw0tUOk=",
         "owner": "Lassulus",
         "repo": "wrappers",
-        "rev": "23625835eb91d925c498780f5a37442ead1ae8e5",
+        "rev": "4e12f430ae705d9bbb591ca9c51cbccbee050a23",
         "type": "github"
       },
       "original": {

flake.nix

@@ -34,12 +34,15 @@
 
       overlays.default = final: prev: {
         niphas-terminal = prev.alacritty;
-        niphas-web-browser = prev.qutebrowser;
+        niphas-web-browser = prev.firefox;
         niphas-file-browser = prev.pcmanfm;
         niphas-runner = prev.writers.writeDashBin "niphas-runner" "${prev.lib.getExe prev.rofi} -show run";
         niphas-locker = prev.swaylock;
+        niphas-screenshot = prev.writers.writeDashBin "niphas-screenshot" ''
+          ${prev.lib.getExe prev.grim} -g "$(${prev.lib.getExe prev.slurp})" - | ${prev.lib.getExe prev.satty} -f -
+        '';
 
-        niphas-editor = prev.callPackage packages/vim { };
+        niphas-editor = prev.lib.makeOverridable (prev.callPackage packages/vim) { };
         niphas-bar = import packages/ashell.nix {
           inherit (inputs) wrappers;
           pkgs = prev;
@@ -48,7 +51,21 @@
           inherit (inputs) wrappers;
           pkgs = prev;
         };
-        niphas-niri = import packages/niri.nix {
+
+        niphas-niri-config-with =
+          overwriteSettings:
+          (import packages/niri.nix {
+            inherit (inputs) wrappers;
+            inherit overwriteSettings;
+            pkgs = final;
+          })."config.kdl".path;
+
+        niphas-niri =
+          (import packages/niri.nix {
+            inherit (inputs) wrappers;
+            pkgs = final;
+          }).wrapper;
+        niphas-kanshi = import packages/kanshi.nix {
           inherit (inputs) wrappers;
           pkgs = final;
         };
@@ -65,7 +82,34 @@
         niphas-set-wallpaper = prev.writers.writeDashBin "niphas-set-wallpaper" ''
           exec ${lib.getExe prev.swaybg} --mode fill --image ${toString final.niphas-wallpaper}
         '';
+
+        niphas-clipboard-watcher = prev.writers.writeDashBin "niphas-clipboard-watcher" ''
+          exec ${lib.getExe' prev.wl-clipboard "wl-paste"} -t text --watch ${lib.getExe prev.clipman} store
+        '';
+
+        niphas-clipman = prev.writers.writeDashBin "niphas-clipman" ''
+          exec ${lib.getExe prev.clipman} pick --tool rofi
+        '';
+
+        niphas-redshift =
+          let
+            geolocation = [
+              52.5244
+              13.4105
+            ];
+            latitude = builtins.elemAt geolocation 0;
+            longitude = builtins.elemAt geolocation 1;
+          in
+          prev.writers.writeDashBin "niphas-redshift" ''
+            exec ${lib.getExe prev.wlsunset} -l ${toString latitude} -L ${toString longitude}
+          '';
+
         vimv = prev.callPackage packages/vimv.nix { };
+
+        keyboardScripts = prev.callPackage packages/keyboardScripts.nix {
+          pkgs = final;
+          inherit (final) lib;
+        };
       };
 
       packages = eachSupportedSystem (
@@ -81,10 +125,17 @@
             niphas-bar
             niphas-git
             niphas-niri
+            niphas-kanshi
             niphas-editor
+            niphas-wallpaper
+            niphas-set-wallpaper
+            niphas-clipboard-watcher
+            niphas-clipman
+            niphas-redshift
             vimv
             ;
         }
+        // pkgs.keyboardScripts
       );
 
       formatter = eachSupportedSystem (system: treefmtEval.${system}.config.build.wrapper);

modules/desktop.nix

@@ -4,6 +4,19 @@
 
   programs.ydotool.enable = true;
 
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gnome
+    ];
+    config.common.default = "*";
+  };
+
+  services.dbus = {
+    # implementation = "broker";
+    # packages = [ pkgs.gcr ];
+  };
+
   # the status bar needs upower to show battery status
   services.upower.enable = true;
 
@@ -14,14 +27,23 @@
     pkgs.libnotify
     pkgs.wdisplays
     pkgs.nsxiv
+    pkgs.xdg-desktop-portal
+    pkgs.clipman
+    pkgs.xdg-desktop-portal-gnome
+
+    pkgs.rofi # to provide rofi-sensible-terminal
 
     pkgs.niphas-bar
     pkgs.niphas-file-browser
     pkgs.niphas-terminal
     pkgs.niphas-web-browser
     pkgs.niphas-set-wallpaper
+    pkgs.niphas-redshift
+    pkgs.niphas-screenshot
+    pkgs.niphas-clipboard-watcher
     pkgs.niphas-runner
     pkgs.niphas-locker
+    pkgs.niphas-kanshi
   ];
 
   programs.niri = {

modules/nix.nix

@@ -13,6 +13,7 @@
   };
 
   programs.nix-index.enable = true;
+  programs.direnv.enable = true;
 
   environment.systemPackages = [
     pkgs.nil

modules/shell/tools.nix

@@ -1,6 +1,6 @@
 { pkgs, lib, ... }:
 let
-  isDarwin = lib.strings.hasSuffix "darwin" pkgs.system;
+  isDarwin = lib.strings.hasSuffix "darwin" pkgs.stdenv.hostPlatform.system;
 in
 {
   environment.systemPackages = [

modules/shell/zsh.nix

@@ -11,14 +11,14 @@ in
 
   environment.variables =
     let
-      defaultFzf = "${lib.getExe pkgs.fd}/bin/fd --type f --strip-cwd-prefix --no-ignore-vcs --exclude .git";
+      defaultFzf = "${lib.getExe pkgs.fd} --type f --strip-cwd-prefix --no-ignore-vcs --exclude .git";
     in
     {
       FZF_DEFAULT_COMMAND = defaultFzf;
       FZF_DEFAULT_OPTS = "--height 40%";
       FZF_CTRL_T_COMMAND = defaultFzf;
       FZF_CTRL_T_OPTS = "--preview='head -$LINES {}'";
-      FZF_ALT_C_COMMAND = "${lib.getExe pkgs.fd}/bin/fd --type d";
+      FZF_ALT_C_COMMAND = "${lib.getExe pkgs.fd} --type d";
     };
 
   users.defaultUserShell = pkgs.zsh;

packages/git.nix

@@ -1,4 +1,7 @@
-{ wrappers, pkgs }:
+{
+  wrappers,
+  pkgs,
+}:
 let
   git = wrappers.wrapperModules.git.apply {
     inherit pkgs;

packages/kanshi.nix

@@ -0,0 +1,18 @@
+{ wrappers, pkgs }:
+let
+  kanshi = wrappers.wrapperModules.kanshi.apply {
+    inherit pkgs;
+    configFile.content = ''
+      profile {
+          output "eDP-1" enable
+      }
+
+      # laptop above external monitor
+      profile {
+          output "HDMI-A-1" enable position 0,0
+          output "eDP-1" enable position 0,1440
+      }
+    '';
+  };
+in
+kanshi.wrapper

packages/keyboardScripts.nix

@@ -0,0 +1,38 @@
+{ pkgs, lib }:
+let
+  keyboards = {
+    german = {
+      code = "de";
+      variant = "T3";
+    };
+    russian = {
+      code = "ru";
+      variant = "phonetic_winkeys";
+    };
+    greek = {
+      code = "gr";
+      variant = "polytonic";
+    };
+  };
+
+  keyboardScripts = lib.mapAttrs' (
+    name: keyboard:
+    lib.nameValuePair "kb-${name}" (
+      pkgs.writers.writeDashBin "kb-${name}" ''
+        exec ${lib.getExe pkgs.niphas-niri} msg action load-config-file --path ${
+          pkgs.niphas-niri-config-with {
+            input = {
+              keyboard = {
+                xkb.layout = "de,${keyboard.code}";
+                xkb.variant = "T3,${keyboard.variant}";
+                xkb.options = "compose:caps,grp:ctrls_toggle";
+                numlock = null;
+              };
+            };
+          }
+        }
+      ''
+    )
+  ) keyboards;
+in
+keyboardScripts

packages/niri.nix

@@ -1,11 +1,7 @@
 {
   wrappers,
   pkgs,
-  screenshotPath ? null,
+  overwriteSettings ? { },
-  geolocation ? [
-    52.5244
-    13.4105
-  ],
 }:
 let
   lib = pkgs.lib;
@@ -15,14 +11,14 @@ let
     shadow-color = "#0007";
   };
 
-  niri = wrappers.wrapperModules.niri.apply {
+  niriWrapper = wrappers.wrapperModules.niri.apply {
     inherit pkgs;
-    settings = builtins.foldl' lib.recursiveUpdate { } (
+    settings = lib.recursiveUpdate {
-      [
-        {
       input = {
         keyboard = {
           xkb.layout = "de";
+          xkb.variant = "T3";
+          xkb.options = "compose:caps";
           numlock = null;
         };
         touchpad = {
@@ -61,20 +57,10 @@ let
       spawn-at-startup = [
         (lib.getExe pkgs.niphas-bar)
         (lib.getExe pkgs.niphas-set-wallpaper)
-          ]
+        (lib.getExe pkgs.niphas-clipboard-watcher)
-          ++ lib.optional (geolocation != null) (
+        (lib.getExe pkgs.niphas-redshift)
-            let
+        (lib.getExe pkgs.niphas-kanshi)
-              latitude = builtins.elemAt geolocation 0;
+      ];
-              longitude = builtins.elemAt geolocation 1;
-            in
-            [
-              (lib.getExe pkgs.wlsunset)
-              "-l"
-              (toString latitude)
-              "-L"
-              (toString longitude)
-            ]
-          );
       hotkey-overlay.skip-at-startup = null;
       prefer-no-csd = null;
       animations.slowdown = 0.5; # twice as fast
@@ -89,6 +75,8 @@ let
           "Mod+Return".spawn = lib.getExe pkgs.niphas-terminal;
           "Mod+D".spawn = lib.getExe pkgs.niphas-runner;
           "Mod+Shift+W".spawn = lib.getExe pkgs.niphas-locker;
+          "Print".spawn = lib.getExe pkgs.niphas-screenshot;
+          "Mod+Q".spawn = lib.getExe pkgs.niphas-clipman;
 
           # TODO allow-when-locked
           "XF86AudioRaiseVolume".spawn-sh = "${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0";
@@ -99,8 +87,8 @@ let
           "XF86AudioStop".spawn-sh = "${lib.getExe pkgs.playerctl} stop";
           "XF86AudioPrev".spawn-sh = "${lib.getExe pkgs.playerctl} previous";
           "XF86AudioNext".spawn-sh = "${lib.getExe pkgs.playerctl} next";
-              "XF86MonBrightnessUp".spawn-sh = "${lib.getExe pkgs.brightnessctl} --class=backlight set +10%";
+          "XF86MonBrightnessUp".spawn-sh = "${lib.getExe pkgs.brightnessctl} --class=backlight set +25%";
-              "XF86MonBrightnessDown".spawn-sh = "${lib.getExe pkgs.brightnessctl} --class=backlight set 10%-";
+          "XF86MonBrightnessDown".spawn-sh = "${lib.getExe pkgs.brightnessctl} --class=backlight set 25%-";
 
           # TODO repeat=false
           "Mod+O".toggle-overview = null;
@@ -114,6 +102,10 @@ let
           "Mod+Shift+J".move-window-down-or-to-workspace-down = null;
           "Mod+Shift+K".move-window-up-or-to-workspace-up = null;
           "Mod+Shift+L".move-column-right = null;
+          "Mod+Shift+Ctrl+H".move-column-to-monitor-left = null;
+          "Mod+Shift+Ctrl+J".move-column-to-monitor-down = null;
+          "Mod+Shift+Ctrl+K".move-column-to-monitor-up = null;
+          "Mod+Shift+Ctrl+L".move-column-to-monitor-right = null;
           "Mod+Home".focus-column-first = null;
           "Mod+End".focus-column-last = null;
           "Mod+Shift+Home".move-column-to-first = null;
@@ -167,19 +159,7 @@ let
           "Mod+Shift+E".quit = null;
           "Ctrl+Alt+Delete".quit = null;
         };
-        }
+    } overwriteSettings;
-      ]
-      ++ lib.optional (screenshotPath != null) [
-        {
-          screenshot-path = screenshotPath;
-          binds = {
-            "Print".screenshot = null;
-            "Ctrl+Print".screenshot-screen = null;
-            "Alt+Print".screenshot-window = null;
-          };
-        }
-      ]
-    );
   };
 in
-niri.wrapper
+niriWrapper

packages/vim/default.nix

@@ -1,5 +1,6 @@
 {
   neovim,
+  nodejs,
   vimPlugins,
   fetchFromGitHub,
   vimUtils,
@@ -14,7 +15,20 @@ neovim.override {
   configure = {
     vimAlias = true;
     viAlias = true;
-    customRC = ''
+    customRC =
+
+      lib.optionalString withCopilot (''
+        luafile ${writeText "copilot.lua" ''
+          require("copilot").setup({
+            suggestion = { enabled = false },
+            panel = { enabled = false },
+            copilot_node_command = '${lib.getExe nodejs}'
+          })
+
+          require("copilot_cmp").setup()
+        ''}
+      '')
+      + ''
         source ${./shared.vim}
         source ${./init.vim}
         let g:snippet_directory = '${vimPlugins.friendly-snippets}'
@@ -81,7 +95,10 @@ neovim.override {
           }
         )
       ]
-      ++ lib.optional withCopilot vimPlugins.copilot.nvim;
+      ++ lib.optionals withCopilot [
+        vimPlugins.copilot-lua
+        vimPlugins.copilot-cmp
+      ];
       opt = [
         csv
         dhall-vim

packages/vim/init.lua

@@ -19,17 +19,23 @@ cmp.setup({
       luasnip.lsp_expand(args.body)
     end,
   },
+  completion = {
+    autocomplete = { require("cmp.types").cmp.TriggerEvent.TextChanged },
+  },
   mapping = {
-    -- https://github.com/hrsh7th/nvim-cmp/wiki/Example-mappings#super-tab-like-mapping
+    ["<C-Space>"] = cmp.mapping.complete(),
+    ["<CR>"] = cmp.mapping.confirm({ select = true }),
+
     ["<Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
       elseif luasnip.expand_or_jumpable() then
         luasnip.expand_or_jump()
       else
-        fallback()
+        cmp.complete()
       end
     end, { "i", "s" }),
+
     ["<S-Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_prev_item()
@@ -41,8 +47,11 @@ cmp.setup({
     end, { "i", "s" }),
   },
   sources = cmp.config.sources({
-    { name = "nvim_lsp" },
+    { name = "copilot",  priority = 1000 },
-    { name = "luasnip" },
+    { name = "nvim_lsp", priority = 800 },
+    { name = "luasnip",  priority = 700 },
+    { name = "path",     priority = 500 },
+    { name = "buffer",   priority = 300 },
   }),
 })
 
@@ -96,6 +105,7 @@ local language_servers = {
   gopls = {},  -- gopls
   denols = {}, -- deno built in
   bashls = {}, -- bash-language-server
+  ocamllsp = {}, -- ocamllsp
   lua_ls = {
     Lua = {
       runtime = {

packages/vim/init.vim

@@ -45,6 +45,17 @@ let g:netrw_winsize = 25
 call matchadd('colorcolumn', '\%101v', 100)
 highlight colorcolumn ctermbg=red
 
+fun! TrimWhitespace()
+  " Skip if the filetype is markdown
+  if &ft =~ 'markdown'
+    return
+  endif
+  let l:save = winsaveview()
+  keeppatterns %s/\s\+$//e
+  call winrestview(l:save)
+endfun
+autocmd BufWritePre * call TrimWhitespace()
+
 " undofile - This allows you to use undos after exiting and restarting
 " This, like swap and backups, uses .vim-undo first, then ~/.vim/undo
 " :help undo-persistence