fix errors

emacs.nix

@@ -1,7 +1,6 @@
-{ config, pkgs, inputs, nurNoPkgs, ... }:
+{ config, pkgs, inputs, lib, ... }:
 
-let
+let pcfg = config.programs.emacs.init.usePackage;
-  pcfg = config.programs.emacs.init.usePackage;
 in {
   imports = [
     pkgs.nur.repos.rycee.hmModules.emacs-init

flake.nix

@@ -11,7 +11,8 @@
     nur.url = "github:nix-community/NUR";
   };
 
-  outputs = { self, nixpkgs-unstable, nixpkgs-22_11, home-manager, nur, ... }@inputs:
+  outputs =
+    { self, nixpkgs-unstable, nixpkgs-22_11, home-manager, nur, ... }@inputs:
     let
       system = "aarch64-darwin";
 
@@ -37,15 +38,13 @@
 
         # Specify your home configuration modules here, for example,
         # the path to your home.nix.
-        modules = [
+        modules = [ nur.hmModules.nur ./home.nix ];
-          ./home.nix
-        ];
 
         # Optionally use extraSpecialArgs
         # to pass through arguments to home.nix
-        extraSpecialArgs = {
+        #        extraSpecialArgs = {
-          inherit nurNoPkgs;
+        #          inherit nurNoPkgs;
-        };
+        #        };
       };
     };
 }

home.nix

@@ -1,17 +1,23 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
-let
+let homeDirectory = config.home.homeDirectory;
-  inherit (lib.systems.elaborate { system = builtins.currentSystem; }) isLinux isDarwin;
-  homeDirectory = config.home.homeDirectory;
 in {
   imports = [
-    ./emacs.nix
+    #./emacs.nix
     ./packages.nix
     ./programs.nix
   ];
 
   nixpkgs.config = {
     allowUnfree = true;
+    allowUnfreePredicate = pkg:
+      builtins.elem (lib.getName pkg) [ "discord" "unrar" ];
+  };
+
+  home = {
+    username = "willem";
+    homeDirectory = "/Users/willem";
+    stateVersion = "22.11";
   };
 
   home.language = {
@@ -25,7 +31,5 @@ in {
     variant = "colemak";
   };
 
-  home.sessionVariables = {
+  home.sessionVariables = { EDITOR = "emacs"; };
-    EDITOR = "emacs";
-  };
 }

packages.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, isDarwin, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   comma = (import (pkgs.fetchFromGitHub {
@@ -6,49 +6,19 @@ let
     repo = "comma";
     rev = "v1.4.0";
     sha256 = "02zh0zn0yibbgn26r0idcsv8nl7pxlnq545qas0fzj5l70hdgyhh";
-  })).default;
-
-  rnix-lsp = (import (pkgs.fetchFromGitHub {
-    owner = "nix-community";
-    repo = "rnix-lsp";
-    rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
-    sha256 = "197s5qi0yqxl84axziq3pcpf5qa9za82siv3ap6v3rcjmndk8jqp";
   }));
-  
+in {
-  darwinPackages = with pkgs; [
+  home.packages = with pkgs;
-    coreutils
+    [ coreutils gnused spoof-mac colima pinentry_mac iterm2 ] ++ [ discord ]
-    gnused
+    ++ [ docker docker-compose ] ++ [
-    spoof-mac
-    colima
-    pinentry_mac
-    iterm2
-  ];
-
-  guiPackages = with pkgs; [
-    discord
-  ];
-  
-  dockerPackages = with pkgs; [
-    unstable.docker
-    docker-compose
-  ];
-  
-  editingPackages = with pkgs; [
       black
       shellcheck
       plantuml
-    rnix-lsp
       clang-tools
       graphviz
       nixfmt
       texlive.combined.scheme-full
-  ];
+    ] ++ [ nodePackages.bash-language-server ] ++ [
-  
-  nodePackages = with pkgs.nodePackages; [
-    bash-language-server
-  ];
-  
-  sharedPackages = with pkgs; [
       zsh-powerlevel10k
       comma
       automake
@@ -66,17 +36,11 @@ let
       jq
       nmap
       unzip
+      unp
+      unrar
       rsync
       openssh
       tldr
       (import ./python-packages.nix { inherit pkgs; })
     ];
-in
-{
-  home.packages = sharedPackages
-++ (lib.optionals isDarwin darwinPackages)
-++ guiPackages
-++ editingPackages
-++ nodePackages
-++ dockerPackages ;
 }

programs.nix

@@ -4,9 +4,7 @@
   programs = {
     direnv = {
       enable = true;
-    nix-direnv = {
+      nix-direnv = { enable = true; };
-      enable = true;
-    };
     };
 
     gpg = {
@@ -24,9 +22,7 @@
 
     git = {
       enable = true;
-    delta = {
+      delta = { enable = true; };
-      enable = true;
-    };
       signing = {
         key = "C3DE5DF6198DACBD";
         signByDefault = true;
@@ -55,7 +51,8 @@
       enableVteIntegration = true;
       autocd = true;
       defaultKeymap = "emacs";
-    envExtra = "export PATH=${pkgs.pinentry_mac.out}/Applications/pinentry-mac.app/Contents/MacOS:$PATH";
+      envExtra =
+        "export PATH=${pkgs.pinentry_mac.out}/Applications/pinentry-mac.app/Contents/MacOS:$PATH";
       dirHashes = {
         docs = "$HOME/Documents";
         appsup = "$HOME/Library/Application Support";

python-packages.nix

@@ -1,6 +1,3 @@
 { pkgs }:
 
-pkgs.python310.withPackages(p: with p; [
+pkgs.python310.withPackages (p: with p; [ matplotlib latexify-py ])
-  matplotlib
-  latexify-py
-])