diff options
| -rw-r--r-- | flake.lock | 54 | ||||
| -rw-r--r-- | system/settings/gaming.nix | 2 | ||||
| -rw-r--r-- | system/settings/hardware/bluetooth-audio.nix | 10 | ||||
| -rw-r--r-- | user/emacs/init.el | 17 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 18 | ||||
| -rw-r--r-- | user/settings/shell.nix | 2 |
6 files changed, 69 insertions, 34 deletions
diff --git a/flake.lock b/flake.lock index 1e6ddd06..b1523039 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1737162735, - "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1737162568, - "narHash": "sha256-cwgeBqXtMKHoK+627GEGGkbIILxhP/OrqNMQhUp/6dQ=", + "lastModified": 1737709319, + "narHash": "sha256-bfkDmJGsxLOp9sbYqf4Qi6nuuTzIQa+iPemodKNSWCo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ac3dfdca835c5b8f7c27d5dcec2b9c4580299a7c", + "rev": "93d351a5010799656026bb4ff253b0e68eab4de5", "type": "github" }, "original": { @@ -269,11 +269,11 @@ ] }, "locked": { - "lastModified": 1737221749, - "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", + "lastModified": 1737704314, + "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=", "owner": "nix-community", "repo": "home-manager", - "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", + "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1737257306, + "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "744d330659e207a1883d2da0141d35e520eb87bd", "type": "github" }, "original": { @@ -304,11 +304,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736978406, - "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", + "lastModified": 1737590910, + "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b678606690027913f3434dea3864e712b862dde5", + "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "type": "github" }, "original": { @@ -335,11 +335,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1737192615, - "narHash": "sha256-jtucJjcdryEZQw1g0RThPSPxCdWNHF42sLp8pmMMGDs=", + "lastModified": 1737706285, + "narHash": "sha256-k/f1rAyCjGkNu4BnlnUGEvQPSnYVG7UHoOeaQQcjQps=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09c71b16e6efc9e90edae7eb8b63348702ff9a85", + "rev": "dcb7446a099fe1c95b3694fdb7a4dda8f19d6ba8", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1736916166, - "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -399,11 +399,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737632463, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "type": "github" }, "original": { diff --git a/system/settings/gaming.nix b/system/settings/gaming.nix index d11d5a3c..2ba1fb33 100644 --- a/system/settings/gaming.nix +++ b/system/settings/gaming.nix @@ -23,7 +23,7 @@ enable = true; enable32Bit = true; }; - hardware.pulseaudio.support32Bit = true; + services.pulseaudio.support32Bit = true; services.pipewire.alsa.support32Bit = true; systemd = { diff --git a/system/settings/hardware/bluetooth-audio.nix b/system/settings/hardware/bluetooth-audio.nix index d368cb29..29a38acf 100644 --- a/system/settings/hardware/bluetooth-audio.nix +++ b/system/settings/hardware/bluetooth-audio.nix @@ -6,10 +6,10 @@ bluetooth = { package = pkgs.bluezFull; }; - pulseaudio = { - extraModules = with pkgs; [ - pulseaudio-modules-bt - ]; - }; + }; + services.pulseaudio = { + extraModules = with pkgs; [ + pulseaudio-modules-bt + ]; }; } diff --git a/user/emacs/init.el b/user/emacs/init.el index 97c5e669..508541f6 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -139,6 +139,15 @@ (setq-default display-line-numbers 'relative display-line-numbers-widen t display-line-numbers-width 4) + +(defun turn-off-display-line-numbers-mode () + (interactive) + (display-line-numbers-mode -1)) + +(defun turn-on-display-line-numbers-mode () + (interactive) + (display-line-numbers-mode (default-value 'display-line-numbers))) + (setq frame-resize-pixelwise t window-resize-pixelwise t display-buffer-alist `(("\\*\\(?:shell\\|compilation\\)\\*" display-buffer-in-side-window @@ -158,6 +167,13 @@ (add-hook 'evil-insert-state-entry-hook #'noct-absolute) (add-hook 'evil-insert-state-exit-hook #'noct-relative) +(use-package ultra-scroll + :defer 1 + :config (progn + (setq scroll-margin 0 + scroll-conservatively 101) + (ultra-scroll-mode +1))) + ;;; Encoding (setq-default bidi-paragraph-direction 'left-to-right @@ -736,6 +752,7 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve :defer 5 :commands (eshell) :functions (eshell/pwd) + :gfhook #'turn-off-display-line-numbers-mode :general (:keymaps 'eshell-command-map "C-r" #'eshell-history-backwards "C-s" #'eshell-history-forwards) diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index e6114e2a..b5470c96 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -159,6 +159,7 @@ in treesit-grammars.with-all-grammars treesit-auto try + ultra-scroll vc-msg vertico vertico-prescient @@ -169,6 +170,23 @@ in yasnippet-capf ]); overrides = self: super: { + ultra-scroll = self.melpaBuild rec { + pname = "ultra-scroll"; + version = "0.3.1"; + + src = pkgs.fetchFromGitHub { + owner = "jdtsmith"; + repo = pname; + rev = "2e3b9997ae1a469e878feaa0af23a23685a0fbed"; + hash = "sha256-9+3T5tXPRuRtENt/Rr0Ss3LZJlTOwpGePbREqofN2j0="; + }; + + meta = { + homepage = "https://github.com/jdtsmith/ultra-scroll"; + description = "scroll emacs like lightning"; + license = pkgs.lib.licenses.gpl3; + }; + }; apheleia = self.melpaPackages.apheleia.overrideAttrs (old: { patchPhase = '' diff --git a/user/settings/shell.nix b/user/settings/shell.nix index cbf3f96f..41805a44 100644 --- a/user/settings/shell.nix +++ b/user/settings/shell.nix @@ -113,7 +113,7 @@ in ho = "home-manager"; hob = "home-manager build"; hos = "home-manager switch --flake '.?submodules=1' -b hm_bak_$(date +%Y%m%d%H%M)"; - hon = "home-manager news"; + hon = "home-manager news --flake '.?submodules=1'"; hoh = "home-manager help"; hop = "home-manager packages"; hol = "home-manager generations"; |