summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew <admonty1@protonmail.com>2025-08-30 14:02:16 -0400
committerAndrew <admonty1@protonmail.com>2025-08-30 14:02:16 -0400
commit4bfb5b88c31af4d668816926be20184ffa8607c5 (patch)
tree788c47cd5bafdf035e51cc35bd9bc293ece042f3
parenttmux and neovim config (diff)
downloadnixos-4bfb5b88c31af4d668816926be20184ffa8607c5.tar.gz
nixos-4bfb5b88c31af4d668816926be20184ffa8607c5.tar.bz2
nixos-4bfb5b88c31af4d668816926be20184ffa8607c5.zip
change some stuff in neovim config
-rw-r--r--home.nix40
-rw-r--r--hyprland/binds.nix113
-rw-r--r--impurities2
-rw-r--r--impurities.md12
-rw-r--r--neovim.nix19
-rw-r--r--obsidian.nix13
-rw-r--r--tmux.nix20
7 files changed, 122 insertions, 97 deletions
diff --git a/home.nix b/home.nix
index a74ffe5..b799b27 100644
--- a/home.nix
+++ b/home.nix
@@ -5,9 +5,7 @@
inputs,
skullNeovim,
...
-}:
-
-{
+}: {
imports = [
./sh.nix
./ghostty.nix
@@ -49,8 +47,8 @@
home.packages = with pkgs; [
# # Adds the 'hello':wq command to your environment. It prints a friendly
# # "Hello, world!" when run.
- audacity
- mpc
+ audacity
+ mpc
discord
catppuccin-gtk
inter
@@ -78,7 +76,6 @@
skullNeovim.neovim
-
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
@@ -107,21 +104,20 @@
# '';
home.file = {
".config/swappy/config".text = ''
- [Default]
- save_dir=$HOME/Screenshots
- save_filename_format=Screenshot-%Y%m%d-%H%M%S.png
- show_panel=true
- line_size=5
- text_size=20
- text_font=monospace
- paint_mode=brush
- early_exit=true
- fill_shape=false
- auto_save=true
- transparent=true
- transparency=50
- '';
-
+ [Default]
+ save_dir=$HOME/Screenshots
+ save_filename_format=Screenshot-%Y%m%d-%H%M%S.png
+ show_panel=true
+ line_size=5
+ text_size=20
+ text_font=monospace
+ paint_mode=brush
+ early_exit=true
+ fill_shape=false
+ auto_save=true
+ transparent=true
+ transparency=50
+ '';
};
# Home Manager can also manage your environment variables through
@@ -181,7 +177,7 @@
xdg.portal = {
enable = true;
- extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
+ extraPortals = [pkgs.xdg-desktop-portal-hyprland];
};
services.gnome-keyring = {
diff --git a/hyprland/binds.nix b/hyprland/binds.nix
index e71dbe1..aed9fd0 100644
--- a/hyprland/binds.nix
+++ b/hyprland/binds.nix
@@ -1,31 +1,33 @@
-{lib, config, pkgs, ... }:
-let
- # workspaces
- workspaces =builtins.concatLists (
- builtins.genList (
- i:
- let
- ws = i + 1;
- in
- [
- "$mod, code:1${toString i}, workspace, ${toString ws}"
- "$mod SHIFT, code:1${toString i}, movetoWorkspace, ${toString ws}"
- ]
- ) 10
- );
-in
{
+ lib,
+ config,
+ pkgs,
+ ...
+}: let
+ # workspaces
+ workspaces = builtins.concatLists (
+ builtins.genList (
+ i: let
+ ws = i + 1;
+ in [
+ "$mod, code:1${toString i}, workspace, ${toString ws}"
+ "$mod SHIFT, code:1${toString i}, movetoWorkspace, ${toString ws}"
+ ]
+ )
+ 10
+ );
+in {
wayland.windowManager.hyprland.settings = {
-
"$mod" = "SUPER";
bindm = [
- "$mod, mouse:272, movewindow"
- "$mod, mouse:273, resizewindow"
+ "$mod, mouse:272, movewindow"
+ "$mod, mouse:273, resizewindow"
];
- bind = [
- # compositor commands
- "$mod SHIFT, E, exec, pkill Hyprland"
+ bind =
+ [
+ # compositor commands
+ "$mod SHIFT, E, exec, pkill Hyprland"
"$mod, W, killactive,"
"$mod, Q, killactive,"
"$mod, F, fullscreen,"
@@ -55,42 +57,33 @@ in
"$mod SHIFT, k, movewindow, u"
"$mod SHIFT, j, movewindow, d"
-
-
- "$mod, D, exec, uwsm app -- ghostty"
- "$mod, b, exec, brave"
- "$mod, space, exec, pkill rofi || rofi -show drun"
- "$mod, p, exec, pkill hyprpicker || hyprpicker -ar"
- "$mod SHIFT, s, exec, pkill slurp || grim -g \"$(slurp)\" - | wl-copy"
- ", PRINT, exec, pkill slurp swappy || grim -g \"$(slurp)\" - | swappy -f -"
- ", XF86Explorer, exec, hyprlock"
- ", F1, exec, hyprlock"
- ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && notify-send 'Volume Up'"
- ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && notify-send 'Volume Down'"
- ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && notify-send 'Mute Toggled'"
- ", XF86AudioNext, exec, playerctl next && notify-send 'Next Song'"
- ", XF86AudioPrev, exec, playerctl previous && notify-send 'Previous Song'"
- ", XF86AudioPlay, exec, playerctl play-pause && notify-send 'Pause/Play Toggled'"
- ", XF86AudioStop, exec, playerctl stop && notify-send 'Music Stopped'"
- ", F11, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && notify-send 'Volume Up'"
- ", F10, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && notify-send 'Volume Down'"
- ", F9, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && notify-send 'Mute Toggled'"
- ", F6, exec, playerctl next && notify-send 'Next Song'"
- ", F5, exec, playerctl previous && notify-send 'Previous Song'"
- ", F7, exec, playerctl play-pause && notify-send 'Pause/Play Toggled'"
- ", F8, exec, playerctl stop && notify-send 'Music Stopped'"
-
-
- ", F4, workspace, 3"
- ", XF86Tools, workspace, 3"
-
-
-
- ]
-++ workspaces;
-
-
- };
- }
-
+ "$mod, D, exec, uwsm app -- ghostty"
+ "$mod, b, exec, brave"
+ "$mod, space, exec, pkill rofi || rofi -show drun"
+ "$mod, p, exec, pkill hyprpicker || hyprpicker -ar"
+ "$mod SHIFT, s, exec, pkill slurp || grim -g \"$(slurp)\" - | wl-copy"
+ ", PRINT, exec, grim - | wl-copy"
+ "SHIFT, PRINT, exec, pkill slurp swappy || grim -g \"$(slurp)\" - | swappy -f -"
+ ", XF86Explorer, exec, hyprlock"
+ ", F1, exec, hyprlock"
+ ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && notify-send 'Volume Up'"
+ ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && notify-send 'Volume Down'"
+ ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && notify-send 'Mute Toggled'"
+ ", XF86AudioNext, exec, playerctl next && notify-send 'Next Song'"
+ ", XF86AudioPrev, exec, playerctl previous && notify-send 'Previous Song'"
+ ", XF86AudioPlay, exec, playerctl play-pause && notify-send 'Pause/Play Toggled'"
+ ", XF86AudioStop, exec, playerctl stop && notify-send 'Music Stopped'"
+ ", F11, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ && notify-send 'Volume Up'"
+ ", F10, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- && notify-send 'Volume Down'"
+ ", F9, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && notify-send 'Mute Toggled'"
+ ", F6, exec, playerctl next && notify-send 'Next Song'"
+ ", F5, exec, playerctl previous && notify-send 'Previous Song'"
+ ", F7, exec, playerctl play-pause && notify-send 'Pause/Play Toggled'"
+ ", F8, exec, playerctl stop && notify-send 'Music Stopped'"
+ ", F4, workspace, 3"
+ ", XF86Tools, workspace, 3"
+ ]
+ ++ workspaces;
+ };
+}
diff --git a/impurities b/impurities
deleted file mode 100644
index 77e0d9f..0000000
--- a/impurities
+++ /dev/null
@@ -1,2 +0,0 @@
-wireplumber / pavucontrol
-under configuration, i had to set Navi 31 HDMI/DP Audio to be digital stereo HDMI 2 Output instead of HDMI 1 to make the monitor volume to work.
diff --git a/impurities.md b/impurities.md
new file mode 100644
index 0000000..93c4fdd
--- /dev/null
+++ b/impurities.md
@@ -0,0 +1,12 @@
+# wireplumber / pavucontrol
+
+under configuration, i had to set Navi 31 HDMI/DP Audio to be digital stereo
+HDMI 2 Output instead of HDMI 1 to make the monitor volume to work.
+
+# fix: o spell file for "programming" in utf-8 Download it?
+
+vim.spellcheck.programmingWordlist.enable Whether to enable vim-dirtytalk, a
+wordlist for programmers containing common programming terms. Enabling this
+option will unconditionally set vim.spellcheck.enable to true as vim-dirtytalk
+depends on spellchecking having been set up. Run :DirtytalkUpdate on first use
+to download the spellfile.
diff --git a/neovim.nix b/neovim.nix
index a6562d9..7e7797c 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -1,4 +1,8 @@
-{inputs, pkgs, ...}: {
+{
+ inputs,
+ pkgs,
+ ...
+}: {
config.vim = {
viAlias = true;
vimAlias = true;
@@ -151,6 +155,19 @@
cheatsheet.enable = true;
};
+ keymaps = [
+ {
+ mode = "n";
+ key = "<leader>?";
+ action = ":Cheatsheet<CR>";
+ }
+ {
+ mode = "n";
+ key = "<leader>e";
+ action = ":Neotree toggle<CR>";
+ }
+ ];
+
telescope.enable = true;
git = {
diff --git a/obsidian.nix b/obsidian.nix
index 1c55a90..7124fe8 100644
--- a/obsidian.nix
+++ b/obsidian.nix
@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
{
+ config,
+ pkgs,
+ ...
+}: {
programs.obsidian = {
enable = true;
defaultSettings = {
@@ -7,10 +10,9 @@
showLineNumber = true;
vimMode = true;
};
- cssSnippets = [
- ./zoom.css
- ];
-
+ # cssSnippets = [
+ # ./zoom.css
+ # ];
};
vaults."Vault" = {
enable = true;
@@ -18,5 +20,4 @@
};
};
};
-
}
diff --git a/tmux.nix b/tmux.nix
index 4d8eb56..648e4d9 100644
--- a/tmux.nix
+++ b/tmux.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
{
+ config,
+ pkgs,
+ ...
+}: {
programs.tmux = {
enable = true;
shell = "${pkgs.fish}/bin/fish";
@@ -36,12 +38,19 @@
unbind C-b
bind C-a send-prefix
+ set -g default-terminal "screen-256color"
+ set -ga terminal-overrides ",xterm-256color:Tc"
+
# Keybindings for easier navigation
bind -n C-h select-pane -L
bind -n C-j select-pane -D
bind -n C-k select-pane -U
bind -n C-l select-pane -R
+ bind-key -r d new-session -s dev
+ bind-key -r m new-session -s music
+ bind-key -r n new-session -s nixos
+
# Fish-friendly clipboard integration
set -g set-clipboard on
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -in -selection clipboard"
@@ -52,11 +61,10 @@
};
home.packages = with pkgs; [
- tmux
- xclip
+ tmux
+ xclip
];
-
# Create session setup script
home.file.".config/tmux/setup-sessions.sh" = {
executable = true;
@@ -81,5 +89,5 @@
# Attach to dev session by default
tmux attach-session -t dev
'';
-};
+ };
}