about summary refs log tree commit diff
path: root/hosts
diff options
context:
space:
mode:
authorBaitinq <manuelpalenzuelamerino@gmail.com>2024-12-30 11:35:14 +0100
committerBaitinq <manuelpalenzuelamerino@gmail.com>2024-12-30 11:35:14 +0100
commitdce2c3c26a2ff9770bbba2a00471c03ab321c472 (patch)
tree91ce56182bab4dee87fd663ea70880446a15f7e7 /hosts
parentFont: Change font style pt 1000 (diff)
downloadnixos-config-dce2c3c26a2ff9770bbba2a00471c03ab321c472.tar.gz
nixos-config-dce2c3c26a2ff9770bbba2a00471c03ab321c472.tar.bz2
nixos-config-dce2c3c26a2ff9770bbba2a00471c03ab321c472.zip
fmt
Diffstat (limited to 'hosts')
-rw-r--r--hosts/configuration.nix42
-rw-r--r--hosts/darwin.nix5
-rw-r--r--hosts/default.nix148
-rw-r--r--hosts/home-darwin.nix55
-rw-r--r--hosts/home.nix283
-rw-r--r--hosts/luna/default.nix16
-rw-r--r--hosts/luna/home.nix38
-rw-r--r--hosts/phobos/default.nix32
-rw-r--r--hosts/phobos/home.nix44
9 files changed, 384 insertions, 279 deletions
diff --git a/hosts/configuration.nix b/hosts/configuration.nix
index f71f497..1800966 100644
--- a/hosts/configuration.nix
+++ b/hosts/configuration.nix
@@ -1,6 +1,17 @@
-{ secrets, dotfiles, lib, pkgs, config, hostname, inputs, user, timezone, system, stateVersion, ... }:
 {
-
+  secrets,
+  dotfiles,
+  lib,
+  pkgs,
+  config,
+  hostname,
+  inputs,
+  user,
+  timezone,
+  system,
+  stateVersion,
+  ...
+}: {
   imports = [
     "${inputs.impermanence}/nixos.nix"
 
@@ -30,7 +41,7 @@
       timeout = 5;
     };
 
-    supportedFilesystems = [ "ntfs" ];
+    supportedFilesystems = ["ntfs"];
     tmp.useTmpfs = true;
   };
 
@@ -42,10 +53,10 @@
     extraHosts = builtins.readFile "${inputs.hosts}/hosts";
     dhcpcd.enable = true;
     resolvconf.enable = true;
-    nameservers = [ "127.0.0.1" ];
+    nameservers = ["127.0.0.1"];
     firewall = {
       enable = true;
-      allowedTCPPorts = [ 80 22 9090 ];
+      allowedTCPPorts = [80 22 9090];
       # networking.firewall.allowedUDPPorts = [ ... ];
       # Or disable the firewall altogether.
     };
@@ -67,7 +78,7 @@
 
     "${user}" = {
       isNormalUser = true;
-      extraGroups = [ "wheel" "audio" "video" ]; # Enable ‘sudo’ for the user.
+      extraGroups = ["wheel" "audio" "video"]; # Enable ‘sudo’ for the user.
       hashedPassword = secrets.baitinq.hashed_password;
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID99gQ/AgXhgwAjs+opsRXMbWpXFRT2aqAOUbN3DsrhQ (none)"
@@ -131,14 +142,14 @@
     inputs.deploy-rs.defaultPackage."${system}"
   ];
 
-  environment.defaultPackages = [ ];
+  environment.defaultPackages = [];
 
   xdg.portal = {
     enable = true;
     wlr.enable = true;
     config.common.default = "*";
     # gtk portal needed to make gtk apps happy
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+    extraPortals = [pkgs.xdg-desktop-portal-gtk];
   };
 
   security = {
@@ -158,10 +169,12 @@
         PasswordAuthentication = false;
         KbdInteractiveAuthentication = false;
       };
-      listenAddresses = [{
-        addr = "0.0.0.0";
-        port = 22;
-      }];
+      listenAddresses = [
+        {
+          addr = "0.0.0.0";
+          port = 22;
+        }
+      ];
     };
     gnome.gnome-keyring.enable = true;
     unbound.enable = true;
