From 5d4b19d217f678e927e0324a6bba090aac5c6097 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Mar 2025 16:05:57 +0100 Subject: [PATCH 01/10] Ignore result links produced by nix-fast-build --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6aecdb6..f7fb3ae 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ result .direnv .pre-commit-config.yaml *.qcow2 +result* \ No newline at end of file From e2ac562d31c7666bd8ef23e179ad5bff24e9b4d4 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Thu, 27 Mar 2025 16:06:06 +0100 Subject: [PATCH 02/10] Default kernel is finally recent enough for Rock5B --- hosts/sisko/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix index 15e267a..9542bc1 100644 --- a/hosts/sisko/default.nix +++ b/hosts/sisko/default.nix @@ -38,8 +38,6 @@ ./disko.nix ]; - boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_11; - system.stateVersion = "24.05"; powerManagement.cpuFreqGovernor = "schedutil"; From 72ea5f7086923a2aac5007c30c426c0cefa5ec3d Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 28 Mar 2025 15:45:47 +0100 Subject: [PATCH 03/10] Lock nixpkgs revision --- flake.lock | 16 ++++++++-------- flake.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 28455ba..a5a47a5 100644 --- a/flake.lock +++ b/flake.lock @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1743065774, - "narHash": "sha256-aC1lwnqwHbYRsPfx+lRi32fHRcln0xhIzf0Q7/Lg+vQ=", + "lastModified": 1743151582, + "narHash": "sha256-aPtMrs2Nwg4ZCN7GQohQXTuRil1FCSUI4RdLGxTf44E=", "ref": "refs/heads/main", - "rev": "b918f1c307b314daa44407bac60046630f13ed48", - "revCount": 17742, + "rev": "b52db5e7c120fdf67e914ba9fec648a461e08614", + "revCount": 17743, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -726,17 +726,17 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 4b6946e..dc8ef51 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { flakeParts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/b6eaf97c6960d97350c584de1b6dcff03c9daf42"; nixosHardware.url = "github:NixOS/nixos-hardware"; homeManager = { url = "github:nix-community/home-manager"; From dedea5399af87bfcfd3cd9f98a13d5b4e788d2b6 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 28 Mar 2025 15:46:32 +0100 Subject: [PATCH 04/10] Use `enter_accept` in `atuin` --- hmModules/shell/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index f63cbf0..5f3890e 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -67,6 +67,7 @@ sync_address = "http://sisko.wg.aciceri.dev:8889"; search_mode = "fuzzy"; style = "compact"; + enter_accept = "true"; }; }; From a74f230db3b167c1f9ca02b834dd44d349418a5b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 28 Mar 2025 15:46:51 +0100 Subject: [PATCH 05/10] Use nixpkgs' mediatomb and change served directories --- modules/mediatomb/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/mediatomb/default.nix b/modules/mediatomb/default.nix index 7a2eba2..df9465f 100644 --- a/modules/mediatomb/default.nix +++ b/modules/mediatomb/default.nix @@ -1,20 +1,22 @@ -{ pkgs, ... }: { services.mediatomb = { enable = true; - # FIXME remove when fixed - package = - (builtins.getFlake "github:NixOs/nixpkgs/3ffbbdbac0566a0977da3d2657b89cbcfe9a173b") - .legacyPackages.${pkgs.stdenv.system}.gerbera; openFirewall = true; serverName = "Sisko"; mediaDirectories = [ { - path = "/mnt/hd/torrent"; + path = "/mnt/hd/movies"; + recursive = true; + } + { + path = "/mnt/hd/series"; recursive = true; } ]; }; - users.users.mediatomb.extraGroups = [ "transmission" ]; + users.users.mediatomb.extraGroups = [ + "radarr" + "sonarr" + ]; } From 4f02f4bd7f6520cc6d228dc45fcc2fe1318a92c0 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 28 Mar 2025 15:47:45 +0100 Subject: [PATCH 06/10] Disable `zulip` on `kirk` --- hosts/kirk/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index ec5d0df..812a16a 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -66,7 +66,6 @@ "digikam" "discord" "remmina" - "zulip" "calibre" "zathura" "imv" From fc79fba781f03507b2ebf976c822bec0eccd3546 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 28 Mar 2025 15:47:58 +0100 Subject: [PATCH 07/10] Remove emacs' `fish-completion` --- hmModules/emacs/init.el | 3 --- packages/emacs/packages.nix | 1 - 2 files changed, 4 deletions(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index a36b0de..885ac12 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -701,9 +701,6 @@ (use-package eshell-atuin :hook ((eshell-mode . eshell-atuin-mode))) -(use-package fish-completion-mode - :hook ((eshell-mode . fish-completion-mode))) - (use-package eshell-syntax-highlighting :custom ((eshell-syntax-highlighting-highlight-in-remote-dirs nil)) diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 9b366a2..73c6e96 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -132,7 +132,6 @@ let ligature treemacs-nerd-icons eshell-syntax-highlighting - fish-completion # fish completion for eshell eshell-prompt-extras eshell-atuin eshell-command-not-found From 4ba43fb6475ce289f81cf32c60cfcdd229085238 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 28 Mar 2025 15:48:08 +0100 Subject: [PATCH 08/10] Configure `gptel` --- hmModules/emacs/init.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 885ac12..9b685a3 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -981,7 +981,6 @@ This is meant to be an helper to be called from the window manager." (use-package gptel :custom - ;; (gptel-model 'deepseek/deepseek-chat) (gptel-model 'qwen/qwen-max) (gptel-backend (gptel-make-openai "OpenRouter" :host "openrouter.ai" @@ -995,8 +994,8 @@ This is meant to be an helper to be called from the window manager." :config (require 'gptel-curl) - (add-hook 'gptel-post-response-functions 'gptel-end-of-response) - (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll) + ;; (add-hook 'gptel-post-response-functions 'gptel-end-of-response) + ;; (add-hook 'gptel-post-stream-hook 'gptel-auto-scroll) (defun ccr/suggest-eshell-command () (interactive) From df2ab41246c6bfd18849226bd207a68f79035114 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 28 Mar 2025 15:52:41 +0100 Subject: [PATCH 09/10] Disable `atuin` --- hmModules/shell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 5f3890e..0e0d9a3 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -56,7 +56,7 @@ }; programs.atuin = { - enable = true; + enable = false; # FIXME broken on bash: https://github.com/nix-community/home-manager/issues/5958 settings = { daemon = { enabled = true; From d450b6d387ffee81886c862ccdf5500ebec50bf4 Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Fri, 28 Mar 2025 15:01:25 +0000 Subject: [PATCH 10/10] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/5c22a2387d4ac1e1d64d66489e7d3ecb0a30cbcd' (2025-03-27) → 'github:nix-community/emacs-overlay/40a9308b06ee2061c5871038024ffcfd992a9ce8' (2025-03-28) • Updated input 'homeManager': 'github:nix-community/home-manager/171915bfce41018528fda9960211e81946d999b7' (2025-03-27) → 'github:nix-community/home-manager/1efd2503172016a6742c87b47b43ca2c8145607d' (2025-03-28) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/ecaa2d911e77c265c2a5bac8b583c40b0f151726' (2025-03-24) → 'github:NixOS/nixos-hardware/0ed819e708af17bfc4bbc63ee080ef308a24aa42' (2025-03-28) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a5a47a5..6ade19b 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1743067111, - "narHash": "sha256-v9VJXx7525gMH6S7WesJM84Dr76jxRubATuBJn4L14o=", + "lastModified": 1743153396, + "narHash": "sha256-Wtgr/u0kYqMHvKjXRu9b7mPo32YDw/7IOIJ2eV8KFuQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5c22a2387d4ac1e1d64d66489e7d3ecb0a30cbcd", + "rev": "40a9308b06ee2061c5871038024ffcfd992a9ce8", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1743082807, - "narHash": "sha256-qmrCYHVqE6j0TQApfxGx8aRYNdNsqtOrZuH09A+cjTU=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "171915bfce41018528fda9960211e81946d999b7", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -569,11 +569,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1743167577, + "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "type": "github" }, "original": {