.gitmodules

@@ -1,6 +0,0 @@
-[submodule "pkgs/binaryninja"]
-	path = pkgs/binaryninja
-	url = ssh://gitea@git.giugl.io:10022/peperunas/binaryninja.git
-[submodule "pkgs/ida"]
-	path = pkgs/ida
-	url = ssh://gitea@git.giugl.io:10022/peperunas/ida.git

common.nix

@@ -28,8 +28,6 @@
     };
   };
 
-  fonts.fonts = with pkgs; [cascadia-code];
-
   environment.systemPackages = with pkgs; [
     file
     pciutils
@@ -43,13 +41,12 @@
     restic
     binutils
     neovim
+    home-manager
     ripgrep
     tmux
     parted
     unzip
     tree
     smartmontools
-    nmap
-    ripgrep
   ];  
 }

flake.nix

@@ -8,29 +8,13 @@
     }; 
   };
   
-  outputs = inputs @ { self, nixpkgs, nixos-unstable, home-manager }: let
+  outputs = { self, nixpkgs, nixos-unstable, home-manager }: let
-    system = "x86_64-linux";
+    util = import ./utils.nix { inherit nixpkgs nixos-unstable home-manager; };
-
-    pkgs = import nixpkgs { 
-      inherit system; 
-      config.allowUnfree = true; 
-      overlays = [ (final: prev: { inherit unstable; }) ];
-    };
-
-    unstable = import nixos-unstable { 
-      inherit system; 
-      config.allowUnfree = true; 
-    };
-
-    utils = import ./lib { inherit pkgs unstable nixpkgs nixos-unstable home-manager; };
-
-    inherit (utils) host;
-    inherit (utils) user;
   in  {
     nixosConfigurations = {
-      architect = host.mkHost { name = "architect"; users = [ { user = "giulio"; } ]; };
+      architect = util.mkHost { name = "architect"; };
-      gAluminum = host.mkHost { name = "gAluminum"; users = [ { user = "giulio"; roles = [ "desktop" "ssh" "git" ]; } ]; roles = [ "gnome" ]; };
+      gAluminum = util.mkHost { name = "gAluminum"; };
-      proxy = host.mkHost { name = "proxy"; };
+      proxy = util.mkHost { name = "proxy"; };
     };
   };
 }

home/code.nix

@@ -1,26 +1,15 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, home, ... }:
 
-{
+{ 
-  imports = [ ./zsh.nix ];
+  nixpkgs.config.allowUnfree = true;
 
-  home = {
+  home.packages = with pkgs; [ 
-    stateVersion     = "21.05";
+    nixfmt
-    sessionVariables = {
+    vscode
-      EDITOR = "nvim";
+  ]; 
-      VISUAL = "nvim";
-    };
-
-    packages = with pkgs; [
-      rizin
-      sshfs
-      nixfmt
-    ];
-  };
 
   programs.neovim = {
     enable      = true;
-    #package = pkgs.unstable.neovim-unwrapped;
-
     extraConfig = ''
       " syntax
       syntax enable
@@ -33,9 +22,9 @@
       set wildmode=longest:full,full
 
       " remapping popup menu (command autocompletion)
-      "      cnoremap <expr> <up> pumvisible() ? "<C-p>" : "<up>
+"      cnoremap <expr> <up> pumvisible() ? "<C-p>" : "<up>
-      "      cnoremap <expr> <down> pumvisible() ? "<C-n>" : "<down>"
+"      cnoremap <expr> <down> pumvisible() ? "<C-n>" : "<down>"
-      "      cnoremap <expr> <CR> pumvisible() ? "<C-e>":"<CR>"
+"      cnoremap <expr> <CR> pumvisible() ? "<C-e>":"<CR>"
       " set line numbers
       set number
 
@@ -76,10 +65,6 @@
       " Fix for code not being aligned if between comment blocks
       set cindent cinkeys-=0#
       set expandtab shiftwidth=2 tabstop=2 softtabstop=2
-
-      set statusline+=%#warningmsg#
-      set statusline+=%{SyntasticStatuslineFlag()}
-      set statusline+=%*
     '';
 
     viAlias  = true;
@@ -98,7 +83,7 @@
       vim-fugitive
       vim-yaml
       vim-autoformat
-      vimtex
     ];
   };
+
 }

