diff --git a/flake.lock b/flake.lock index b03d758..0b62241 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1745502102, - "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", + "lastModified": 1745369821, + "narHash": "sha256-mi6cAjuBztm9gFfpiVo6mAn81cCID6nmDXh5Kmyjwyc=", "owner": "nix-community", "repo": "disko", - "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", + "rev": "c5140c6079ff690e85eac0b86e254de16a79a4b7", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1745511950, - "narHash": "sha256-vO7gtC4nVqfTf1ZEg9gksds/Xesvim4qy+8ewF91ufo=", + "lastModified": 1745400268, + "narHash": "sha256-dNSzXe3GNwoBYUBGBjXTvBaWfBSDFheWyIbEu+g0Et8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2e939b25ef18fd3efbd60829fc7f87c8235cdd40", + "rev": "d8bad40da349c15b37f83159019a5e7f452cecc6", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "lastModified": 1745416071, + "narHash": "sha256-L8mEeVZvS1e0XaEDsibClr4MhBzqrxhUDiiAIbDnZGM=", "owner": "nix-community", "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "rev": "6c132a098e61163fb559db986efe913acd3df4e7", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1745512428, - "narHash": "sha256-Gy2jKtVPEzxfTezBS3lFS3hI8xZ7wtEAw8HSi2w/3Nw=", + "lastModified": 1745340344, + "narHash": "sha256-FUhusarVwMBrKmsfLFWj+L67/JT4bO/FILhHqKQLnZs=", "ref": "refs/heads/main", - "rev": "c36c83c4c6ceb6166cf4a6867354d7244a0c7984", - "revCount": 17789, + "rev": "7dbdd5bd0cb44b3e0c1bebc91c1f5a4d46d6b702", + "revCount": 17786, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -569,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1745503349, - "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", + "lastModified": 1745392233, + "narHash": "sha256-xmqG4MZArM1JNxPJ33s0MtuBzgnaCO9laARoU3AfP8E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", + "rev": "8bf8a2a0822365bd8f44fd1a19d7ed0a1d629d64", "type": "github" }, "original": { @@ -711,11 +711,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { @@ -742,11 +742,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1745234285, + "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "type": "github" }, "original": { diff --git a/hmModules/chirp/default.nix b/hmModules/chirp/default.nix index f6ff45e..7353aee 100644 --- a/hmModules/chirp/default.nix +++ b/hmModules/chirp/default.nix @@ -1,4 +1,8 @@ { pkgs, ... }: +let +in +# nixpkgs = builtins.getFlake "github:NixOS/nixpkgs/932fc16b263f26803d3960e4400bc13dde84a972"; +# chirp = nixpkgs.legacyPackages.${pkgs.system}.chirp; { home.packages = [ pkgs.chirp ]; } diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index f941643..192f3fd 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -690,39 +690,9 @@ (defalias (car alias) (cdr alias))) ccr/eshell-aliases) - - (defun ccr/eshell-get-current-input () - "Restituisce l'input corrente dell'utente nella riga Eshell." - (when (eq major-mode 'eshell-mode) - (let ((start (save-excursion (eshell-bol) (point))) - (end (point-at-eol))) - (buffer-substring-no-properties start end)))) - - (defun ccr/eshell-replace-current-input (new-input) - (when (eq major-mode 'eshell-mode) - (let ((inhibit-read-only t)) - (eshell-bol) - (delete-region (point) (point-at-eol)) - (insert new-input) - (end-of-line)))) - - (defun ccr/eshell-history () - (interactive) - (when (eq major-mode 'eshell-mode) - (let* ((current-input (ccr/eshell-get-current-input)) - (eshell-history (when (and eshell-history-file-name - (file-readable-p eshell-history-file-name)) - (f-read-text eshell-history-file-name))) - (bash-history (when (file-readable-p "~/.bash_history") - (f-read-text "~/.bash_history"))) - (history (split-string (concat (or eshell-history "") "\n" - (or bash-history "")) "\n" t)) - (selection (completing-read "History: " history nil t current-input))) - (ccr/eshell-replace-current-input selection)))) - :bind (("C-c o e" . project-eshell) (:map eshell-mode-map - ("C-r" . ccr/eshell-history) + ("C-r" . eshell-atuin-history) ("C-" . corfu-send) ))) ;; i.e. just C-r in semi-char-mode diff --git a/hmModules/sdrangel/default.nix b/hmModules/sdrangel/default.nix index 4b65cb5..b241700 100644 --- a/hmModules/sdrangel/default.nix +++ b/hmModules/sdrangel/default.nix @@ -1,8 +1,7 @@ { pkgs, ... }: { home.packages = [ - (builtins.getFlake "github:NixOS/nixpkgs/063dece00c5a77e4a0ea24e5e5a5bd75232806f8") - .legacyPackages.${pkgs.system}.sdrangel + pkgs.sdrangel pkgs.kdePackages.qtlocation ]; } diff --git a/hmModules/waybar/default.nix b/hmModules/waybar/default.nix index d311a89..0e544d9 100644 --- a/hmModules/waybar/default.nix +++ b/hmModules/waybar/default.nix @@ -22,4 +22,8 @@ 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 ]}"; } diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 3eecfbf..58038d3 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -97,7 +97,6 @@ "ib-tws" "zoom" "pantalaimon" - "moonlight" ]; extraGroups = [ "plugdev" ]; backupPaths = [ ]; diff --git a/hosts/pike/default.nix b/hosts/pike/default.nix index 1e278d5..83ae586 100644 --- a/hosts/pike/default.nix +++ b/hosts/pike/default.nix @@ -61,6 +61,7 @@ "udiskie" "xdg" # "spotify" + "lutris" "wine" "cura" "chrome" @@ -70,6 +71,7 @@ "tor-browser" "kicad" "monero" + # "zulip" "teams" "obs-studio" "calibre" @@ -86,6 +88,7 @@ "chirp" "sdrangel" "discord" + # "ib-tws" "zoom" "pantalaimon" ]; @@ -98,12 +101,20 @@ 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; @@ -141,12 +152,6 @@ ]; }; - fileSystems."/mnt/shared" = { - device = "/dev/nvme0n1p2"; - fsType = "ntfs"; - options = [ "nofail" ]; - }; - services.zfs.autoScrub.enable = true; networking.hostId = "30fc8ed7"; diff --git a/modules/wireguard-common/default.nix b/modules/wireguard-common/default.nix index 6451aa5..e67cf81 100644 --- a/modules/wireguard-common/default.nix +++ b/modules/wireguard-common/default.nix @@ -1,5 +1,7 @@ { + lib, config, + vpn, ... }: { diff --git a/modules/wireguard-server/default.nix b/modules/wireguard-server/default.nix index a02ccad..27c8a8a 100644 --- a/modules/wireguard-server/default.nix +++ b/modules/wireguard-server/default.nix @@ -9,7 +9,7 @@ networking.nat.enable = true; - networking.firewall.allowedUDPPorts = [ config.networking.wireguard.interfaces.wg0.listenPort ]; + networking.firewall.allowedUDPPorts = [ config.networking.wireguard.interfaces.wg0.listenPort ]; # FIXME move this to wireguard-server networking.wireguard.interfaces.wg0 = { ips = [ "${vpn.${config.networking.hostName}.ip}/24" ];