@@ -202,7 +215,7 @@
 
   nix = {
     registry.nixpkgs.flake = inputs.nixpkgs;
-    nixPath = [ "nixpkgs=/etc/channels/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" ];
+    nixPath = ["nixpkgs=/etc/channels/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels"];
     gc = {
       automatic = true;
       dates = "daily";
@@ -210,7 +223,7 @@
     };
     package = pkgs.nixVersions.stable;
     settings = {
-      experimental-features = [ "nix-command" "flakes" "ca-derivations" "auto-allocate-uids" ];
+      experimental-features = ["nix-command" "flakes" "ca-derivations" "auto-allocate-uids"];
       auto-optimise-store = true;
       auto-allocate-uids = true;
       max-jobs = "auto";
@@ -228,4 +241,3 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = stateVersion; # Did you read the comment?
 }
-
diff --git a/hosts/darwin.nix b/hosts/darwin.nix
index 209465b..61a9055 100644
--- a/hosts/darwin.nix
+++ b/hosts/darwin.nix
@@ -1,5 +1,8 @@
-{ pkgs, user, ... }:
 {
+  pkgs,
+  user,
+  ...
+}: {
   users.users."${user}".home = "/Users/${user}";
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/default.nix b/hosts/default.nix
index 68adebe..10d9b50 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,33 +1,63 @@
-{ lib, inputs, secrets, dotfiles, hosts, hardwares, systems, isNixOS, isMacOS, isIso, isHardware, user, nixpkgs, home-manager, nix-darwin, ... }:
-let
-  mkHost = { host, hardware, stateVersion, system, timezone, location, extraOverlays, extraModules }: isNixOS: isMacOS: isIso: isHardware:
-    let
-      pkgs = import nixpkgs {
-        inherit system;
-        config = {
-          allowUnfree = true;
-          allowBroken = true;
-          allowUnsupportedSystem = true;
-        };
-        overlays = [
+{
+  lib,
+  inputs,
+  secrets,
+  dotfiles,
+  hosts,
+  hardwares,
+  systems,
+  isNixOS,
+  isMacOS,
+  isIso,
+  isHardware,
+  user,
+  nixpkgs,
+  home-manager,
+  nix-darwin,
+  ...
+}: let
+  mkHost = {
+    host,
+    hardware,
+    stateVersion,
+    system,
+    timezone,
+    location,
+    extraOverlays,
+    extraModules,
+  }: isNixOS: isMacOS: isIso: isHardware: let
+    pkgs = import nixpkgs {
+      inherit system;
+      config = {
+        allowUnfree = true;
+        allowBroken = true;
+        allowUnsupportedSystem = true;
+      };
+      overlays =
+        [
           inputs.nur.overlays.default
           # inputs.neovim-nightly-overlay.overlay
           (import ../packages)
           (import ../overlays)
-        ] ++ extraOverlays;
-      };
+        ]
+        ++ extraOverlays;
+    };
 
-      extraArgs = { inherit pkgs inputs isIso isHardware user secrets dotfiles timezone location hardware system stateVersion; hostname = host + "-" + hardware; };
+    extraArgs = {
+      inherit pkgs inputs isIso isHardware user secrets dotfiles timezone location hardware system stateVersion;
+      hostname = host + "-" + hardware;
+    };
 
-      extraSpecialModules = extraModules ++ lib.optional isHardware  ../hardware/${hardware} ++ lib.optional isIso "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
-    in
+    extraSpecialModules = extraModules ++ lib.optional isHardware ../hardware/${hardware} ++ lib.optional isIso "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
+  in
     if isNixOS
     then
       nixpkgs.lib.nixosSystem
-        {
-          inherit system;
-          specialArgs = extraArgs;
-          modules = [
+      {
+        inherit system;
+        specialArgs = extraArgs;
+        modules =
+          [
             ./configuration.nix
             ./${host}
             home-manager.nixosModules.home-manager
@@ -38,52 +68,62 @@ let
               home-manager.users.${user} = {
                 imports = [
                   ./home.nix
-                  ./${ host }/home.nix
+                  ./${host}/home.nix
                 ];
               };
             }
             inputs.nix-index.nixosModules.nix-index
-          ] ++ extraSpecialModules;
-        }
+          ]
+          ++ extraSpecialModules;
+      }
     else if isMacOS
     then
       nix-darwin.lib.darwinSystem
-        {
-          inherit system;
-          specialArgs = extraArgs;
-          modules = [
-            ./darwin.nix
-            home-manager.darwinModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs = extraArgs;
-              home-manager.users."manuel.palenzuela" = {
-                imports = [
-                  ./home-darwin.nix
-                ];
-              };
-            }
-          ];
-        }
+      {
+        inherit system;
+        specialArgs = extraArgs;
+        modules = [
+          ./darwin.nix
+          home-manager.darwinModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.extraSpecialArgs = extraArgs;
+            home-manager.users."manuel.palenzuela" = {
+              imports = [
+                ./home-darwin.nix
+              ];
+            };
+          }
+        ];
+      }
     else
       home-manager.lib.homeManagerConfiguration
