pull/73/head
Vivian 2023-01-05 13:50:37 +01:00
parent 42d660e0cf
commit 526bafa6e0
5 changed files with 39 additions and 46 deletions

5
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"Lua.diagnostics.globals": [
"vim"
]
}

View File

@ -433,11 +433,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1671966569, "lastModified": 1672780900,
"narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=", "narHash": "sha256-DxuSn6BdkZapIbg76xzYx1KhVPEZeBexMkt1q/sMVPA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea", "rev": "54245e1820caabd8a0b53ce4d47e4d0fefe04cd4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +454,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1672238357, "lastModified": 1672757503,
"narHash": "sha256-xqAoDgopfv8y9q6xWu82LK4Pf9S3WOBar9+6VTlc6VM=", "narHash": "sha256-2MKfXQ9f2GUYEt+Yht/Qp5JpkamRu5pqRGX0HVwe13Q=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "a6699ef30c0a7f66c4b1ff6e38ea836b8e898015", "rev": "0e3547e0f6b4016aa308292a86c43cd47dd206fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -506,11 +506,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1671404096, "lastModified": 1672869224,
"narHash": "sha256-ls8i+lXweg0udqbd9XuF/ag+rqDSy/i05B6RrMW2BAI=", "narHash": "sha256-LqyBdWSQDDuNUdgJGlLOVcXFKaHeWOBfWtTEfqqQxQc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "60013ee65566ec7601c367829da2560d7b8638fa", "rev": "1c19aa2b4f2b9e70dd9a3d2105f396cf094b0e82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -581,11 +581,11 @@
"utils": "utils_4" "utils": "utils_4"
}, },
"locked": { "locked": {
"lastModified": 1672189776, "lastModified": 1672621843,
"narHash": "sha256-UrcVHWeY7ad+CUkkddb6qAjlCKDAiAwsmcbxnPZU8eQ=", "narHash": "sha256-Bl2yNHv+5s3eSf5i6icb6seKAwk3AV+iXqx1KWFtX0s=",
"owner": "jyooru", "owner": "jyooru",
"repo": "nix-minecraft-servers", "repo": "nix-minecraft-servers",
"rev": "b34d73e47078bd7b1e214831a7ab947e6a2140a7", "rev": "516bb060d630dc1aff23a6cb9493399a937887af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -720,11 +720,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1671355134, "lastModified": 1672682641,
"narHash": "sha256-ZtnUWTDDyFog+NQBjZpnhgPdj3gHp5ImxFVWy+ObNno=", "narHash": "sha256-940TLvtdT8YKuP5nXcPhUfNeK0A/leSjjG8hfqvWM84=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "64a96ca8621d03cb3889daf0d3ff58d8209e3e0c", "rev": "30516cb2b01896e14ce66893e414b6e3eec71cac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -735,11 +735,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1671631481, "lastModified": 1672644464,
"narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=", "narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd", "rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -800,11 +800,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1672202919, "lastModified": 1672897942,
"narHash": "sha256-uNv6D+C3y/5b72DPx04E70OAa2oN4fAuCLulNAdWneg=", "narHash": "sha256-5RijBVaikhHgBMaoZ3kG6W1QjPKcnHmJGJgY0TfzUIE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57dbff4228a9d8fba7aedf439ffdd841a2326427", "rev": "6c575c59f986548cc3ecaf870f4d4d4791a175f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -851,15 +851,14 @@
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nmdSrc": "nmdSrc"
}, },
"locked": { "locked": {
"lastModified": 1671840534, "lastModified": 1672434283,
"narHash": "sha256-ZKBg7cM1qJ4ic4O6PGS9ESPSazGQI1TXFsGiFXIL3tw=", "narHash": "sha256-AltegOzuCjlernfEGWQYmle1yGiDBaky+u35DhJvxqI=",
"owner": "pta2002", "owner": "pta2002",
"repo": "nixvim", "repo": "nixvim",
"rev": "5f67918bae3115e5d5ae17eeb9d414517762fc66", "rev": "125ed74a423429e5af6796334b68400c78ac26b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -868,29 +867,13 @@
"type": "github" "type": "github"
} }
}, },
"nmdSrc": {
"flake": false,
"locked": {
"lastModified": 1666190571,
"narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
"owner": "rycee",
"repo": "nmd",
"rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmd",
"type": "gitlab"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1672238814, "lastModified": 1672908458,
"narHash": "sha256-Smw3SBu9y9LaiBkZPvditOQP/s11qUrBDMAAYzj8VPg=", "narHash": "sha256-M/sq9vN+O1fFlAEwCS+plJuLmbDy8K3ULh1SSysbDf4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e578f1caa6ff51a68cabac472f6f68e1d576c213", "rev": "b25df321856354c521b793ad3b7c30e77e15c93a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -29,6 +29,7 @@ in {
nixfmt nixfmt
nixpkgs-review nixpkgs-review
python3 python3
plex-media-player
rustup rustup
solo2-cli solo2-cli
tex tex
@ -156,6 +157,7 @@ in {
vscodevim.vim vscodevim.vim
vadimcn.vscode-lldb vadimcn.vscode-lldb
xaver.clang-format xaver.clang-format
sumneko.lua
]; ];
}; };

View File

@ -10,13 +10,16 @@
maps.normal = { maps.normal = {
"<leader>ff" = "<cmd>lua require('telescope.builtin').find_files()<cr>"; "<leader>ff" = "<cmd>lua require('telescope.builtin').find_files()<cr>";
"<leader>fg" = "<cmd>lua require('telescope.builtin').live_grep()<cr>"; "<leader>fg" = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
"<C-_>" = "<cmd>lua require('Comment.api').toggle.linewise.current()<cr>"; # map ctrl+/ to commenting code "<C-_>" =
"<cmd>lua require('Comment.api').toggle.linewise.current()<cr>"; # map ctrl+/ to commenting code
}; };
extraPlugins = with pkgs.vimPlugins; [ catppuccin-nvim luasnip ]; extraPlugins = with pkgs.vimPlugins; [ catppuccin-nvim luasnip ];
colorscheme = "catppuccin-frappe"; colorscheme = "catppuccin-frappe";
extraConfigLua = builtins.readFile ./nvim.lua;
plugins = { plugins = {
barbar.enable = true; barbar.enable = true;
nix.enable = true; nix.enable = true;

View File