aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------config/nvim0
-rw-r--r--config/qutebrowser/config.py2
-rw-r--r--config/zsh/zshrc2
-rw-r--r--configuration.nix12
m---------extras/notes0
-rw-r--r--hardware/thinkpad-e14/default.nix18
-rw-r--r--modules/git.home.nix4
-rw-r--r--modules/keyboard/default.nix2
-rw-r--r--modules/keyboard/kmonad.k2.kbd16
-rw-r--r--packages.nix16
-rwxr-xr-xpackages/dwm/autostart.sh25
11 files changed, 57 insertions, 40 deletions
diff --git a/config/nvim b/config/nvim
-Subproject e8e23813616c5ab75781c3def1292655234484d
+Subproject 01ae9b6e7d4d639f61dba51f5dc30ad934f8103
diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py
index f469c83..d741669 100644
--- a/config/qutebrowser/config.py
+++ b/config/qutebrowser/config.py
@@ -286,7 +286,7 @@ config.set('content.media.video_capture', True, '*://meet.google.com')
c.url.default_page = '~/.config/qutebrowser/homepage/index.html'
c.url.start_pages = [c.url.default_page]
-DEFAULT_SEARCH_ENGINE = 'd'
+DEFAULT_SEARCH_ENGINE = 'go'
c.url.searchengines = {
# Main general
'd': 'https://duckduckgo.com/?q={}',
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index f82b493..cc97978 100644
--- a/config/zsh/zshrc
+++ b/config/zsh/zshrc
@@ -18,7 +18,7 @@ setopt share_history # share command history data
export ZSH_CUSTOM_CONF_FILES="$HOME/.config/zsh";
# FZF integration
-eval "$(fzf --zsh)";
+source <(fzf --zsh);
for f in $ZSH_CUSTOM_CONF_FILES/*.zsh; do source $f; done;
source $ZSH_CUSTOM_CONF_FILES/aliases.zsh;
diff --git a/configuration.nix b/configuration.nix
index e89159a..792179a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -137,12 +137,12 @@ in
enable = true;
autorun = false;
displayManager.startx.enable = true;
- libinput = {
- enable = true;
- touchpad = {
- tapping = true;
- naturalScrolling = false;
- };
+ };
+ services.libinput = {
+ enable = true;
+ touchpad = {
+ tapping = true;
+ naturalScrolling = false;
};
};
fonts.packages = with pkgs; [
diff --git a/extras/notes b/extras/notes
-Subproject 8f6fb614f59908052610f571112e5f7317b4b63
+Subproject 81c6c833fe4a925605b8e99b0e4632feaa7d261
diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix
index 3ce72db..65de753 100644
--- a/hardware/thinkpad-e14/default.nix
+++ b/hardware/thinkpad-e14/default.nix
@@ -6,7 +6,8 @@
services.fwupd.enable = true;
- boot.kernelPackages = pkgs.linuxPackages_6_6;
+ # boot.kernelPackages = pkgs.linuxPackages_6_9;
+ boot.kernelPackages = pkgs.linuxPackages_xanmod_stable;
boot.initrd = {
availableKernelModules = [
"xhci_pci"
@@ -27,6 +28,8 @@
"uinput"
"v4l2loopback"
"acpi_call"
+ "thinkpad_acpi"
+ "coretemp"
];
boot.extraModulePackages = with config.boot.kernelPackages; [
acpi_call
@@ -46,11 +49,16 @@
boot.extraModprobeConfig = ''
options snd slots=snd-hda-intel
options v4l2loopback exclusive_caps=1 card_label="Virtual Camera"
+ options thinkpad_acpi experimental=1 fan_control=1
'';
boot.supportedFilesystems = [ "ntfs" ];
# boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
services.throttled.enable = true;
+ services.thermald = {
+ enable = true;
+ ignoreCpuidCheck = true;
+ };
services.udev = {
packages = [
@@ -59,10 +67,16 @@
];
};
+ environment.systemPackages = with pkgs; [
+ mesa
+ xorg.xf86inputlibinput
+ xorg.xf86videointel
+ ];
+ # services.xserver.videoDrivers = [ "intel" ];
+
hardware = {
enableAllFirmware = true;
cpu.intel.updateMicrocode = true;
- # firmware = with pkgs; [ wireless-regdb rtw88-firmware ];
};
nixpkgs.config.packageOverrides = pkgs: {
diff --git a/modules/git.home.nix b/modules/git.home.nix
index a304423..68094cc 100644
--- a/modules/git.home.nix
+++ b/modules/git.home.nix
@@ -57,6 +57,7 @@
};
delta = {
enable = true;
+ # package = pkgs.delta;
options = {
navigate = true;
side-by-side = true;
@@ -87,6 +88,9 @@
pull = {
rebase = false;
};
+ # pager = {
+ # diff = "${pkgs.delta}/bin/delta --color-only";
+ # };
};
signing.key = "AAAB13AE8B82A5267C1A35D7E1B701723EA37849";
signing.signByDefault = true;
diff --git a/modules/keyboard/default.nix b/modules/keyboard/default.nix
index 92f29b0..6d68e0c 100644
--- a/modules/keyboard/default.nix
+++ b/modules/keyboard/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
{
imports = [ ./kmonad.nix ];
diff --git a/modules/keyboard/kmonad.k2.kbd b/modules/keyboard/kmonad.k2.kbd
index 094224b..813b5f5 100644
--- a/modules/keyboard/kmonad.k2.kbd
+++ b/modules/keyboard/kmonad.k2.kbd
@@ -29,8 +29,9 @@
(defalias
- navf (tap-hold 180 f (layer-toggle navigation))
esc (tap-hold 180 esc lctl)
+ navf (tap-hold-next-release 180 f (tap-next f (layer-toggle navigation)))
+ leadf (tap-hold-next-release 180 ralt (tap-next ralt (layer-toggle leadlayer)))
)
(deflayer default
@@ -39,14 +40,23 @@
tab q w e r t y u i o p [ ] \
@esc a s d @navf g h j k l ; ' ret
lsft z x c v b n m , . / rsft
- lctl lmet lalt spc ralt rmet rctl left down up right
+ lctl lmet lalt spc @leadf rmet rctl left down up right
)
(deflayer navigation
_
_ 1 2 3 4 5 6 7 8 9 0 _ _ _
- _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ _ _ _ _ _ _ ret _ _ _ _ _ _ _
_ _ _ _ _ _ left down up right _ _ _
_ _ _ _ _ _ _ _ _ _ _ _
_ _ _ ret _ _ _ _ _ _ _
)
+
+(deflayer leadlayer
+ _
+ _ 1 2 3 4 5 6 7 8 9 0 _ _ _
+ _ 4 5 6 _ _ _ _ _ _ _ _ _ _
+ _ 7 8 9 _ _ _ _ _ _ _ _ _
+ _ 0 0 0 _ _ _ _ _ _ _ _
+ _ _ _ _ _ _ _ _ _ _ _
+)
diff --git a/packages.nix b/packages.nix
index db562a0..40f0326 100644
--- a/packages.nix
+++ b/packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, config, lib, ... }:
let
localPkgs = import ./packages/default.nix { pkgs = pkgs; };
@@ -27,6 +27,7 @@ let
direnv
# gh
just
+ # hurl
# delta
# gibo
@@ -46,6 +47,15 @@ let
nodePackages.vscode-json-languageserver
nodePackages.vscode-langservers-extracted
nodePackages.prettier
+ biome
+
+ lua5_1
+ # .withPackages(ps: with ps; [
+ # luarocks
+ # lua-curl
+ # ])
+ lua51Packages.luarocks
+ lua51Packages.lua-curl
];
apps = with pkgs; [
@@ -163,6 +173,10 @@ in
"qtwebkit-5.212.0-alpha4"
];
+ # environment.variables = {
+ # CURL_DIR = lib.makeLibraryPath [pkgs.curl];
+ # };
+
programs.adb.enable = true;
programs.steam.enable = true;
diff --git a/packages/dwm/autostart.sh b/packages/dwm/autostart.sh
index 91c5e4c..e7426c0 100755
--- a/packages/dwm/autostart.sh
+++ b/packages/dwm/autostart.sh
@@ -58,31 +58,6 @@ spew() {
# Battery watcher
run "" ~/scripts/battery-watch.sh start;
-
- # Cron jobs
- #run "crond" crond -n -f ~/.config/crontab/crontab;
-
- # Disk automount
- #once "udiskie" ~/.bin/with_zsh udiskie;
-
- # Clipboard history
- #once "clipmenud" clipmenud;
-
- # Network manager applet
- #once "nm-applet" nm-applet;
-
- # Syncthing
- #run "syncthing" syncthing -logflags=0 -no-browser 2>&1 >/dev/null;
-
- # Torrent daemon
- #once "btpd" btpd -d "$HOME/.config/btpd";
- #once "transmission" transmission-daemon --download-dir ~/Downloads/dl;
-
- # Music daemon
- #once "mpd" mpd ~/.config/mpd/mpd.conf --stdout --no-daemon;
-
- # Hide mouse pointer
- #once "unclutter" unclutter;
# }}}