wine

5 files changed, 27 insertions, 61 deletions

diff --git a/home-manager/flake.lock b/home-manager/flake.lock
index 0f1ec4d..8b5ae40 100644
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742655702,
-        "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
+        "lastModified": 1744117652,
+        "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
+        "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742751704,
-        "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
+        "lastModified": 1743975612,
+        "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
+        "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1742751704,
-        "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
+        "lastModified": 1743975612,
+        "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
+        "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1742889210,
-        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+        "lastModified": 1743964447,
+        "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+        "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
         "type": "github"
       },
       "original": {
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/"
   ];