-        {
-          inherit pkgs;
-          extraSpecialArgs = extraArgs;
-          modules = [
-            ./home.nix
-            ./${ host }/home.nix
-          ];
-        };
+      {
+        inherit pkgs;
+        extraSpecialArgs = extraArgs;
+        modules = [
+          ./home.nix
+          ./${host}/home.nix
+        ];
+      };
 
   hardwarePermutatedHosts = lib.concatMap (hardware: map (host: host // hardware) hosts) hardwares;
   systemsPermutatedHosts = lib.concatMap (system: map (host: host // system) hardwarePermutatedHosts) systems;
   permutatedHosts = systemsPermutatedHosts;
 in
   /*
-    We have a list of sets.
-    Map each element of the list applying the mkHost function to its elements and returning a set in the listToAttrs format
-    builtins.listToAttrs on the result
+  We have a list of sets.
+  Map each element of the list applying the mkHost function to its elements and returning a set in the listToAttrs format
+  builtins.listToAttrs on the result
   */
-builtins.listToAttrs (map (mInput@{ host, hardware, system, ... }: { name = host + "-" + hardware + "-" + system; value = mkHost mInput isNixOS isMacOS isIso isHardware; }) permutatedHosts)
+  builtins.listToAttrs (map (mInput @ {
+      host,
+      hardware,
+      system,
+      ...
+    }: {
+      name = host + "-" + hardware + "-" + system;
+      value = mkHost mInput isNixOS isMacOS isIso isHardware;
+    })
+    permutatedHosts)
diff --git a/hosts/home-darwin.nix b/hosts/home-darwin.nix
index ce924d5..913261f 100644
--- a/hosts/home-darwin.nix
+++ b/hosts/home-darwin.nix
@@ -1,5 +1,11 @@
-{ pkgs, stateVersion, lib, dotfiles, user, ... }:
 {
+  pkgs,
+  stateVersion,
+  lib,
+  dotfiles,
+  user,
+  ...
+}: {
   imports = [
   ];
 
@@ -12,41 +18,42 @@
     ];
   };
 
-  services = { };
+  services = {};
 
   programs = {
     emacs = {
       enable = true;
-      extraPackages = epkgs: with epkgs; [
-        use-package
+      extraPackages = epkgs:
+        with epkgs; [
+          use-package
 
-        direnv
+          direnv
 
-        evil
-        evil-collection
+          evil
+          evil-collection
 
-        doom-modeline
-        dashboard
+          doom-modeline
+          dashboard
 
-        projectile
-        lsp-ui
+          projectile
+          lsp-ui
 
-        lsp-bridge
-        rust-mode
-        rustic
-        company
-        flycheck
-        lsp-haskell
+          lsp-bridge
+          rust-mode
+          rustic
+          company
+          flycheck
+          lsp-haskell
 
-        nix-mode
-        haskell-mode
-        typescript-mode
-        jq-mode
+          nix-mode
+          haskell-mode
+          typescript-mode
+          jq-mode
 
-        doom-themes
+          doom-themes
 
-        dired-sidebar
-      ];
+          dired-sidebar
+        ];
       extraConfig = builtins.readFile "${dotfiles}/.emacs";
     };
   };
diff --git a/hosts/home.nix b/hosts/home.nix
index aff09f4..8c21be9 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -1,5 +1,16 @@
-{ config, lib, pkgs, inputs, user, hostname, secrets, dotfiles, location, stateVersion, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  inputs,
+  user,
+  hostname,
+  secrets,
+  dotfiles,
+  location,
+  stateVersion,
+  ...
+}: {
   imports = [
     ../modules/email
   ];
@@ -8,71 +19,72 @@
     username = "${user}";
     homeDirectory = "/home/${user}";
 
-    packages = with pkgs; [
-      scrot
-      redshift
-      discord
-      tdesktop
-      mpv
-      sxiv
-      #dwm
-      #st
-      alacritty
-      # ghostty
-      dmenu
-      unclutter
-      clipmenu
-      dunst
-      sxhkd
-      zathura
-      feh
-      pavucontrol
-      polkit_gnome
-      nixpkgs-fmt
-      virt-manager
-      xmonadctl
-      xdotool #needed for xmobar clickable workspaces
-      xlockmore
-      arandr
-      # jrnl
-      # todo-txt-cli
-      # element-desktop
-      speedtest-cli
-      libnotify
-      dwmbar
-      manga-cli
-      mov-cli
-      calibre
-      kcc
-      slack
-      openvpn
-      smart-wallpaper
-      waybar
-      wl-clipboard
-      sway
-      swayidle
-      swaylock-effects
-      swaybg
-      river
-      wlr-randr
-      wlsunset
-      vscode
-      chromium
-      grim
-      qbittorrent
-      slurp
-      appimage-run
-      google-cloud-sdk
-      ghidra
-      ollama
-      kubectl
-      kubectx
-      kubernetes-helm
-    ] ++
-    (with pkgs.custom; [
-      lemacs
-      kindlegen
-    ]);
+    packages = with pkgs;
+      [
+        scrot
+        redshift
+        discord
+        tdesktop
+        mpv
+        sxiv
+        #dwm
+        #st
+        alacritty
+        # ghostty
+        dmenu
+        unclutter
+        clipmenu
+        dunst
+        sxhkd
+        zathura
+        feh
+        pavucontrol
+        polkit_gnome
+        nixpkgs-fmt
+        virt-manager
+        xmonadctl
+        xdotool #needed for xmobar clickable workspaces
+        xlockmore
+        arandr
+        # jrnl
+        # todo-txt-cli
+        # element-desktop
+        speedtest-cli
+        libnotify
+        dwmbar
+        manga-cli
+        mov-cli
+        calibre
+        kcc
+        slack
+        openvpn
+        smart-wallpaper
+        waybar
+        wl-clipboard
+        sway
+        swayidle
+        swaylock-effects
+        swaybg
+        river
+        wlr-randr
+        wlsunset
+        vscode
+        chromium
+        grim
+        qbittorrent
+        slurp
+        appimage-run
+        google-cloud-sdk
+        ghidra
+        ollama
+        kubectl
+        kubectx
+        kubernetes-helm
+      ]
+      ++ (with pkgs.custom; [
+        lemacs
+        kindlegen
+      ]);
   };
 
   xsession.windowManager.xmonad = {
@@ -106,7 +118,7 @@
       enable = true;
       enableSshSupport = true;
       enableExtraSocket = true;
-      sshKeys = [ "BC10A40920B576F641480795B9C7E01A4E47DA9F" ];
+      sshKeys = ["BC10A40920B576F641480795B9C7E01A4E47DA9F"];
       defaultCacheTtl = 43200; #12h
       defaultCacheTtlSsh = 43200;
       maxCacheTtl = 86400; #24h
@@ -145,7 +157,7 @@
       extraConfig = {
         push.autoSetupRemote = true;
         init.defaultBranch = "master";
-        safe.directory = [ "*" ];
+        safe.directory = ["*"];
         sendemail = {
           smtpserver = "smtp.gmail.com";
           smtpserverport = "587";
@@ -163,43 +175,44 @@
 
     emacs = {
       enable = true;
-      extraPackages = epkgs: with epkgs; [
-        direnv
-        which-key
+      extraPackages = epkgs:
+        with epkgs; [
+          direnv
+          which-key
 
-        evil
-        evil-collection
+          evil
+          evil-collection
 
-        general
+          general
 
-        doom-modeline
-        doom-themes
-        dashboard
+          doom-modeline
+          doom-themes
+          dashboard
 
-        projectile
+          projectile
 
-        corfu
-        kind-icon
-        eldoc-box
+          corfu
+          kind-icon
+          eldoc-box
 
-        vertico
-        consult
-        orderless
-        marginalia
+          vertico
+          consult
+          orderless
+          marginalia
 
-        treesit-auto
+          treesit-auto
 
-        go-mode
-        gotest
-        rustic
+          go-mode
+          gotest
+          rustic
 
-        treemacs
-        minimap
-        centaur-tabs
+          treemacs
+          minimap
+          centaur-tabs
 
-        shell-pop
-        eat
-      ];
+          shell-pop
+          eat
+        ];
       extraConfig = builtins.readFile "${dotfiles}/.emacs";
     };
 
@@ -217,50 +230,50 @@
         extraConfig = lib.strings.concatStrings [
           (builtins.readFile "${inputs.arkenfox-userjs}/user.js")
           ''
-	    // Re-enables URL usages as a search bar.
-            /* 0801 */ user_pref("keyword.enabled", true);
-	    user_pref("browser.search.suggest.enabled", true);    // 0804: live search suggestions
-	    // Re-allows COPY / CUT from "non-privileged" content as it actually breaks many websites.
-            /* 2404 */ user_pref("dom.allow_cut_copy", true);
-            // Disables RFP letter-boxing to avoid big white borders on screen.
-            /* 4504 */ user_pref("privacy.resistFingerprinting.letterboxing", false);
-	    // Set UI density to normal
-            user_pref("browser.uidensity", 0);
-            // DRM content :(
-            user_pref("media.gmp-widevinecdm.enabled", true);
-            user_pref("media.eme.enabled", true);
-	    user_pref("webgl.disabled", false); // 4520
-            user_pref("network.http.referer.XOriginTrimmingPolicy", 0);
-	    user_pref("privacy.clearOnShutdown.history", false); // 2811: don't clear history on close
-	    user_pref("browser.startup.page", 3);                 // 0102: enable session restore
-	    user_pref("signon.rememberSignons", true);           // 5003: enable saving passwords
-	    /* [UX,-HIST] Remember more closed tabs for undo. */
-            user_pref("browser.sessionstore.max_tabs_undo", 27);                    // 1020
-            /* [UX,-HIST] Restore all state for closed tab or previous session after Firefox restart. */
-            user_pref("browser.sessionstore.privacy_level", 0);                     // 1021
-            user_pref("browser.sessionstore.interval", 15000);                      // 1023
-            /* [UX,-HIST] Enable search and form history. */
-            user_pref("browser.formfill.enable", true);                             // 0860
-            user_pref("general.autoScroll", true);
-	    //user_pref("network.cookie.lifetimePolicy", 0); //keep cookies 2801
-	    user_pref("network.cookie.cookieBehavior", 5); // 2701
-	    user_pref("privacy.clearOnShutdown.offlineApps", false);
-            user_pref("privacy.cpd.offlineApps", false);
-	    user_pref("privacy.cpd.history", false); // 2812 to match when you use Ctrl-Shift-Del
-	    user_pref("privacy.clearOnShutdown.cookies", false);
-	    user_pref("privacy.clearOnShutdown.downloads", false);
-	    user_pref("privacy.clearOnShutdown.formdata", false);
-	    user_pref("privacy.clearOnShutdown.sessions", false);
-	    user_pref("extensions.pocket.enabled", false);        // 0900: disable Pocket
-	    user_pref("_user.js.baitinq", "Survived the overrides :)");
-	  ''
+            // Re-enables URL usages as a search bar.
+                   /* 0801 */ user_pref("keyword.enabled", true);
+            user_pref("browser.search.suggest.enabled", true);    // 0804: live search suggestions
+            // Re-allows COPY / CUT from "non-privileged" content as it actually breaks many websites.
+                   /* 2404 */ user_pref("dom.allow_cut_copy", true);
+                   // Disables RFP letter-boxing to avoid big white borders on screen.
+                   /* 4504 */ user_pref("privacy.resistFingerprinting.letterboxing", false);
+            // Set UI density to normal
+                   user_pref("browser.uidensity", 0);
+                   // DRM content :(
+                   user_pref("media.gmp-widevinecdm.enabled", true);
+                   user_pref("media.eme.enabled", true);
+            user_pref("webgl.disabled", false); // 4520
+                   user_pref("network.http.referer.XOriginTrimmingPolicy", 0);
+            user_pref("privacy.clearOnShutdown.history", false); // 2811: don't clear history on close
+            user_pref("browser.startup.page", 3);                 // 0102: enable session restore
+            user_pref("signon.rememberSignons", true);           // 5003: enable saving passwords
+            /* [UX,-HIST] Remember more closed tabs for undo. */
+                   user_pref("browser.sessionstore.max_tabs_undo", 27);                    // 1020
+                   /* [UX,-HIST] Restore all state for closed tab or previous session after Firefox restart. */
+                   user_pref("browser.sessionstore.privacy_level", 0);                     // 1021
+                   user_pref("browser.sessionstore.interval", 15000);                      // 1023
+                   /* [UX,-HIST] Enable search and form history. */
+                   user_pref("browser.formfill.enable", true);                             // 0860
+                   user_pref("general.autoScroll", true);
+            //user_pref("network.cookie.lifetimePolicy", 0); //keep cookies 2801
+            user_pref("network.cookie.cookieBehavior", 5); // 2701
+            user_pref("privacy.clearOnShutdown.offlineApps", false);
+                   user_pref("privacy.cpd.offlineApps", false);
+            user_pref("privacy.cpd.history", false); // 2812 to match when you use Ctrl-Shift-Del
+            user_pref("privacy.clearOnShutdown.cookies", false);
+            user_pref("privacy.clearOnShutdown.downloads", false);
+            user_pref("privacy.clearOnShutdown.formdata", false);
+            user_pref("privacy.clearOnShutdown.sessions", false);
+            user_pref("extensions.pocket.enabled", false);        // 0900: disable Pocket
+            user_pref("_user.js.baitinq", "Survived the overrides :)");
+          ''
         ];
       };
     };
 
-    rtorrent = { enable = true; };
+    rtorrent = {enable = true;};
 
-    obs-studio = { enable = true; };
+    obs-studio = {enable = true;};
 
     bash = {
       enable = true;
@@ -375,7 +388,6 @@
         bindkey "\e\x7f" backward-kill-word
       '';
     };
-
   };
 
   xdg = {
@@ -415,5 +427,4 @@
   xdg.userDirs.desktop = "$HOME/";
 
   home.stateVersion = stateVersion;
-
 }
diff --git a/hosts/luna/default.nix b/hosts/luna/default.nix
index 2fde132..0bb60f6 100644
--- a/hosts/luna/default.nix
+++ b/hosts/luna/default.nix
@@ -1,6 +1,14 @@
-{ config, pkgs, lib, secrets, hostname, inputs, user, ... }: {
-
-  imports = [ ];
+{
+  config,
+  pkgs,
+  lib,
+  secrets,
+  hostname,
+  inputs,
+  user,
+  ...
+}: {
+  imports = [];
 
   services = {
     # Configure keymap in X11
@@ -25,6 +33,4 @@
 
   environment.systemPackages = with pkgs; [
   ];
-
 }
-
diff --git a/hosts/luna/home.nix b/hosts/luna/home.nix
index 1169b3c..b230601 100644
--- a/hosts/luna/home.nix
+++ b/hosts/luna/home.nix
@@ -1,12 +1,23 @@
-{ config, lib, pkgs, inputs, user, hostname, location, secrets, dotfiles, ... }:
 {
-  home.packages = with pkgs; [
-    xorg.xmodmap
-    trackma
-    adl
-  ] ++
-  (with pkgs.custom; [
-  ]);
+  config,
+  lib,
+  pkgs,
+  inputs,
+  user,
+  hostname,
+  location,
+  secrets,
+  dotfiles,
+  ...
+}: {
+  home.packages = with pkgs;
+    [
+      xorg.xmodmap
+      trackma
+      adl
+    ]
+    ++ (with pkgs.custom; [
+      ]);
 
   programs.firefox.profiles.default.settings = {
     "gfx.webrender.all" = true;
@@ -38,12 +49,12 @@
     '';
 
     "sxhkd/sxhkdrc".text =
-      builtins.readFile "${dotfiles}/sxhkd/xmonad" +
-      builtins.readFile "${dotfiles}/sxhkd/base" +
-      ''
-      
+      builtins.readFile "${dotfiles}/sxhkd/xmonad"
+      + builtins.readFile "${dotfiles}/sxhkd/base"
+      + ''
+
         #enter and leave game mode
-        alt + shift + F11: ctrl + shift + F11 
+        alt + shift + F11: ctrl + shift + F11
           pkill -ALRM sxhkd
 
         # Make sxhkd reload its configuration files
@@ -158,5 +169,4 @@
     ! bind Super+L to search
     keycode  133 = XF86Search
   '';
-
 }
diff --git a/hosts/phobos/default.nix b/hosts/phobos/default.nix
index b8d6f69..b30bf1e 100644
--- a/hosts/phobos/default.nix
+++ b/hosts/phobos/default.nix
@@ -1,5 +1,13 @@
-{ config, pkgs, lib, secrets, hostname, inputs, user, ... }: {
-
+{
+  config,
+  pkgs,
+  lib,
+  secrets,
+  hostname,
+  inputs,
+  user,
+  ...
+}: {
   imports = [
     ../../modules/bluetooth
   ];
@@ -19,18 +27,18 @@
     # proxy.noProxy = "127.0.0.1,localhost,internal.domain";
   };
 
-  environment.systemPackages = with pkgs;
-    [
-    ];
+  environment.systemPackages = with pkgs; [
+  ];
 
   programs = {
     steam.enable = true;
   };
 
-  /*  services.udev.extraRules = ''
-    SUBSYSTEM=="input", ACTION=="add", ATTRS{bInterfaceProtocol}=="02", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceSubClass}=="01", ENV{DISPLAY}=":0", ENV{XAUTHORITY}="/home/${user}/.Xauthority", RUN+="${pkgs.xorg.xf86inputsynaptics}/bin/synclient TouchpadOff=1"
-    SUBSYSTEM=="input", ACTION=="remove", ATTRS{bInterfaceProtocol}=="02", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceSubClass}=="01", ENV{DISPLAY}=":0", ENV{XAUTHORITY}="/home/${user}/.Xauthority", RUN+="${pkgs.xorg.xf86inputsynaptics}/bin/synclient TouchpadOff=0"
-    '';
+  /*
+    services.udev.extraRules = ''
+  SUBSYSTEM=="input", ACTION=="add", ATTRS{bInterfaceProtocol}=="02", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceSubClass}=="01", ENV{DISPLAY}=":0", ENV{XAUTHORITY}="/home/${user}/.Xauthority", RUN+="${pkgs.xorg.xf86inputsynaptics}/bin/synclient TouchpadOff=1"
+  SUBSYSTEM=="input", ACTION=="remove", ATTRS{bInterfaceProtocol}=="02", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceSubClass}=="01", ENV{DISPLAY}=":0", ENV{XAUTHORITY}="/home/${user}/.Xauthority", RUN+="${pkgs.xorg.xf86inputsynaptics}/bin/synclient TouchpadOff=0"
+  '';
   */
 
   services.boinc = {
@@ -38,8 +46,6 @@
     dataDir = "/var/lib/boinc";
   };
 
-  users.users.${user}.extraGroups = [ "boinc" ];
-  users.users.boinc.extraGroups = [ "video" ];
-
+  users.users.${user}.extraGroups = ["boinc"];
+  users.users.boinc.extraGroups = ["video"];
 }
-
diff --git a/hosts/phobos/home.nix b/hosts/phobos/home.nix
index 4dd57fd..a74ab86 100644
--- a/hosts/phobos/home.nix
+++ b/hosts/phobos/home.nix
@@ -1,15 +1,26 @@
-{ config, lib, pkgs, inputs, user, hostname, location, secrets, dotfiles, ... }:
 {
-  home.packages = with pkgs; [
-    minecraft
-    trackma
-    adl
-    jetbrains.idea-community
-    gimp
-    godot_4
-  ] ++
-  (with pkgs.custom; [
-  ]);
+  config,
+  lib,
+  pkgs,
+  inputs,
+  user,
+  hostname,
+  location,
+  secrets,
+  dotfiles,
+  ...
+}: {
+  home.packages = with pkgs;
+    [
+      minecraft
+      trackma
+      adl
+      jetbrains.idea-community
+      gimp
+      godot_4
+    ]
+    ++ (with pkgs.custom; [
+      ]);
 
   programs.firefox.profiles.default.settings = {
     "gfx.webrender.all" = true;
@@ -41,13 +52,13 @@
     '';
 
     "sxhkd/sxhkdrc".text =
-      builtins.readFile "${dotfiles}/sxhkd/xmonad" +
-      builtins.readFile "${dotfiles}/sxhkd/base" +
-      ''
-      
+      builtins.readFile "${dotfiles}/sxhkd/xmonad"
+      + builtins.readFile "${dotfiles}/sxhkd/base"
+      + ''
+
         # Not supported by swhkd
         #enter and leave game mode
-        #alt + shift + F11: ctrl + shift + F11 
+        #alt + shift + F11: ctrl + shift + F11
         #    pkill -ALRM sxhkd
 
         # Make sxhkd reload its configuration files
@@ -116,5 +127,4 @@
         #	exec ~/.config/i3/scripts/toggletouchpad.sh
       '';
   };
-
 }