fixes

home/default.nix

@@ -2,7 +2,6 @@
 
 let
   albert_autostart = (pkgs.makeAutostartItem {
-<<<<<<< HEAD
     name    = "albert";
     package = pkgs.albert;
   });
@@ -10,23 +9,25 @@ let
     name    = "guake";
     package = pkgs.guake;
   });
-in {
-  imports = [ 
-    ./zsh.nix 
-    ./code.nix 
-    ./git.nix
-  ];
+in 
+  {
+    imports = [ 
+      ./zsh.nix 
+      ./code.nix 
+      ./git.nix
+      ./gnome.nix
+    ];
 
-  nixpkgs.config.allowUnfree = true;
+    nixpkgs.config.allowUnfree = true;
 
-  home = {
-    stateVersion     = "21.05";
-    sessionVariables = {
-      EDITOR = "nvim";
-      VISUAL = "nvim";
-    };
+    home = {
+      stateVersion     = "21.05";
+      sessionVariables = {
+        EDITOR = "nvim";
+        VISUAL = "nvim";
+      };
 
-    packages = with pkgs; [
+      packages = with pkgs; [
     # essentials
     albert
     guake
@@ -34,52 +35,19 @@ in {
     # browsers
     firefox
     brave
-=======
-    name = "albert";
-    package = pkgs.albert;
-  });
-  guake_autostart = (pkgs.makeAutostartItem {
-    name = "guake";
-    package = pkgs.guake;
-  });
-in {
-  nixpkgs.config = { allowUnfree = true; };
-
-  imports = [ ./git.nix ./zsh.nix ./gnome.nix ./code.nix ];
-
-  home.stateVersion = "21.05";
-
-  home.packages = with pkgs; [
-    albert
-    guake
-
-    firefox
->>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b
     chromium
 
     # reversing
     rizin
-<<<<<<< HEAD
 
-    # networking
-    nmap
-
-    # development
-    clang
-
-    # social
-=======
-    
     nmap 
 
->>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b
     slack
     signal-desktop
     teams
     discord
     element-desktop
 
-<<<<<<< HEAD
     # music
     spotify
 
@@ -88,25 +56,11 @@ in {
 
     # system
     gparted
-=======
-    spotify
-
-    bind
-    gparted
     sshfs
->>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b
 
     # autostart
     albert_autostart
     guake_autostart
   ];
-<<<<<<< HEAD
 };
-=======
-
-  home.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
-  };
->>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b
 }

users.nix

@@ -6,10 +6,6 @@
   users.users.giulio = {
     description  = "Giulio De Pasquale";
     isNormalUser = true;
-<<<<<<< HEAD
-    shell        = pkgs.zsh;
-    extraGroups  = [ "wheel" ]; # Enable ‘sudo’ for the user.
-=======
     shell = pkgs.zsh;
     extraGroups = [ "wheel" "docker" "networkmanager" ];
   };
@@ -17,7 +13,6 @@
   programs.zsh = {
     enableBashCompletion = true;
     enableCompletion = true;
->>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b
   };
 
   home-manager.users.giulio = {