home/default.nix

@@ -0,0 +1,67 @@
+{ config, pkgs, ... }:
+
+let
+  albert_autostart = (pkgs.makeAutostartItem {
+    name    = "albert";
+    package = pkgs.albert;
+  });
+  guake_autostart = (pkgs.makeAutostartItem {
+    name    = "guake";
+    package = pkgs.guake;
+  });
+in 
+  {
+    imports = [ 
+      ./zsh.nix 
+      ./code.nix 
+      ./git.nix
+      ./gnome.nix
+      ./ssh.nix
+    ];
+
+    nixpkgs.config.allowUnfree = true;
+
+    home = {
+      stateVersion     = "21.05";
+      sessionVariables = {
+        EDITOR = "nvim";
+        VISUAL = "nvim";
+      };
+
+      packages = with pkgs; [
+    # essentials
+    albert
+    guake
+
+    # browsers
+    firefox
+    brave
+    chromium
+
+    # reversing
+    rizin
+
+    nmap 
+
+    slack
+    signal-desktop
+    teams
+    discord
+    element-desktop
+
+    # music
+    spotify
+
+    # misc
+    bind
+
+    # system
+    gparted
+    sshfs
+
+    # autostart
+    albert_autostart
+    guake_autostart
+  ];
+};
+}

home/ssh.nix

@@ -4,11 +4,6 @@
     compression = true;
 
     matchBlocks = {
-      "giugl.io" = {
-        user = "root";
-        identityFile = "~/.ssh/architectproxy";
-      };
-
       "tommy.devs.giugl.io" = {
         user = "giulio";
         identityFile = "~/.ssh/tommypc";

home/zsh.nix

@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }: {
-  home.packages = with pkgs; [ zsh any-nix-shell ];
+  home.packages = with pkgs; [ zsh ];
 
   programs.zsh = {
     enable = true;
@@ -9,9 +9,5 @@
       plugins = [ "git" "sudo" "docker" "docker-compose" "adb" "systemd" ];
       theme = "bira";
     };
-
-    initExtra = ''
-      any-nix-shell zsh --info-right | source /dev/stdin
-    '';
   };
 }

hosts/gAluminum/default.nix

