feat: switch over to a neovim cofeat & fix & refactor: so many things. listed in desc
switch over to a neovim configuration in lua, btrtile for dwl, remove unnecessary things, some browser addons, rofimoji, fix february flake
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
imports = [
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
inputs.stylix.nixosModules.stylix
|
||||
inputs.base16.nixosModule
|
||||
|
||||
./stylix.nix
|
||||
./dwl/dwl.nix
|
||||
@@ -46,17 +47,6 @@
|
||||
|
||||
services.gnome.glib-networking.enable = true;
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# services.displayManager.sddm = {
|
||||
# enable = true;
|
||||
# theme = "catppuccin-mocha-mauve";
|
||||
# wayland.enable = true;
|
||||
# package = pkgs.kdePackages.sddm;
|
||||
# };
|
||||
|
||||
services.displayManager.ly = {
|
||||
enable = true;
|
||||
};
|
||||
@@ -65,16 +55,28 @@
|
||||
enable = true;
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
config.sway = {
|
||||
default = [ "gtk" ];
|
||||
"org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||
"org.freedesktop.impl.portal.ScreenCast" = [ "wlr" ];
|
||||
"org.freedesktop.impl.portal.ScreenShot" = [ "wlr" ];
|
||||
"org.freedesktop.impl.portal.Inhibit" = [ ];
|
||||
};
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-wlr
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
wlr.enable = true;
|
||||
};
|
||||
|
||||
services.blueman.enable = true;
|
||||
|
||||
services.printing.enable = true;
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings = {
|
||||
PermitRootLogin = "no";
|
||||
PasswordAuthentication = false;
|
||||
};
|
||||
};
|
||||
|
||||
services.pulseaudio.enable = false;
|
||||
@@ -120,6 +122,7 @@
|
||||
fontSize = "12";
|
||||
})
|
||||
wget
|
||||
ntfs3g
|
||||
];
|
||||
|
||||
fonts = {
|
||||
@@ -142,9 +145,9 @@
|
||||
|
||||
environment.sessionVariables = {
|
||||
EDITOR = "nvim";
|
||||
BROWSER = "zen";
|
||||
SUDO_EDITOR = "nvim";
|
||||
SHELL = "nu";
|
||||
BROWSER = "zen";
|
||||
SHELL = "fish";
|
||||
};
|
||||
|
||||
system.stateVersion = "24.05";
|
||||
|
||||
@@ -75,10 +75,13 @@ static const Rule rules[] = {
|
||||
static const Layout layouts[] = {
|
||||
/* symbol arrange function */
|
||||
{ "[]=", tile },
|
||||
{ "|w|", btrtile },
|
||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||
{ "[M]", monocle },
|
||||
};
|
||||
|
||||
#define CONFIG_BTRTILE_LAYOUT &layouts[1]
|
||||
|
||||
/* monitors */
|
||||
/* (x=-1, y=-1) is reserved as an "autoconfigure" monitor position indicator
|
||||
* WARNING: negative values other than (-1, -1) cause problems with Xwayland clients
|
||||
@@ -93,16 +96,22 @@ static const MonitorRule monrules[] = {
|
||||
/* defaults */
|
||||
|
||||
// https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/monitorconfig/monitorconfig.patch
|
||||
{ "DP-2", 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1, 2560, 1440, 180.0f, 0, 1},
|
||||
{ "HDMI-A-2", 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1, 1920, 1080, 60.0f, 0, 1},
|
||||
{ "DP-2", 0.55f, 1, 1, CONFIG_BTRTILE_LAYOUT, WL_OUTPUT_TRANSFORM_NORMAL, -1, -1, 2560, 1440, 180.0f, 0, 1},
|
||||
{ "HDMI-A-2", 0.55f, 1, 1, CONFIG_BTRTILE_LAYOUT, WL_OUTPUT_TRANSFORM_NORMAL, -1, -1, 1920, 1080, 60.0f, 0, 1},
|
||||
};
|
||||
|
||||
// https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart.patch
|
||||
static const char *const autostart[] = {
|
||||
// Set the resolution
|
||||
"wlr-randr", "--output", "DP-2", "--mode", "2560x1440@180Hz", NULL,
|
||||
// Start the wallpaper daemon
|
||||
"swww-daemon", NULL,
|
||||
// Include the wallpaper
|
||||
"swww", "img", WALLPAPER, "-t", "none", NULL,
|
||||
// Start waybar
|
||||
"waybar", NULL,
|
||||
// Needed for screencasting
|
||||
"dbus-update-activation-environment", "--systemd", "WAYLAND_DISPLAY", "XDG_CURRENT_DESKTOP=sway", NULL,
|
||||
NULL,
|
||||
};
|
||||
|
||||
@@ -177,6 +186,7 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
|
||||
static const char *termcmd[] = { "ghostty", NULL };
|
||||
static const char *menucmd[] = { "rofi", "-show", "drun", NULL };
|
||||
static const char *powrcmd[] = { "rofi", "-show", "pm", "-modi", "pm:rofi-power-menu", "--choices", "suspend/reboot/shutdown", NULL };
|
||||
static const char *emjicmd[] = { "rofimoji", "--action", "copy", NULL };
|
||||
static const char *scshcmd[] = { "gscreenshot", "-c", "-s", NULL };
|
||||
static const char *brsrcmd[] = { "zen-beta", NULL };
|
||||
|
||||
@@ -186,6 +196,7 @@ static const Key keys[] = {
|
||||
{ MODKEY, XKB_KEY_d, spawn, {.v = menucmd} },
|
||||
{ MODKEY, XKB_KEY_q, spawn, {.v = termcmd} },
|
||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_P, spawn, {.v = powrcmd} },
|
||||
{ MODKEY, XKB_KEY_e, spawn, {.v = emjicmd} },
|
||||
{ MODKEY, XKB_KEY_s, spawn, {.v = scshcmd} },
|
||||
{ MODKEY, XKB_KEY_w, spawn, {.v = brsrcmd} },
|
||||
|
||||
@@ -214,7 +225,7 @@ static const Key keys[] = {
|
||||
|
||||
{ MODKEY, XKB_KEY_Return, zoom, {0} },
|
||||
{ MODKEY, XKB_KEY_c, killclient, {0} },
|
||||
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
||||
// { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY, XKB_KEY_v, togglefloating, {0} },
|
||||
{ MODKEY, XKB_KEY_f, togglefullscreen, {0} },
|
||||
TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0),
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
environment.systemPackages = [
|
||||
pkgs.gscreenshot
|
||||
pkgs.wlr-randr
|
||||
pkgs.swww
|
||||
];
|
||||
programs.dwl = {
|
||||
enable = true;
|
||||
|
||||
Reference in New Issue
Block a user