diff --git a/home-manager/config.nix b/home-manager/config.nix index a7beade..773b34c 100644 --- a/home-manager/config.nix +++ b/home-manager/config.nix @@ -8,6 +8,7 @@ ./cli.nix ./mpv.nix ./ssh.nix + ./keepassxc.nix ]; services.syncthing = { enable = true; diff --git a/home-manager/fish.nix b/home-manager/fish.nix index 7caf1b3..6eb627b 100644 --- a/home-manager/fish.nix +++ b/home-manager/fish.nix @@ -56,6 +56,7 @@ functions = { ns = "nix shell nixpkgs#$argv[1]"; nss = "nix shell nixpkgs#$argv[1] -c $argv"; + epoch = "date --date +\"@$argv[1]\""; }; shellAbbrs = { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 754e124..f679225 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -12,7 +12,7 @@ nix-flatpak.url = "github:gmodena/nix-flatpak"; plasma-manager = { - url = "github:pjones/plasma-manager"; + url = "github:nix-community/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; diff --git a/home-manager/homeFiles.nix b/home-manager/homeFiles.nix index ae04e49..3247aae 100644 --- a/home-manager/homeFiles.nix +++ b/home-manager/homeFiles.nix @@ -18,39 +18,4 @@ rootless_storage_path="/mnt/storage/.containers" driver="btrfs" ''; - - home.file.".config/keepassxc/keepassxc.ini".text = '' - [General] - ConfigVersion=2 - MinimizeAfterUnlock=true - OpenPreviousDatabasesOnStartup=false - RememberLastDatabases=false - RememberLastKeyFiles=false - - [Browser] - Enabled=true - - [GUI] - CompactMode=true - MonospaceNotes=true - - [PasswordGenerator] - AdditionalChars= - AdvancedMode=true - Dashes=false - ExcludedChars= - Length=64 - Logograms=true - LowerCase=true - Numbers=true - Punctuation=false - UpperCase=true - - [SSHAgent] - Enabled=true - - [Security] - IconDownloadFallback=true - LockDatabaseScreenLock=false - ''; } diff --git a/home-manager/keepassxc.nix b/home-manager/keepassxc.nix new file mode 100644 index 0000000..2669903 --- /dev/null +++ b/home-manager/keepassxc.nix @@ -0,0 +1,42 @@ +{config, ...}: { + home.file.keepassxc = { + target = ".var/app/org.keepassxc.KeePassXC/config/keepassxc/keepassxc.ini"; + # TODO is there a better way? + source = config.lib.file.mkOutOfStoreSymlink config.xdg.configHome + /keepassxc/keepassxc.ini; + }; + + programs.keepassxc.enable = true; + programs.keepassxc.package = null; # Flatpak + programs.keepassxc.settings = { + General = { + MinimizeAfterUnlock = true; + OpenPreviousDatabasesOnStartup = false; + RememberLastDatabases = false; + RememberLastKeyFiles = false; + MinimizeOnCopy = true; + }; + GUI = { + CompactMode = true; + MonospaceNotes = true; + CheckForUpdates = false; + ColorPasswords = true; + }; + PasswordGenerator = { + AdvancedMode = true; + Length = 64; + }; + Browser = { + Enabled = true; + BestMatchOnly = true; + }; + SSHAgent = { + Enabled = true; + # TODO get runtime dir dynamically + AuthSockOverride = "/run/user/1000/gnupg/S.gpg-agent.ssh"; + }; + Security = { + IconDownloadFallback = true; + LockDatabaseScreenLock = false; + }; + }; +} diff --git a/home-manager/nixvim/keymaps.nix b/home-manager/nixvim/keymaps.nix index 2edc976..f2bb427 100644 --- a/home-manager/nixvim/keymaps.nix +++ b/home-manager/nixvim/keymaps.nix @@ -17,6 +17,10 @@ key = "${k}"; action = lua "${fn}"; }; + unmap = k: { + key = "${k}"; + action = ""; + }; lkey = k: fn: { key = ldr "${k}"; action = lua "${fn}"; @@ -46,5 +50,6 @@ in { (key "" (luafr "nvim-tree.api" "tree.toggle()")) (lkey "d" "vim.cmd.bdelete") + (unmap "") ]; } diff --git a/home-manager/nixvim/nixvim.nix b/home-manager/nixvim/nixvim.nix index 6a3adc7..54b3b7a 100644 --- a/home-manager/nixvim/nixvim.nix +++ b/home-manager/nixvim/nixvim.nix @@ -79,7 +79,6 @@ }; }; programs.nixvim.extraPlugins = [ - pkgs.vimPlugins.legendary-nvim pkgs.vimPlugins.guess-indent-nvim pkgs.vimPlugins.vim-monokai-tasty (pkgs.vimUtils.buildVimPlugin {