diff --git a/flake.lock b/flake.lock index 4e671d3..aef6c4d 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1736414269, - "narHash": "sha256-HrRQ54D2JfevmU3u7Rw2auCdJPaT7PlIg3IUf8iamBo=", + "lastModified": 1736327656, + "narHash": "sha256-vDli473KKyf13uexB4Ja9Jt7KmeUSbHbeuwIDP0M2yM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0924fcda6ea2ff09c857663d965a6d01e5d13ea6", + "rev": "42b7368d193ad1939c32e87b48e970423f22f242", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1736421950, - "narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", + "lastModified": 1736336279, + "narHash": "sha256-9Xp2X7ofKY4h39vUbd4coNambsG7Y/9axLFyTXaXOMU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d4aebb947a301b8da8654a804979a738c5c5da50", + "rev": "45bcdbc910dc5131943bb6f7edb156617898fd1a", "type": "github" }, "original": { @@ -864,11 +864,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", + "lastModified": 1736085891, + "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", + "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "type": "github" }, "original": { @@ -1164,11 +1164,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 25a8175..68ba3d2 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -48,6 +48,8 @@ (native-comp-async-report-warnings-errors nil) (inhibit-startup-message t) (visible-bell t) + (scroll-conservatively 101) ;; more than 100 => redisplay doesn't recenter point) + (scroll-margin 3) (temporary-file-directory "~/.emacs-saves/") (backup-directory-alist `(("." . ,temporary-file-directory))) (auto-save-files-name-transforms `((".*" ,temporary-file-directory t))) @@ -82,13 +84,6 @@ (async-shell-command (format "sudo nixos-rebuild --flake fleet %s -L" operation) buffer-name))) ) -(use-package ultra-scroll - :init - (setq scroll-conservatively 101 ; important! - scroll-margin 0) - :config - (ultra-scroll-mode 1)) - (use-package doc-view :custom (doc-view-scale-internally nil) @@ -633,6 +628,7 @@ (add-to-list 'eat-semi-char-non-bound-keys '[?\e 108]) ; M-l (eat-update-semi-char-mode-map) (eat-reload) + :hook (eat-mode . (lambda () (setq-local scroll-margin 0))) :bind (("C-c o t" . eat-project)) ;; FIXME doesn't work well ;; ((eat-mode . compilation-shell-minor-mode)) @@ -670,6 +666,7 @@ (defalias (car alias) (cdr alias))) ccr/eshell-aliases) + :hook (eshell-mode . (lambda () (setq-local scroll-margin 0))) :bind (("C-c o e" . project-eshell) :map eshell-mode-map ("C-r" . eshell-atuin-history))) ;; i.e. just C-r in semi-char-mode diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix index 45852ee..2596638 100644 --- a/hmModules/hyprland/default.nix +++ b/hmModules/hyprland/default.nix @@ -27,7 +27,7 @@ in ../waybar ../swayidle ../gammastep - # ../swaync + ../swaync ../foot ]; diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl index 65a4ae5..5a3b61f 100644 --- a/hmModules/niri/config.kdl +++ b/hmModules/niri/config.kdl @@ -75,7 +75,7 @@ environment { // Find more information on the wiki: // https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs // Remember to uncomment the node by removing "/-"! -output "eDP-1" { +/-output "eDP-1" { // Uncomment this line to disable this output. // off @@ -85,12 +85,12 @@ output "eDP-1" { // for the resolution. // If the mode is omitted altogether or is invalid, niri will pick one automatically. // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. - mode "1920x1080@59.999" + mode "1920x1080@120.030" // You can use integer or fractional scale, for example use 1.5 for 150% scale. - scale 1.2 + scale 2 - // Transform allows to rotate the output counter-clockwise, valid values are:monitor + // Transform allows to rotate the output counter-clockwise, valid values are: // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. transform "normal" @@ -103,13 +103,7 @@ output "eDP-1" { // so to put another output directly adjacent to it on the right, set its x to 1920. // If the position is unset or results in an overlap, the output is instead placed // automatically. - // position x=1280 y=0 -} - -output "Dell Inc. DELL U2515H 9X2VY5170PJL" { - mode "2560x1440@59.951" - scale 1 - transform "normal" + position x=1280 y=0 } // Settings that influence how windows are positioned and sized. diff --git a/modules/audio/default.nix b/modules/audio/default.nix index 65ac9fa..96e68ee 100644 --- a/modules/audio/default.nix +++ b/modules/audio/default.nix @@ -2,5 +2,10 @@ { sound.enable = true; + hardware.pulseaudio = { + enable = true; + package = pkgs.pulseaudioFull; + }; + users.extraUsers.ccr.extraGroups = [ "audio" ]; } diff --git a/modules/bluetooth/default.nix b/modules/bluetooth/default.nix index f6f28f7..9d5ee45 100644 --- a/modules/bluetooth/default.nix +++ b/modules/bluetooth/default.nix @@ -1,13 +1,13 @@ { pkgs, config, - lib, ... }: { services.blueman.enable = true; + hardware.pulseaudio.enable = true; hardware.bluetooth = { - enable = lib.mkDefault true; + enable = true; settings = { General = { Name = config.networking.hostName; diff --git a/modules/pipewire/default.nix b/modules/pipewire/default.nix index fac17a0..8b69935 100644 --- a/modules/pipewire/default.nix +++ b/modules/pipewire/default.nix @@ -3,6 +3,6 @@ services.pipewire.enable = true; hardware.pulseaudio = { - enable = false; + enable = lib.mkForce false; }; } diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index fde9e30..a3d9f0d 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -88,16 +88,6 @@ let }; deps = [ ]; }; - ultra-scroll = buildEmacsPackage { - name = "ultra-scroll"; - src = pkgs.fetchFromGitHub { - owner = "jdtsmith"; - repo = "ultra-scroll"; - rev = "78ab497c6568e4a99f34a84b4c9bfe87d1a71d8c"; - hash = "sha256-q/LGP69GRtEEbSpXi9JUoZjr/UV1QMVjQw96M6qxsZU="; - }; - deps = [ ]; - }; }; # *List* containing emacs packages from (M)ELPA