diff --git a/flake.lock b/flake.lock index 6af0044a..24865cd2 100644 --- a/flake.lock +++ b/flake.lock @@ -194,16 +194,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733951536, + "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -512,16 +512,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0dbacb87..e71e136a 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # NixOS related inputs - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; sops-nix = { @@ -35,7 +35,7 @@ # home-manager related inputs home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nurpkgs.url = "github:nix-community/NUR"; diff --git a/home-config/config/applications/graphical/keepassxc.nix b/home-config/config/applications/graphical/keepassxc.nix index 8f93fcee..bd1ccb60 100644 --- a/home-config/config/applications/graphical/keepassxc.nix +++ b/home-config/config/applications/graphical/keepassxc.nix @@ -5,40 +5,40 @@ in { home.packages = with pkgs; [ keepassxc ]; - systemd.user.services.keepass-sync = { - Unit.Description = "KeepassXC synchronization"; - Service = { - Type = "oneshot"; - ExecStart = - builtins.toString ( - pkgs.writeShellApplication { - name = "sync-keepassxc"; - runtimeInputs = with pkgs; [ - coreutils - gnugrep - libsecret - nextcloudcmd - ]; + # systemd.user.services.keepass-sync = { + # Unit.Description = "KeepassXC synchronization"; + # Service = { + # Type = "oneshot"; + # ExecStart = + # builtins.toString ( + # pkgs.writeShellApplication { + # name = "sync-keepassxc"; + # runtimeInputs = with pkgs; [ + # coreutils + # gnugrep + # libsecret + # nextcloudcmd + # ]; - text = '' - (secret-tool search URL 'https://nextcloud.tlater.net' 2>&1 \ - | grep UserName \ - | cut -d' ' -f3; \ - secret-tool lookup URL 'https://nextcloud.tlater.net') | \ - nextcloudcmd \ - --path Backups/keepass \ - "$HOME/.local/share/keepassxc/synced/" \ - 'https://nextcloud.tlater.net' - ''; - } - ) - + "/bin/sync-keepassxc"; - }; - }; + # text = '' + # (secret-tool search URL 'https://nextcloud.tlater.net' 2>&1 \ + # | grep UserName \ + # | cut -d' ' -f3; \ + # secret-tool lookup URL 'https://nextcloud.tlater.net') | \ + # nextcloudcmd \ + # --path Backups/keepass \ + # "$HOME/.local/share/keepassxc/synced/" \ + # 'https://nextcloud.tlater.net' + # ''; + # } + # ) + # + "/bin/sync-keepassxc"; + # }; + # }; - systemd.user.timers.keepass-sync = { - Unit.Description = "Periodic KeepassXC synchronization"; - Timer.OnCalendar = "hourly"; - Install.WantedBy = [ "timers.target" ]; - }; + # systemd.user.timers.keepass-sync = { + # Unit.Description = "Periodic KeepassXC synchronization"; + # Timer.OnCalendar = "hourly"; + # Install.WantedBy = [ "timers.target" ]; + # }; } diff --git a/nixos-config/default.nix b/nixos-config/default.nix index dd3fb354..99cecd82 100644 --- a/nixos-config/default.nix +++ b/nixos-config/default.nix @@ -18,8 +18,6 @@ ]; nix = { - package = pkgs.nixFlakes; - settings = { auto-optimise-store = true; experimental-features = [ @@ -122,7 +120,7 @@ packages = with pkgs; [ hack-font noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji ];