From 59217752392d62ca06acddfe5664643694e4be5a Mon Sep 17 00:00:00 2001 From: js0ny Date: Fri, 7 Nov 2025 12:19:39 +0000 Subject: [PATCH] niri --- .../dot_config/nvim/lua/plugins/fileutils.lua | 16 ++--- .../nvim/lua/plugins/mod/alpha-nvim.lua | 1 - .../nvim/lua/plugins/mod/snacks-nvim.lua | 18 +++--- home/dot_config/zed/keymap.json | 8 +++ nixcfgs/hosts/polder/default.nix | 58 ------------------- nixcfgs/hosts/zephyrus/default.nix | 2 +- nixcfgs/modules/nixos/desktop/de/hyprland.nix | 3 - nixcfgs/modules/nixos/desktop/de/niri.nix | 15 ----- nixcfgs/users/js0ny/packages/gui.nix | 1 + .../programs/desktop/wayland-wm/niri.nix | 15 ++++- .../programs/desktop/wayland-wm/packages.nix | 2 +- .../programs/desktop/wayland-wm/waybar.nix | 1 + nixcfgs/users/js0ny/zephyrus.nix | 2 +- 13 files changed, 42 insertions(+), 100 deletions(-) delete mode 100644 nixcfgs/hosts/polder/default.nix diff --git a/home/dot_config/nvim/lua/plugins/fileutils.lua b/home/dot_config/nvim/lua/plugins/fileutils.lua index a9fe512..40899fa 100644 --- a/home/dot_config/nvim/lua/plugins/fileutils.lua +++ b/home/dot_config/nvim/lua/plugins/fileutils.lua @@ -30,12 +30,12 @@ return { -- end, -- dependencies = { "nvim-telescope/telescope.nvim" }, -- }, - -- { - -- "NeogitOrg/neogit", - -- config = true, - -- cmd = { - -- "Neogit", - -- }, - -- }, - { import = "plugins.mod.neo-tree" }, + { + "NeogitOrg/neogit", + config = true, + cmd = { + "Neogit", + }, + }, + -- { import = "plugins.mod.neo-tree" }, } diff --git a/home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua index c07d395..4b04359 100644 --- a/home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua +++ b/home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua @@ -40,7 +40,6 @@ return { dashboard.button("p", "󰈞 查找项目", "Telescope projects"), dashboard.button("h", " 历史文件", "Telescope oldfiles"), dashboard.button("l", " 加载会话", "SessionSearch"), - -- FIXME: This does not work on Windows - Make it more portable dashboard.button("c", " 转到设置", "Telescope find_files cwd=~/.config/nvim"), dashboard.button("SPC q", "󱊷 退出", "qa"), } diff --git a/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua index a59bb56..7815266 100644 --- a/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua +++ b/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua @@ -88,13 +88,13 @@ return { img_dirs = { "90 - System/Assets" }, }, }, - -- keys = { - -- { - -- "ft", - -- function() - -- require("snacks").explorer() - -- end, - -- desc = "Toggle File Explorer", - -- }, - -- }, + keys = { + { + "ft", + function() + require("snacks").explorer() + end, + desc = "Toggle File Explorer", + }, + }, } diff --git a/home/dot_config/zed/keymap.json b/home/dot_config/zed/keymap.json index c1f5eed..272a785 100644 --- a/home/dot_config/zed/keymap.json +++ b/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" + } } ] diff --git a/nixcfgs/hosts/polder/default.nix b/nixcfgs/hosts/polder/default.nix deleted file mode 100644 index daa8b2d..0000000 --- a/nixcfgs/hosts/polder/default.nix +++ /dev/null @@ -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 - ]; -} diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix index 1f58038..2322ca7 100644 --- a/nixcfgs/hosts/zephyrus/default.nix +++ b/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 diff --git a/nixcfgs/modules/nixos/desktop/de/hyprland.nix b/nixcfgs/modules/nixos/desktop/de/hyprland.nix index 490b5cc..c659259 100644 --- a/nixcfgs/modules/nixos/desktop/de/hyprland.nix +++ b/nixcfgs/modules/nixos/desktop/de/hyprland.nix @@ -1,7 +1,4 @@ {pkgs, ...}: { - imports = [ - ./wayland-wm.nix - ]; programs.hyprland = { enable = true; withUWSM = false; diff --git a/nixcfgs/modules/nixos/desktop/de/niri.nix b/nixcfgs/modules/nixos/desktop/de/niri.nix index b82f45f..a18a159 100644 --- a/nixcfgs/modules/nixos/desktop/de/niri.nix +++ b/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"]; - }; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 6f763f7..9561248 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -62,6 +62,7 @@ kdePackages.breeze zotero anki-bin + feishin # Email protonmail-bridge diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri.nix index 6afbc39..26d96fb 100644 --- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/niri.nix +++ b/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 {} - numlock + keyboard { + xkb {} + numlock + } touchpad { tap naturalscroll } mouse {} + trackpoint {} } ''; enable = false; # TODO: diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix index 90fbf18..5f26780 100644 --- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix +++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/packages.nix @@ -9,6 +9,6 @@ swaylock-effects # Screensaver cliphist # Clipboard daemon swww # Wallpaper daemon - pavucontrol + wmname ]; } diff --git a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/waybar.nix b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/waybar.nix index 43ba885..84794cd 100644 --- a/nixcfgs/users/js0ny/programs/desktop/wayland-wm/waybar.nix +++ b/nixcfgs/users/js0ny/programs/desktop/wayland-wm/waybar.nix @@ -2,5 +2,6 @@ home.packages = with pkgs; [ waybar pavucontrol + font-awesome ]; } diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 209125f..10c6c55 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/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