code review

flake.nix

@@ -41,6 +41,7 @@
     in {
       nixosConfigurations = {
         laptop = mkNixOS [ ./hosts/laptop ];
+        arrakis = mkNixxOS [ ./hosts/arrakis ];
         desktop = mkNixOS [ ./hosts/desktop ];
         test = mkNixOS [ ./hosts/test ];
         pi = mkNixOS [ ./hosts/pi ];
@@ -49,6 +50,7 @@
 
       homeConfigurations = {
         "naps62@laptop" = mkHome [ ./home-manager/laptop ] x86;
+        "naps62@arrakis" = mkHome [ ./home-manager/arrakis ] x86;
         "naps62@desktop" = mkHome [ ./home-manager/desktop ] x86;
         "naps62@pi" = mkHome [ ./home-manager/pi ] x86;
         "naps62@test" = mkHome [ ./home-manager/test ] x86;

home-manager/arrakis/default.nix

@@ -0,0 +1,21 @@
+{ inputs, lib, pkgs, config, outputs, ... }: {
+  imports = [
+    inputs.nix-colors.homeManagerModule
+    inputs.nixvim.homeManagerModules.nixvim
+    ../common/programs/default.nix
+  ];
+
+  colorscheme = inputs.nix-colors.colorSchemes.catppuccin-frappe;
+
+  programs = {
+    home-manager.enable = true;
+    git.enable = true;
+    fzf.enable = true;
+    neovim.enable = true;
+  };
+
+  home = {
+    username = lib.mkDefault "naps62";
+    stateVersion = lib.mkDefault "24.05";
+  };
+}

home-manager/common/programs/zsh.nix

@@ -1,8 +1,8 @@
-{ inputs, ... }: {
+{ inputs, config, ... }: {
   programs.zsh = {
     enable = true;
     enableCompletion = true;
-    autosuggestions.enable = true;
+    autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
 
     shellAliases = {
@@ -23,6 +23,21 @@
       size = 10000;
       path = "${config.xdg.dataHome}/zsh/history";
     };
+
+    zplug = {
+      enable = true;
+      plugins =
+        [ { name = "hlissner/zsh-autopair"; } { name = "Aloxaf/fzf-tab"; } ];
+    };
+
+    initExtra = ''
+      eval "$(mise activate zsh)"
+    '';
+  };
+
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
   };
 
   programs.starship = {

home-manager/test/default.nix

@@ -17,6 +17,5 @@
   home = {
     username = lib.mkDefault "naps62";
     stateVersion = lib.mkDefault "24.05";
-    file = { "asd".text = "asd"; };
   };
 }

hosts/arrakis/default.nix

@@ -0,0 +1,46 @@
+{ inputs, pkgs, ... }:
+let
+  tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
+  hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
+in {
+  imports = [
+    ./hardware-configuration.nix
+    ../common/global
+    ../common/features/networking.nix
+    ../common/features/hyprland.nix
+    ../common/features/docker.nix
+    ../common/features/desktop-apps.nix
+    ../common/features/syncthing.nix
+  ];
+
+  networking.hostName = "arrakis";
+
+  boot = {
+    loader = {
+      grub = {
+        enable = true;
+        device = "/dev/vda";
+        useOSProber = true;
+      };
+    };
+  };
+
+  system.stateVersion = "24.05";
+
+  programs.zsh.enable = true;
+
+  users.users.naps62 = {
+    isNormalUser = true;
+    description = "Miguel Palhas";
+    extraGroups = [ "networkmanager" "input" "wheel" "docker" ];
+    shell = pkgs.zsh;
+    hashedPassword =
+      "$y$j9T$0p/ZYQsSA/FroVjV59pI/0$LKyzass6W9GjJR0GLWI6xhVrLi0b5AYYMR3MvQKNK11";
+  };
+
+  fileSystems."mnt/nfs" = {
+    device = "192.168.122.1:/home/naps62/projects/nixos";
+    fsType = "nfs";
+    options = [ "rw" "soft" ];
+  };
+}

hosts/common/features/desktop-apps.nix

@@ -9,6 +9,8 @@
     pkgs.obsidian
     pkgs.mpv
     pkgs.obs-studio
+    pkgs.calibre
+    pkgs.gimp
 
     # communication
     pkgs.slack
@@ -18,6 +20,7 @@
     pkgs.ferdium
     pkgs.bruno
     pkgs.kitty
+    pkgs.bun
   ];
 
 }

hosts/common/global/default.nix

@@ -1,8 +1,12 @@
 { inputs, pkgs, ... }: {
-  imports =
-    [ inputs.home-manager.nixosModules.home-manager ./nix.nix ./cli-tools.nix ];
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    ./nix.nix
+    ./cli-tools.nix
+    ./ssh.nix
+  ];
 
-  environment.systemPackages = [ pkgs.home-manager ];
+  environment.systemPackages = [ pkgs.home-manager pkgs.zsh ];
 
   time = { timeZone = "Europe/Lisbon"; };
 

hosts/common/global/ssh.nix

@@ -0,0 +1 @@
+{ inputs, pkgs, ... }: { environment.systemPackages = [ pkgs.openssh ]; }

hosts/common/main-programs.nix

@@ -0,0 +1,19 @@
+{ inputs, pkgs, ... }: {
+  environment.systemPackages = [
+    # desktop apps
+    pkgs.google-chrome
+    pkgs.firefox-devedition
+    pkgs.spotify
+    pkgs.spicetify-cli
+    pkgs.xfce.thunar
+    pkgs.obsidian
+    pkgs.mpv
+
+    # communication
+    pkgs.slack
+
+    # dev tools
+    pkgs.ferdium
+    pkgs.bruno
+  ];
+}

hosts/test/default.nix

@@ -27,6 +27,8 @@ in {
 
   system.stateVersion = "24.05";
 
+  programs.zsh.enable = true;
+
   users.users.naps62 = {
     isNormalUser = true;
     description = "Miguel Palhas";