From 8529f8bd45fd874d3d8db0f2a353ac8ae98bc91d Mon Sep 17 00:00:00 2001
From: Alex Stan <90788596+Ultra980@users.noreply.github.com>
Date: Mon, 27 Mar 2023 18:21:54 +0300
Subject: [PATCH] changes

Signed-off-by: Alex Stan <stan.alexandru@ichb.ro>
---
 flake.nix                 |  2 ++
 ultrapc/configuration.nix | 12 +---------
 ultrapc/home.nix          | 48 +++++++++++++++++++++++++++++++++++----
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8c50617..e76fd60 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,10 +19,12 @@
         ./ultrapc/configuration.nix
       ];
     };
+    home-manager.extraSpecialArgs = { inherit inputs; };
     defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
     homeConfigurations = {
       ultra = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        # specialArgs = { inherit inputs; };
         modules = [ ./ultrapc/home.nix ];
       }; 
     };
diff --git a/ultrapc/configuration.nix b/ultrapc/configuration.nix
index 800f923..d34247d 100644
--- a/ultrapc/configuration.nix
+++ b/ultrapc/configuration.nix
@@ -4,16 +4,9 @@
 
 { config, pkgs, lib, inputs, ... }:
 let
-  # nix-software-center = import (pkgs.fetchFromGitHub {
-    # owner = "vlinkz";
-    # repo = "nix-software-center";
-    # rev = "0.1.1";
-    # sha256 = "0frigabszyfkphfbsniaa1d546zm8a2gx0cqvk2fr2qfa71kd41n";
-  # }) {};
   nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center;
   doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default;
-in
-{
+in {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
@@ -99,7 +92,6 @@ in
     packages = with pkgs; [
       firefox
       kate
-    #  thunderbird
       distrobox
       fish
       nushell
@@ -112,7 +104,6 @@ in
       starship
       atuin
       clang
-      # clang++
       gcc
       exa
       gnumake
@@ -134,7 +125,6 @@ in
       microsoft-edge
       doom-emacs
       ripgrep
-      # microsoft-edge-dev # fails to build
     ];
     shell = pkgs.fish;
     hashedPassword = "$6$OBjnSQhhJgHsr5LE$jFtUz.2qv0l2viv86exXmfHWC0fDFXKD3rqH41NmqgkdoBrwY2rPkDBCPjdq7PSoeudYcQ0nXxJvh1N7EIUs90";
diff --git a/ultrapc/home.nix b/ultrapc/home.nix
index 13afbce..913ea2a 100644
--- a/ultrapc/home.nix
+++ b/ultrapc/home.nix
@@ -1,12 +1,52 @@
-{pkgs, ...}: {
+{ pkgs, inputs, ... }: 
+let
+  nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center;
+  doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default;
+in {
     home = {
       username = "ultra";
       homeDirectory = "/home/ultra/";
       stateVersion = "22.11";
       packages = with pkgs; [
-        # neovim
-        # bat
+        firefox
+        kate
+        distrobox
+        fish
+        nushell
+        git
+        bat
+        gnupg1
+        zoom-us
+        google-chrome
+        zoxide
+        starship
+        atuin
+        clang
+        gcc
+        exa
+        gnumake
+        plasma-browser-integration
+        libsForQt5.bismuth
+        whatsapp-for-linux
+        signal-desktop
+        nodejs
+        onlyoffice-bin
+        drawio
+        xclip
+        steam
+        packagekit
+        armcord
+        packagekit
+        rnote
+        obsidian
+        gnome-obfuscate
+        microsoft-edge
+        doom-emacs
+        ripgrep
       ];
     };
-    programs.home-manager.enable = true;
+    programs = {
+      home-manager.enable = true;
+      # fish.enable = true;
+    };
 }