back to nil_ls

.nixd.json

@@ -1,17 +0,0 @@
-{
-  "eval": {
-    "target": {
-      "args": ["-f", "default.nix"],
-      "installable": "nixosConfigurations.sakotop.config.system.build.toplevel"
-    },
-    "depth": 0,
-    "workers": 3
-  },
-  "options": {
-    "enable": true,
-    "target": {
-      "args": [],
-      "installable": ".#nixosConfigurations.sakotop.options"
-    }
-  }
-}

config/nvim/lua/core/plugin_config/lsp_config.lua

@@ -29,7 +29,7 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities()
 mason_null_ls.setup()
 
 -- funny lsp config stuff
-require('lspconfig').nixd.setup({
+require('lspconfig').nil_ls.setup({
   on_attach = on_attach,
   capabilities = capabilities,
 })

default-options.nix

@@ -1,123 +0,0 @@
-{ config, inputs, outputs, pkgs, lib, home-manager, ...}:
-{
-  imports = [
-    # home manager
-    inputs.home-manager.nixosModules.default
-    # modules
-    # import for each folder
-    # modules/desktop IMPORT
-    # modules/desktop/example DO NOT IMPORT, 
-    # add entry to module's default.nix
-    outputs.nixosModules.desktop
-    outputs.nixosModules.shell
-    outputs.nixosModules.hardware
-    outputs.nixosModules.dev
-    outputs.nixosModules.media
-  ];
-  
-  # flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes"];
-
-  # import the overlays
-  nixpkgs = {
-     overlays = [
-       outputs.overlays.additions
-       outputs.overlays.modifications
-       outputs.overlays.unstable-packages
-     ];
-  }; 
-
-  # grub (mount efi partition to /boot/efi)
-  # why /boot/efi? instead of /efi?
-  # 1. when dualbooting, windows makes the efi partition 100mb instead of 512mb+ (we need this for generations
-  # and intel microcode)
-  # 2. nixos does not like /efi :(
-  # 3. i dont like systemd boot D:
-  # TODO(sako):: add shim secure boot 
-  # because window and riot games devs :(
-  boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi";
-    };
-    grub = {
-      devices = [ "nodev" ];
-      efiSupport = true;
-      enable = true;
-      useOSProber = true;
-      configurationLimit = 10;
-    };
-  };
-
-  # this shouldnt cause any issues right?
-  networking.networkmanager.enable = true;
-
-  time.timeZone = "Africa/Cairo";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  console = {
-    font = "Lat2-Terminus16";
-    # keyMap = "us";
-    # use xorg layout option 
-    # TODO(sako):: add arabic locale
-    useXkbConfig = true;
-  };
-
-  # xorg layout
-  # change to needed
-  services.xserver.layout = "us";
-
-  # already sold soul to corporations \_o_/
-  nixpkgs.config.allowUnfree = true;
-
-  home-manager.useUserPackages = true;
-  home-manager.users.sako = { pkgs, ...}: {
-      # CHANGE THIS WHEN THE SYSTEM VERSION CHANGES TOO!!!
-      home.stateVersion = "23.05";
-      home.packages = [];
-      home.username = "sako";
-      home.homeDirectory = "/home/sako";
-      programs.bash.enable = true;
-      programs.home-manager.enable = true;
-      xdg.configFile.git = {
-        source = ./config/git;
-      };
-  };
-  # bare minimum
-  environment.systemPackages = with pkgs; [
-    vim # backup
-    wget #double u get
-    killall # die processes
-    alsa-utils # unsupported application
-    pulseaudio # unsupported application
-    pamixer # unsupported application
-    feh # im different
-    unzip # zip file
-    gh # github
-    htop # htop
-    tree # trees
-  ]; 
-  # you phisiclally cannot live without this
-  # litearlly!  ! ! ! ! ! 
-  programs.gnupg.agent = {
-    enable = true;
-    pinentryFlavor = "gtk2";
-    # enableSSHSupport = true;
-  };
-
-  programs.git = {
-      enable = true;
-      package = pkgs.gitFull;
-  };
-
-
-  # something nixos release
-  # something use ful in for mat ion
-  # blah blah blah
-  # nixos packages type shit
-  # change this on every update idiot
-  # dont name it to string beans or some shit
-  # you idiot
-  system.stateVersion = "23.05"; 
-  # read comment you read the comment?
-}

default.nix

