diff --git a/flake.lock b/flake.lock index 66d894d..e995bdb 100644 --- a/flake.lock +++ b/flake.lock @@ -632,11 +632,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737077867, - "narHash": "sha256-+VpCgelbCgJvxos+4sAVaKfwYRKrkflsWcYVOhG0mXg=", + "lastModified": 1737097711, + "narHash": "sha256-Zql7TDxEMAOASLSu0wBlfM5SIY+4Pz2R/k17O/asCYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ab8bdef1a34b67d2ecc8f86763cbb3cb5297699", + "rev": "3cbc78cfa611511c04f47c4932509f9dbdf4381a", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1737094363, - "narHash": "sha256-RQvEM5nMQ7UUuatWk9ytnYv5DyKZhocfdGzHYuDk3B8=", + "lastModified": 1737107600, + "narHash": "sha256-pBF7pAmSRlmmObXbS71v0YM5sEC4/4HvesFV3oz2xQU=", "owner": "nix-community", "repo": "NUR", - "rev": "af9410660d59f7ef2d1c5d375e62ecfd739ae737", + "rev": "b65350213a768bdf4d2da001537a6635edcd562a", "type": "github" }, "original": { @@ -783,11 +783,11 @@ ] }, "locked": { - "lastModified": 1736808430, - "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", + "lastModified": 1737107480, + "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "owner": "mic92", "repo": "sops-nix", - "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", + "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95c3d75..f16b7e3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Nix Config"; + description = "Nixos Config"; inputs = { # Nixpkgs diff --git a/home/common/core/nixvim/plugins/default.nix b/home/common/core/nixvim/plugins/default.nix index 0397ee1..bc87197 100644 --- a/home/common/core/nixvim/plugins/default.nix +++ b/home/common/core/nixvim/plugins/default.nix @@ -23,6 +23,7 @@ in { ./todo-comments.nix ./oil.nix ./comment.nix + ./git-workree.nix ]; programs.nixvim.plugins.web-devicons.enable = true; diff --git a/home/common/core/nixvim/plugins/git-workree.nix b/home/common/core/nixvim/plugins/git-workree.nix new file mode 100644 index 0000000..b0085d1 --- /dev/null +++ b/home/common/core/nixvim/plugins/git-workree.nix @@ -0,0 +1,26 @@ +{ + programs.nixvim.keymaps = [ + # Switching worktrees + { + mode = ["n"]; + key = "fws"; + action = "lua require('telescope').extensions.git_worktree.git_worktrees()"; + options = {noremap = true;}; + } + { + mode = ["n"]; + key = "fwc"; + action = "lua require('telescope').extensions.git_worktree.create_git_worktree()"; + options = {noremap = true;}; + } + ]; + programs.nixvim.plugins.git-worktree = { + enable = true; + enableTelescope = true; + autopush = true; + changeDirectoryCommand = "cd"; + clearJumpsOnChange = true; + updateOnChange = true; + updateOnChangeCommand = "e ."; + }; +} diff --git a/home/common/core/nixvim/plugins/telescope.nix b/home/common/core/nixvim/plugins/telescope.nix index e35310a..728a828 100644 --- a/home/common/core/nixvim/plugins/telescope.nix +++ b/home/common/core/nixvim/plugins/telescope.nix @@ -46,5 +46,12 @@ action = "Telescope oldfiles"; options = {noremap = true;}; } + { + # show recently opened files + mode = ["n"]; + key = "fk"; + action = "Telescope keymaps"; + options = {noremap = true;}; + } ]; } diff --git a/hosts/common/optional/arion-containers/photoprism.nix b/hosts/common/optional/arion-containers/photoprism.nix index 55dae6c..dbe5e17 100644 --- a/hosts/common/optional/arion-containers/photoprism.nix +++ b/hosts/common/optional/arion-containers/photoprism.nix @@ -1,8 +1,7 @@ -{ +{config, ...}: { sops.secrets = { "software/photoprism" = { - path = "/run/secrets/photoprism/config.yaml"; - mode = "0600"; + path = "/etc/photoprism/options.yml"; }; }; virtualisation.arion = { @@ -11,7 +10,7 @@ settings = { services.photoprism.service = { ports = [ - "8096:8096" + "2342:2342" ]; container_name = "photoprism"; image = "photoprism/photoprism:latest"; @@ -21,10 +20,10 @@ "/media/photos/sam/originals:/photoprism/originals" "/media/photos/sam/imports:/photoprism/import" "/srv/docker/photoprism/storage:/photoprism/storage" - "/run/secrets/photoprism/config.yaml:/etc/photoprism/config.yaml" + "${config.sops.secrets."software/photoprism".path}:/etc/photoprism/options.yml" ]; environment = { - PHOTOPRISM_CONFIG_PATH = "/etc/photoprism/config.yaml"; + PHOTOPRISM_CONFIG_PATH = "/etc/photoprism"; PHOTOPRISM_INIT = "intel"; PHOTOPRISM_ORIGINALS_LIMIT = 5000; PHOTOPRISM_HTTP_COMPRESSION = "gzip"; diff --git a/hosts/sparky/default.nix b/hosts/sparky/default.nix index 6b56c0e..cd84569 100644 --- a/hosts/sparky/default.nix +++ b/hosts/sparky/default.nix @@ -3,6 +3,7 @@ config, lib, configVars, + outputs, ... }: let # Disko setup @@ -46,6 +47,7 @@ in { ../common/optional/nfs-mounts/media.nix ../common/optional/gaming.nix ../common/optional/printing.nix + outputs.nixosModules.nixosAutoUpgrade ]; boot = {