push

navi/configuration.nix

@@ -1,83 +1,46 @@
+{ config, pkgs, ... }:
 {
-  pkgs,
-  lib,
-  ...
-}: {
   imports = [
     ./hardware-configuration.nix
   ];
 
+  # Bootloader
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelParams = ["transparent_hugepage=never"];
-
+  programs.dconf.enable = true;
+  # Hostname
   networking.hostName = "navi";
   networking.networkmanager.enable = true;
 
-  services.mullvad-vpn = {
-    enable = true;
-    package = pkgs.mullvad-vpn;
-  };
-  services.resolved.enable = true;
-
-  virtualisation.vmware.host.enable = true;
-
+  # Timezone & locale
   time.timeZone = "Asia/Jerusalem";
-  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.defaultLocale = "en_IL";
   i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
+    LC_ADDRESS        = "he_IL.UTF-8";
+    LC_IDENTIFICATION = "he_IL.UTF-8";
+    LC_MEASUREMENT    = "he_IL.UTF-8";
+    LC_MONETARY       = "he_IL.UTF-8";
+    LC_NAME           = "he_IL.UTF-8";
+    LC_NUMERIC        = "he_IL.UTF-8";
+    LC_PAPER          = "he_IL.UTF-8";
+    LC_TELEPHONE      = "he_IL.UTF-8";
+    LC_TIME           = "he_IL.UTF-8";
   };
 
-  programs.bash = {
+  # X11 + i3 (no GNOME)
+  services.xserver = {
     enable = true;
-    completion.enable = true;
-    interactiveShellInit = ''
-      eval "$(${pkgs.starship}/bin/starship init bash)"
-    '';
-  };
-
-  services.desktopManager.gnome.enable = true;
-
-  programs.hyprland = {
-    enable = true;
-    withUWSM = true;
-    xwayland.enable = true;
-  };
-
-  xdg.portal = {
-    enable = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-hyprland
-      xdg-desktop-portal-gtk
-    ];
-  };
-
-  programs.regreet.enable = true;
-
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      command = "${pkgs.greetd.regreet}/bin/regreet";
-      user = "greeter";
+    windowManager.i3.enable = true;
+    displayManager.lightdm.enable = true;
+    xkb = {
+      layout = "us";
+      variant = "";
     };
   };
 
-  services.xserver.xkb = {
-    layout = "us,il";
-    variant = "";
-  };
-
-  services.pulseaudio.enable = false;
-  programs.dconf.enable = true;
+  # Sound
   security.rtkit.enable = true;
+  services.pulseaudio.enable = false;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -85,39 +48,25 @@
     pulse.enable = true;
   };
 
+  services.printing.enable = true;
+
+  # User
   users.users.laniakea = {
     isNormalUser = true;
     description = "laniakea";
-    extraGroups = ["networkmanager" "wheel" "input" "adbusers" "plugdev"];
+    extraGroups = [ "networkmanager" "wheel" ];
+  };
+
+  # home-manager as NixOS module
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.laniakea = import ./navi/default.nix;
   };
 
   programs.firefox.enable = true;
-
   nixpkgs.config.allowUnfree = true;
+  environment.systemPackages = with pkgs; [ git ];
 
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
-  programs.nh = {
-    enable = true;
-    clean.enable = true;
-    clean.extraArgs = "--keep-since 4d --keep 3";
-    flake = "/etc/nixos";
-  };
-
-  programs.gnupg.agent = {
-    enable = true;
-    pinentryPackage = pkgs.pinentry-gnome3;
-  };
-
-  services.udev.extraRules = ''
-    KERNEL=="hidraw*", ATTRS{idVendor}=="fc32", ATTRS{idProduct}=="0287", MODE="0666", GROUP="input"
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="fc32", ATTRS{idProduct}=="0287", MODE="0666", GROUP="input"
-  '';
-
-  services.udev.packages = with pkgs; [
-    vial
-    via
-  ];
-
-  system.stateVersion = "24.11";
+ 
 }