Compare commits

...

6 commits

Author SHA1 Message Date
10946e39ae
History completion in eshell
Some checks failed
EVAL x86_64-linux.picard
BUILD x86_64-linux.picard
UPLOAD x86_64-linux.picard
DOWNLOAD x86_64-linux.picard
CACHIX x86_64-linux.picard
ATTIC x86_64-linux.picard
/ test (push) Successful in 7m53s
2025-04-24 14:06:15 +02:00
11efc745e3
Unused 2025-04-24 14:06:07 +02:00
f889c8fdda
Unused (was causing eval error with the new home-manager revision) 2025-04-24 14:05:43 +02:00
79fd28061b
Use sdrangel from an old commit (it's broken) 2025-04-24 14:05:29 +02:00
403029e478
Unused comments 2025-04-24 14:05:20 +02:00
44c45c48a1
Bump inputs 2025-04-24 14:05:13 +02:00
6 changed files with 79 additions and 70 deletions

98
flake.lock generated
View file

@ -26,11 +26,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1743801669,
"narHash": "sha256-RxQQQCGqywOPbdNrWGbFyFdcrdrXM4YBHW7vYt13OeI=",
"lastModified": 1745352209,
"narHash": "sha256-u3vJEzi6zxgG59KXjMR5koERsdKT5nd1OEKCpr6zgn8=",
"owner": "catppuccin",
"repo": "nix",
"rev": "07beb389d69a52c4dd5895da9553463c3740a26a",
"rev": "6268e50dbb0ac9375e110560395b5dc199e4dfb8",
"type": "github"
},
"original": {
@ -41,11 +41,11 @@
},
"crane": {
"locked": {
"lastModified": 1741148495,
"narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=",
"lastModified": 1741481578,
"narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
"owner": "ipetkov",
"repo": "crane",
"rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53",
"rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
"type": "github"
},
"original": {
@ -83,11 +83,11 @@
]
},
"locked": {
"lastModified": 1744145203,
"narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=",
"lastModified": 1745369821,
"narHash": "sha256-mi6cAjuBztm9gFfpiVo6mAn81cCID6nmDXh5Kmyjwyc=",
"owner": "nix-community",
"repo": "disko",
"rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989",
"rev": "c5140c6079ff690e85eac0b86e254de16a79a4b7",
"type": "github"
},
"original": {
@ -122,11 +122,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1744337628,
"narHash": "sha256-ghjocOkjH1pSMiyX7h6+gJmLsgcief/+D+Cbcum8HsI=",
"lastModified": 1745483009,
"narHash": "sha256-nMSo37sprHHbK7uYAw5IwVbQ/qqB9piMh8IGH77EqSk=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "8aa1c071bbcb8a270bb841e4797a0d14528709d4",
"rev": "acf94b5dd33ce8e3fb995421cd1a719bb0d9c804",
"type": "github"
},
"original": {
@ -191,11 +191,11 @@
]
},
"locked": {
"lastModified": 1740872218,
"narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3876f6b87db82f33775b1ef5ea343986105db764",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@ -387,11 +387,11 @@
]
},
"locked": {
"lastModified": 1744343724,
"narHash": "sha256-DkiOZlkXbdf6f09pSulJPE0IaaJi1p7sqia/G2kqNKI=",
"lastModified": 1745439012,
"narHash": "sha256-TwbdiH28QK7Da2JQTqFHdb+UCJq6QbF2mtf+RxHVzEA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f1ffd097e717a8d1b441577b8d23f9d2c96e0657",
"rev": "d31710fb2cd536b1966fee2af74e99a0816a61a8",
"type": "github"
},
"original": {
@ -448,11 +448,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1741442524,
"narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=",
"lastModified": 1745271491,
"narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=",
"owner": "nix-community",
"repo": "lanzaboote",
"rev": "d8099586d9a84308ffedac07880e7f07a0180ff4",
"rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba",
"type": "github"
},
"original": {
@ -464,11 +464,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1744302352,
"narHash": "sha256-QJQecf/Z1rLZBpVoQaI+EunLX5U7c7uYGER5iw00YrI=",
"lastModified": 1745340344,
"narHash": "sha256-FUhusarVwMBrKmsfLFWj+L67/JT4bO/FILhHqKQLnZs=",
"ref": "refs/heads/main",
"rev": "81d476984901d1f00fdcac36a0a8f06cb54048f6",
"revCount": 17777,
"rev": "7dbdd5bd0cb44b3e0c1bebc91c1f5a4d46d6b702",
"revCount": 17786,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
@ -569,11 +569,11 @@
},
"nixosHardware": {
"locked": {
"lastModified": 1743420942,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
"lastModified": 1745392233,
"narHash": "sha256-xmqG4MZArM1JNxPJ33s0MtuBzgnaCO9laARoU3AfP8E=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
"rev": "8bf8a2a0822365bd8f44fd1a19d7ed0a1d629d64",
"type": "github"
},
"original": {
@ -647,11 +647,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1744168086,
"narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=",
"lastModified": 1745279238,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73",
"rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
"type": "github"
},
"original": {
@ -679,11 +679,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1743583204,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"lastModified": 1744463964,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github"
},
"original": {
@ -711,11 +711,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1744098102,
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
"lastModified": 1745391562,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"type": "github"
},
"original": {
@ -742,11 +742,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1744098102,
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
"lastModified": 1745391562,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"type": "github"
},
"original": {
@ -821,11 +821,11 @@
]
},
"locked": {
"lastModified": 1740915799,
"narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=",
"lastModified": 1741379162,
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "42b1ba089d2034d910566bf6b40830af6b8ec732",
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"type": "github"
},
"original": {
@ -906,11 +906,11 @@
]
},
"locked": {
"lastModified": 1741228283,
"narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=",
"lastModified": 1741573199,
"narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403",
"rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
"type": "github"
},
"original": {
@ -1009,11 +1009,11 @@
]
},
"locked": {
"lastModified": 1743748085,
"narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
"lastModified": 1744961264,
"narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
"rev": "8d404a69efe76146368885110f29a2ca3700bee6",
"type": "github"
},
"original": {

View file

@ -1,8 +1,4 @@
{ pkgs, ... }:
let
in
# nixpkgs = builtins.getFlake "github:NixOS/nixpkgs/932fc16b263f26803d3960e4400bc13dde84a972";
# chirp = nixpkgs.legacyPackages.${pkgs.system}.chirp;
{
home.packages = [ pkgs.chirp ];
}

View file

@ -690,9 +690,30 @@
(defalias (car alias) (cdr alias)))
ccr/eshell-aliases)
(defun ccr/eshell-get-current-input ()
(when (eq major-mode 'eshell-mode)
(let ((input-start (save-excursion
(eshell-bol)
(point)))
(input-end (point-at-eol)))
(buffer-substring-no-properties input-start input-end))))
(defun ccr/eshell-history ()
(interactive)
(when (eq major-mode 'eshell-mode)
(let* ((current-input (ccr/eshell-get-current-input))
(eshell-history (f-read-text eshell-history-file-name))
(bash-history (f-read-text "/home/ccr/.bash_history"))
(history (split-string (concat eshell-history "\n" bash-history) "\n"))
(selection (completing-read "History: " history nil t current-input)))
(eshell-bol)
(kill-line)
(insert selection))))
:bind (("C-c o e" . project-eshell)
(:map eshell-mode-map
("C-r" . eshell-atuin-history)
("C-r" . ccr/eshell-history)
("C-<return>" . corfu-send)
))) ;; i.e. just C-r in semi-char-mode

View file

@ -1,7 +1,8 @@
{ pkgs, ... }:
{
home.packages = [
pkgs.sdrangel
(builtins.getFlake "github:NixOS/nixpkgs/063dece00c5a77e4a0ea24e5e5a5bd75232806f8")
.legacyPackages.${pkgs.system}.sdrangel
pkgs.kdePackages.qtlocation
];
}

View file

@ -22,8 +22,4 @@
home.packages = with pkgs; [
rofi-power-menu
];
# waybar needs the hyprctl binary in PATH when started in hyprland
# TODO still needed?
systemd.user.services.waybar.Service.Environment = "PATH=${lib.makeBinPath [ pkgs.hyprland ]}";
}

View file

@ -61,7 +61,6 @@
"udiskie"
"xdg"
# "spotify"
"lutris"
"wine"
"cura"
"chrome"
@ -71,7 +70,6 @@
"tor-browser"
"kicad"
"monero"
# "zulip"
"teams"
"obs-studio"
"calibre"
@ -88,7 +86,6 @@
"chirp"
"sdrangel"
"discord"
# "ib-tws"
"zoom"
"pantalaimon"
];
@ -101,20 +98,12 @@
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
# "ahci"
"usbhid"
# "r8169"
"thunderbolt"
"vmd"
"usb_storage"
"sd_mod"
];
boot.kernelModules = [
# "kvm-amd"
# "ddcci"
# "ddcci-backlight"
# "i2c-dev" # needed?
];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -152,6 +141,12 @@
];
};
fileSystems."/mnt/shared" = {
device = "/dev/nvme0n1p2";
fsType = "ntfs";
options = [ "nofail" ];
};
services.zfs.autoScrub.enable = true;
networking.hostId = "30fc8ed7";