diff --git a/flake.lock b/flake.lock index 7ac1526a..c4c5df9f 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1744942666, - "narHash": "sha256-urNvJw/w3AmxS5d3PNmmoS+DRMNUUpQwb8FvUkZVWIk=", + "lastModified": 1745655630, + "narHash": "sha256-z7HM7dWfE+/Cl58VlmXmTKh9GCFpeavoZk9KumfHARU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fc950eda6b8a2b0b1e2085317a3185a96cbf1ba6", + "rev": "dbc579e088c6f297995073d964fb8eaf2eb78524", "type": "github" }, "original": { @@ -262,11 +262,11 @@ ] }, "locked": { - "lastModified": 1744919155, - "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=", + "lastModified": 1745627989, + "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=", "owner": "nix-community", "repo": "home-manager", - "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70", + "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1744954024, - "narHash": "sha256-eErpyq4Fdvz+cla8NmTiwJ0WdrYKDeJ0nlvion5FhmQ=", + "lastModified": 1745587317, + "narHash": "sha256-h9v4lIpLYhMY5z9QzAS2rSDz8ntHpqY51Ksk59lGdTA=", "owner": "nixos", "repo": "nix", - "rev": "f683a555bf3e258ca7e3669d51993587f6a641d0", + "rev": "3f811c237312a91cfe9314a215ebb4b159bccb23", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -472,11 +472,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -556,11 +556,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1744961239, - "narHash": "sha256-/WlhL3pu1gxJrqQZR4jLzGFCCIxA1HVQElfxUEvCKpg=", + "lastModified": 1745654654, + "narHash": "sha256-WpX/MF0i483wYKLZaytc9m/X9L1wH6L3YanhreQyFm8=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "6c6fbac2746e7c6a8f0236bc14ed6cbff301e9dd", + "rev": "d3b83bf0a92fd1a237f7b0280ca8ad974aadf182", "type": "github" }, "original": { @@ -611,11 +611,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { -- 2.51.2 From 5a6f6b055bea765f904d71f19cc3a52c8dfc2c57 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 26 Apr 2025 11:01:30 +0200 Subject: [PATCH 2/4] remove unused restic module for HM it was in conflict with a newly added HM module anyway. --- home/modules/default.nix | 1 - home/modules/services/restic/default.nix | 85 ------------------------ 2 files changed, 86 deletions(-) delete mode 100644 home/modules/services/restic/default.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index 81afdfc6..4c5a70e9 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -15,7 +15,6 @@ "programs/wezterm" = ./programs/wezterm; "services/insync" = ./services/insync; - "services/restic" = ./services/restic; "services/rustic" = ./services/rustic; "misc/awesome" = ./misc/awesome; diff --git a/home/modules/services/restic/default.nix b/home/modules/services/restic/default.nix deleted file mode 100644 index 81871061..00000000 --- a/home/modules/services/restic/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{self, ...}: { - config, - lib, - pkgs, - self, - ... -}: let - cfg = config.services.restic; - - bin = "${cfg.package}/bin/restic"; - excludes = builtins.concatStringsSep " " (builtins.map (e: "--exclude=${e}") cfg.exclude); - xFlags = lib.optionalString cfg.oneFileSystem "-x"; - compressFlag = "--compression ${cfg.compression}"; - flags = "${xFlags} ${compressFlag} ${excludes}"; - - command = "${bin} --tag home -vv backup ${flags} %h"; -in { - options.services.restic = { - enable = lib.mkEnableOption "Restic Backup Tool"; - - package = lib.mkOption { - type = lib.types.package; - default = pkgs.restic; - description = "Restic derivation to use"; - }; - - exclude = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = []; - description = "Corresponds to `--exclude`. Use `%h` instead of `~`"; - }; - - oneFileSystem = lib.mkOption { - type = lib.types.bool; - default = false; - description = "If true, exclude other file systems, don't cross filesystem boundaries and subvolumes"; - }; - - repo = lib.mkOption { - type = lib.types.str; - description = "Location of the repository"; - }; - - compression = lib.mkOption { - type = lib.types.enum ["off" "auto" "max"]; - description = "The compression mode to use"; - default = "auto"; - }; - - # TODO: Add options for inlcude, password file, etc - }; - - config = lib.mkIf cfg.enable { - home.packages = [cfg.package]; - - systemd.user.services.restic-backup = { - Unit = { - Description = "Restic Backup Tool"; - StartLimitIntervalSec = "25m"; - StartLimitBurst = "4"; - }; - - Service = { - Environment = [ - "PATH=${lib.makeBinPath [pkgs.openssh]}" - "RESTIC_PASSWORD_FILE=%h/.config/restic/password" - "RESTIC_REPOSITORY=${cfg.repo}" - ]; - Type = "oneshot"; - ExecStart = command; - Restart = "on-failure"; - RestartSec = "2m"; - }; - }; - - systemd.user.timers.restic-backup = { - Unit.Description = "Restic periodic backup"; - Timer = { - Unit = "restic-backup.service"; - OnCalendar = "hourly"; - }; - Install.WantedBy = ["timers.target"]; - }; - }; -} -- 2.51.2 From c64b35b1a7336cdca2a993ea86ea1be2e10074c4 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 26 Apr 2025 11:05:44 +0200 Subject: [PATCH 3/4] remove openshift module from HM, its unused --- home/modules/default.nix | 1 - home/modules/programs/openshift/default.nix | 23 --------------------- 2 files changed, 24 deletions(-) delete mode 100644 home/modules/programs/openshift/default.nix diff --git a/home/modules/default.nix b/home/modules/default.nix index 4c5a70e9..45e42331 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -9,7 +9,6 @@ "programs/eza" = ./programs/eza; "programs/ghostty" = ./programs/ghostty; "programs/nixpkgs" = ./programs/nixpkgs; - "programs/openshift" = ./programs/openshift; "programs/p10k" = ./programs/p10k; "programs/rbw" = ./programs/rbw; "programs/wezterm" = ./programs/wezterm; diff --git a/home/modules/programs/openshift/default.nix b/home/modules/programs/openshift/default.nix deleted file mode 100644 index 47aab8c7..00000000 --- a/home/modules/programs/openshift/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -_: { - pkgs, - lib, - config, - ... -}: let - cfg = config.programs.openshift; -in { - options.programs.openshift = { - enable = lib.mkEnableOption "Tools to manage openshift instances"; - }; - - config = lib.mkIf cfg.enable { - home.packages = [pkgs.sops pkgs.openshift (lib.setPrio 0 pkgs.kubectl) pkgs.kubernetes-helm]; - - programs.zsh.initExtra = '' - # Enable autocomplete for oc, kubectl and helm - eval "$(${pkgs.openshift}/bin/oc completion zsh)" - eval "$(${pkgs.kubectl}/bin/kubectl completion zsh)" - eval "$(${pkgs.kubernetes-helm}/bin/helm completion zsh)" - ''; - }; -} -- 2.51.2 From 42914b851cc42ee292edcc1932f5489cc04dfcc9 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 26 Apr 2025 11:12:39 +0200 Subject: [PATCH 4/4] `zsh.initExtra` => `zsh.initContent` --- home/modules/profiles/base/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index 534eaf3d..711d41bc 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -251,7 +251,7 @@ in { } ]; - initExtra = '' + initContent = '' bindkey "^[[1;5D" backward-word bindkey "^[[1;5C" forward-word