From cd7db37ccd329f4683501ca16c7a5c5f64afff53 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:35:41 +0200 Subject: [PATCH] Update --- docs/KEYBINDINGS.md | 2 +- docs/TODO.md | 2 - flake.lock | 303 ++++++++++++++++++++++++++++----- flake.nix | 27 +-- home/programs/nvim/default.nix | 1 + home/programs/nvim/keymaps.nix | 17 +- 6 files changed, 276 insertions(+), 76 deletions(-) diff --git a/docs/KEYBINDINGS.md b/docs/KEYBINDINGS.md index 14e3d1d..f303520 100644 --- a/docs/KEYBINDINGS.md +++ b/docs/KEYBINDINGS.md @@ -3,7 +3,7 @@ The list of the keybindings working on Hyprland: | Description | Keybinding | Command | -|-----------------------------|------------------------|--------------------------------------------------------------------| +| --------------------------- | ---------------------- | ------------------------------------------------------------------ | | Switch Workspace | SUPER + {Number} | workspace {Number} | | Move app to Workspace | SUPER SHIFT + {Number} | movetoworkspace {Number} | | Kitty | SUPER + RETURN | exec \${pkgs.kitty}/bin/kitty | diff --git a/docs/TODO.md b/docs/TODO.md index 5cec4c9..f8b41fc 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -21,8 +21,6 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md)) - [ ] Fix screenshots - [ ] Nixvim - - [+] Markdown snippets - - [+] Markdown fold - [ ] Keymaps: - Toggle todos - Format tables diff --git a/flake.lock b/flake.lock index 50df281..2a8ca71 100644 --- a/flake.lock +++ b/flake.lock @@ -26,7 +26,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixvim", "nixpkgs" @@ -47,6 +47,38 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -60,7 +92,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_2": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -119,6 +151,54 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -133,9 +213,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_6": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1685518550, @@ -153,7 +233,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_4", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -207,11 +287,11 @@ ] }, "locked": { - "lastModified": 1720135141, - "narHash": "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY=", + "lastModified": 1720188602, + "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=", "owner": "nix-community", "repo": "home-manager", - "rev": "c514e862cd5705e51edb6fe8d01146fdeec661f2", + "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7", "type": "github" }, "original": { @@ -281,11 +361,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1720092067, - "narHash": "sha256-ebMlTz4wm+Md5BkCk6uGcRUvOvyjtc4bENvVSO5jrBI=", + "lastModified": 1720213509, + "narHash": "sha256-aPYf8Jnu1fMgMYMgQnH433/Fcqfky1Z5ZuzCkNKcR1U=", "ref": "refs/heads/main", - "rev": "0a6e83005f1910b5c1ec78476fcffc05af47833a", - "revCount": 4906, + "rev": "cc98594c3aed0b542e03818371a4636f549f80e1", + "revCount": 4908, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -402,6 +482,61 @@ "type": "github" } }, + "neorg": { + "flake": false, + "locked": { + "lastModified": 1720213524, + "narHash": "sha256-qJTjLp5bCKhoZSUXb8J7cTKLbB7pztQTBeP4MaaujMo=", + "owner": "nvim-neorg", + "repo": "neorg", + "rev": "0255c2de18dc558e320b7424dc3daed6cbe94260", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "neorg", + "type": "github" + } + }, + "neorg-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "neorg": "neorg", + "neorg-telescope": "neorg-telescope", + "nixpkgs": "nixpkgs_3", + "norg": "norg", + "norg-meta": "norg-meta" + }, + "locked": { + "lastModified": 1720217665, + "narHash": "sha256-o8NvIK0+YZcq/TrK3f0+vxrlOg/kDxan7kgKIWwpBls=", + "owner": "nvim-neorg", + "repo": "nixpkgs-neorg-overlay", + "rev": "f887ecf74846e8b3a47ac5c27d6a20121c6694ab", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "nixpkgs-neorg-overlay", + "type": "github" + } + }, + "neorg-telescope": { + "flake": false, + "locked": { + "lastModified": 1718775458, + "narHash": "sha256-VZbmetQyPHiduMlmHTaFQJZUt4bYPS5vxMc5dwHUBnE=", + "owner": "nvim-neorg", + "repo": "neorg-telescope", + "rev": "fe255a3432ce639de7a374ccfb8602f517244dcd", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "neorg-telescope", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -457,16 +592,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1719720450, + "narHash": "sha256-57+R2Uj3wPeDeq8p8un19tzFFlgWiXJ8PbzgKtBgBX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "78f8641796edff3bfabbf1ef5029deadfe4a21d0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -488,6 +623,54 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1720149507, + "narHash": "sha256-OFJoD1jjxzFlY1tAsehEWVA88DbU5smzDPQuu9SmnXY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d9c0b9d611277e42e6db055636ba0409c59db6d2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1720031269, "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", @@ -503,7 +686,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_7": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -522,7 +705,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": "home-manager_2", @@ -533,11 +716,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1720126856, - "narHash": "sha256-xtRwIUKv7EpuyGtvq+rO7PoZZIpD55AYe6rl+plEhY8=", + "lastModified": 1720210105, + "narHash": "sha256-AjcTv44xEAOxGqpoMxbfYcUwhCWLHESQIOIMcBFUCKk=", "owner": "nix-community", "repo": "nixvim", - "rev": "92e9f5466dcfd51e8e2e7627e992c1c9d5fc6fd6", + "rev": "367380bd8462419f0199d262b058fadfb43823ff", "type": "github" }, "original": { @@ -546,27 +729,54 @@ "type": "github" } }, - "nur": { + "norg": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1720162013, - "narHash": "sha256-WcprtFdAb1M4mOYyIMBrkw3dQ3mxE5wKZTuvlqxwMio=", - "owner": "nix-community", - "repo": "NUR", - "rev": "af7f0b9941efb5f8fd0a805fa1d4e9dcd4cd4e8b", + "lastModified": 1672582520, + "narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=", + "owner": "nvim-neorg", + "repo": "tree-sitter-norg", + "rev": "d7a466e182a532065a559dbfc7a847271d5e9c29", "type": "github" }, "original": { - "id": "nur", - "type": "indirect" + "owner": "nvim-neorg", + "ref": "dev", + "repo": "tree-sitter-norg", + "type": "github" + } + }, + "norg-meta": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1713028366, + "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=", + "owner": "nvim-neorg", + "repo": "tree-sitter-norg-meta", + "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d", + "type": "github" + }, + "original": { + "owner": "nvim-neorg", + "repo": "tree-sitter-norg-meta", + "type": "github" } }, "nurpkgs": { "locked": { - "lastModified": 1720162013, - "narHash": "sha256-WcprtFdAb1M4mOYyIMBrkw3dQ3mxE5wKZTuvlqxwMio=", + "lastModified": 1720208481, + "narHash": "sha256-RtLovYSWt6p8ustpxjm0dNwAqxGwFVGeCWeIidw1i0U=", "owner": "nix-community", "repo": "NUR", - "rev": "af7f0b9941efb5f8fd0a805fa1d4e9dcd4cd4e8b", + "rev": "3f937d15f3218fa58e1c0683e839cd72fcad641a", "type": "github" }, "original": { @@ -592,10 +802,10 @@ "apple-fonts": "apple-fonts", "home-manager": "home-manager", "hyprland": "hyprland", + "neorg-overlay": "neorg-overlay", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", - "nur": "nur", "nurpkgs": "nurpkgs", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix" @@ -657,11 +867,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1720187017, + "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "1b11e208cee97c47677439625dc22e5289dcdead", "type": "github" }, "original": { @@ -672,8 +882,8 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1704167711, @@ -749,6 +959,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 10ea814..ccd2d13 100644 --- a/flake.nix +++ b/flake.nix @@ -24,9 +24,10 @@ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; nurpkgs.url = "github:nix-community/NUR"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + neorg-overlay.url = "github:nvim-neorg/nixpkgs-neorg-overlay"; }; - outputs = inputs@{ nixpkgs, nur, ... }: { + outputs = inputs@{ nixpkgs, ... }: { nixosConfigurations = { nixy = nixpkgs.lib.nixosSystem { @@ -36,7 +37,8 @@ inputs.nixos-hardware.nixosModules.omen-16-n0005ne inputs.home-manager.nixosModules.home-manager { - nixpkgs.overlays = [ nur.overlay ]; + nixpkgs.overlays = + [ inputs.nurpkgs.overlay inputs.neorg-overlay.overlays.default ]; _module.args = { inherit inputs; }; home-manager = { useGlobalPkgs = true; @@ -55,7 +57,7 @@ ./hosts/server/configuration.nix inputs.home-manager.nixosModules.home-manager { - nixpkgs.overlays = [ nur.overlay ]; + nixpkgs.overlays = [ inputs.nurpkgs.overlay ]; _module.args = { inherit inputs; }; home-manager = { useGlobalPkgs = true; @@ -67,25 +69,6 @@ ]; }; - yourhostname = nixpkgs.lib.nixosSystem { # CHANGEME - system = "x86_64-linux"; - modules = [ - ./hosts/yourhostname/configuration.nix # CHANGEME - inputs.home-manager.nixosModules.home-manager - { - nixpkgs.overlays = [ nur.overlay ]; - _module.args = { inherit inputs; }; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users."yourusername" = import # CHANGEME - ./hosts/yourhostname/home.nix; # CHANGEME - extraSpecialArgs = { inherit inputs; }; - }; - } - ]; - }; - }; }; } diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index ed42c93..219a453 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -9,6 +9,7 @@ ./plugins/ui.nix ./plugins/utils.nix ./plugins/zen-mode.nix + ./plugins/neorg.nix ./options.nix ./colorscheme.nix diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix index 33e46e9..b293180 100644 --- a/home/programs/nvim/keymaps.nix +++ b/home/programs/nvim/keymaps.nix @@ -1,14 +1,7 @@ { - programs.nixvim.keymaps = [ - { - key = "fm"; - action = "lua vim.lsp.buf.format()"; - options.desc = "LSP Format"; - } - { - key = "ft"; - action = "vip:!pandoc -t commonmark_x"; - options.desc = "Format markdown table"; - } - ]; + programs.nixvim.keymaps = [{ + key = "fm"; + action = "lua vim.lsp.buf.format()"; + options.desc = "LSP Format"; + }]; }