nevafel/myNixosFlake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code editors cleanup

Browse Source
This commit is contained in:
ficache 2024-11-15 19:40:42 +03:00
parent be25933d9d
commit c506178309
18 changed files with 44 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
flake.lock generated
View File

@ -228,11 +228,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730814269, "lastModified": 1731363552,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2", "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +287,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731235328, "lastModified": 1731604581,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "60bb110917844d354f3c18e05450606a435d2d10", "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730837930, "lastModified": 1731535640,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "rev": "35b055009afd0107b69c286fca34d2ad98940d57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731153869, "lastModified": 1731454423,
"narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "5c74ab862c8070cbf6400128a1b56abb213656da", "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -393,11 +393,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730958623, "lastModified": 1731531548,
"narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85f7e662eda4fa3a995556527c87b2524b691933", "rev": "24f0d4acd634792badd6470134c387a3b039dace",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,11 +409,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1731319897,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -425,11 +425,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725194671, "lastModified": 1731531548,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "rev": "24f0d4acd634792badd6470134c387a3b039dace",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +454,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1731155487, "lastModified": 1731675303,
"narHash": "sha256-+D57j7BcV5O3XH9za3c3XXVLHr+F+enThAN2EeF6H/M=", "narHash": "sha256-Pd0ZZICCwwDIE+ruHTDg8Oaizna5bJrdw5BSTht+Pdc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "31364af1990067d5529846a2ebf17a42c5ab22ff", "rev": "46e574d4ea1642dd87a6bfb162053c52b2e4878b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,11 +477,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731060242, "lastModified": 1731347683,
"narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=", "narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "ef493352f9e1f051e01a55c062731503a6b36b4e", "rev": "135d202e032be70c93b6d7d53592ef4799d6efde",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,11 +516,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1731090365, "lastModified": 1731657386,
"narHash": "sha256-ti3gXhgVpIUL/7w6zDJuH+hOnyTZqxrIX/yYqALmiEI=", "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "6863412636c8f2cb3b7360f747fbd020fbfddf68", "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
home-manager/modules/helix.nix Normal file
View File

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
programs.helix = {
enable = true;
defaultEditor = true;
extraPackages = with pkgs; [
marksman
nil
];
};
}

9
home-manager/modules/nixvim/keymaps.nix
View File

@ -1,9 +0,0 @@
{ ... }:
{
programs.nixvim.keymaps = [
{
action = "<cmd>Neotree toggle<CR>";
key = "l";
}
];
}

28
home-manager/modules/nixvim/nixvim.nix
View File

@ -1,28 +0,0 @@
{
programs.nixvim = {
enable = true;
plugins = {
web-devicons.enable = true;
which-key.enable = true;
gitsigns.enable = true;
trouble.enable = true;
};
defaultEditor = true;
# Color schemes managed by stylix! :D
opts = {
relativenumber = true;
clipboard = "unnamedplus";
tabstop = 2;
softtabstop = 2;
showtabline = 2;
};
};
imports = [
./keymaps.nix
./plugins-bundle.nix
];
}

14
home-manager/modules/nixvim/plugins-bundle.nix
View File

@ -1,14 +0,0 @@
{
imports = [
./plugins/cmp.nix
./plugins/lsp.nix
./plugins/lualine.nix
./plugins/neotree.nix
./plugins/presence.nix
./plugins/autoclose.nix
./plugins/dashboard.nix
./plugins/telescope.nix
./plugins/buffreline.nix
./plugins/inted-a-matic.nix
];
}

10
home-manager/modules/nixvim/plugins/autoclose.nix
View File

@ -1,10 +0,0 @@
{
programs.nixvim.plugins.autoclose = {
enable = true;
keys = {
"(" = { escape = false; close = true; pair = "()"; };
"[" = { escape = false; close = true; pair = "[]"; };
"{" = { escape = false; close = true; pair = "{}"; };
};
};
}

3
home-manager/modules/nixvim/plugins/buffreline.nix
View File

@ -1,3 +0,0 @@
{
programs.nixvim.plugins.bufferline.enable = true;
}

