From bff11897be55ff700d97e2c3cf4c8c764e66ffa8 Mon Sep 17 00:00:00 2001
From: Origami404 <Origami404@foxmail.com>
Date: Sat, 22 Jun 2024 17:04:37 +0800
Subject: [PATCH] move to home-manager

---
 configuration.nix | 40 +--------------------------------
 flake.lock        |  7 +++---
 flake.nix         | 13 ++++++-----
 home.nix          | 56 ++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index a9c5ef1..243df74 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -45,10 +45,6 @@
     wget
     curl
 
-    # Shell & Editor
-    fish # better shell
-    #helix.packages."${pkgs.system}".helix
-
     # Archives
     zip
     xz
@@ -56,28 +52,6 @@
     p7zip
     zstd
     gnutar
-    atool # all-in-one tar
-
-    # Modern unix
-    ripgrep # better grep
-    jq # better cat on json
-    bat # better cat on everything
-    eza # better ls
-    fzf # A command-line fuzzy finder
-    du-dust # better du
-    duf # better df
-    fd # better find
-    btop # better top
-    procs # better ps
-    zoxide # better cd
-    scc # better cloc
-
-    # Networking
-    mtr # better traceroute
-    iperf3
-    q # better dig/nslookup
-    socat # better netcat
-    nmap
 
     # Misc
     file
@@ -88,26 +62,15 @@
     gnupg
     pciutils # lspci
     usbutils # lsusb
-    neofetch
     v2raya # Only for Chinese user
 
-    # nix related
-    #
-    # it provides the command `nom` works just like `nix`
-    # with more details log output
+    # Nix related
     nix-output-monitor
     nixd
     nixpkgs-fmt
 
-    # system call monitoring
-    strace # system call monitoring
-    ltrace # library call monitoring
-    lsof # list open files
-
     # Desktop Utils
     chromium # Web browser
-    gnome3.gnome-tweaks
-    telegram-desktop
   ];
 
   fonts = {
@@ -152,7 +115,6 @@
 
   # Users
   programs.fish.enable = true;
-
   users.groups.origami.gid = 1000;
   users.users.origami = {
     isNormalUser = true;
diff --git a/flake.lock b/flake.lock
index 702281d..79ef343 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,15 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1718983978,
-        "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=",
+        "lastModified": 1719037157,
+        "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902",
+        "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 6f06dcf..a665d9b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sops-nix.url = "github:Mic92/sops-nix";
@@ -19,10 +19,13 @@
           ./configuration.nix
           home-manager.nixosModules.home-manager
           {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.origami = import ./home.nix;
-            home-manager.extraSpecialArgs = inputs;
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.origami = import ./home.nix;
+              extraSpecialArgs = inputs;
+              backupFileExtension = "bak";
+            };
           }
         ];
       };
diff --git a/home.nix b/home.nix
index 6c2d587..104cda0 100644
--- a/home.nix
+++ b/home.nix
@@ -6,7 +6,61 @@
 
   programs.home-manager.enable = true;
 
-  home.packages = with pkgs;[ ];
+  home.packages = with pkgs;[
+    # Shell & Editor
+    fish 
+
+    # Archives
+    atool # all-in-one tar
+
+    # Modern unix
+    ripgrep # better grep
+    jq # better cat on json
+    bat # better cat on everything
+    eza # better ls
+    fzf # A command-line fuzzy finder
+    du-dust # better du
+    duf # better df
+    fd # better find
+    btop # better top
+    procs # better ps
+    zoxide # better cd
+    scc # better cloc
+    btop # better top
+
+    # Networking
+    mtr # better traceroute
+    iperf3
+    q # better dig/nslookup
+    socat # better netcat
+    nmap
+
+    # Misc
+    neofetch
+
+
+    # system call monitoring
+    strace # system call monitoring
+    ltrace # library call monitoring
+    lsof # list open files
+
+    # Desktop Utils
+    gnome3.gnome-tweaks
+    telegram-desktop
+  ];
+
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      set fish_greeting # Disable greeting
+    '';
+    plugins = with pkgs.fishPlugins; [
+      { name = "z"; src = z.src; }
+      { name = "grc"; src = grc.src; }
+      { name = "fzf"; src = fzf.src; }
+    ];
+  };
+
   programs.vscode = {
     enable = true;
   };