minor

Author: debugloop

flake.nix

@@ -20,6 +20,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     impermanence.url = "github:nix-community/impermanence";
+    zed.url = "github:zed-industries/zed";
 
     # niri-unstable = {
     #   url = "github:YaLTeR/niri/a11fe23cbf6ba01ae4c23679aa2f7d7d8b44baf4";
@@ -35,5 +36,5 @@
     # gridx.url = "path:/home/danieln/code/gridx";
   };
 
-  outputs = inputs: inputs.blueprint {inherit inputs;};
+  outputs = inputs: inputs.blueprint { inherit inputs; };
 }

modules/home/class-laptop/applications.nix

@@ -14,6 +14,7 @@
       gnumeric
       google-chrome
       inkscape
+      obsidian
       qview
       spotify
       xfce.thunar

modules/home/class-laptop/default.nix

@@ -45,6 +45,7 @@
       wev
       wl-mirror
       xdg-utils
+      zed-editor-fhs
       # cli apps with graphical deps
       imagemagick
       pdftk

modules/home/class-laptop/niri.nix

@@ -7,6 +7,7 @@
   home.packages = with pkgs; [
     xwayland-satellite
   ];
+  services.swww.enable = true;
   programs.niri = {
     package = perSystem.niri.niri-unstable;
     settings = {
@@ -51,13 +52,14 @@
       prefer-no-csd = true;
       layout = {
         empty-workspace-above-first = true;
-        gaps = 2;
-        # struts = {
-        #   top = -6;
-        #   bottom = -6;
-        #   left = -6;
-        #   right = -6;
-        # };
+        always-center-single-column = true;
+        gaps = 12;
+        struts = {
+          top = -6;
+          bottom = -6;
+          left = -6;
+          right = -6;
+        };
         shadow = {
           enable = false;
           color = "#${config.colors.blue}";
@@ -104,14 +106,17 @@
         };
         insert-hint.display.color = "#${config.colors.green}88";
       };
+      debug = {
+        honor-xdg-activation-with-invalid-serial = true;
+      };
       window-rules = [
         {
           clip-to-geometry = true;
           geometry-corner-radius = {
-            bottom-left = 1.0;
-            bottom-right = 1.0;
-            top-left = 1.0;
-            top-right = 1.0;
+            bottom-left = 0.0;
+            bottom-right = 10.0;
+            top-left = 10.0;
+            top-right = 0.0;
           };
         }
         {
@@ -156,10 +161,16 @@
           ];
           focus-ring = {
             enable = true;
-            width = 2;
+            width = 1;
             active.color = "#${config.colors.bright-red}";
             inactive.color = "#${config.colors.bright-red}";
           };
+          border = {
+            enable = true;
+            width = 1;
+            active.color = "#${config.colors.bright-red}00";
+            inactive.color = "#${config.colors.bright-red}00";
+          };
           shadow = {
             enable = true;
             softness = 8;
@@ -208,7 +219,6 @@
         # lock and suspend
         "Mod+Backslash".action = spawn "${pkgs.swaylock-effects}/bin/swaylock" "-f";
         "Mod+Ctrl+Backslash".action = spawn "systemctl" "suspend";
-        "Cancel".action = spawn "${pkgs.swaylock-effects}/bin/swaylock" "-f";
 
         # window actions
         "Mod+Q".action = close-window;
@@ -219,25 +229,13 @@
         "Mod+W".action = toggle-column-tabbed-display;
         "Mod+Ctrl+V".action = toggle-window-floating;
         "Mod+V".action = switch-focus-between-floating-and-tiling;
-        # "Mod+Space".action = spawn "${pkgs.writeScript "consume_next.py" ''
-        #   #!/usr/bin/env python
-        #   import subprocess
-        #
-        #   p = subprocess.Popen(['niri', 'msg', '-j', 'event-stream'], stdout=subprocess.PIPE)
-        #
-        #   for line in p.stdout:
-        #       line = line.decode('utf-8')
-        #       if 'WindowOpenedOrChanged' in line:
-        #           subprocess.call(['niri', 'msg', 'action', 'consume-or-expel-window-left'])
-        #           break
-        # ''}";
         "Mod+Space".action = toggle-overview;
 
         # window width
         "Mod+R".action = switch-preset-column-width;
         "Mod+Period".action = switch-preset-column-width;
         "Mod+Comma".action = switch-preset-column-width-back;
-        "Mod+M".action = maximize-column;
+        "Mod+M".action = maximize-window-to-edges;
         "Mod+Ctrl+M".action = expand-column-to-available-width;
         "Mod+XF86AudioRaiseVolume".action = switch-preset-column-width;
         "Mod+XF86AudioLowerVolume".action = switch-preset-column-width-back;
@@ -294,14 +292,10 @@
         "Mod+Ctrl+Left".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-monitor-left || niri msg action move-column-left-or-to-monitor-left";
         "Mod+Ctrl+Right".action = spawn "fish" "-c" "niri msg -j windows | jq -er '.[]|select(.is_focused==true)|.is_floating' && niri msg action move-window-to-monitor-right || niri msg action move-column-right-or-to-monitor-right";
 
-        # swaylike workspace focus with wrapping
-        # "Mod+Ctrl+J".action = spawn "fish" "-c" "niri msg -j workspaces | jq -r 'sort_by(.idx).[-2].is_focused' | grep true; and niri msg action focus-workspace (niri msg -j workspaces | jq -r 'sort_by(.idx).[0].idx'); or niri msg action focus-workspace-down";
-        # "Mod+Ctrl+K".action = spawn "fish" "-c" "niri msg -j workspaces | jq -r 'sort_by(.idx).[0].is_focused' | grep true; and niri msg action focus-workspace (niri msg -j workspaces | jq -r 'sort_by(.idx).[-2].idx'); or niri msg action focus-workspace-up";
-
         # monitors
-        "Mod+Tab".action = focus-monitor-next;
-        "Mod+Shift+Tab".action = move-window-to-monitor-next;
-        "Mod+Ctrl+Tab".action = move-workspace-to-monitor-next;
+        # "Mod+Tab".action = focus-monitor-next;
+        # "Mod+Shift+Tab".action = move-window-to-monitor-next;
+        # "Mod+Ctrl+Tab".action = move-workspace-to-monitor-next;
 
         # laptop screen
         "Mod+Equal".action = spawn "niri" "msg" "output" "eDP-1" "on";

modules/home/common/development.nix

@@ -59,6 +59,7 @@
       lua-language-server
       luajit
       mermaid-cli
+      nil
       nodePackages_latest.prettier
       nodePackages_latest.yaml-language-server
       pgcli

modules/home/common/nvim/default.nix

@@ -96,7 +96,7 @@
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
       rev = "main";
-      sha256 = "sha256-kPB4KyhE0+mNfanTIzc4O+4wvw/u8lyHTHoQ368KWXI=";
+      sha256 = "sha256-usW9Z8+yilTLzs+8BzTyJad0L7CEoopXV/ExMuWlpoc=";
     };
   in
     {
@@ -111,7 +111,7 @@
           owner = "nvim-treesitter";
           repo = "nvim-treesitter-textobjects";
           rev = "main";
-          sha256 = "sha256-jjKT3bZHwZIVDsTw4m7cJm9G2JW8lUXasKTaiGzT0Ag=";
+          sha256 = "sha256-w2dzc5oWyEoPUgbqaAuNKCeFeh81rYJPOCPVRnFC724=";
         };
       };
       "nvim/nixpkgs/nvim-treesitter" = {

modules/home/common/nvim/lua/plugins.lua

@@ -149,7 +149,25 @@ return inject_all({
         ["<left>"] = { "cancel", "fallback" },
         ["<down>"] = { "show_and_insert", "select_next", "fallback" },
         ["<up>"] = { "select_prev", "fallback" },
-        ["<right>"] = { "show_and_insert", "select_and_accept", "fallback" },
+        ["<c-right>"] = { "show_and_insert", "select_and_accept", "fallback" },
+        ["<right>"] = {
+          function(cmp)
+            local has_no_words_after = function()
+              local col = vim.api.nvim_win_get_cursor(0)[2]
+              local line = vim.api.nvim_get_current_line()
+              if col == #line then
+                return true
+              end
+              return line:sub(col + 1, col + 1):match("%s") ~= nil
+            end
+
+            if has_no_words_after() then
+              return cmp.show_and_insert()
+            end
+          end,
+          "select_and_accept",
+          "fallback",
+        },
       },
       cmdline = {
         enabled = true,

modules/home/common/starship.nix

@@ -43,14 +43,14 @@
 
       git_branch = {
         format = "[$symbol$branch(:$remote_branch)]($style)";
-        symbol = " ";
+        symbol = "󰘬 ";
       };
 
       git_commit = {
-        format = " [ $hash$tag]($style)";
+        format = " [󰓼 $hash$tag]($style)";
         style = "purple";
         tag_disabled = false;
-        tag_symbol = "  ";
+        tag_symbol = " 󰓼 ";
       };
 
       git_state = {
@@ -59,13 +59,13 @@
       };
 
       git_status = {
-        format = "[$conflicted$deleted](red)[$modified](blue)[$staged$renamed](yellow)[$untracked$stashed](bright-black)[$ahead_behind](bold) ";
-        ahead = "  $count";
-        behind = "  $count";
-        diverged = "  $ahead_count $behind_count";
-        conflicted = " 󱚟 $count";
+        format = "[$conflicted](red)[$modified](blue)[$staged$renamed$deleted](yellow)[$untracked$stashed](bright-black)[$ahead_behind](bold) ";
+        ahead = "  $count";
+        behind = "  $count";
+        diverged = "  $ahead_count $behind_count";
+        conflicted = "  $count";
         deleted = "  $count";
-        modified = "  $count";
+        modified = " 󰦒 $count";
         renamed = " 󰶻 $count";
         staged = " 󰘻 $count";
         stashed = "  $count";

modules/nixos/class-laptop/desktop.nix

@@ -3,7 +3,8 @@
   inputs,
   perSystem,
   ...
-}: {
+}:
+{
   imports = [
     inputs.niri.nixosModules.niri
   ];
@@ -34,9 +35,9 @@
     # nerd-fonts.noto
     # nerd-fonts.iosevka
     nerd-fonts.symbols-only
-    noto-fonts
-    noto-fonts-monochrome-emoji
-    noto-fonts-lgc-plus
+    # noto-fonts
+    # noto-fonts-monochrome-emoji
+    # noto-fonts-lgc-plus
     roboto
     roboto-mono
   ];
@@ -56,7 +57,7 @@
         "org.freedesktop.impl.portal.Secret" = "gnome-keyring";
       };
     };
-    extraPortals = [pkgs.xdg-desktop-portal-gtk];
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
 
   environment.systemPackages = with pkgs; [
@@ -82,7 +83,10 @@
   };
 
   security = {
-    pam.services.swaylock = {};
+    pam.services = {
+      swaylock = { };
+      login.enableGnomeKeyring = true;
+    };
     rtkit.enable = true; # for pipewire
   };
 }