26
home-manager/modules/nixvim/plugins/cmp.nix
View File

@ -1,26 +0,0 @@
{
programs.nixvim.plugins.cmp-nvim-lsp.enable = true;
programs.nixvim.plugins.cmp-vsnip.enable = true;
programs.nixvim.plugins.cmp = {
enable = true;
autoEnableSources = true;
settings.sources = [
{name = "nvim_lsp";}
{name= "vsnip";}
{name = "path";}
{name = "buffer";}
];
settings.mapping = {
"<C-Space>" = "cmp.mapping.complete()";
"<C-d>" = "cmp.mapping.scroll_docs(-4)";
"<C-e>" = "cmp.mapping.close()";
"<C-f>" = "cmp.mapping.scroll_docs(4)";
"<CR>" = "cmp.mapping.confirm({ select = true })";
"<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
};
};
}

5
home-manager/modules/nixvim/plugins/dashboard.nix
View File

@ -1,5 +0,0 @@
{
programs.nixvim.plugins.dashboard = {
enable = true;
};
}

3
home-manager/modules/nixvim/plugins/inted-a-matic.nix
View File

@ -1,3 +0,0 @@
{
programs.nixvim.plugins.indent-o-matic.enable = true;
}

13
home-manager/modules/nixvim/plugins/lsp.nix
View File

@ -1,13 +0,0 @@
{
# programs.nixvim.plugins.lsp-lines.enable = true;
programs.nixvim.plugins.lsp = {
enable = true;
servers = {
nixd.enable = true;
gopls.enable = true;
};
};
}

3
home-manager/modules/nixvim/plugins/lualine.nix
View File

@ -1,3 +0,0 @@
{
programs.nixvim.plugins.lualine.enable = true;
}

7
home-manager/modules/nixvim/plugins/neotree.nix
View File

@ -1,7 +0,0 @@
{
programs.nixvim.plugins.neo-tree = {
enable = true;
filesystem.followCurrentFile.enabled = true;
closeIfLastWindow = true;
};
}

10
home-manager/modules/nixvim/plugins/presence.nix
View File

@ -1,10 +0,0 @@
{
programs.nixvim.plugins.presence-nvim = {
enable = true;
buttons =
[
{label = "Gitlab"; url = "https://gitlab.com/Dixxe";}
{label = "Github"; url = "https://github.com/Dixxe";}
];
};
}

28
home-manager/modules/nixvim/plugins/telescope.nix
View File

@ -1,28 +0,0 @@
{
programs.nixvim.plugins.telescope = {
enable = true;
keymaps = {
"<leader>ff" = "find_files";
"<leader>b" = "buffers";
"<leader>fh" = "help_tags";
"<leader>gf" = "git_files";
"<leader>of" = "oldfiles";
# "<leader>fg" = "live_grep";
# "<leader>fd" = "diagnostics";
};
settings.defaults = {
file_ignore_patterns = [
"^.git/"
"^.mypy_cache/"
"^__pycache__/"
"^output/"
"^data/"
"%.ipynb"
];
set_env.COLORTERM = "truecolor";
};
};
}

2
home-manager/your-modules.nix
View File

@ -2,8 +2,8 @@
imports = [ imports = [
./modules/defaultGtk.nix ./modules/defaultGtk.nix
./modules/git.nix ./modules/git.nix
./modules/nixvim/nixvim.nix
./modules/stylix.nix ./modules/stylix.nix
./modules/syncthing.nix ./modules/syncthing.nix
./modules/helix.nix
]; ];
} }

6
home-manager/your-packages.nix
View File

@ -2,11 +2,7 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Hyprland stuff obsidian
lxqt.lxqt-policykit
wofi
obsidian
alacritty alacritty
grimblast grimblast
vlc vlc

2
nixos/modules/hardware/nvidia.nix
View File

@ -16,7 +16,7 @@
hardware.nvidia.prime = { hardware.nvidia.prime = {
reverseSync.enable = true; sync.enable = true;
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
amdgpuBusId = "PCI:4:2:0"; amdgpuBusId = "PCI:4:2:0";