From 6dcf30e323ae94e1c5fd8c34190f81c2bc5cf4c0 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sun, 24 Dec 2023 12:25:03 +0530 Subject: config sync --- config/nvim | 2 +- config/qutebrowser/config.py | 6 +++--- config/qutebrowser/ui.py | 9 ++++----- config/zsh/aliases/system.zsh | 6 +++--- config/zsh/plugins/fzf-cd.zsh | 4 ++-- configuration.nix | 1 + extras/notes | 2 +- hardware-configuration.nix | 4 ++++ packages.nix | 24 +++++++++++++++--------- scripts/bin/sidekick | 3 +++ 10 files changed, 37 insertions(+), 24 deletions(-) create mode 100755 scripts/bin/sidekick diff --git a/config/nvim b/config/nvim index b0f166c..369b933 160000 --- a/config/nvim +++ b/config/nvim @@ -1 +1 @@ -Subproject commit b0f166c0c9a971af19b600f80aa1f8671ff7b7d3 +Subproject commit 369b93318934373ff1c27bc9a87ff39688273120 diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py index 9e029f6..7dcfb12 100644 --- a/config/qutebrowser/config.py +++ b/config/qutebrowser/config.py @@ -156,8 +156,8 @@ nmap(localleader + 'td', ':toggle-darkmode') # }}} #### Sessions {{{ -nmap(leader + 'sl', ':cmd-set-text :session-load '); -nmap(leader + 'sw', ':cmd-set-text :session-save'); +nmap(leader + 'sl', ':cmd-set-text -s :session-load '); +nmap(leader + 'sw', ':cmd-set-text -s :session-save'); # }}} #### Navigation {{{ @@ -207,7 +207,7 @@ nmap('', 'tab-prev') nmap('', 'tab-next') nmap('', 'tab-move -') nmap('', 'tab-move +') -# nmap('b', 'cmd-set-text --space :buffer') # List buffers by index +nmap('b', 'cmd-set-text -s :tab-select') # List buffers by index for i in range(1, 10 + 1): key = 0 if i == 10 else i diff --git a/config/qutebrowser/ui.py b/config/qutebrowser/ui.py index f1479f3..85d7f09 100644 --- a/config/qutebrowser/ui.py +++ b/config/qutebrowser/ui.py @@ -20,11 +20,10 @@ c.fonts.default_size = '12px' c.colors.webpage.preferred_color_scheme = 'dark' c.colors.webpage.darkmode.enabled = False -c.colors.webpage.darkmode.algorithm = "lightness-cielab" -c.colors.webpage.darkmode.threshold.text = 150 -c.colors.webpage.darkmode.threshold.background = 100 -c.colors.webpage.darkmode.policy.images = 'always' -c.colors.webpage.darkmode.grayscale.images = 0.35 +# c.colors.webpage.darkmode.algorithm = "lightness-cielab" +# c.colors.webpage.darkmode.threshold.foreground = 150 +# c.colors.webpage.darkmode.threshold.background = 100 +# c.colors.webpage.darkmode.policy.images = 'always' ## Hints c.colors.hints.bg = 'yellow' diff --git a/config/zsh/aliases/system.zsh b/config/zsh/aliases/system.zsh index 3f049a3..9e562dd 100644 --- a/config/zsh/aliases/system.zsh +++ b/config/zsh/aliases/system.zsh @@ -24,13 +24,13 @@ nix-rollback() { setup_webcam_day() { v4l2-ctl -d /dev/video2 --set-ctrl exposure_absolute=300 v4l2-ctl -d /dev/video2 --set-ctrl gamma=180 - v4l2-ctl -d /dev/video2 --set-ctrl saturation=17 - v4l2-ctl -d /dev/video2 --set-ctrl contrast=12 + v4l2-ctl -d /dev/video2 --set-ctrl saturation=15 + v4l2-ctl -d /dev/video2 --set-ctrl contrast=11 v4l2-ctl -d /dev/video2 --set-ctrl brightness=1 } setup_webcam_night() { - v4l2-ctl -d /dev/video2 --set-ctrl exposure_absolute=400 + v4l2-ctl -d /dev/video2 --set-ctrl exposure_absolute=460 v4l2-ctl -d /dev/video2 --set-ctrl gamma=230 v4l2-ctl -d /dev/video2 --set-ctrl saturation=14 v4l2-ctl -d /dev/video2 --set-ctrl contrast=10 diff --git a/config/zsh/plugins/fzf-cd.zsh b/config/zsh/plugins/fzf-cd.zsh index f1897c5..02b85e7 100644 --- a/config/zsh/plugins/fzf-cd.zsh +++ b/config/zsh/plugins/fzf-cd.zsh @@ -4,7 +4,7 @@ fzf-change-dir-cwd() { # fzf + cd in cwd if [ ! -z "$selected" ] && [ "$selected" != "$(pwd)" ]; then cd $selected; fi - zle send-break + zle send-break || true } zle -N fzf-change-dir-cwd; @@ -15,7 +15,7 @@ fzf-change-dir() { if ! [[ -z "$result" ]]; then cd "$result" fi - zle send-break + zle send-break || true } zle -N fzf-change-dir; diff --git a/configuration.nix b/configuration.nix index fed444c..b2eb3e0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -66,6 +66,7 @@ in enable = true; alsa.enable = true; pulse.enable = true; + jack.enable = true; }; # Network diff --git a/extras/notes b/extras/notes index 0bcb849..7475fe7 160000 --- a/extras/notes +++ b/extras/notes @@ -1 +1 @@ -Subproject commit 0bcb849e74734168bd38a727c4678e297ded7143 +Subproject commit 7475fe7d45a14db08218572e22c69696444b0a49 diff --git a/hardware-configuration.nix b/hardware-configuration.nix index f4eb75f..b4e9a58 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -52,6 +52,10 @@ cpu.intel.updateMicrocode = true; firmware = with pkgs; [ wireless-regdb rtw88-firmware ]; # rtlwifi_new-firmware }; + # hardware.opengl = { + # enable = true; + # driSupport = true; + # }; # Bootloader boot.loader = { diff --git a/packages.nix b/packages.nix index 89c055a..6ef601e 100644 --- a/packages.nix +++ b/packages.nix @@ -12,7 +12,7 @@ let dmenu anypinentry # bslock - sidekick + # sidekick ]; devPackages = with pkgs; [ @@ -20,6 +20,7 @@ let neovim silver-searcher ripgrep + ast-grep ctags fzf docker-compose @@ -48,6 +49,7 @@ let apps = with pkgs; [ # Browser qutebrowser + # qutebrowser-qt5 brave # firefox # ungoogled-chromium @@ -64,7 +66,7 @@ let feh obs-studio inkscape - krita + # krita zathura blender j4-dmenu-desktop @@ -75,9 +77,12 @@ let dunst # Audio - # qjackctl - # ardour + qjackctl + ardour + a2jmidid pavucontrol + audacity + # guitarix # easyeffects # TUI stuff @@ -103,15 +108,15 @@ let bat catimg fd - sad + # sad mediainfo poppler_utils glow - figlet + # figlet wineWowPackages.stable + pkgs.steam-run flatpak distrobox - xorg.xhost # appimage-run # Audio @@ -122,19 +127,20 @@ let brightnessctl xorg.xinit xorg.xrandr - arandr xorg.xmodmap xorg.xkill + xorg.xhost xclip xdo xdotool + arandr v4l-utils ]; in { # Packages - environment.systemPackages = devPackages ++ customPackages ++ apps ++ utils ++ [ pkgs.steam-run ]; + environment.systemPackages = devPackages ++ customPackages ++ apps ++ utils; nixpkgs.config.permittedInsecurePackages = [ "ffmpeg-3.4.8" diff --git a/scripts/bin/sidekick b/scripts/bin/sidekick new file mode 100755 index 0000000..a2cff55 --- /dev/null +++ b/scripts/bin/sidekick @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +~/dev/projects/nvim-sidekick-dashboard/bin/sidekick -- cgit v1.3.1