diff --git a/dotfiles/neovim/init.lua b/dotfiles/neovim/init.lua index bfbdf18..1e7853a 100644 --- a/dotfiles/neovim/init.lua +++ b/dotfiles/neovim/init.lua @@ -1,3 +1,6 @@ +-- enable experimental lua loader +vim.loader.enable() + -- bootstrap from github local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" diff --git a/dotfiles/neovim/lua/my/plugins/init.lua b/dotfiles/neovim/lua/my/plugins/init.lua index a8d7b1f..86a0aba 100644 --- a/dotfiles/neovim/lua/my/plugins/init.lua +++ b/dotfiles/neovim/lua/my/plugins/init.lua @@ -198,7 +198,7 @@ return { }) end, event = "VeryLazy", - cond = false, + -- cond = false, }, { "mbbill/undotree", diff --git a/home/features/cli/productivity/default.nix b/home/features/cli/productivity/default.nix index 3f2c1b2..1e680ea 100644 --- a/home/features/cli/productivity/default.nix +++ b/home/features/cli/productivity/default.nix @@ -1,3 +1,3 @@ { - imports = [ ./smos.nix ./intray.nix ]; + imports = [ ./smos ./intray.nix ]; } diff --git a/home/features/cli/productivity/smos.nix b/home/features/cli/productivity/smos.nix deleted file mode 100644 index 1b3886d..0000000 --- a/home/features/cli/productivity/smos.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, ... }: { - programs.smos = { - enable = true; - notify.enable = true; - config = { }; - }; - - satellite.persistence.at.data.apps.smos.directories = [ - config.programs.smos.workflowDir - ]; -} diff --git a/home/features/cli/productivity/smos/default.nix b/home/features/cli/productivity/smos/default.nix new file mode 100644 index 0000000..01a8e9d --- /dev/null +++ b/home/features/cli/productivity/smos/default.nix @@ -0,0 +1,23 @@ +{ config, ... }: { + programs.smos = { + enable = true; + + notify = { + enable = true; + }; + + github = { + enable = true; + oauth-token-file = config.homeage.file.smos.path; + }; + }; + + satellite.persistence.at.data.apps.smos.directories = [ + config.programs.smos.workflowDir + ]; + + homeage.file.smos = { + source = ./smos_github_oauth.age; + path = "${config.xdg.dataHome}/smos/.github_token"; + }; +} diff --git a/home/features/cli/productivity/smos/smos_github_oauth.age b/home/features/cli/productivity/smos/smos_github_oauth.age new file mode 100644 index 0000000..f86ad51 --- /dev/null +++ b/home/features/cli/productivity/smos/smos_github_oauth.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 UUF9JQ 8KhqQ8dEHYLDM89d+glRT9xtId2umJM2O8Vj6oWM0zY +UAZ+pzFuL+wKSFY+yG1t1U9l0knA/VpupVBr6m2/+eY +-> Q7U4ZXW4-grease S8&{':OI EQs~v%Gq zp_"?LJ* z@)Y +mmb3Yi9moBnueYa4AeMJwAA0A6lZAo9+L4zYgnxyjLBOUwQMPO/zDPmHqQ +--- HMqzE5ekHYLWxdxpC7J9NMdrfx4VJYVwwnvhq6JAtmI + +c ¤ÞµŒ­ûF ;úU¶KFçtö2üÚ_†}¦èns3µ„¼oYCn…쎪8Œ‰¾0á蠦@»"Aìjµ©³QÌ` \ No newline at end of file diff --git a/home/features/desktop/wakatime/wakatime_config.age b/home/features/desktop/wakatime/wakatime_config.age index 452a0bf..c052136 100644 Binary files a/home/features/desktop/wakatime/wakatime_config.age and b/home/features/desktop/wakatime/wakatime_config.age differ diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix index f4d4e1a..513eba4 100644 --- a/home/features/neovim/default.nix +++ b/home/features/neovim/default.nix @@ -116,14 +116,12 @@ let # }}} # {{{ Clients neovim = wrapClient { - # REASON: nvim 9.0 - base = upkgs.neovim; + base = pkgs.neovim; name = "nvim"; }; neovide = wrapClient { - # REASON: neovide 10.0.4 - base = upkgs.neovide; + base = pkgs.neovide; name = "neovide"; extraArgs = "--set NEOVIDE_MULTIGRID true"; }; diff --git a/hosts/nixos/common/global/default.nix b/hosts/nixos/common/global/default.nix index 563559c..4ea608e 100644 --- a/hosts/nixos/common/global/default.nix +++ b/hosts/nixos/common/global/default.nix @@ -42,7 +42,7 @@ in nixpkgs = { # Add all overlays defined in the overlays directory overlays = builtins.attrValues outputs.overlays ++ [ - inputs.neovim-nightly-overlay.overlay + # inputs.neovim-nightly-overlay.overlay ]; config = { diff --git a/hosts/nixos/common/global/wireless/wifi_passwords.age b/hosts/nixos/common/global/wireless/wifi_passwords.age index 3535e24..bd612e3 100644 Binary files a/hosts/nixos/common/global/wireless/wifi_passwords.age and b/hosts/nixos/common/global/wireless/wifi_passwords.age differ diff --git a/hosts/nixos/common/users/adrielus_password.age b/hosts/nixos/common/users/adrielus_password.age index 5a564a4..ab17351 100644 Binary files a/hosts/nixos/common/users/adrielus_password.age and b/hosts/nixos/common/users/adrielus_password.age differ diff --git a/secrets.nix b/secrets.nix index b662867..1bd2211 100644 --- a/secrets.nix +++ b/secrets.nix @@ -13,6 +13,7 @@ in "./hosts/nixos/common/users/adrielus_password.age".publicKeys = all_hosts ++ [ adrielus_tethys ]; # Scoped for the user - # TODO: move this into `pass`. + # TODO: perhaps move this into `pass`?. "./home/features/desktop/wakatime/wakatime_config.age".publicKeys = [ adrielus_tethys ]; + "./home/features/cli/productivity/smos/smos_github_oauth.age".publicKeys = [ adrielus_tethys ]; }