diff --git a/flake.lock b/flake.lock index a5a47a5..28455ba 100644 --- a/flake.lock +++ b/flake.lock @@ -464,11 +464,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1743151582, - "narHash": "sha256-aPtMrs2Nwg4ZCN7GQohQXTuRil1FCSUI4RdLGxTf44E=", + "lastModified": 1743065774, + "narHash": "sha256-aC1lwnqwHbYRsPfx+lRi32fHRcln0xhIzf0Q7/Lg+vQ=", "ref": "refs/heads/main", - "rev": "b52db5e7c120fdf67e914ba9fec648a461e08614", - "revCount": 17743, + "rev": "b918f1c307b314daa44407bac60046630f13ed48", + "revCount": 17742, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -726,17 +726,17 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" } }, diff --git a/flake.nix b/flake.nix index dc8ef51..4b6946e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { flakeParts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:NixOS/nixpkgs/b6eaf97c6960d97350c584de1b6dcff03c9daf42"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixosHardware.url = "github:NixOS/nixos-hardware"; homeManager = { url = "github:nix-community/home-manager"; diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 9b685a3..a36b0de 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -701,6 +701,9 @@ (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)) @@ -981,6 +984,7 @@ 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" @@ -994,8 +998,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) diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 5f3890e..f63cbf0 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -67,7 +67,6 @@ sync_address = "http://sisko.wg.aciceri.dev:8889"; search_mode = "fuzzy"; style = "compact"; - enter_accept = "true"; }; }; diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index 812a16a..ec5d0df 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -66,6 +66,7 @@ "digikam" "discord" "remmina" + "zulip" "calibre" "zathura" "imv" diff --git a/modules/mediatomb/default.nix b/modules/mediatomb/default.nix index df9465f..7a2eba2 100644 --- a/modules/mediatomb/default.nix +++ b/modules/mediatomb/default.nix @@ -1,22 +1,20 @@ +{ 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/movies"; - recursive = true; - } - { - path = "/mnt/hd/series"; + path = "/mnt/hd/torrent"; recursive = true; } ]; }; - users.users.mediatomb.extraGroups = [ - "radarr" - "sonarr" - ]; + users.users.mediatomb.extraGroups = [ "transmission" ]; } diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index 73c6e96..9b366a2 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -132,6 +132,7 @@ let ligature treemacs-nerd-icons eshell-syntax-highlighting + fish-completion # fish completion for eshell eshell-prompt-extras eshell-atuin eshell-command-not-found