niri

home/dot_config/nvim/lua/plugins/fileutils.lua

@@ -30,12 +30,12 @@ return {
   --   end,
   --   dependencies = { "nvim-telescope/telescope.nvim" },
   -- },
-  -- {
+  {
-  --   "NeogitOrg/neogit",
+    "NeogitOrg/neogit",
-  --   config = true,
+    config = true,
-  --   cmd = {
+    cmd = {
-  --     "Neogit",
+      "Neogit",
-  --   },
+    },
-  -- },
+  },
-  { import = "plugins.mod.neo-tree" },
+  -- { import = "plugins.mod.neo-tree" },
 }

home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua

@@ -40,7 +40,6 @@ return {
         dashboard.button("p", "󰈞 查找项目", "<cmd>Telescope projects<CR>"),
         dashboard.button("h", " 历史文件", "<cmd>Telescope oldfiles<CR>"),
         dashboard.button("l", " 加载会话", "<cmd>SessionSearch<CR>"),
-        -- FIXME: This does not work on Windows - Make it more portable
         dashboard.button("c", " 转到设置", "<cmd>Telescope find_files cwd=~/.config/nvim<CR>"),
         dashboard.button("SPC q", "󱊷 退出", "<cmd>qa<CR>"),
       }

home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua

@@ -88,13 +88,13 @@ return {
       img_dirs = { "90 - System/Assets" },
     },
   },
-  -- keys = {
+  keys = {
-  --   {
+    {
-  --     "<leader>ft",
+      "<leader>ft",
-  --     function()
+      function()
-  --       require("snacks").explorer()
+        require("snacks").explorer()
-  --     end,
+      end,
-  --     desc = "Toggle File Explorer",
+      desc = "Toggle File Explorer",
-  --   },
+    },
-  -- },
+  },
 }

home/dot_config/zed/keymap.json

@@ -124,5 +124,13 @@
       "ctrl-w l": "workspace::ActivatePaneRight",
       "ctrl-w j": "workspace::ActivatePaneDown"
     }
+  },
+  // Sneak
+  {
+    "context": "vim_mode == normal || vim_mode == visual",
+    "bindings": {
+      "s": "vim::PushSneak",
+      "shift-s": "vim::PushSneakBackward"
+    }
   }
 ]

nixcfgs/hosts/polder/default.nix

@@ -1,58 +0,0 @@
-# ~/.config/nixcfgs/hosts/polder/default.nix
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    # impure build
-    /etc/nixos/hardware-configuration.nix
-    ../../modules/nixos
-  ];
-  system.stateVersion = "25.05";
-
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-  boot.kernelParams = ["console=ttyS0,115200n8" "console=tty0"];
-  boot.loader.grub.useOSProber = true;
-  services.qemuGuest.enable = true;
-  services.spice-vdagentd.enable = true;
-  time.timeZone = "Etc/UTC";
-
-  nixpkgs.config.allowUnfree = true;
-  networking.hostName = "polder";
-
-  services.openssh = {
-    enable = true;
-    settings = {
-      PermitRootLogin = "no";
-    };
-  };
-
-  networking = {
-    usePredictableInterfaceNames = false;
-    interfaces.eth0.ipv4.addresses = [
-      {
-        address = "158.220.98.103";
-        prefixLength = 20;
-      }
-    ];
-    defaultGateway = {
-      address = "158.220.96.1";
-      interface = "eth0";
-    };
-    nameservers = [
-      "1.1.1.1"
-      "8.8.8.8"
-      "2606:4700:4700::1111"
-      "2001:4860:4860::8888"
-    ];
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [22];
-    };
-  };
-  environment.systemPackages = with pkgs; [
-    rclone
-  ];
-}

nixcfgs/hosts/zephyrus/default.nix

@@ -22,7 +22,7 @@
     # desktop environment and display manager
     ../../modules/nixos/desktop/dm/sddm.nix
     ../../modules/nixos/desktop/de/kde.nix
-    ../../modules/nixos/desktop/de/hyprland.nix
+    ../../modules/nixos/desktop/de/niri.nix
 
     # desktop programs
     ../../modules/nixos/programs/zsh.nix

nixcfgs/modules/nixos/desktop/de/hyprland.nix

@@ -1,7 +1,4 @@
 {pkgs, ...}: {
-  imports = [
-    ./wayland-wm.nix
-  ];
   programs.hyprland = {
     enable = true;
     withUWSM = false;

nixcfgs/modules/nixos/desktop/de/niri.nix

@@ -1,22 +1,7 @@
 {pkgs, ...}: {
   programs.niri.enable = true;
   environment.systemPackages = with pkgs; [
-    waybar
-    dunst
-    rofi
-    rofimoji
-    rofi-power-menu
-    swaylock-effects
-    swayidle
     xwayland-satellite
-    wmname
     hyprpolkitagent
   ];
-  fonts.packages = [pkgs.font-awesome];
-  xdg.portal = {
-    extraPortals = with pkgs; [
-      kdePackages.xdg-desktop-portal-kde
-    ];
-    config.common.default = ["kde" "wlr"];
-  };
 }

nixcfgs/users/js0ny/packages/gui.nix

@@ -62,6 +62,7 @@
     kdePackages.breeze
     zotero
     anki-bin
+    feishin
 
     # Email
     protonmail-bridge

nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri.nix

@@ -3,21 +3,30 @@
   pkgs,
   ...
 }: {
+  imports = [
+    ./packages.nix
+  ];
   home.file."${config.xdg.configHome}/niri/config.kdl" = {
     text = ''
       spawn-at-startup "waybar" // Status Bar
       spawn-at-startup "dunst" // Notifications
       spawn-at-startup "fcitx5" // Input Method
       spawn-at-startup "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent"
-      spawn-at-startup
+
+      screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+      prefer-no-csd // client-side decorations (window decorations)
+
       input {
-        xkb {}
+        keyboard {
-        numlock
+            xkb {}
+            numlock
+        }
         touchpad {
             tap
             naturalscroll
         }
         mouse {}
+        trackpoint {}
       }
     '';
     enable = false; # TODO:

nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix

@@ -9,6 +9,6 @@
     swaylock-effects # Screensaver
     cliphist # Clipboard daemon
     swww # Wallpaper daemon
-    pavucontrol
+    wmname
   ];
 }

nixcfgs/users/js0ny/programs/desktop/wayland-wm/waybar.nix

@@ -2,5 +2,6 @@
   home.packages = with pkgs; [
     waybar
     pavucontrol
+    font-awesome
   ];
 }

nixcfgs/users/js0ny/zephyrus.nix

@@ -40,7 +40,7 @@
 
     # Desktop Linux
     ./programs/desktop/plasma.nix
-    ./programs/desktop/wayland-wm/hyprland.nix
+    ./programs/desktop/wayland-wm/niri.nix
 
     # General Program config
     ../../modules/home/programs/eza.nix