faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nvf changes

Browse source
This commit is contained in:
Charlie Root 2024-07-06 15:53:16 +02:00
commit 5548480371
42 changed files with 261 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hosts/vali/hermit/hardware-configuration.nix
View file

@ -1,11 +1,15 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
@ -13,15 +17,15 @@
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6";
fileSystems."/" = {
device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-f1b24c23-8211-433e-983e-2ebad020826e".device = "/dev/disk/by-uuid/f1b24c23-8211-433e-983e-2ebad020826e";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/E355-67EA";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E355-67EA";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};

7
hosts/vali/hermit/programs.nix
View file

@ -1,5 +1,8 @@
{ inputs, pkgs, ... }:
let
{
inputs,
pkgs,
...
}: let
fenix = inputs.fenix.packages.${pkgs.system};
nixpkgs-wayland = inputs.nixpkgs-wayland.packages.${pkgs.system};
in {

9
modules/editors/nvf/nvf.nix
View file

@ -1,6 +1,11 @@
# Thank your Mr. poz! (https://git.jacekpoz.pl/jacekpoz/niksos)
{ config, inputs, lib, pkgs, ... }:
let
{
config,
inputs,
lib,
pkgs,
...
}: let
cfg = config.modules.editors.neovim;
inherit (config.modules.other.system) username;

4
modules/editors/nvf/plugins/extra.nix
View file

@ -1,12 +1,14 @@
{
config,
self,
pkgs,
...
}: let
inherit (config.modules.other.system) username;
inherit (pkgs.vimPlugins) friendly-snippets aerial-nvim nvim-surround undotree mkdir-nvim ssr-nvim direnv-vim legendary-nvim;
pluginSources = import ./sources {inherit self pkgs;};
in {
programs.neovim-flake.settings.vim.extraPlugins = {
home-manager.users.${username}.programs.neovim-flake.settings.vim.extraPlugins = {
# plugins that are pulled from nixpkgs
direnv = {package = direnv-vim;};
friendly-snippets = {package = friendly-snippets;};

6
modules/editors/nvf/plugins/settings/assistant.nix
View file

@ -1,5 +1,7 @@
{
programs.neovim-flake.settings.vim = {
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.programs.neovim-flake.settings.vim = {
assistant.copilot = {
enable = true;
cmp.enable = true;

6
modules/editors/nvf/plugins/settings/autocomplete.nix
View file

@ -1,5 +1,7 @@
{
programs.neovim-flake.settings.vim = {
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.programs.neovim-flake.settings.vim = {
autocomplete = {
enable = true;
type = "nvim-cmp";

6
modules/editors/nvf/plugins/settings/autopairs.nix
View file

@ -1,5 +1,7 @@
{
programs.neovim-flake.settings.vim = {
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.programs.neovim-flake.settings.vim = {
autopairs.enable = true;
};
}

6
modules/editors/nvf/plugins/settings/binds.nix
View file

@ -1,5 +1,7 @@
{
programs.neovim-flake.settings.vim = {
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.programs.neovim-flake.settings.vim = {
binds = {
whichKey.enable = true;
cheatsheet.enable = false;

6
modules/editors/nvf/plugins/settings/comments.nix
View file

@ -1,5 +1,7 @@
{
programs.neovim-flake.settings.vim = {
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.programs.neovim-flake.settings.vim = {
comments.comment-nvim.enable = true;
};
}

6
modules/editors/nvf/plugins/settings/dashboard.nix
View file

@ -1,5 +1,7 @@
{
programs.neovim-flake.settings.vim = {
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.programs.neovim-flake.settings.vim = {
dashboard = {
alpha.enable = true;
};

6
modules/editors/nvf/plugins/settings/debugger.nix
View file

@ -1,5 +1,7 @@
{
programs.neovim-flake.settings.vim = {
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.programs.neovim-flake.settings.vim = {
debugger.nvim-dap = {
enable = true;
ui.enable = true;

5
modules/editors/nvf/plugins/settings/filetree.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
filetree = {
nvimTree = {

5
modules/editors/nvf/plugins/settings/gestures.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
gestures.gesture-nvim.enable = false;
};

5
modules/editors/nvf/plugins/settings/git.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
git = {
enable = true;

6
modules/editors/nvf/plugins/settings/languages.nix
View file

@ -3,8 +3,10 @@
pkgs,
lib,
...
}: {
programs.neovim-flake.settings.vim = {
}: let
inherit (config.modules.other.system) username;
in {
home-manager.users.${username}.programs.neovim-flake.settings.vim = {
languages = {
enableLSP = true;
enableFormat = true;

5
modules/editors/nvf/plugins/settings/lsp.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
lsp = {
formatOnSave = true;

5
modules/editors/nvf/plugins/settings/minimap.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
minimap = {
# cool for vanity but practically useless on small screens

5
modules/editors/nvf/plugins/settings/notes.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
notes = {
todo-comments.enable = true;

5
modules/editors/nvf/plugins/settings/notify.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
notify = {
nvim-notify.enable = true;

5
modules/editors/nvf/plugins/settings/presence.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
presence.neocord.enable = false;
};

5
modules/editors/nvf/plugins/settings/projects.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
projects = {
project-nvim = {

5
modules/editors/nvf/plugins/settings/session.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
session.nvim-session-manager = {
enable = false;

5
modules/editors/nvf/plugins/settings/statusline.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
statusline = {
lualine = {

5
modules/editors/nvf/plugins/settings/tabline.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
tabline = {
nvimBufferline.enable = true;

5
modules/editors/nvf/plugins/settings/telescope.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
telescope.enable = true;
};

5
modules/editors/nvf/plugins/settings/template.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
};
}

5
modules/editors/nvf/plugins/settings/terminal.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
terminal = {
toggleterm = {

5
modules/editors/nvf/plugins/settings/theme.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
theme = {
enable = true;

9
modules/editors/nvf/plugins/settings/treesitter.nix
View file

@ -1,4 +1,11 @@
{pkgs, ...}: {
{
config,
pkgs,
...
}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
treesitter = {
fold = true;

7
modules/editors/nvf/plugins/settings/ui.nix
View file

@ -1,4 +1,11 @@
{
config,
pkgs,
...
}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
ui = {
noice.enable = true;

9
modules/editors/nvf/plugins/settings/utility.nix
View file

@ -1,4 +1,11 @@
{pkgs, ...}: {
{
config,
pkgs,
...
}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
utility = {
ccc.enable = true;

5
modules/editors/nvf/plugins/settings/visuals.nix
View file

@ -1,4 +1,7 @@
{
{config, ...}: let
inherit (config.modules.other.system) username;
in {
home-manager.${username}.
programs.neovim-flake.settings.vim = {
visuals = {
enable = true;

14
modules/editors/nvf/plugins/sources/default.nix
View file

@ -15,12 +15,11 @@
smart-splits = buildVimPlugin {
name = "smart-splits";
src = pins."smart-splits.nvim";
};
slides-nvim = buildVimPlugin {
name = "slides.nvim";
src = pins."slides.nvim";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "smart-splits.nvim";
rev = "95833675cd92538bf9cded1d2d58d1fc271c5428";
hash = "";
};
regexplainer = buildVimPlugin {
@ -52,7 +51,6 @@
hash = "sha256-nanNQEtpjv0YKEkkrPmq/5FPxq+Yj/19cs0Gf7YgKjU=";
};
};
data-viewer-nvim = buildVimPlugin {
name = "data-viewer.nvim";
src = fetchFromGitHub {
@ -62,7 +60,6 @@
hash = "sha256-D5hvLhsYski11H9qiDDL2zlZMtYmbpHgpewiWR6C7rE=";
};
};
vim-nftables = buildVimPlugin {
name = "vim-nftables";
src = fetchFromGitHub {
@ -83,5 +80,6 @@
};
};
};
};
in
sources

15
modules/gui/foot.nix
View file

@ -1,5 +1,10 @@
{ config, inputs, lib, pkgs, ... }:
let
{
config,
inputs,
lib,
pkgs,
...
}: let
cfg = config.modules.programs.foot;
inherit (config.modules.other.system) username;
@ -36,8 +41,7 @@ in {
pad = "5x5 center";
resize-delay-ms = 100;
notify =
"${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
notify = "${pkgs.libnotify}/bin/notify-send -a \${app-id} -i \${app-id} \${title} \${body}";
bold-text-in-bright = "no";
word-delimiters = '',│`|:"'()[]{}<>'';
@ -59,8 +63,7 @@ in {
launch = "${pkgs.xdg-utils}/bin/xdg-open \${url}";
label-letters = "sadfjklewcmpgh";
osc8-underline = "always";
protocols =
"http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
protocols = "http, https, ftp, ftps, file, gemini, gopher, irc, ircs";
uri-characters = ''
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]'';
};

1
modules/wms/wayland/hypr/land.nix
View file

@ -61,7 +61,6 @@ in {
];
# Workspace config
workspace = [
"1,monitor:HDMI-A-1, default:true"
"2,monitor:HDMI-A-1"
"3,monitor:HDMI-A-1"

9
options/common/bluetooth.nix
View file

@ -1,5 +1,10 @@
{ config, lib, pkgs, ... }:
let inherit (config.modules.other.system) username;
{
config,
lib,
pkgs,
...
}: let
inherit (config.modules.other.system) username;
in {
hardware.bluetooth = {
enable = true;