summaryrefslogtreecommitdiff
path: root/home-manager/modules/apps
diff options
context:
space:
mode:
Diffstat (limited to 'home-manager/modules/apps')
-rw-r--r--home-manager/modules/apps/default.nix3
-rw-r--r--home-manager/modules/apps/desktop/default.nix2
-rw-r--r--home-manager/modules/apps/desktop/wine.nix7
-rw-r--r--home-manager/modules/apps/nvim/default.nix52
4 files changed, 15 insertions, 49 deletions
diff --git a/home-manager/modules/apps/default.nix b/home-manager/modules/apps/default.nix
index 094a0a6..29974f5 100644
--- a/home-manager/modules/apps/default.nix
+++ b/home-manager/modules/apps/default.nix
@@ -21,11 +21,12 @@ with lib;
zsh
cmake
( hiPrio gcc)
+ gnumake
clang
rustup
# Do i need this?
- php
+ php83
php83Packages.composer
];
diff --git a/home-manager/modules/apps/desktop/default.nix b/home-manager/modules/apps/desktop/default.nix
index 6acfaad..06817cb 100644
--- a/home-manager/modules/apps/desktop/default.nix
+++ b/home-manager/modules/apps/desktop/default.nix
@@ -1,5 +1,5 @@
{lib, pkgs, ...}: with lib; {
- imports = [ ./hyprland.nix ];
+ imports = [ ./hyprland.nix ./wine.nix ];
home.packages = with pkgs; [
speedcrunch
diff --git a/home-manager/modules/apps/desktop/wine.nix b/home-manager/modules/apps/desktop/wine.nix
new file mode 100644
index 0000000..4aa00b6
--- /dev/null
+++ b/home-manager/modules/apps/desktop/wine.nix
@@ -0,0 +1,7 @@
+{pkgs, config, lib, ...}:
+{
+ home.packages = with pkgs; [
+ wineWowPackages.waylandFull
+ winetricks
+ ];
+}
diff --git a/home-manager/modules/apps/nvim/default.nix b/home-manager/modules/apps/nvim/default.nix
index 366cdf0..ebba423 100644
--- a/home-manager/modules/apps/nvim/default.nix
+++ b/home-manager/modules/apps/nvim/default.nix
@@ -1,53 +1,18 @@
{ pkgs, config, ...}:
-let
- treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p : [
- p.bash
- p.comment
- p.css
- p.dockerfile
- p.gitattributes
- p.gitignore
- p.go
- p.gomod
- p.gowork
- p.rust
- p.javascript
- p.typescript
- p.json5
- p.json
- p.lua
- p.markdown
- p.nix
- p.python
- p.java
- p.rust
- p.toml
- p.vue
- p.yaml
- p.php
- p.latex
- ]));
- treesitter-parsers = pkgs.symlinkJoin {
- name = "treesitter-parsers";
- paths = treesitterWithGrammars.dependencies;
- };
-
-in
{
programs.neovim = {
enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
- # vimdiffAlias = true;
- # # withPython3 = false;
- # # withNodeJs = false;
- # # withRuby = false;
- #
+ vimdiffAlias = true;
+ withPython3 = true;
+ withNodeJs = true;
+ withRuby = true;
+
coc.enable = false;
#
plugins = [
- treesitterWithGrammars
];
};
@@ -55,7 +20,6 @@ in
require("wilkuu.set")
require("wilkuu.remap")
'';
- #vim.opt.runtimepath:append("${treesitter-parsers}")
home.file."./.config/nvim/lua/wilkuu/nix.lua".text = ''
return {
@@ -63,12 +27,6 @@ in
}
'';
-
- # home.file."./.local/share/nvim/nix/nvim-treesitter/" = {
- # source = treesitterWithGrammars;
- # recursive = true;
- # };
-
home.sessionPath = [
"/home/wilkuu/.npm/bin/"
];