@@ -5,11 +5,14 @@ let
 in {
   imports = [ 
     ./hardware.nix 
-    ./wireguard.nix
+    ../../variables.nix
+    ../../common.nix
+    ../../users.nix
   ];
+  
+  variables.hostname = hostname;
 
   boot = {
-    supportedFilesystems = [ "ntfs" ];
     loader = {
       efi.canTouchEfiVariables = true;
       efi.efiSysMountPoint = "/boot/efi";
@@ -27,22 +30,68 @@ in {
 
   networking = {
     hostName = hostname;
-    networkmanager.wifi = {
+
-      powersave = false;
+    wg-quick.interfaces = {
-      macAddress = "random";
+      giupi = {
+        address = ["10.3.0.2/32"];
+        privateKeyFile = "/etc/wireguard/giupi.key";
+        dns = ["10.3.0.1"];
+        peers = [
+          {
+            publicKey = "I4glUMvIGjjhvQMKhwGc8copPl2t9Us/YYRjT0BKuiw=";
+            allowedIPs = ["0.0.0.0/0"];
+            endpoint = "giugl.io:1194";
+            persistentKeepalive = 25;
+          }
+        ];
+      };
     };
   };
 
   time.timeZone = "Europe/London";
 
-  virtualisation.virtualbox.host.enable = true;
+  services = {
-  virtualisation.virtualbox.host.enableExtensionPack = true;
+    xserver = {
-  users.extraGroups.vboxusers.members = [ "giulio" ];
+      enable = true;
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+      libinput.enable = true;
+      layout = "us";
+      xkbOptions = "eurosign:e";
+    };
+
+    printing.enable = true;
+    dbus.packages = with pkgs; [ gnome3.dconf ];
+    udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; 
+  };
 
-  services.printing.enable = true;
   sound.enable = true;
   hardware.pulseaudio.enable = true;
-  environment.systemPackages = with pkgs; [ efibootmgr ];
+
+  environment.systemPackages = with pkgs; [
+    wget
+    git
+    pciutils
+    curl
+    virtualbox
+    cmake
+    ninja
+    gdb
+    htop
+    glances
+    tcpdump
+    restic
+    gnomeExtensions.appindicator
+    binutils
+    efibootmgr
+    neovim
+    home-manager
+  ];
+
+  fonts.fonts = with pkgs; [cascadia-code];
+
   system.stateVersion = "21.05"; # Did you read the comment?
+
+  security.pam.services.gdm.enableGnomeKeyring = true;
 }
 

hosts/gAluminum/wireguard.nix

@@ -1,17 +0,0 @@
-{
-  networking.wg-quick.interfaces = {
-      giupi = {
-        address = ["10.3.0.2/32"];
-        privateKeyFile = "/etc/wireguard/giupi.key";
-        dns = ["10.3.0.1"];
-        peers = [
-          {
-            publicKey = "I4glUMvIGjjhvQMKhwGc8copPl2t9Us/YYRjT0BKuiw=";
-            allowedIPs = ["0.0.0.0/0"];
-            endpoint = "architect.devs.giugl.io:1194";
-            persistentKeepalive = 25;
-          }
-        ];
-      };
-    };
-}

lib/default.nix

@@ -1,5 +0,0 @@
-{ pkgs, unstable, nixpkgs, nixos-unstable, home-manager, ...}:
-rec {
-  user = import ./user.nix { inherit pkgs; };
-  host = import ./host.nix { inherit pkgs nixpkgs unstable nixos-unstable home-manager user; };
-}   

lib/host.nix

@@ -1,40 +0,0 @@
-{ pkgs, nixpkgs, nixos-unstable, unstable, home-manager, user, ... }:
-
-{
-  mkHost = { name, users, roles ? [] }: 
-  let
-    system = "x86_64-linux";
-
-    mkRole = role : import (../roles + "/${role}.nix");
-
-    users_mod= (map (u: user.mkUser {name = u.user; roles= u.roles; }) users);
-    roles_mod = (map (r: mkRole r) roles);
-  in nixpkgs.lib.nixosSystem {
-    inherit system;
-
-    modules = [ 
-      {
-        imports = users_mod ++ roles_mod;
-
-        nixpkgs.pkgs = pkgs;
-        nix.nixPath = [ 
-          "nixpkgs=${nixpkgs}" 
-          "unstable=${nixos-unstable}"
-        ];
-        nix.registry.nixpkgs.flake = nixpkgs;
-        nix.registry.unstable.flake = nixos-unstable;
-
-        users.users.root = {
-          shell = pkgs.zsh;
-        };
-
-        home-manager.users.root.imports = [ ../roles/home/common.nix ];
-      }
-
-      home-manager.nixosModules.home-manager
-      ../roles/common.nix
-      ../roles/acme.nix
-      ../hosts/${name}/default.nix
-    ];
-  };
-}

lib/user.nix

@@ -1,23 +0,0 @@
-{ pkgs, ...}:
-
-{
-  mkUser = { name, roles ? [] }: 
-  let
-    mkRole = role: import (../roles/home + "/${role}.nix");
-    roles_mod = (map (r: mkRole r) roles);
-  in {
-    fileSystems."/home/${name}/Downloads" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["size=3G"];
-    };
-
-    users.users.${name} = {
-      isNormalUser = true;
-      shell = pkgs.zsh;
-      extraGroups = [ "wheel" ];
-    };
-
-    home-manager.users.${name}.imports = [ ../roles/home/common.nix ] ++ roles_mod;
-  };
-}

pkgs/binaryninja

@@ -1 +0,0 @@
-Subproject commit 8ed0f28dc78dfc482c397056b73a6a1e680e8af0

pkgs/ida

@@ -1 +0,0 @@
-Subproject commit fe8eed08ff9f6e09abaa8216beaa45aa83767862

roles/gnome.nix

@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services = {
-    xserver = {
-      enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-      libinput.enable = true;
-      layout = "us";
-      xkbOptions = "eurosign:e";
-    };
-
-    dbus.packages = with pkgs; [ gnome3.dconf ];
-    udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; 
-  };
-
-  environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator ];
-  security.pam.services.gdm.enableGnomeKeyring = true;
-}

roles/home/desktop.nix

@@ -1,42 +0,0 @@
-{ pkgs, ... }:
-
-let
-  albert_autostart = (pkgs.makeAutostartItem {
-    name    = "albert";
-    package = pkgs.albert;
-  });
-  guake_autostart = (pkgs.makeAutostartItem {
-    name    = "guake";
-    package = pkgs.guake;
-  });
-in 
-  {
-    imports = [ ./gnome.nix ];
-
-    nixpkgs.config.allowUnfree = true;
-    home.packages = with pkgs; [
-      albert
-      guake
-
-      firefox
-      brave
-      chromium
-
-      slack
-      signal-desktop
-      teams
-      discord
-      element-desktop
-
-      spotify
-
-      gparted
-
-      libreoffice
-      vscode
-      jetbrains.idea-ultimate
-
-      albert_autostart
-      guake_autostart
-    ];
-  }

roles/zsh.nix

@@ -1,8 +0,0 @@
-{ ... }:
-
-{
-  programs.zsh = {
-    enableBashCompletion = true;
-    enableCompletion = true;
-  };
-}

users.nix

@@ -0,0 +1,35 @@
+{config, pkgs, home-manager, ...}:
+
+{
+  users.users = {
+    giulio = {
+      description  = "Giulio De Pasquale";
+      isNormalUser = true;
+      shell        = pkgs.zsh;
+      extraGroups  = [ "wheel" "docker" "networkmanager" ];
+    };
+
+    root = {
+      shell = pkgs.zsh;
+    };
+  };
+
+  programs.zsh = {
+    enableBashCompletion = true;
+    enableCompletion     = true;
+  };
+
+  home-manager.users.root = {
+    imports = [ ./home/zsh.nix ./home/ssh.nix ./home/code.nix ];
+  };
+
+  home-manager.users.giulio = {
+    imports = [ ./home ];
+  };
+
+  fileSystems."/home/giulio/Downloads" = {
+    device = "tmpfs";
+    fsType = "tmpfs";
+    options = ["size=3G"];
+  };
+}

utils.nix

@@ -0,0 +1,38 @@
+{ nixos-unstable, nixpkgs, home-manager, ... }:
+
+{
+  mkHost = {name}: 
+  let
+    system = "x86_64-linux";
+
+    unstable = import nixos-unstable { 
+      inherit system; 
+      config.allowUnfree = true; 
+    };
+
+    pkgs = import nixpkgs { 
+      inherit system; 
+      config.allowUnfree = true; 
+      overlays = [ (final: prev: { inherit unstable; }) ];
+    };
+  in nixpkgs.lib.nixosSystem {
+    inherit system;
+    modules = [ 
+      {
+        nixpkgs.pkgs = pkgs;
+        nix.nixPath = [ 
+          "nixpkgs=${nixpkgs}" 
+          "unstable=${nixos-unstable}"
+        ];
+        nix.registry.nixpkgs.flake = nixpkgs;
+        nix.registry.unstable.flake = nixos-unstable;
+      }
+
+      ./common.nix
+      ./users.nix
+      home-manager.nixosModules.home-manager
+      ./hosts/${name}/default.nix
+      ./acme.nix
+    ];
+  };
+}

variables.nix

@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  options.variables = mkOption {
+    type = types.attrs;
+    default = {};
+  };
+
+  config._module.args.variables = config.variables;
+}