From 07f13ef6e86d72c48ba760ba353e17d441881160 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Fri, 5 Dec 2025 23:00:42 +0530 Subject: Cleanup --- config/zsh/aliases/dir.zsh | 1 + config/zsh/aliases/edit.zsh | 3 ++- configuration.nix | 9 +++++++-- extras/notes | 2 +- home.nix | 2 +- modules/lockscreen.nix | 9 +++++---- packages.nix | 39 +++++++++++++++++++-------------------- packages/dwm/source | 2 +- scripts/commands/:monitor-off | 3 +++ scripts/commands/:monitor-on | 3 +++ scripts/music/yt-music.sh | 2 +- 11 files changed, 44 insertions(+), 31 deletions(-) create mode 100755 scripts/commands/:monitor-off create mode 100755 scripts/commands/:monitor-on diff --git a/config/zsh/aliases/dir.zsh b/config/zsh/aliases/dir.zsh index 3e5925f..2dac5cd 100644 --- a/config/zsh/aliases/dir.zsh +++ b/config/zsh/aliases/dir.zsh @@ -19,6 +19,7 @@ alias gvim="cd $NIXCONF/config/nvim"; alias gemacs="cd $NIXCONF/config/emacs"; alias gcmd="cd $NIXCONF/scripts/commands"; alias gzsh="cd $NIXCONF/config/zsh"; +alias gkak="cd $HOME/.config/kak"; alias gdwm="cd $NIXCONF/packages/dwm/source"; alias gbar="cd $NIXCONF/packages/dwmblocks/source"; diff --git a/config/zsh/aliases/edit.zsh b/config/zsh/aliases/edit.zsh index 2111430..da93dff 100644 --- a/config/zsh/aliases/edit.zsh +++ b/config/zsh/aliases/edit.zsh @@ -12,5 +12,6 @@ alias ekey='gkey && sensible-editor config.h'; alias equte='gqute && sensible-editor config.py'; alias eas='sensible-editor ~/nixos/packages/dwm/autostart.sh'; alias emime="sensible-editor ~/nixos/scripts/bin/open"; +alias ekak='gkak && sensible-editor autoload/+init.kak'; -alias fe='sensible-editor `fzf`' +alias fe='sensible-editor `fzf`'; diff --git a/configuration.nix b/configuration.nix index 20299ec..e2e54a6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -49,8 +49,8 @@ hostName = "smartfridge"; firewall = { enable = true; - allowedTCPPorts = [ 3000 3001 ]; - allowedUDPPorts = [ 41641 ]; + allowedTCPPorts = [ 3000 3001 80 443 ]; + allowedUDPPorts = [ 41641 80 443 ]; }; nameservers = [ "100.100.100.100" "1.1.1.1" "8.8.8.8" ]; search = [ "resolve.construction" ]; @@ -152,6 +152,11 @@ keep-outputs = true keep-derivations = true ''; + # system.autoUpgrade = { + # enable = true; + # allowReboot = false; + # dates = "monthly"; + # }; system.stateVersion = "20.09"; } diff --git a/extras/notes b/extras/notes index 285e10e..c8796f6 160000 --- a/extras/notes +++ b/extras/notes @@ -1 +1 @@ -Subproject commit 285e10edbeb085b991821a7a5ae955dff079532e +Subproject commit c8796f683ae0d373d159a1b378395c793c45c3b2 diff --git a/home.nix b/home.nix index 784a24e..54294a0 100644 --- a/home.nix +++ b/home.nix @@ -94,7 +94,7 @@ in ".local/share/qutebrowser/userscripts".source = ./config/qutebrowser/userscripts; ".local/share/qutebrowser/greasemonkey".source = ./config/qutebrowser/greasemonkey; ".config/dunst".source = ./config/dunst; - ".config/lf".source = ./config/lf; + # ".config/lf".source = ./config/lf; ".config/picom.conf".source = ./config/picom.conf; ".wyrdrc".source = ./config/remind/.wyrdrc; "scripts".source = ./scripts; diff --git a/modules/lockscreen.nix b/modules/lockscreen.nix index 09c6727..386f08a 100644 --- a/modules/lockscreen.nix +++ b/modules/lockscreen.nix @@ -1,16 +1,17 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let localPkgs = import ../packages/default.nix { inherit pkgs; }; in { environment.systemPackages = [ localPkgs.bslock ]; + # TODO: Clear gpg pass cache on autolock `gpg-connect-agent reloadagent /bye` services.xserver.xautolock = { enable = true; - time = 30; # minutes - locker = "${localPkgs.bslock}/bin/bslock"; + time = 45; # minutes + locker = "/run/wrappers/bin/bslock"; # Bslock with security wrapper enableNotifier = true; notify = 30; - notifier = "${pkgs.libnotify}/bin/notify-send 'Locking in 30 seconds'"; + notifier = ''${pkgs.libnotify}/bin/notify-send "Locking in 30 seconds"''; killer = null; }; diff --git a/packages.nix b/packages.nix index b6d993a..6681561 100644 --- a/packages.nix +++ b/packages.nix @@ -23,10 +23,7 @@ let ctags docker-compose direnv - w3m - ed rlwrap - moreutils gitu # gh just @@ -42,7 +39,7 @@ let gnumake nodejs_24 bun - marksman + nodePackages.typescript # bspwm # sxhkd @@ -60,8 +57,7 @@ let })) fnlfmt efm-langserver - - nodePackages.typescript + marksman nodePackages.typescript-language-server nodePackages.vscode-json-languageserver nodePackages.vscode-langservers-extracted @@ -80,7 +76,7 @@ let # Browser qutebrowser brave - ungoogled-chromium + chromium # Media sxiv @@ -92,18 +88,18 @@ let inkscape # obs-studio # krita - blender + # blender - luanti - xonotic - openarena + # luanti + # xonotic + # openarena # chiaki # PS remote play remind dunst # TUI stuff - lf + # lf bottom tremc wyrd @@ -138,6 +134,9 @@ let figlet fd fzf + w3m + ed + moreutils # sad mediainfo poppler-utils @@ -148,11 +147,11 @@ let distrobox # FIXME: wine broken: 19 April 25 - (import ( - builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/21808d22b1cda1898b71cf1a1beb524a97add2c4.tar.gz"; - } - ) {}).wineWowPackages.stable + # (import ( + # builtins.fetchTarball { + # url = "https://github.com/NixOS/nixpkgs/archive/21808d22b1cda1898b71cf1a1beb524a97add2c4.tar.gz"; + # } + # ) {}).wineWowPackages.stable # X stuff picom @@ -191,9 +190,9 @@ in environment.systemPackages = devPackages ++ customPackages ++ apps ++ utils; nixpkgs.config.permittedInsecurePackages = [ - "ffmpeg-3.4.8" - "qtwebkit-5.212.0-alpha4" - "qtwebengine-5.15.19" + # "ffmpeg-3.4.8" + # "qtwebkit-5.212.0-alpha4" + # "qtwebengine-5.15.19" ]; # environment.variables = { diff --git a/packages/dwm/source b/packages/dwm/source index 7aba9c5..aa8b22e 160000 --- a/packages/dwm/source +++ b/packages/dwm/source @@ -1 +1 @@ -Subproject commit 7aba9c5b43c20b7f7f3eea67ad55fa85a7b2e85e +Subproject commit aa8b22eac9bd9da0655870c7029dd41c15381d4c diff --git a/scripts/commands/:monitor-off b/scripts/commands/:monitor-off new file mode 100755 index 0000000..1eb1523 --- /dev/null +++ b/scripts/commands/:monitor-off @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +exec ~/scripts/monitor.sh off diff --git a/scripts/commands/:monitor-on b/scripts/commands/:monitor-on new file mode 100755 index 0000000..fb2d9a1 --- /dev/null +++ b/scripts/commands/:monitor-on @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +exec ~/scripts/monitor.sh on left-of diff --git a/scripts/music/yt-music.sh b/scripts/music/yt-music.sh index abf2fac..c117972 100755 --- a/scripts/music/yt-music.sh +++ b/scripts/music/yt-music.sh @@ -21,7 +21,7 @@ yt_download() { return 0; fi - yt-dlp -x --audio-format mp3 \ + yt-dlp -x --audio-format flac --audio-quality 8 \ --embed-metadata --embed-thumbnail \ --parse-metadata "playlist_index:%(track_number)s" --add-metadata \ -o "$MUSIC_DIR/%(artist|Others)s/%(album,playlist)s/%(playlist_index)02d - %(title)s.%(ext)s" \ -- cgit v1.3.1