diff --git a/home/default.nix b/home/default.nix index a8d5d13..886f120 100644 --- a/home/default.nix +++ b/home/default.nix @@ -2,6 +2,7 @@ let albert_autostart = (pkgs.makeAutostartItem { +<<<<<<< HEAD name = "albert"; package = pkgs.albert; }); @@ -33,10 +34,32 @@ 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 @@ -45,12 +68,18 @@ in { clang # social +======= + + nmap + +>>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b slack signal-desktop teams discord element-desktop +<<<<<<< HEAD # music spotify @@ -59,10 +88,25 @@ in { # system gparted +======= + spotify + + bind + gparted + sshfs +>>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b # autostart albert_autostart guake_autostart ]; +<<<<<<< HEAD }; +======= + + home.sessionVariables = { + EDITOR = "nvim"; + VISUAL = "nvim"; + }; +>>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b } diff --git a/hosts/gAluminum/configuration.nix b/hosts/gAluminum/default.nix similarity index 82% rename from hosts/gAluminum/configuration.nix rename to hosts/gAluminum/default.nix index 03dd178..c517385 100644 --- a/hosts/gAluminum/configuration.nix +++ b/hosts/gAluminum/default.nix @@ -1,29 +1,23 @@ { config, pkgs, ... }: -{ - imports = [ configuration.nix ]; - - nixpkgs.config.allowUnfree = true; - - time.timeZone = "Europe/Rome"; - - fileSystems."/tmp" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = ["size=2G"]; - }; - - fileSystems."/home/giulio/Downloads" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = ["size=3G"]; - }; +let + hostname = "gAluminum"; +in { + imports = [ + ./hardware.nix + ../../variables.nix + ../../common.nix + ../../users.nix + ]; + + variables.hostname = hostname; boot = { - loader.efi.canTouchEfiVariables = true; - loader.efi.efiSysMountPoint = "/boot/efi"; - - loader.systemd-boot.enable = true; + loader = { + efi.canTouchEfiVariables = true; + efi.efiSysMountPoint = "/boot/efi"; + systemd-boot.enable = true; + }; initrd.luks.devices = { root = { @@ -35,7 +29,8 @@ }; networking = { - hostName = "gAluminum"; + hostName = hostname; + wg-quick.interfaces = { giupi = { address = ["10.3.0.2/32"]; @@ -53,8 +48,9 @@ }; }; - services = { + time.timeZone = "Europe/London"; + services = { xserver = { enable = true; displayManager.gdm.enable = true; @@ -69,7 +65,6 @@ udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; }; - sound.enable = true; hardware.pulseaudio.enable = true; @@ -99,5 +94,16 @@ security.pam.services.gdm.enableGnomeKeyring = true; + fileSystems."/tmp" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = ["size=2G"]; + }; + + fileSystems."/home/giulio/Downloads" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = ["size=3G"]; + }; } diff --git a/hosts/gAluminum/hardware-configuration.nix b/hosts/gAluminum/hardware.nix similarity index 100% rename from hosts/gAluminum/hardware-configuration.nix rename to hosts/gAluminum/hardware.nix diff --git a/users.nix b/users.nix index 03377d8..ba9897c 100644 --- a/users.nix +++ b/users.nix @@ -6,8 +6,18 @@ 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" ]; + }; + + programs.zsh = { + enableBashCompletion = true; + enableCompletion = true; +>>>>>>> 010141fe0b7b6d866f46dd9721653d8ee0521a6b }; home-manager.users.giulio = {