From 4c28cd8b087b7418853a79a5fd4b95d9fd23ca0c Mon Sep 17 00:00:00 2001 From: Pegasust Date: Fri, 23 Dec 2022 00:46:08 -0700 Subject: [PATCH] nvim: smart case search; zk: updated date cmd --- neovim/init.lua | 3 +++ nix-conf/system/flake.nix | 43 +++++++++++++++++---------------------- zk/config.toml | 2 +- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/neovim/init.lua b/neovim/init.lua index 216d448..5657a14 100644 --- a/neovim/init.lua +++ b/neovim/init.lua @@ -95,6 +95,9 @@ endif ]]) vim.cmd([[ +set ignorecase +set smartcase +set incsearch set number relativenumber set tabstop=4 softtabstop=4 set autoindent diff --git a/nix-conf/system/flake.nix b/nix-conf/system/flake.nix index e6fabcc..780769c 100644 --- a/nix-conf/system/flake.nix +++ b/nix-conf/system/flake.nix @@ -1,19 +1,14 @@ { inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - # TODO: when sops-nix is supported in home-manager, switch to home-manager instead - sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + agenix.url = "github:ryantm/agenix"; }; - outputs = { self, nixpkgs, sops-nix, ... }: + outputs = { self, nixpkgs, agenix, ... }: let lib = nixpkgs.lib; - proj_root = builtins.toString ./../..; - # TODO: when sops-nix is supported in home-manager, switch to home-manager instead - base_modules = [sops-nix.nixosModules.sops]; + proj_root = ./../..; + base_modules = [agenix.nixosModule]; in { # Windows with NixOS WSL nixosConfigurations.Felia = nixpkgs.lib.nixosSystem { @@ -219,21 +214,21 @@ (lib.mapAttrsToList (name: value: "${name}${lib.optionalString (value != null) "=${value}"}") conf)); in "${mount_dest} ${confToBackendArg backend_args} ${s3fs-exec}#${bucket}"; personalStorage = [ - # (autofs-s3fs_entry { - # mount_dest = "hot"; - # backend_args = { - # "-fstype" = "fuse"; - # use_cache = "/tmp"; - # del_cache = null; - # allow_other = null; - # url = "https://f5i0.ph.idrivee2-32.com"; - # # TODO: builtins.readFile requires a Git-controlled file - # passwd_file = (pkgs.writeText "env.s3fs.idrive" (builtins.readFile - # "${proj_root}//secrets/env.s3fs" - # )); - # }; - # bucket = "hungtr-hot"; - # }) + (autofs-s3fs_entry { + mount_dest = "hot"; + backend_args = { + "-fstype" = "fuse"; + use_cache = "/tmp"; + del_cache = null; + allow_other = null; + url = "https://f5i0.ph.idrivee2-32.com"; + # TODO: builtins.readFile requires a Git-controlled file + passwd_file = (pkgs.writeText "env.s3fs.idrive" (builtins.readFile + ./../../secrets/env.s3fs + )); + }; + bucket = "hungtr-hot"; + }) ]; persoConf = pkgs.writeText "personal" (builtins.concatStringsSep "\n" personalStorage); in { diff --git a/zk/config.toml b/zk/config.toml index 6817b68..56eff48 100644 --- a/zk/config.toml +++ b/zk/config.toml @@ -1,7 +1,7 @@ [note] # Settings that reflect the creation of a new note language = "en" default-title = "Untitled" -filename = "{{date now 'timestamp'}}" # Loyal to my current style: 202208201345 +filename = "{{format-date now 'timestamp'}}" # Loyal to my current style: 202208201345 extension = "md" # might switch to mdx [extra]