aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: aciceri:ea612479a073cdcbff339fab7e03c4652a54a493
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test
...
compare: aciceri:db2dc67e47b3e06c4498192b8b94b93540bade87
Branches Tags
aciceri:update-flake-lock
aciceri:master
aciceri:aaa
aciceri:wip
aciceri:test

3 commits
ea612479a0 ... db2dc67e47

Author SHA1 Message Date
Andrea Ciceri
db2dc67e47
Add ultra-scroll to Emacs
Some checks failed
EVAL x86_64-linux.picard
Details
BUILD x86_64-linux.picard
Details
UPLOAD x86_64-linux.picard
Details
DOWNLOAD x86_64-linux.picard
Details
CACHIX x86_64-linux.picard
Details
ATTIC x86_64-linux.picard
Details
/ test (push) Successful in 29m11s
Details
2025-01-09 11:17:38 +01:00
Andrea Ciceri
8b8ce6baa3
Disable swayvnc 2025-01-09 11:17:19 +01:00
Andrea Ciceri
a313be12ea
Bump inputs 2025-01-09 11:17:06 +01:00
7 changed files with 79 additions and 88 deletions
Show stats Expand all files Collapse all files

133
flake.lock generated
View file

@ -32,11 +32,11 @@
"nuscht-search": "nuscht-search" "nuscht-search": "nuscht-search"
}, },
"locked": { "locked": {
"lastModified": 1735569271, "lastModified": 1736069220,
"narHash": "sha256-4CIClg4LMcmcCRIXSTcHDe6ujPzlxMtbCjMH7ntV784=", "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "7413a65b3ed37964c16e2fbe20145b55bcda8281", "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735468753, "lastModified": 1736199437,
"narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1735575692, "lastModified": 1736327656,
"narHash": "sha256-akoVz7FBTAqLEj2bFLbA3Zqs1V7eF9J6KluWWojsxd0=", "narHash": "sha256-vDli473KKyf13uexB4Ja9Jt7KmeUSbHbeuwIDP0M2yM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "eab2ed354a88a6870ffca4980abb470bba0e4452", "rev": "42b7368d193ad1939c32e87b48e970423f22f242",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +267,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1735774679,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1736143030,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,15 +412,14 @@
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1734797603, "lastModified": 1735882644,
"narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -583,11 +582,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735381016, "lastModified": 1736349537,
"narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "narHash": "sha256-jE6CXoJLBmvuq9bWjv+EQusiEtSxPiNasWbD+N4575U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "rev": "456e599f9101ed153dde268b4401c5d294ba6c8c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -688,11 +687,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735572323, "lastModified": 1736275188,
"narHash": "sha256-Wjt+PK15IdaOUoI0sgsRzaNMxKQGSROLe9sOd44+fwM=", "narHash": "sha256-IWu1aN1MeRCtx0PYIKTvG5iDSOx/JVegm4Y+0lAZGTE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "5c7ea4f446de58aa64f78087bb4ec26b9c4111aa", "rev": "3413ab56292f12ac03ee49270bcaf16038020cb3",
"revCount": 16600, "revCount": 16605,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -777,11 +776,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1734716067, "lastModified": 1736168988,
"narHash": "sha256-BCpd50t/3JU4ydiNfJxH3LzQDzyGbBI0CKWaeplnkVg=", "narHash": "sha256-jqH3cfg98+mRSB59WmJuWnvsSyOUNIOVZxf16Mh9/8s=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-fast-build", "repo": "nix-fast-build",
"rev": "ed736c65a8cb58a85369f6ee1c3f4403aa904fcc", "rev": "a06a8b2c079f7b6dab491a12555387bdb737cc44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -865,11 +864,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1735478292, "lastModified": 1736085891,
"narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -901,11 +900,11 @@
}, },
"nixosHardware": { "nixosHardware": {
"locked": { "locked": {
"lastModified": 1735388221, "lastModified": 1736283893,
"narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -964,14 +963,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1733096140, "lastModified": 1735774519,
"narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "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": { "nixpkgs-lib_2": {
@ -1010,11 +1009,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1735531152, "lastModified": 1736200483,
"narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1040,22 +1039,6 @@
"type": "github" "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": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1682134069, "lastModified": 1682134069,
@ -1104,11 +1087,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1736012469,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1165,11 +1148,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1703255338,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1181,11 +1164,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1736012469,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1283,7 +1266,7 @@
"lanzaboote", "lanzaboote",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1731363552, "lastModified": 1731363552,
@ -1514,11 +1497,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734543842, "lastModified": 1735905407,
"narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=", "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "76159fc74eeac0599c3618e3601ac2b980a29263", "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1534,11 +1517,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735135567, "lastModified": 1736154270,
"narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "9e09d30a644c57257715902efbb3adc56c79cf28", "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
hmModules/emacs/init.el
View file

@ -48,8 +48,6 @@
(native-comp-async-report-warnings-errors nil) (native-comp-async-report-warnings-errors nil)
(inhibit-startup-message t) (inhibit-startup-message t)
(visible-bell t) (visible-bell t)
(scroll-conservatively 101) ;; more than 100 => redisplay doesn't recenter point)
(scroll-margin 3)
(temporary-file-directory "~/.emacs-saves/") (temporary-file-directory "~/.emacs-saves/")
(backup-directory-alist `(("." . ,temporary-file-directory))) (backup-directory-alist `(("." . ,temporary-file-directory)))
(auto-save-files-name-transforms `((".*" ,temporary-file-directory t))) (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))) (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 (use-package doc-view
:custom :custom
(doc-view-scale-internally nil) (doc-view-scale-internally nil)
@ -628,7 +633,6 @@
(add-to-list 'eat-semi-char-non-bound-keys '[?\e 108]) ; M-l (add-to-list 'eat-semi-char-non-bound-keys '[?\e 108]) ; M-l
(eat-update-semi-char-mode-map) (eat-update-semi-char-mode-map)
(eat-reload) (eat-reload)
:hook (eat-mode . (lambda () (setq-local scroll-margin 0)))
:bind (("C-c o t" . eat-project)) :bind (("C-c o t" . eat-project))
;; FIXME doesn't work well ;; FIXME doesn't work well
;; ((eat-mode . compilation-shell-minor-mode)) ;; ((eat-mode . compilation-shell-minor-mode))
@ -666,7 +670,6 @@
(defalias (car alias) (cdr alias))) (defalias (car alias) (cdr alias)))
ccr/eshell-aliases) ccr/eshell-aliases)
:hook (eshell-mode . (lambda () (setq-local scroll-margin 0)))
:bind (("C-c o e" . project-eshell) :bind (("C-c o e" . project-eshell)
:map eshell-mode-map :map eshell-mode-map
("C-r" . eshell-atuin-history))) ;; i.e. just C-r in semi-char-mode ("C-r" . eshell-atuin-history))) ;; i.e. just C-r in semi-char-mode

2
hmModules/hyprland/default.nix
View file

@ -27,7 +27,7 @@ in
../waybar ../waybar
../swayidle ../swayidle
../gammastep ../gammastep
../swaync # ../swaync
../foot ../foot
]; ];

5
modules/audio/default.nix
View file

@ -2,10 +2,5 @@
{ {
sound.enable = true; sound.enable = true;
hardware.pulseaudio = {
enable = true;
package = pkgs.pulseaudioFull;
};
users.extraUsers.ccr.extraGroups = [ "audio" ]; users.extraUsers.ccr.extraGroups = [ "audio" ];
} }

4
modules/bluetooth/default.nix
View file

@ -1,13 +1,13 @@
{ {
pkgs, pkgs,
config, config,
lib,
... ...
}: }:
{ {
services.blueman.enable = true; services.blueman.enable = true;
hardware.pulseaudio.enable = true;
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = lib.mkDefault true;
settings = { settings = {
General = { General = {
Name = config.networking.hostName; Name = config.networking.hostName;

2
modules/pipewire/default.nix
View file

@ -3,6 +3,6 @@
services.pipewire.enable = true; services.pipewire.enable = true;
hardware.pulseaudio = { hardware.pulseaudio = {
enable = lib.mkForce false; enable = false;
}; };
} }

10
packages/emacs/packages.nix
View file

@ -88,6 +88,16 @@ let
}; };
deps = [ ]; 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 # *List* containing emacs packages from (M)ELPA