tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

nixbook: nixvim fixes, add devcontainer script

Browse source
This commit is contained in:
Tristan 2024-08-14 19:49:52 +01:00
parent 8964da1663
commit 24de630982
5 changed files with 44 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
flake.lock generated
View file

@ -460,6 +460,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1723362943,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1721466660,
"narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
@ -475,7 +491,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@ -499,18 +515,16 @@
"git-hooks": "git-hooks",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs_2",
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1723481641,
"narHash": "sha256-9djT72/Ab2E3SpUbB3l0WmqZQ5mj05+LIVoorcjCWgE=",
"lastModified": 1723634417,
"narHash": "sha256-5M5fjJn02iOZN5z3zM/95l28kC0zjKCkId5JJ9J63fE=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "dbf6f7bc997dc3a9ab1f014ea075600357226950",
"rev": "cb398ce4ba243c7a3a8d1fbfea1b56a44de6b3c9",
"type": "github"
},
"original": {
@ -574,7 +588,7 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
@ -603,7 +617,7 @@
"flake-compat": "flake-compat_3",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1722946882,

5
flake.nix
View file

@ -18,11 +18,6 @@
};
};
# nixConfig = {
# substituters = ["https://cosmic.cachix.org/"];
# trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
# };
outputs = {nixvim, ...} @ inputs: let
system = "x86_64-linux";
pkgs = import inputs.nixpkgs {inherit system;};

2
home/programs/neovim/default.nix
View file

@ -3,7 +3,7 @@
{
enable = true;
}
// import ../../../lib/nixvim.nix;
// ( import ../../../lib/nixvim.nix {inherit pkgs;} );
programs.vscode = {
extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim];

14
home/programs/work.nix
View file

@ -19,7 +19,6 @@ in {
home.packages = [
pkgs.thunderbird
pkgs.remmina
pkgs.devcontainer
(import ../../lib/mkapp.nix "slack" {
inherit pkgs browser;
desktopName = "Slack";
@ -30,6 +29,19 @@ in {
app-id = pwa.teams;
desktopName = "Microsoft Teams";
})
pkgs.devcontainer
(pkgs.writeShellScriptBin "devcontainer-open" (let
jq = "${pkgs.jq}/bin/jq";
devcontainer = "${pkgs.devcontainer}/bin/devcontainer";
in ''
res=$(${devcontainer} up --workspace-folder .)
outcome=$(echo $res | ${jq} -r '.outcome')
[[ $outcome = "success" ]] || exit 1
containerId=$(echo $res | ${jq} -r '.containerId')
remoteWorkspaceFolder=$(echo $res | ${jq} -r '.remoteWorkspaceFolder')
docker exec -it --workdir=$remoteWorkspaceFolder $containerId bash
''))
];
home.sessionVariables = {

17
lib/nixvim.nix
View file

@ -1,4 +1,4 @@
{
{pkgs, ...}: {
globals = {
mapleader = " ";
};
@ -36,22 +36,22 @@
options.desc = "close buffer";
}
{
key = "<leader>ggs";
key = "<leader>gs";
action = ":Gitsigns stage_hunk<CR>";
options.desc = "git stage hunk";
}
{
key = "<leader>ggr";
action = ":LazyGit<CR>";
key = "<leader>gr";
action = ":Gitsigns reset_hunk<CR>";
options.desc = "git restore hunk";
}
{
key = "<leader>ggb";
key = "<leader>gb";
action = ":Gitsigns blame<CR>";
options.desc = "show git blame";
}
{
key = "<leader>ggg";
key = "<leader>gg";
action = ":LazyGit<CR>";
options.desc = "open lazy git";
}
@ -63,7 +63,6 @@
comment.enable = true;
markdown-preview.enable = true;
treesitter.enable = true;
telescope = {
enable = true;
@ -81,7 +80,7 @@
enable = true;
servers = {
tsserver.enable = true;
nixd.enable = true;
nil-ls.enable = true;
};
keymaps = {
lspBuf = {
@ -111,8 +110,6 @@
cmp-nvim-lsp.enable = true;
cmp-path.enable = true;
ts-autotag.enable = true;
gitsigns.enable = true;
git-worktree = {
enable = true;