summaryrefslogtreecommitdiff
path: root/hm
diff options
context:
space:
mode:
Diffstat (limited to 'hm')
-rw-r--r--hm/conf/xdg-dirs.nix14
-rw-r--r--hm/env/niri/binds.nix58
-rw-r--r--hm/env/niri/niri.nix63
-rw-r--r--hm/soft/media.nix45
-rw-r--r--hm/soft/nixcord.nix2
-rw-r--r--hm/soft/obsidian.nix2
-rw-r--r--hm/soft/sioyek.nix18
-rw-r--r--hm/soft/soft.nix2
-rw-r--r--hm/soft/vpn.nix20
9 files changed, 118 insertions, 106 deletions
diff --git a/hm/conf/xdg-dirs.nix b/hm/conf/xdg-dirs.nix
index ba5b063..3a37e6a 100644
--- a/hm/conf/xdg-dirs.nix
+++ b/hm/conf/xdg-dirs.nix
@@ -18,7 +18,7 @@ in
createDirectories = true;
download = "${config.home.homeDirectory}/dl";
- documents = "${config.home.homeDirectory}/docs";
+ documents = "${config.home.homeDirectory}/dc";
pictures = "${toString cfg.storagePath}/pics";
videos = "${toString cfg.storagePath}/vids";
@@ -29,7 +29,7 @@ in
templates = null;
extraConfig = {
- PROJECTS = "${config.home.homeDirectory}/proj";
+ DEV = "${config.home.homeDirectory}/dv";
GAMES = "${config.home.homeDirectory}/games";
storage = "${toString cfg.storagePath}";
SS = "${toString cfg.storagePath}/pics/ss";
@@ -39,15 +39,5 @@ in
ARCHIVE = "${toString cfg.storagePath}/archive";
};
};
- home.sessionVariables = {
- PROJECTS = "${config.home.homeDirectory}/proj";
- GAMES = "${config.home.homeDirectory}/games";
- storage = "${toString cfg.storagePath}";
- SS = "${toString cfg.storagePath}/pics/ss";
- CLIPS = "${toString cfg.storagePath}/vids/clips";
- MOVIES = "${toString cfg.storagePath}/movies";
- ANIME = "${toString cfg.storagePath}/anime";
- ARCHIVE = "${toString cfg.storagePath}/archive";
- };
};
}
diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix
index 0dc4ea5..a84d5f5 100644
--- a/hm/env/niri/binds.nix
+++ b/hm/env/niri/binds.nix
@@ -22,9 +22,6 @@ in
XF86AudioMute.action =
spawn "sh" "-c"
"wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
- XF86Tools.action =
- spawn "sh" "-c"
- "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
# Media Control
XF86AudioPlay.action = playerctl "play-pause";
@@ -36,26 +33,46 @@ in
XF86MonBrightnessDown.action = spawn "light" "-U" "10";
# --- Applications ---
- "Mod+Return".action = spawn "foot";
+ "Mod+Return".action = spawn "footclient";
"Mod+D".action = spawn "fuzzel";
- "Mod+C".action = spawn "qalculate-gtk";
"Mod+Shift+D".action = spawn "sh" "-c" "cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
"Super+Return".action = spawn "sh" "-c" "OBS_WEBSOCKET_URL=$(cat ${obsPass}) obs-cmd replay save";
+ "Super+C".action = spawn "qalculate-gtk";
+ "Super+D".action = spawn "equibop";
+ "Super+B".action = spawn "librewolf";
+ "Super+S".action = spawn "spotify";
+ "Super+E".action = spawn "thunar";
+
# --- Navigation: Columns & Workspaces ---
- "Mod+H".action = focus-column-left;
- "Mod+L".action = focus-column-right;
- "Mod+J".action = focus-workspace-down;
- "Mod+K".action = focus-workspace-up;
+ "Mod+H".action = focus-column-or-monitor-left;
+ "Mod+L".action = focus-column-or-monitor-right;
+ "Mod+J".action = focus-window-or-workspace-down;
+ "Mod+K".action = focus-window-or-workspace-up;
+
+ "Super+H".action = focus-monitor-left;
+ "Super+L".action = focus-monitor-right;
+ "Super+Shift+H".action = move-column-left-or-to-monitor-left;
+ "Super+Shift+L".action = move-column-right-or-to-monitor-right;
"Mod+WheelScrollDown".action = focus-column-right;
"Mod+WheelScrollUp".action = focus-column-left;
- "Super+WheelScrollDown".action = focus-workspace-down;
- "Super+WheelScrollUp".action = focus-workspace-up;
+ "Super+WheelScrollDown".action = focus-window-or-workspace-down;
+ "Super+WheelScrollUp".action = focus-window-or-workspace-up;
- # --- Navigation: Monitors ---
- "Super+H".action = focus-monitor-left;
- "Super+L".action = focus-monitor-right;
+ "Mod+Tab" = {
+ action =
+ spawn "sh" "-c"
+ "niri msg action focus-column-right; niri msg action move-column-to-last; niri msg action focus-window-previous";
+ repeat = false;
+ };
+
+ XF86Tools = {
+ action =
+ spawn "sh" "-c"
+ "niri msg action set-dynamic-cast-window --id $(niri msg --json pick-window | ${pkgs.jq}/bin/jq .id)";
+ repeat = false;
+ };
# --- Window Management ---
"Mod+Shift+Q".action = close-window;
@@ -66,15 +83,13 @@ in
};
# Moving Windows/Columns
- "Mod+Shift+H".action = move-column-left;
- "Mod+Shift+L".action = move-column-right;
+ "Mod+Shift+H".action = move-column-left-or-to-monitor-left;
+ "Mod+Shift+L".action = move-column-right-or-to-monitor-right;
"Mod+Shift+J".action = move-window-down-or-to-workspace-down;
"Mod+Shift+K".action = move-window-up-or-to-workspace-up;
- "Super+Shift+H".action = move-column-to-monitor-left;
- "Super+Shift+L".action = move-column-to-monitor-right;
- "Mod+Shift+WheelScrollDown".action = move-column-right;
"Mod+Shift+WheelScrollUp".action = move-column-left;
+ "Mod+Shift+WheelScrollDown".action = move-column-right;
"Super+Shift+WheelScrollDown".action = move-window-down-or-to-workspace-down;
"Super+Shift+WheelScrollUp".action = move-window-up-or-to-workspace-up;
@@ -86,13 +101,13 @@ in
XF86Launch5.action = consume-or-expel-window-right;
XF86Launch6.action = consume-or-expel-window-left;
+ XF86Launch7.action = switch-preset-column-width;
# --- Layout & Sizing ---
"Mod+F".action = maximize-column;
"Mod+Shift+F".action = fullscreen-window;
"Mod+W".action = toggle-column-tabbed-display;
"Mod+R".action = switch-preset-column-width;
- XF86Launch7.action = switch-preset-column-width;
"Mod+Shift+R".action = reset-window-height;
"Mod+Minus".action = set-column-width "-10%";
@@ -124,6 +139,9 @@ in
'';
repeat = false;
};
+
+ "Mod+grave".action.focus-workspace = 0;
+ "Mod+Shift+grave".action.move-column-to-workspace = 0;
}
// (builtins.listToAttrs (
builtins.concatMap (
diff --git a/hm/env/niri/niri.nix b/hm/env/niri/niri.nix
index f8e1542..2274259 100644
--- a/hm/env/niri/niri.nix
+++ b/hm/env/niri/niri.nix
@@ -57,13 +57,12 @@ in
};
layout = {
empty-workspace-above-first = true;
- border = {
- width = 2;
- # active = <decoration>;
- };
+ border.enable = false;
focus-ring = {
- width = 2;
- # active = <decoration>;
+ enable = true;
+ width = 3;
+ active.color = "#7fc8ff";
+ inactive.color = "#505050";
};
preset-column-widths = [
{ proportion = 1. / 3.; }
@@ -84,17 +83,65 @@ in
window-rules = [
{
matches = [
- { app-id = "Bitwarden"; }
+ { app-id = "^Bitwarden$"; }
+ { app-id = "^org\\.keepassxc\\.KeePassXC$"; }
];
block-out-from = "screen-capture";
}
+ {
+ matches = [
+ {
+ app-id = "steam";
+ title = "^notificationtoasts_\\d+_desktop$";
+ }
+ ];
+ default-floating-position = {
+ x = 10;
+ y = 10;
+ relative-to = "bottom-right";
+ };
+ }
+ {
+ matches = [ { is-window-cast-target = true; } ];
+
+ focus-ring.active.color = "#f38ba8";
+ shadow = {
+ enable = true;
+ color = "#7d0d2d70";
+ };
+ }
+ {
+ matches = [ { app-id = "^qalculate-gtk$"; } ];
+ open-floating = true;
+
+ # Use default-window-height instead of default-floating-height
+ default-window-height.fixed = 537;
+ default-column-width.fixed = 802;
+
+ default-floating-position = {
+ relative-to = "right";
+ x = 100;
+ y = 0;
+ };
+ }
+ {
+ matches = [ { app-id = "^sober$"; } ];
+ open-fullscreen = true;
+ }
+ ];
+ layer-rules = [
+ {
+ matches = [
+ { namespace = "^notifications$"; }
+ ];
+ block-out-from = "screencast";
+ }
];
gestures.hot-corners.enable = false;
spawn-at-startup = [
{
command = [
"obs"
- "--disable-missing-files-check"
"--startreplaybuffer"
];
}
diff --git a/hm/soft/media.nix b/hm/soft/media.nix
index 72ddc64..de70715 100644
--- a/hm/soft/media.nix
+++ b/hm/soft/media.nix
@@ -10,56 +10,15 @@ in
{
options.hm.soft.media.enable = lib.mkEnableOption "media cli tools";
config = lib.mkIf cfg.enable {
- programs.zathura = {
- enable = true;
- package = pkgs.zathura.override {
- plugins = with pkgs.zathuraPkgs; [
- zathura_pdf_mupdf
- zathura_cb
- ];
- };
- options = {
- selection-clipboard = "clipboard";
-
- incremental-search = true;
- highlight-active-color = "#fabd2f";
- highlight-color = "#fe8019";
-
- recolor = true;
- recolor-keephue = true;
-
- default-bg = "#282828";
- default-fg = "#ebdbb2";
- recolor-lightcolor = "#282828";
- recolor-darkcolor = "#ebdbb2";
-
- render-loading = false;
- scroll-step = 50;
- statusbar-h-padding = 10;
- statusbar-v-padding = 10;
- };
-
- mappings = {
- "u" = "scroll half-up";
- "d" = "scroll half-down";
- "D" = "toggle_page_mode";
- "r" = "reload";
- "R" = "rotate";
- "K" = "zoom in";
- "J" = "zoom out";
- "i" = "recolor";
- };
- };
home.packages = with pkgs; [
- (callPackage ./czkawka-v11.nix { })
-
+ czkawka
nsxiv
pinta
ffmpeg
imagemagick
mediainfo
sox
- syncplay-nogui
+ syncplay
];
};
}
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index 112a82b..8e5ae12 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -24,7 +24,7 @@ in
autoscroll.enable = true;
vencord.enable = false;
- equicord.enable = true;
+ # equicord.enable = true;
};
equibop = {
enable = true;
diff --git a/hm/soft/obsidian.nix b/hm/soft/obsidian.nix
index a840726..38093fa 100644
--- a/hm/soft/obsidian.nix
+++ b/hm/soft/obsidian.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
let
cfg = config.hm.soft.obsidian;
in
diff --git a/hm/soft/sioyek.nix b/hm/soft/sioyek.nix
new file mode 100644
index 0000000..6b2650d
--- /dev/null
+++ b/hm/soft/sioyek.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+let
+ cfg = config.hm.soft.sioyek;
+in
+{
+ options.hm.soft.sioyek.enable = lib.mkEnableOption "enables sioyek pdf reader";
+ config = lib.mkIf cfg.enable {
+ programs.sioyek = {
+ enable = true;
+ config = {
+
+ };
+ bindings = {
+
+ };
+ };
+ };
+}
diff --git a/hm/soft/soft.nix b/hm/soft/soft.nix
index 0d74669..f6a9a69 100644
--- a/hm/soft/soft.nix
+++ b/hm/soft/soft.nix
@@ -13,7 +13,7 @@
./onlyoffice.nix
./spicetify.nix
./torrent.nix
- ./vpn.nix
./yt-dlp.nix
+ ./sioyek.nix
];
}
diff --git a/hm/soft/vpn.nix b/hm/soft/vpn.nix
deleted file mode 100644
index 47bd959..0000000
--- a/hm/soft/vpn.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
- cfg = config.hm.soft.vpn;
-in
-{
- options.hm.soft.vpn = {
- protonvpn.enable = lib.mkEnableOption "protonvpn";
- mullvad.enable = lib.mkEnableOption "mullvad vpn";
- };
- config = lib.mkMerge [
- (lib.mkIf cfg.mullvad.enable {
- programs.mullvad-vpn = {
- enable = true;
- };
- })
- (lib.mkIf cfg.protonvpn.enable {
- home.packages = [ pkgs.protonvpn-gui ];
- })
- ];
-}
generated by cgit v1.3 (git 2.53.0) at 2026-08-17 02:22:08 +0000