From 638483c8b0c0e84f322b72320b988156f2dedc86 Mon Sep 17 00:00:00 2001 From: uku Date: Tue, 19 Nov 2024 09:02:56 +0100 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'api-rs': 'github:uku3lig/api-rs/c191b5c6812ffc28542c4e49b4b8384b6d830fd7?narHash=sha256-odTAgcoTYYSQ4viygvIdf7pcOkS4Q0Mhphk3mHQl02E%3D' (2024-11-11) → 'github:uku3lig/api-rs/7f73f6b1de15194f44c08184cf6d6bd2902c6524?narHash=sha256-IlHhc9Z1RTR6iynt6f/Q/6Y0opTi9c0NtpKayOUTFow%3D' (2024-11-18) • Updated input 'camasca': 'github:uku3lig/camasca/ff1df231c345ec70bffb78cae572a81f800b38a6?narHash=sha256-D1Afu2NKW3f%2BBhIQrYrEkTKOBDeTmJsY9AJDgb%2BtX2E%3D' (2024-11-12) → 'github:uku3lig/camasca/328afb1258e520374a205338707c1d88e731d5f5?narHash=sha256-UCq%2BRvapUJcrtFe97k0t2XyragRlpO/fYJfnLl2H/3k%3D' (2024-11-18) • Updated input 'crane': 'github:ipetkov/crane/ef80ead953c1b28316cc3f8613904edc2eb90c28?narHash=sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp%2B4cAgkut%2BNNE%3D' (2024-11-08) → 'github:ipetkov/crane/3cb338ce81076ce5e461cf77f7824476addb0e1c?narHash=sha256-enYSSZVVl15FI5p%2B0Y5/Ckf5DZAvXe6fBrHxyhA/njc%3D' (2024-11-19) • Updated input 'ghostty': 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=4a7181235295713213014a96697f0fd8c5ca7a9b' (2024-11-16) → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=29c3a52e964a97dddaed876ce472aeb167774acf' (2024-11-18) • Updated input 'home-manager': 'github:nix-community/home-manager/5056a1cf0ce7c2a08ab50713b6c4af77975f6111?narHash=sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR%2BhT0%3D' (2024-11-17) → 'github:nix-community/home-manager/a42fa14b53ceab66274a21da480c9f8e06204173?narHash=sha256-%2BhTCwETOE9N8voTAaF%2BIzdUZz28Ws3LDpH90FWADrEE%3D' (2024-11-18) • Updated input 'lanzaboote': 'github:nix-community/lanzaboote/cef39a78679c266300874e7a7000b4da066228d4?narHash=sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF%2BgIv/OyGtlBJE%3D' (2024-11-04) → 'github:nix-community/lanzaboote/2f48272f34174fd2a5ab3df4d8a46919247be879?narHash=sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE%3D' (2024-11-18) • Updated input 'mystia': 'github:soopyc/mystia/39b8c674740707f712af6d0f7be6415ab7890ca6?narHash=sha256-6YiZpZFUvQ9VTxSMx6rh6TXJpW4nYnSMEXWvclRT1aE%3D' (2024-11-15) → 'github:soopyc/mystia/9f138875cdcdbad8ee96c5ac804761bf392f3e5e?narHash=sha256-afVWAddl5L8Lo9uC4f6MIOrnn5Lq0J5JFbP2xr5xong%3D' (2024-11-18) • Updated input 'ukubot-rs': 'github:uku3lig/ukubot-rs/7005de8fecde645b7209091485e1deaa333d2fce?narHash=sha256-TKBadc5T6c8kZt/YVtcKKwGmQFhqhL2H8q//tZwjC8U%3D' (2024-11-11) → 'github:uku3lig/ukubot-rs/57ba3acb3719abac0e368610b5dffdccf76ec4c9?narHash=sha256-QDopfd5HPMPOhqs/pTYIuCVkk3K%2B0fEfOPEgvVGk8Lo%3D' (2024-11-18) • Updated input 'vencord': 'github:Vendicated/Vencord/25ceff5ec2ba708f3668bac7a4338549b09ad71c?narHash=sha256-/CZzRIXD0shEok9H%2BVx7s9BmzXTI6ly957jvS%2BnU2fI%3D' (2024-11-13) → 'github:Vendicated/Vencord/cd61f4e7449343acfcc7debf42ee20958fcebf20?narHash=sha256-3jW9GFAFb/1kkw6XyltXaSOOFflEQX/SGyhvaxiiNcs%3D' (2024-11-17) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/5cf92678e6799ce45442dee4c9cb8094843c7cfa?narHash=sha256-WwJqguc/5Q7HEwHlgDzDT8mtd8ZxInxZM2neJKC1oh8%3D' (2024-11-17) → 'github:nix-community/nix-vscode-extensions/6f1845dd71ddeb7463856750c5e0cb6c122bb87a?narHash=sha256-EnDFNJq3CuPLZ%2B3BxGDAqIckbK5pBkUFt3nqLafni4o%3D' (2024-11-19) --- flake.lock | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index ac8fee1..ccabf12 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1731364432, - "narHash": "sha256-odTAgcoTYYSQ4viygvIdf7pcOkS4Q0Mhphk3mHQl02E=", + "lastModified": 1731967898, + "narHash": "sha256-IlHhc9Z1RTR6iynt6f/Q/6Y0opTi9c0NtpKayOUTFow=", "owner": "uku3lig", "repo": "api-rs", - "rev": "c191b5c6812ffc28542c4e49b4b8384b6d830fd7", + "rev": "7f73f6b1de15194f44c08184cf6d6bd2902c6524", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1731426118, - "narHash": "sha256-D1Afu2NKW3f+BhIQrYrEkTKOBDeTmJsY9AJDgb+tX2E=", + "lastModified": 1731888097, + "narHash": "sha256-UCq+RvapUJcrtFe97k0t2XyragRlpO/fYJfnLl2H/3k=", "owner": "uku3lig", "repo": "camasca", - "rev": "ff1df231c345ec70bffb78cae572a81f800b38a6", + "rev": "328afb1258e520374a205338707c1d88e731d5f5", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1731974733, + "narHash": "sha256-enYSSZVVl15FI5p+0Y5/Ckf5DZAvXe6fBrHxyhA/njc=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "3cb338ce81076ce5e461cf77f7824476addb0e1c", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1731782530, - "narHash": "sha256-vF5njLcChOfk0v1LjE6jwlh0mxERHjkS/mHp1yXo6MA=", + "lastModified": 1731971697, + "narHash": "sha256-6JNMcpy0z19yOLBRt3eE4Rk4A96kcEsRv5+ym1hkv1c=", "ref": "refs/heads/main", - "rev": "4a7181235295713213014a96697f0fd8c5ca7a9b", - "revCount": 8009, + "rev": "29c3a52e964a97dddaed876ce472aeb167774acf", + "revCount": 8021, "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" }, @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1731832479, - "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", + "lastModified": 1731968878, + "narHash": "sha256-+hTCwETOE9N8voTAaF+IzdUZz28Ws3LDpH90FWADrEE=", "owner": "nix-community", "repo": "home-manager", - "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", + "rev": "a42fa14b53ceab66274a21da480c9f8e06204173", "type": "github" }, "original": { @@ -218,11 +218,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730739295, - "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", + "lastModified": 1731941836, + "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "cef39a78679c266300874e7a7000b4da066228d4", + "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", "type": "github" }, "original": { @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1731657726, - "narHash": "sha256-6YiZpZFUvQ9VTxSMx6rh6TXJpW4nYnSMEXWvclRT1aE=", + "lastModified": 1731916929, + "narHash": "sha256-afVWAddl5L8Lo9uC4f6MIOrnn5Lq0J5JFbP2xr5xong=", "owner": "soopyc", "repo": "mystia", - "rev": "39b8c674740707f712af6d0f7be6415ab7890ca6", + "rev": "9f138875cdcdbad8ee96c5ac804761bf392f3e5e", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1731312692, - "narHash": "sha256-TKBadc5T6c8kZt/YVtcKKwGmQFhqhL2H8q//tZwjC8U=", + "lastModified": 1731914858, + "narHash": "sha256-QDopfd5HPMPOhqs/pTYIuCVkk3K+0fEfOPEgvVGk8Lo=", "owner": "uku3lig", "repo": "ukubot-rs", - "rev": "7005de8fecde645b7209091485e1deaa333d2fce", + "rev": "57ba3acb3719abac0e368610b5dffdccf76ec4c9", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "vencord": { "flake": false, "locked": { - "lastModified": 1731534261, - "narHash": "sha256-/CZzRIXD0shEok9H+Vx7s9BmzXTI6ly957jvS+nU2fI=", + "lastModified": 1731887105, + "narHash": "sha256-3jW9GFAFb/1kkw6XyltXaSOOFflEQX/SGyhvaxiiNcs=", "owner": "Vendicated", "repo": "Vencord", - "rev": "25ceff5ec2ba708f3668bac7a4338549b09ad71c", + "rev": "cd61f4e7449343acfcc7debf42ee20958fcebf20", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1731808759, - "narHash": "sha256-WwJqguc/5Q7HEwHlgDzDT8mtd8ZxInxZM2neJKC1oh8=", + "lastModified": 1731981189, + "narHash": "sha256-EnDFNJq3CuPLZ+3BxGDAqIckbK5pBkUFt3nqLafni4o=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "5cf92678e6799ce45442dee4c9cb8094843c7cfa", + "rev": "6f1845dd71ddeb7463856750c5e0cb6c122bb87a", "type": "github" }, "original": { From d7ff44563c7f27047ac761d30db8e7aa7a2856be Mon Sep 17 00:00:00 2001 From: uku Date: Tue, 19 Nov 2024 09:03:45 +0100 Subject: [PATCH 2/3] chore(flake): use forgejo url for camasca --- flake.lock | 12 ++++++------ flake.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index ccabf12..4358cf5 100644 --- a/flake.lock +++ b/flake.lock @@ -59,15 +59,15 @@ "locked": { "lastModified": 1731888097, "narHash": "sha256-UCq+RvapUJcrtFe97k0t2XyragRlpO/fYJfnLl2H/3k=", - "owner": "uku3lig", - "repo": "camasca", + "ref": "refs/heads/main", "rev": "328afb1258e520374a205338707c1d88e731d5f5", - "type": "github" + "revCount": 24, + "type": "git", + "url": "https://git.uku3lig.net/uku/camasca" }, "original": { - "owner": "uku3lig", - "repo": "camasca", - "type": "github" + "type": "git", + "url": "https://git.uku3lig.net/uku/camasca" } }, "catppuccin": { diff --git a/flake.nix b/flake.nix index 29e5a72..e926fa1 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,7 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; camasca = { - url = "github:uku3lig/camasca"; + url = "git+https://git.uku3lig.net/uku/camasca"; inputs.nixpkgs.follows = "nixpkgs"; }; From a3c8b1ecabc3eb15ac1c615480fb6b25bd37889b Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 17 Nov 2024 09:58:51 +0100 Subject: [PATCH 3/3] feat: add neovim config --- configs/client.nix | 1 + programs/neovim/default.nix | 10 ++++++ programs/neovim/init.lua | 63 +++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 programs/neovim/default.nix create mode 100644 programs/neovim/init.lua diff --git a/configs/client.nix b/configs/client.nix index 52abc35..a1ccde0 100644 --- a/configs/client.nix +++ b/configs/client.nix @@ -3,6 +3,7 @@ ./common.nix ../programs/rust.nix + ../programs/neovim ]; environment.systemPackages = with pkgs; [ diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix new file mode 100644 index 0000000..d5bbbda --- /dev/null +++ b/programs/neovim/default.nix @@ -0,0 +1,10 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + (lua5_1.withPackages (ps: with ps; [luarocks])) + ]; + + hm.programs.neovim = { + enable = true; + extraLuaConfig = builtins.readFile ./init.lua; + }; +} diff --git a/programs/neovim/init.lua b/programs/neovim/init.lua new file mode 100644 index 0000000..282c08d --- /dev/null +++ b/programs/neovim/init.lua @@ -0,0 +1,63 @@ +-- sets the "key", which can be used in shortcuts +vim.g.mapleader = ' ' + +vim.g.have_nerd_font = true + +-- [[ vim options, see `:help vim.opt` ]] +-- line numbers +vim.opt.number = true + +-- enable mouse +vim.opt.mouse = 'a' + +-- save undo history +vim.opt.undofile = true + +-- case insensitive search, unless the terms contains uppercase or '\C' +vim.opt.ignorecase = true +vim.opt.smartcase = true + +-- save swapfile 250ms after nothing is done +vim.opt.updatetime = 250 + +-- timeout mapped sequences after 300ms +vim.opt.timeoutlen = 300 + +-- configure where splits open +vim.opt.splitright = true +vim.opt.splitbelow = true + +-- show whitespace characters clearly (see :help 'list') +vim.opt.list = true + +-- preview substitutions (:s & :%s) while typing +vim.opt.inccommand = 'split' + +-- highlight the line the cursor is on +vim.opt.cursorline = true + +-- sync os clipboard and neovim +vim.schedule(function() + vim.opt.clipboard = 'unnamedplus' +end) + + +-- [[ shortcuts, see `:help vim.keymap.set()` ]] +-- hide search results when pressing esc +vim.keymap.set('n', '', 'nohlsearch') + + +-- disable arrow keys in normal mode +vim.keymap.set('n', '', 'echo "Use h to move!!"') +vim.keymap.set('n', '', 'echo "Use l to move!!"') +vim.keymap.set('n', '', 'echo "Use k to move!!"') +vim.keymap.set('n', '', 'echo "Use j to move!!"') + +-- Keybinds to make split navigation easier. +-- Use CTRL+ to switch between windows +-- +-- See `:help wincmd` for a list of all window commands +vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' })