From a313be12eaa945f25c5b583dff8c783dad7c12be Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 9 Jan 2025 11:17:06 +0100
Subject: [PATCH 1/3] Bump inputs
---
flake.lock | 133 +++++++++++++++-------------------
modules/audio/default.nix | 5 --
modules/bluetooth/default.nix | 4 +-
modules/pipewire/default.nix | 2 +-
4 files changed, 61 insertions(+), 83 deletions(-)
diff --git a/flake.lock b/flake.lock
index 4ccd5fb..7b241b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,11 +32,11 @@
"nuscht-search": "nuscht-search"
},
"locked": {
- "lastModified": 1735569271,
- "narHash": "sha256-4CIClg4LMcmcCRIXSTcHDe6ujPzlxMtbCjMH7ntV784=",
+ "lastModified": 1736069220,
+ "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=",
"owner": "catppuccin",
"repo": "nix",
- "rev": "7413a65b3ed37964c16e2fbe20145b55bcda8281",
+ "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
"type": "github"
},
"original": {
@@ -117,11 +117,11 @@
]
},
"locked": {
- "lastModified": 1735468753,
- "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
+ "lastModified": 1736199437,
+ "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=",
"owner": "nix-community",
"repo": "disko",
- "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
+ "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf",
"type": "github"
},
"original": {
@@ -156,11 +156,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1735575692,
- "narHash": "sha256-akoVz7FBTAqLEj2bFLbA3Zqs1V7eF9J6KluWWojsxd0=",
+ "lastModified": 1736327656,
+ "narHash": "sha256-vDli473KKyf13uexB4Ja9Jt7KmeUSbHbeuwIDP0M2yM=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "eab2ed354a88a6870ffca4980abb470bba0e4452",
+ "rev": "42b7368d193ad1939c32e87b48e970423f22f242",
"type": "github"
},
"original": {
@@ -267,11 +267,11 @@
]
},
"locked": {
- "lastModified": 1733312601,
- "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+ "lastModified": 1735774679,
+ "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+ "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
"type": "github"
},
"original": {
@@ -378,11 +378,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1733312601,
- "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+ "lastModified": 1736143030,
+ "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+ "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github"
},
"original": {
@@ -412,15 +412,14 @@
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable_3"
+ ]
},
"locked": {
- "lastModified": 1734797603,
- "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+ "lastModified": 1735882644,
+ "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+ "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github"
},
"original": {
@@ -583,11 +582,11 @@
]
},
"locked": {
- "lastModified": 1735381016,
- "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
+ "lastModified": 1736349537,
+ "narHash": "sha256-jE6CXoJLBmvuq9bWjv+EQusiEtSxPiNasWbD+N4575U=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
+ "rev": "456e599f9101ed153dde268b4401c5d294ba6c8c",
"type": "github"
},
"original": {
@@ -688,11 +687,11 @@
"lix": {
"flake": false,
"locked": {
- "lastModified": 1735572323,
- "narHash": "sha256-Wjt+PK15IdaOUoI0sgsRzaNMxKQGSROLe9sOd44+fwM=",
+ "lastModified": 1736275188,
+ "narHash": "sha256-IWu1aN1MeRCtx0PYIKTvG5iDSOx/JVegm4Y+0lAZGTE=",
"ref": "refs/heads/main",
- "rev": "5c7ea4f446de58aa64f78087bb4ec26b9c4111aa",
- "revCount": 16600,
+ "rev": "3413ab56292f12ac03ee49270bcaf16038020cb3",
+ "revCount": 16605,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@@ -777,11 +776,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
- "lastModified": 1734716067,
- "narHash": "sha256-BCpd50t/3JU4ydiNfJxH3LzQDzyGbBI0CKWaeplnkVg=",
+ "lastModified": 1736168988,
+ "narHash": "sha256-jqH3cfg98+mRSB59WmJuWnvsSyOUNIOVZxf16Mh9/8s=",
"owner": "Mic92",
"repo": "nix-fast-build",
- "rev": "ed736c65a8cb58a85369f6ee1c3f4403aa904fcc",
+ "rev": "a06a8b2c079f7b6dab491a12555387bdb737cc44",
"type": "github"
},
"original": {
@@ -865,11 +864,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1735478292,
- "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=",
+ "lastModified": 1736085891,
+ "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac",
+ "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c",
"type": "github"
},
"original": {
@@ -901,11 +900,11 @@
},
"nixosHardware": {
"locked": {
- "lastModified": 1735388221,
- "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
+ "lastModified": 1736283893,
+ "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
+ "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6",
"type": "github"
},
"original": {
@@ -964,14 +963,14 @@
},
"nixpkgs-lib": {
"locked": {
- "lastModified": 1733096140,
- "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
+ "lastModified": 1735774519,
+ "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
},
"original": {
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
}
},
"nixpkgs-lib_2": {
@@ -1010,11 +1009,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1735531152,
- "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
+ "lastModified": 1736200483,
+ "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
+ "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github"
},
"original": {
@@ -1040,22 +1039,6 @@
"type": "github"
}
},
- "nixpkgs-stable_4": {
- "locked": {
- "lastModified": 1730741070,
- "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs_10": {
"locked": {
"lastModified": 1682134069,
@@ -1104,11 +1087,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1735471104,
- "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+ "lastModified": 1736012469,
+ "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+ "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github"
},
"original": {
@@ -1165,11 +1148,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1735471104,
- "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+ "lastModified": 1703255338,
+ "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+ "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
"type": "github"
},
"original": {
@@ -1181,11 +1164,11 @@
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1735471104,
- "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+ "lastModified": 1736012469,
+ "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+ "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github"
},
"original": {
@@ -1283,7 +1266,7 @@
"lanzaboote",
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_4"
+ "nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1731363552,
@@ -1514,11 +1497,11 @@
]
},
"locked": {
- "lastModified": 1734543842,
- "narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=",
+ "lastModified": 1735905407,
+ "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "76159fc74eeac0599c3618e3601ac2b980a29263",
+ "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8",
"type": "github"
},
"original": {
@@ -1534,11 +1517,11 @@
]
},
"locked": {
- "lastModified": 1735135567,
- "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
+ "lastModified": 1736154270,
+ "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
+ "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github"
},
"original": {
diff --git a/modules/audio/default.nix b/modules/audio/default.nix
index 96e68ee..65ac9fa 100644
--- a/modules/audio/default.nix
+++ b/modules/audio/default.nix
@@ -2,10 +2,5 @@
{
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 9d5ee45..f6f28f7 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 = true;
+ enable = lib.mkDefault true;
settings = {
General = {
Name = config.networking.hostName;
diff --git a/modules/pipewire/default.nix b/modules/pipewire/default.nix
index 8b69935..fac17a0 100644
--- a/modules/pipewire/default.nix
+++ b/modules/pipewire/default.nix
@@ -3,6 +3,6 @@
services.pipewire.enable = true;
hardware.pulseaudio = {
- enable = lib.mkForce false;
+ enable = false;
};
}
From 8b8ce6baa32e995169dd8bf77b7fbb7cbb572007 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 9 Jan 2025 11:17:12 +0100
Subject: [PATCH 2/3] Disable swayvnc
---
hmModules/hyprland/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix
index 2596638..45852ee 100644
--- a/hmModules/hyprland/default.nix
+++ b/hmModules/hyprland/default.nix
@@ -27,7 +27,7 @@ in
../waybar
../swayidle
../gammastep
- ../swaync
+ # ../swaync
../foot
];
From db2dc67e47b3e06c4498192b8b94b93540bade87 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 9 Jan 2025 11:17:38 +0100
Subject: [PATCH 3/3] Add `ultra-scroll` to Emacs
---
hmModules/emacs/init.el | 11 +++++++----
packages/emacs/packages.nix | 10 ++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el
index 68ba3d2..25a8175 100644
--- a/hmModules/emacs/init.el
+++ b/hmModules/emacs/init.el
@@ -48,8 +48,6 @@
(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)))
@@ -84,6 +82,13 @@
(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)
@@ -628,7 +633,6 @@
(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))
@@ -666,7 +670,6 @@
(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/packages/emacs/packages.nix b/packages/emacs/packages.nix
index a3d9f0d..fde9e30 100644
--- a/packages/emacs/packages.nix
+++ b/packages/emacs/packages.nix
@@ -88,6 +88,16 @@ 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