massive rewrite using flake-parts

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

home/natto/default.nix

@@ -1,5 +1,11 @@
 { config, pkgs, lib, ... }:
 {
+  home = {
+    homeDirectory = "/home/natto";
+    username = "natto";
+    stateVersion = "22.11";
+  };
+
   imports = [
     ./email.nix
     ./secrets

home/natto/gruvbox-el.patch

@@ -0,0 +1,19 @@
+--- a/gruvbox.el	2021-05-17 21:19:07.731014155 +0530
++++ b/gruvbox.el	2021-05-17 21:20:11.297990471 +0530
+@@ -162,11 +162,11 @@
+ 
+ 
+      ;; line numbers
+-     (line-number                               (:foreground gruvbox-dark4 :background gruvbox-dark1))
+-     (line-number-current-line                  (:foreground gruvbox-bright_orange :background gruvbox-dark2))
+-     (linum                                     (:foreground gruvbox-dark4 :background gruvbox-dark1))
+-     (linum-highlight-face                      (:foreground gruvbox-bright_orange :background gruvbox-dark2))
+-     (linum-relative-current-face               (:foreground gruvbox-bright_orange :background gruvbox-dark2))
++     (line-number                               (:foreground gruvbox-dark4 :background nil))
++     (line-number-current-line                  (:foreground gruvbox-bright_orange :background gruvbox-dark1))
++     (linum                                     (:foreground gruvbox-dark4 :background nil))
++     (linum-highlight-face                      (:foreground gruvbox-bright_orange :background gruvbox-dark1))
++     (linum-relative-current-face               (:foreground gruvbox-bright_orange :background gruvbox-dark1))
+ 
+      ;; Highlight indentation mode
+      (highlight-indentation-current-column-face (:background gruvbox-dark2))

home/natto/pkgs.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, flake, inputs, pkgs, ... }:
 {
   home.packages = with pkgs; [
 
@@ -36,8 +36,8 @@
     jmtpfs
     neofetch
     xdotool
-    nbfc-linux
-    customscripts
+    (inputs.nbfc.packages.${pkgs.system}.nbfc-client-c)
+    (flake.packages.${pkgs.system}.customscripts)
 
     # GUI utils
     (xfce.thunar.override {
@@ -50,7 +50,7 @@
     xfce.xfconf
     xfce.tumbler
     flameshot
-    (master.discord.override {
+    (discord.override {
       nss = nss_latest;
     })
     qbittorrent
@@ -69,12 +69,12 @@
 
     # Wine and games and stuff
     wineWowPackages.stable
-    master.winetricks
-    tlauncher
+    winetricks
     citra
     yuzu
     ryujinx
-    gaming.osu-stable
+    (inputs.nix-gaming.packages.${pkgs.system}.osu-stable)
+    (flake.packages.${pkgs.system}.tlauncher)
 
     # Dev shit
     rust-analyzer

home/natto/programs.nix

@@ -1,6 +1,7 @@
 { pkgs, config, ... }:
 {
   programs = {
+    home-manager.enable = true;
     firefox = {
       enable = true;
       profiles.natto = {

home/natto/services.nix

@@ -1,26 +1,35 @@
-{ config, pkgs, ... }:
-let
-  home = config.home.homeDirectory;
-in
+{ config, pkgs, inputs, ... }:
 {
-  services = {
-    baremacs = {
-      enable = true;
-      package = pkgs.mymacs.override {
-        config = ./config/emacs/config.org;
-      };
-      defaultEditor = {
-        enable = false;
-        editor = "emacsclient";
-      };
-      copyConfigFiles = {
-        enable = true;
-        files = {
-          "config.org" = ./config/emacs/config.org;
-          "init.el" = ./config/emacs/init.el;
-        };
-      };
+  home.file = with config; {
+    "config.org" = {
+      source = ./config/emacs/config.org;
+      target = "${home.homeDirectory}/.emacs.d/config.org";
     };
+    "init.el" = {
+      source = ./config/emacs/init.el;
+      target = "${home.homeDirectory}/.emacs.d/init.el";
+    };
+  };
+
+  services = {
+    emacs =
+      let
+        mymacs = config: # with inputs.emacs-overlay.packages.${pkgs.system}; already resolved with overlay
+          with pkgs; emacsWithPackagesFromUsePackage {
+            inherit config;
+            package = emacsGit;
+            alwaysEnsure = true;
+            alwaysTangle = true;
+            extraEmacsPackages = epkgs: with epkgs; [
+              use-package
+              (epkgs.tree-sitter-langs.withPlugins (_: epkgs.tree-sitter-langs.plugins))
+            ];
+          };
+      in
+      {
+        enable = true;
+        package = mymacs ./config/emacs/config.org;
+      };
 
     sxhkd = {
       enable = false;
@@ -80,7 +89,7 @@ in
           background = "#dc322f";
           foreground = "#eee8d5";
           timeout = 0;
-        };     
+        };
       };
     };
 

home/natto/xsession.nix

@@ -1,7 +1,7 @@
-{ pkgs, config, ... }:
+{ pkgs, config, flake, ... }:
 {
   home.pointerCursor = {
-    package = pkgs.simp1e-cursors;
+    package = flake.packages.${pkgs.system}.simp1e-cursors;
     name = "Simp1e-Solarized-Light";
     x11 = {
       enable = true;