From ad8137b7e67f08ab1201e7d8a486e1794fe617ab Mon Sep 17 00:00:00 2001
From: Tasia Iso <tasiaiso@proton.me>
Date: Wed, 29 May 2024 22:41:28 +0200
Subject: [PATCH] a

---
 common/base.nix                     |   2 +
 common/components/packages-full.nix |   3 +-
 home/tasia/home.nix                 | 163 ++++++++++++++--------------
 3 files changed, 86 insertions(+), 82 deletions(-)

diff --git a/common/base.nix b/common/base.nix
index 7c3ab6c..8bd6cfa 100644
--- a/common/base.nix
+++ b/common/base.nix
@@ -67,6 +67,8 @@
         # Nvidia drivers
         "nvidia-x11"
         "nvidia-settings"
+
+        # osu!
         "osu-lazer-bin-2024.412.1"
         "osu-lazer-bin"
       ];
diff --git a/common/components/packages-full.nix b/common/components/packages-full.nix
index e2c05e7..ef27ffe 100644
--- a/common/components/packages-full.nix
+++ b/common/components/packages-full.nix
@@ -18,7 +18,8 @@
     ripgrep
     jq
     yq
-    neofetch
+    fastfetch
+    cpufetch
     tldr
     # dust
     powertop
diff --git a/home/tasia/home.nix b/home/tasia/home.nix
index 4447b4b..8177bb6 100644
--- a/home/tasia/home.nix
+++ b/home/tasia/home.nix
@@ -21,88 +21,89 @@
   };
 
   home-manager.users.tasia = {pkgs, ...}: {
-    home.file = {
-      ".zshrc".source = ../../dotfiles/.shellrc;
-      ".bashrc".source = ../../dotfiles/.shellrc;
-      ".config/btop/btop.conf".source = ../../dotfiles/btop.conf;
-      # ".gitconfig".source = ../../dotfiles/.gitconfig;
+    home = {
+      file = {
+        ".zshrc".source = ../../dotfiles/.shellrc;
+        ".bashrc".source = ../../dotfiles/.shellrc;
+        ".config/btop/btop.conf".source = ../../dotfiles/btop.conf;
+        # ".gitconfig".source = ../../dotfiles/.gitconfig;
 
-      ".librewolf/librewolf.overrides.cfg".source = ../../dotfiles/librewolf.overrides.cfg;
+        ".librewolf/librewolf.overrides.cfg".source = ../../dotfiles/librewolf.overrides.cfg;
+      };
+
+      shellAliases = {
+        e = "nvim";
+        ee = "nvim $(fzf)";
+        g = "git";
+        l = "ls";
+        lg = "lazygit";
+        ll = "ls -al";
+
+        done = "curl -d 'Done' ntfy.sh/tasiaiso_done";
+        rebuild = "sudo nixos-rebuild switch --flake .#$(cat /etc/hostname)";
+      };
+
+      packages = with pkgs; [
+        # Development
+        rustc
+        cargo
+        nodejs
+        yarn
+        nodePackages.node-gyp
+        nodePackages.node-pre-gyp
+        openssl
+        nodePackages.node-pre-gyp
+        jdk17
+
+        # Dektop apps
+        bitwarden
+        simplex-chat-desktop
+        picard
+        kleopatra
+        qbittorrent
+        tor-browser
+        ssb-patchwork
+        pixelorama
+
+        # System utilities
+        gocryptfs
+        sirikali
+        rpi-imager
+        protonvpn-gui
+        protonvpn-cli
+        # home-manager
+        lsof
+        appimage-run
+
+        atool
+        httpie
+        cowsay
+        stress
+        lazygit
+
+        ssb-patchwork
+        xonotic
+
+        # android-tools
+        # endless-sky
+        # gnucash
+        # obs-studio
+        # kdenlive
+        # wireshark
+        # android-studio
+        # swig
+        # radicle-cli
+        # opensnitch-ui
+        # hurl https://github.com/Orange-OpenSource/hurl
+        amfora
+        dive
+        inxi
+        # revolt-desktop
+      ];
+
+      # The state version is required and should stay at the version you
+      # originally installed.
+      stateVersion = "24.05";
     };
-
-    home.shellAliases = {
-      e = "nvim";
-      ee = "nvim $(fzf)";
-      g = "git";
-      l = "ls";
-      lg = "lazygit";
-      ll = "ls -al";
-
-      done = "curl -d 'Done' ntfy.sh/tasiaiso_done";
-      rebuild = "sudo nixos-rebuild switch --flake .#$(cat /etc/hostname)";
-    };
-
-    home.packages = with pkgs; [
-      # Development
-      rustc
-      cargo
-      nodejs
-      yarn
-      nodePackages.node-gyp
-      nodePackages.node-pre-gyp
-      openssl
-
-      # Dektop apps
-      bitwarden
-      simplex-chat-desktop
-      picard
-      kleopatra
-      qbittorrent
-      tor-browser
-      ssb-patchwork
-
-      # System utilities
-      gocryptfs
-      sirikali
-      rpi-imager
-      protonvpn-gui
-      protonvpn-cli
-      home-manager
-
-      atool
-      httpie
-      cowsay
-      stress
-      lazygit
-
-      ssb-patchwork
-      xonotic
-
-      # android-tools
-      # endless-sky
-      # gnucash
-      # obs-studio
-      # kdenlive
-      # wireshark
-      # appimage-run
-      # android-studio
-      # swig
-      # radicle-cli
-      # opensnitch-ui
-      # superTuxKart
-      # qgis
-      amfora
-      dive
-      inxi
-      revolt-desktop
-      lsof
-      pixelorama
-      nodePackages.node-pre-gyp
-      jdk17
-    ];
-
-    # The state version is required and should stay at the version you
-    # originally installed.
-    home.stateVersion = "24.05";
   };
 }