@@ -1,10 +1,123 @@
-(import
+{ config, inputs, outputs, pkgs, lib, home-manager, ...}:
-  (
+{
-    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
+  imports = [
-    fetchTarball {
+    # home manager
-      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    inputs.home-manager.nixosModules.default
-      sha256 = lock.nodes.flake-compat.locked.narHash;
+    # modules
+    # import for each folder
+    # modules/desktop IMPORT
+    # modules/desktop/example DO NOT IMPORT, 
+    # add entry to module's default.nix
+    outputs.nixosModules.desktop
+    outputs.nixosModules.shell
+    outputs.nixosModules.hardware
+    outputs.nixosModules.dev
+    outputs.nixosModules.media
+  ];
+  
+  # flakes
+  nix.settings.experimental-features = [ "nix-command" "flakes"];
+
+  # import the overlays
+  nixpkgs = {
+     overlays = [
+       outputs.overlays.additions
+       outputs.overlays.modifications
+       outputs.overlays.unstable-packages
+     ];
+  }; 
+
+  # grub (mount efi partition to /boot/efi)
+  # why /boot/efi? instead of /efi?
+  # 1. when dualbooting, windows makes the efi partition 100mb instead of 512mb+ (we need this for generations
+  # and intel microcode)
+  # 2. nixos does not like /efi :(
+  # 3. i dont like systemd boot D:
+  # TODO(sako):: add shim secure boot 
+  # because window and riot games devs :(
+  boot.loader = {
+    efi = {
+      canTouchEfiVariables = true;
+      efiSysMountPoint = "/boot/efi";
+    };
+    grub = {
+      devices = [ "nodev" ];
+      efiSupport = true;
+      enable = true;
+      useOSProber = true;
+      configurationLimit = 10;
+    };
+  };
+
+  # this shouldnt cause any issues right?
+  networking.networkmanager.enable = true;
+
+  time.timeZone = "Africa/Cairo";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    # keyMap = "us";
+    # use xorg layout option 
+    # TODO(sako):: add arabic locale
+    useXkbConfig = true;
+  };
+
+  # xorg layout
+  # change to needed
+  services.xserver.layout = "us";
+
+  # already sold soul to corporations \_o_/
+  nixpkgs.config.allowUnfree = true;
+
+  home-manager.useUserPackages = true;
+  home-manager.users.sako = { pkgs, ...}: {
+      # CHANGE THIS WHEN THE SYSTEM VERSION CHANGES TOO!!!
+      home.stateVersion = "23.05";
+      home.packages = [];
+      home.username = "sako";
+      home.homeDirectory = "/home/sako";
+      programs.bash.enable = true;
+      programs.home-manager.enable = true;
+      xdg.configFile.git = {
+        source = ./config/git;
+      };
+  };
+  # bare minimum
+  environment.systemPackages = with pkgs; [
+    vim # backup
+    wget #double u get
+    killall # die processes
+    alsa-utils # unsupported application
+    pulseaudio # unsupported application
+    pamixer # unsupported application
+    feh # im different
+    unzip # zip file
+    gh # github
+    htop # htop
+    tree # trees
+  ]; 
+  # you phisiclally cannot live without this
+  # litearlly!  ! ! ! ! ! 
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryFlavor = "gtk2";
+    # enableSSHSupport = true;
+  };
+
+  programs.git = {
+      enable = true;
+      package = pkgs.gitFull;
+  };
+
+
+  # something nixos release
+  # something use ful in for mat ion
+  # blah blah blah
+  # nixos packages type shit
+  # change this on every update idiot
+  # dont name it to string beans or some shit
+  # you idiot
+  system.stateVersion = "23.05"; 
+  # read comment you read the comment?
 }
-  )
-  { src = ./.; }
-).defaultNix

flake.nix

@@ -10,32 +10,39 @@
     home-manager.url = "github:nix-community/home-manager/release-23.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     # flake-compat for nixd
-      flake-compat = {
+    #flake-compat = {
-        url = "github:edolstra/flake-compat";
+    #  url = "github:edolstra/flake-compat";
-        flake = false;
+    #  flake = false;
-      };
+    #};
     # TODO(sako):: add agenix or sops-nix
     # https://github.com/ryantm/agenix#install-via-flakes
     # https://github.com/Mic92/sops-nix
   };
 
-  outputs = { self, nixpkgs, home-manager, ...}@inputs: 
+  outputs = {
-  let
+    self,
+    nixpkgs,
+    home-manager,
+    ...
+  } @ inputs: let
     inherit (self) outputs;
     forAllSystems = nixpkgs.lib.genAttrs [
       "x86_64-linux"
     ];
-    in
+  in rec {
-    rec {
     # custom packages
-    packages = forAllSystems (system:
+    packages = forAllSystems (
-      let pkgs = nixpkgs.legacyPackages.${system};
+      system: let
-      in import ./packages { inherit pkgs; }
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+        import ./packages {inherit pkgs;}
     );
     # dev shell for bootstrap
-    devShells = forAllSystems (system:
+    devShells = forAllSystems (
-      let pkgs = nixpkgs.legacyPackages.${system};
+      system: let
-      in import ./shell.nix { inherit pkgs; }
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+        import ./shell.nix {inherit pkgs;}
     );
 
     # overlays here
@@ -48,18 +55,17 @@
       sakotop = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
-          ./default-options.nix
+          ./default.nix
           ./hosts/sakotop/configuration.nix
         ];
       };
       sakopc = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
-          ./default-options.nix
+          ./default.nix
           ./hosts/sakopc/configuration.nix
         ];
       };
     };
-    
   };
 }

hosts/sakotop/configuration.nix

@@ -65,8 +65,8 @@
         nvim.enable = true;
         vscode.fhs.enable = true;
       };
-      nixd.enable = true;
+      nixd.enable = false;
-      nil.enable = false;
+      nil.enable = true;
       cc.enable = true;
       javascript.enable = true;
       python.enable = true;

packages/.nixd.json

@@ -1,10 +0,0 @@
-{
-  "eval": {
-    "target": {
-      "args": [
-        "--expr",
-        "with import <nixpkgs> { }; callPackage ./nullpomino.nix { }"
-      ]
-    }
-  }
-}