From 3a4974b2c35e1acfdb3221315f03a7034c74f448 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 28 Sep 2024 10:43:27 -0500 Subject: [PATCH 1/4] Some minor extra nvim config --- user/app/nvim/init.lua | 4 +++- user/app/nvim/lua/mappings.lua | 1 + user/app/nvim/lua/plugins/init.lua | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/user/app/nvim/init.lua b/user/app/nvim/init.lua index 67f609e..59737fc 100644 --- a/user/app/nvim/init.lua +++ b/user/app/nvim/init.lua @@ -16,11 +16,13 @@ if vim.g.neovide then vim.g.neovide_text_gamma = 0.8 vim.g.neovide_text_contrast = 0.1 vim.opt.termguicolors = true + vim.g.neovide_scale_factor = 1.0 end +vim.o.conceallevel = 2 + vim.api.nvim_create_user_command('W', 'execute "silent! write !sudo tee % >/dev/null" edit', { nargs = 0}) -vim.g.neovide_scale_factor = 1.0 -- bootstrap lazy and all plugins local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" diff --git a/user/app/nvim/lua/mappings.lua b/user/app/nvim/lua/mappings.lua index 412948f..c0f9656 100644 --- a/user/app/nvim/lua/mappings.lua +++ b/user/app/nvim/lua/mappings.lua @@ -37,6 +37,7 @@ map("n", "ws", "split", { desc = "horizontal split" }) map("n", "wS", "split", { desc = "horizontal split" }) map("n", "wv", "vsplit", { desc = "vertical split" }) map("n", "wV", "vsplit", { desc = "vertical split" }) +map("n", "", "edit #", { desc = "edit previous" }) map({ "n", "t", "i", "v" }, "", "NvimTreeToggle", { desc = "nvimtree toggle window" }) map({ "n", "t", "i", "v" }, "", function() require("nvchad.term").toggle { pos = "sp", id = "htoggleTerm" } diff --git a/user/app/nvim/lua/plugins/init.lua b/user/app/nvim/lua/plugins/init.lua index 69c205e..9af253e 100644 --- a/user/app/nvim/lua/plugins/init.lua +++ b/user/app/nvim/lua/plugins/init.lua @@ -26,6 +26,7 @@ return { { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make', lazy = false, }, { 'nvim-telescope/telescope-project.nvim', lazy = false, }, { 'natecraddock/workspaces.nvim', lazy = false, }, + { 'jghauser/follow-md-links.nvim', lazy = false, }, { "NeogitOrg/neogit", @@ -39,4 +40,13 @@ return { }, config = true }, + { + 'nvim-orgmode/orgmode', + event = 'VeryLazy', + ft = { 'org' }, + config = function() + -- Setup orgmode + require('orgmode').setup({}) + end, + }, } From 3ee7a982aab631db2dc95c3d133a648f0fb9d390 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 28 Sep 2024 10:43:47 -0500 Subject: [PATCH 2/4] There is no replacement for emacs org roam :| --- user/wm/hyprland/hyprland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index f5fdd4e..994b67b 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -56,6 +56,7 @@ in exec-once = GOMAXPROCS=1 syncthing --no-browser exec-once = protonmail-bridge --noninteractive exec-once = waybar + exec-once = emacs --daemon exec-once = hypridle exec-once = sleep 5 && libinput-gestures From e4a0675fc56ace0f608b991232b76c3c91ed789e Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 1 Oct 2024 21:14:49 -0500 Subject: [PATCH 3/4] Updated system --- flake.lock | 146 ++++++++++++++++++++++++++--------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/flake.lock b/flake.lock index b67d177..fec0861 100644 --- a/flake.lock +++ b/flake.lock @@ -67,22 +67,6 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { @@ -99,38 +83,6 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { @@ -150,11 +102,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1726880464, - "narHash": "sha256-xF0wgVbbL/ESCuGeXUB8W0qqZm6OJQfPmf22Ie9EMTE=", + "lastModified": 1727457521, + "narHash": "sha256-2BsHujKUS3L78/BpQg3QJJxLnORHfn/wyU09zOo1T6U=", "owner": "StevenBlack", "repo": "hosts", - "rev": "e7237a0bc6877ec61ec823aca830195d42b09979", + "rev": "2db6a9f1ce75f3da11310a1f75b675aaa1139c79", "type": "github" }, "original": { @@ -538,11 +490,11 @@ ] }, "locked": { - "lastModified": 1726818100, - "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -559,11 +511,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -1067,11 +1019,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -1114,11 +1066,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726838390, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", + "lastModified": 1727397532, + "narHash": "sha256-pojbL/qteElw/nIXlN8kmHn/w6PQbEHr7Iz+WOXs0EM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "rev": "f65141456289e81ea0d5a05af8898333cab5c53d", "type": "github" }, "original": { @@ -1524,11 +1476,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1726885519, - "narHash": "sha256-wrXknshJMRLv91KQD5d7ovUqJ70FlDM7XeG/upSsKgM=", + "lastModified": 1727490462, + "narHash": "sha256-OrrPiNBiikv9BR464XTT75FzOq7tKAvMbMi7YOKVIeg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a66e16cb21e4428224925dbf1b66238c727dda0a", + "rev": "11a13e50debafae4ae802f1d6b8585101516dd93", "type": "github" }, "original": { @@ -1573,24 +1525,24 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager", "nixpkgs": "nixpkgs_3", - "systems": "systems_5" + "systems": "systems_5", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1726828291, - "narHash": "sha256-pGRPVVm7UXf+fx2NVpH6FFSWR9AynG6eoVlagaqH9i4=", + "lastModified": 1727362643, + "narHash": "sha256-Ceiq/aYjRlRBU677lBaemn8ZU2Jpr08Iso6UlBc9nFc=", "owner": "danth", "repo": "stylix", - "rev": "53bcceb4e46d0b3e8ae6434a7a6bcc3463092093", + "rev": "e3eb7fdf8d129ff3676dfbc84ee1262322ca6fb4", "type": "github" }, "original": { @@ -1674,6 +1626,54 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "ts-fold": { "flake": false, "locked": { From 18cca08356d0d73afea438f3903ec24b33e11c5a Mon Sep 17 00:00:00 2001 From: Emmet Date: Fri, 4 Oct 2024 06:08:01 -0500 Subject: [PATCH 4/4] Updated system --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index fec0861..ad93f7d 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1727457521, - "narHash": "sha256-2BsHujKUS3L78/BpQg3QJJxLnORHfn/wyU09zOo1T6U=", + "lastModified": 1727970531, + "narHash": "sha256-MATJK6QO//6z5CXS3zVo/s/Bz6c2z0g8C+InM5iiv2o=", "owner": "StevenBlack", "repo": "hosts", - "rev": "2db6a9f1ce75f3da11310a1f75b675aaa1139c79", + "rev": "b5ade5394f3b7510072c1c572b2275d8a7e1c6c2", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1728026342, + "narHash": "sha256-3mGqKM1jSkc2DrJvR/HCTav0Chd1n8/s1eJ9Y5GzNVM=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "30e04f3d477256de3eb6a7cff608e220087537d4", "type": "github" }, "original": { @@ -1019,11 +1019,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1066,11 +1066,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727397532, - "narHash": "sha256-pojbL/qteElw/nIXlN8kmHn/w6PQbEHr7Iz+WOXs0EM=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f65141456289e81ea0d5a05af8898333cab5c53d", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -1168,11 +1168,11 @@ "nvchad": { "flake": false, "locked": { - "lastModified": 1726117897, - "narHash": "sha256-Av0yO+tFzlQiZSIzSw5Zj9C/BDXuHpvJ6D0b1Gu2gzw=", + "lastModified": 1727828331, + "narHash": "sha256-cb0glXaPYU31Nai8hSCD60DKvU0rH1i769bT7sBxcQ0=", "owner": "NvChad", "repo": "starter", - "rev": "59f23d053a047a0c6c555fea2fc4b7b26201e64f", + "rev": "76da790a27dbe470a9cb8d7e6e7c874fc0656cc7", "type": "github" }, "original": { @@ -1476,11 +1476,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1727490462, - "narHash": "sha256-OrrPiNBiikv9BR464XTT75FzOq7tKAvMbMi7YOKVIeg=", + "lastModified": 1728008962, + "narHash": "sha256-MjGMCVKqafsrqLQYJHHKXJkvocTjkxKjadBfN952/Zw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11a13e50debafae4ae802f1d6b8585101516dd93", + "rev": "862d0c1e5fe2348a22044f225afef39b75df8cf0", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1727362643, - "narHash": "sha256-Ceiq/aYjRlRBU677lBaemn8ZU2Jpr08Iso6UlBc9nFc=", + "lastModified": 1727723275, + "narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=", "owner": "danth", "repo": "stylix", - "rev": "e3eb7fdf8d129ff3676dfbc84ee1262322ca6fb4", + "rev": "e7e97059776da7e34b739415a7bc8f80f606b803", "type": "github" }, "original": {