mirror of
https://github.com/js0ny/dotfiles.git
synced 2025-12-21 00:33:00 +00:00
niri
This commit is contained in:
parent
64d100c252
commit
5921775239
13 changed files with 42 additions and 100 deletions
|
|
@ -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" },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>"),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,13 +88,13 @@ return {
|
|||
img_dirs = { "90 - System/Assets" },
|
||||
},
|
||||
},
|
||||
-- keys = {
|
||||
-- {
|
||||
-- "<leader>ft",
|
||||
-- function()
|
||||
-- require("snacks").explorer()
|
||||
-- end,
|
||||
-- desc = "Toggle File Explorer",
|
||||
-- },
|
||||
-- },
|
||||
keys = {
|
||||
{
|
||||
"<leader>ft",
|
||||
function()
|
||||
require("snacks").explorer()
|
||||
end,
|
||||
desc = "Toggle File Explorer",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./wayland-wm.nix
|
||||
];
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
withUWSM = false;
|
||||
|
|
|
|||
|
|
@ -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"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@
|
|||
kdePackages.breeze
|
||||
zotero
|
||||
anki-bin
|
||||
feishin
|
||||
|
||||
# Email
|
||||
protonmail-bridge
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -9,6 +9,6 @@
|
|||
swaylock-effects # Screensaver
|
||||
cliphist # Clipboard daemon
|
||||
swww # Wallpaper daemon
|
||||
pavucontrol
|
||||
wmname
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,5 +2,6 @@
|
|||
home.packages = with pkgs; [
|
||||
waybar
|
||||
pavucontrol
|
||||
font-awesome
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue