Compare commits

...

4 Commits

4 changed files with 47 additions and 18 deletions

21
flake.lock generated
View File

@ -185,6 +185,26 @@
"type": "github" "type": "github"
} }
}, },
"nvim": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1698363600,
"narHash": "sha256-r71uS/uw3I9xJAnmlgaN0TC9aC/1m2L4iNhKjqBzAtQ=",
"ref": "refs/heads/master",
"rev": "9652f4cb75d799ee5a2511883d2fda60bea00141",
"revCount": 19,
"type": "git",
"url": "https://git.project-cloud.net/asmir/nvim_flake"
},
"original": {
"type": "git",
"url": "https://git.project-cloud.net/asmir/nvim_flake"
}
},
"peerix": { "peerix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -212,6 +232,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-xilinx": "nix-xilinx", "nix-xilinx": "nix-xilinx",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nvim": "nvim",
"peerix": "peerix", "peerix": "peerix",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",

View File

@ -24,6 +24,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nvim = {
url = "git+https://git.project-cloud.net/asmir/nvim_flake";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -44,6 +49,7 @@
home-manager, home-manager,
nixpkgs, nixpkgs,
nix-xilinx, nix-xilinx,
nvim,
peerix, peerix,
simple-nixos-mailserver, simple-nixos-mailserver,
sops-nix, sops-nix,

View File

@ -5,9 +5,7 @@
inputs, inputs,
... ...
}: }:
with lib; let with lib; {
vimrc = import ./vimrc.nix {inherit pkgs vimUtils fetchFromGitHub;};
in {
imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix]; imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
home.stateVersion = "22.11"; home.stateVersion = "22.11";
@ -172,15 +170,6 @@ in {
}; };
}; };
neovim = {
enable = true;
vimAlias = true;
vimdiffAlias = true;
plugins = vimrc.plugins;
extraConfig = "";
extraPackages = vimrc.extraPackages;
};
obs-studio = { obs-studio = {
enable = true; enable = true;
plugins = with pkgs.obs-studio-plugins; [obs-vkcapture input-overlay obs-multi-rtmp obs-pipewire-audio-capture wlrobs obs-vaapi]; plugins = with pkgs.obs-studio-plugins; [obs-vkcapture input-overlay obs-multi-rtmp obs-pipewire-audio-capture wlrobs obs-vaapi];
@ -191,11 +180,6 @@ in {
zsh.enable = true; zsh.enable = true;
}; };
xdg.configFile."nvim/init.lua" = {
source = ./vimrc.lua;
recursive = true;
};
services = { services = {
lorri.enable = false; lorri.enable = false;
mako.enable = true; mako.enable = true;

View File

@ -82,6 +82,24 @@
zeal-qt6 zeal-qt6
zig zig
zls zls
/* install here until nvim flake is fixed */
alejandra
ccls
gopls
luaformatter
nixd
pyright
rust-analyzer
sumneko-lua-language-server
svls
texlab
tree-sitter
verible
zls
] ]
++ [inputs.swaysw.packages.x86_64-linux.swaysw]; ++ [
inputs.swaysw.packages.x86_64-linux.swaysw
inputs.nvim.packages.x86_64-linux.nvim
];
} }