398 current 2025-05-22 01:40:26 25.05.20250424.f771eb4 6.12.24 *

hosts/rq/configuration.nix

@@ -17,39 +17,38 @@ in {
     ../../system/system.nix
   ];
 
-  options.res = lib.mkOption {
+  options = {
-    type = lib.types.str;
+    res = lib.mkOption {
-    default = "1920x1080";
+      type = lib.types.str;
-    description = "screen resolution";
+      default = "1920x1080";
-  };
+      description = "screen resolution";
+    };
 
-  options.zsh_remote = lib.mkOption {
+    zsh_remote = lib.mkOption {
-    type = lib.types.str;
+      type = lib.types.str;
-    default = "1920x1080";
+      default = "1920x1080";
-    description = "zsh remote secret";
+      description = "zsh remote secret";
+    };
   };
 
   config = {
+    networking.hostName = "rq"; # Define your hostname.
+    res = "2560x1440";
+
     home-manager = {
       useGlobalPkgs = true;
       useUserPackages = true;
       backupFileExtension = "backup";
-      # sharedModules = [agenix.homeManagerModules.default];
-      # extraSpecialArgs = {inherit (config);};
-      # users.synchronous.imports = [
-      # ({
-      # config,
-      # lib,
-      # ...
-      # }:
-      # import ../../home/home.nix {
-      # inherit config pkgs lib;
-      # })
-      # ];
       users.synchronous.imports = [../../home/home.nix];
     };
 
-    res = "2560x1440";
+    # Bootloader.
+    boot.loader.grub.enable = true;
+    boot.loader.grub.device = "/dev/nvme0n1";
+    boot.loader.grub.useOSProber = true;
+    boot.loader.grub.version = 2;
+    services.logind.lidSwitchExternalPower = "ignore";
+
     age = {
       secrets.zsh_remote = {
         file = ../../secrets/zsh_remote.age;
@@ -61,40 +60,6 @@ in {
       identityPaths = ["/home/synchronous/.ssh/id_ed25519"];
     };
 
-    # config = {
-    # res = "1366x768";
-    # };
-
-    # system.res = "1366x768";
-
-    # Bootloader.
-    boot.loader.grub.enable = true;
-    boot.loader.grub.device = "/dev/nvme0n1";
-    boot.loader.grub.useOSProber = true;
-    boot.loader.grub.version = 2;
-    services.logind.lidSwitchExternalPower = "ignore";
-
-    services.udisks2.enable = true;
-
-    virtualisation.docker = {
-      enable = true;
-      enableOnBoot = true;
-      liveRestore = false;
-    };
-
-    virtualisation.libvirtd.enable = true;
-    programs.virt-manager.enable = true;
-
-    xdg.mime.defaultApplications = {
-      "application/pdf" = "firefox.desktop";
-      "text/html" = "firefox.desktop";
-      "text/markdown" = "firefox.desktop";
-      "text/x-markdown" = "firefox.desktop";
-      "x-scheme-handler/about" = "firefox.desktop";
-      "x-scheme-handler/http" = "firefox.desktop";
-      "x-scheme-handler/https" = "firefox.desktop";
-      "x-scheme-handler/unknown" = "firefox.desktop";
-    };
     #boot = {
     #  loader.systemd-boot = {
     #    enable = true;
@@ -106,76 +71,10 @@ in {
     # boot.loader.efi.canTouchEfiVariables = true;
     # boot.loader.grub.enable = false;
 
-    networking.hostName = "rq"; # Define your hostname.
-    # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-    nix = {
-      nixPath = [
-        "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
-        "nixos-config=/home/synchronous/nix-cfg/configuration.nix"
-        "/nix/var/nix/profiles/per-user/root/channels"
-      ];
-
-      settings = {
-        experimental-features = ["nix-command" "flakes"];
-        substituters = [
-          "https://nix-community.cachix.org"
-        ];
-        trusted-public-keys = [
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        ];
-      };
-    };
-
     # Configure network proxy if necessary
     # networking.proxy.default = "http://user:password@proxy:port/";
     # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-    # Enable networking
-    networking.networkmanager.enable = true;
-
-    # Set your time zone.
-    time.timeZone = "America/New_York";
-
-    # Select internationalisation properties.
-    i18n.defaultLocale = "en_US.UTF-8";
-
-    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";
-    };
-
-    # Enable CUPS to print documents.
-    services.printing.enable = true;
-    hardware.bluetooth.enable = true;
-    programs.dconf.enable = true;
-
-    # Enable sound with pipewire.
-    hardware.pulseaudio.enable = false;
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      # If you want to use JACK applications, uncomment this
-      #jack.enable = true;
-
-      # use the example session manager (no others are packaged yet so this is enabled by default,
-      # no need to redefine it in your config for now)
-      #media-session.enable = true;
-    };
-
-    # Enable touchpad support (enabled default in most desktopManager).
-    # services.xserver.libinput.enable = true;
-
     users.users.synchronous = {
       isNormalUser = true;
       description = "jake";
@@ -224,40 +123,6 @@ in {
       ];
     };
 
-    security.sudo = {
-      # me ne frego. i dare you to privilege escalate me
-      enable = true;
-      extraRules = [
-        {
-          commands = [
-            {
-              command = "/etc/profiles/per-user/synchronous/bin/rebuild";
-              options = ["NOPASSWD"];
-            }
-            {
-              command = "/home/synchronous/nix-cfg/home/scripts/nixos-rebuild.sh";
-              options = ["NOPASSWD"];
-            }
-            {
-              command = "/home/synchronous/.scripts/nixos-rebuild.sh";
-              options = ["NOPASSWD"];
-            }
-            {
-              # are you serious?
-              command = "/run/current-system/sw/bin/nixos-rebuild";
-              options = ["NOPASSWD"];
-            }
-          ];
-          users = ["synchronous"];
-        }
-      ];
-    };
-
-    # Allow unfree packages
-    nixpkgs.config.allowUnfree = true;
-
-    # List packages installed in system profile. To search, run:
-    # $ nix search wget
     environment.systemPackages = with pkgs; [
       vim
       neovim
@@ -275,13 +140,5 @@ in {
       bspwm
       # librewolf
     ];
-
-    # This value determines the NixOS release from which the default
-    # settings for stateful data, like file locations and database versions
-    # on your system were taken. It‘s perfectly fine and recommended to leave
-    # this value at the release version of the first install of this system.
-    # Before changing this value read the documentation for this option
-    # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-    system.stateVersion = "24.11"; # Did you read the comment?
   };
 }

hosts/thonkpad/configuration.nix

@@ -16,16 +16,18 @@ in {
     ../../system/system.nix
   ];
 
-  options.res = lib.mkOption {
+  options = {
-    type = lib.types.str;
+    res = lib.mkOption {
-    default = "1920x1080";
+      type = lib.types.str;
-    description = "screen resolution";
+      default = "1920x1080";
-  };
+      description = "screen resolution";
+    };
 
-  options.zsh_remote = lib.mkOption {
+    # zsh_remote = lib.mkOption {
-    type = lib.types.str;
+    # type = lib.types.str;
-    default = "1920x1080";
+    # default = "1920x1080";
-    description = "zsh remote secret";
+    # description = "zsh remote secret";
+    # };
   };
 
   config = {

hosts/yoga/configuration.nix

@@ -17,45 +17,33 @@ in {
     ../../system/system.nix
   ];
 
-  options.res = lib.mkOption {
+  options = {
-    type = lib.types.str;
+    res = lib.mkOption {
-    default = "1920x1080";
+      type = lib.types.str;
-    description = "screen resolution";
+      default = "1920x1080";
+      description = "screen resolution";
+    };
+
+    zsh_remote = lib.mkOption {
+      type = lib.types.str;
+      default = "1920x1080";
+      description = "zsh remote secret";
+    };
   };
 
-  options.zsh_remote = lib.mkOption {
-    type = lib.types.str;
-    default = "1920x1080";
-    description = "zsh remote secret";
-  };
-
-  
   config = {
     home-manager = {
       useGlobalPkgs = true;
       useUserPackages = true;
       backupFileExtension = "backup";
-      # sharedModules = [agenix.homeManagerModules.default];
-      # extraSpecialArgs = {inherit (config);};
-      # users.synchronous.imports = [
-      # ({
-      # config,
-      # lib,
-      # ...
-      # }:
-      # import ../../home/home.nix {
-      # inherit config pkgs lib;
-      # })
-      # ];
       users.synchronous.imports = [../../home/home.nix];
     };
 
     # nixPath = [
-      # "nixpkgs=${inputs.nixpkgs}" # FLAKE, NIXD
+    # "nixpkgs=${inputs.nixpkgs}" # FLAKE, NIXD
-      # "/nix/var/nix/profiles/per-user/root/channels"
+    # "/nix/var/nix/profiles/per-user/root/channels"
     # ];
 
-
     res = "1920x1080";
     age = {
       secrets.zsh_remote = {
@@ -135,7 +123,6 @@ in {
       };
     };
 
-
     # Set your time zone.
     time.timeZone = "America/New_York";
 

system/system.nix

@@ -3,6 +3,120 @@
   pkgs,
   ...
 }: {
+  # Set your time zone.
+  time.timeZone = "America/New_York";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  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";
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  virtualisation.docker = {
+    enable = true;
+    enableOnBoot = true;
+    liveRestore = false;
+  };
+
+  virtualisation.libvirtd.enable = true;
+  programs.virt-manager.enable = true;
+  services.udisks2.enable = true;
+  services.printing.enable = true;
+  hardware.bluetooth.enable = true;
+  programs.dconf.enable = true;
+
+  xdg.mime.defaultApplications = {
+    "application/pdf" = "firefox.desktop";
+    "text/html" = "firefox.desktop";
+    "text/markdown" = "firefox.desktop";
+    "text/x-markdown" = "firefox.desktop";
+    "x-scheme-handler/about" = "firefox.desktop";
+    "x-scheme-handler/http" = "firefox.desktop";
+    "x-scheme-handler/https" = "firefox.desktop";
+    "x-scheme-handler/unknown" = "firefox.desktop";
+  };
+
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  security.sudo = {
+    # me ne frego. i dare you to privilege escalate me
+    enable = true;
+    extraRules = [
+      {
+        commands = [
+          {
+            command = "/etc/profiles/per-user/synchronous/bin/rebuild";
+            options = ["NOPASSWD"];
+          }
+          {
+            command = "/home/synchronous/nix-cfg/home/scripts/nixos-rebuild.sh";
+            options = ["NOPASSWD"];
+          }
+          {
+            command = "/home/synchronous/.scripts/nixos-rebuild.sh";
+            options = ["NOPASSWD"];
+          }
+          {
+            # are you serious?
+            command = "/run/current-system/sw/bin/nixos-rebuild";
+            options = ["NOPASSWD"];
+          }
+        ];
+        users = ["synchronous"];
+      }
+    ];
+  };
+
+  nix = {
+    nixPath = [
+      "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
+      "nixos-config=/home/synchronous/nix-cfg/configuration.nix"
+      "/nix/var/nix/profiles/per-user/root/channels"
+    ];
+
+    settings = {
+      experimental-features = ["nix-command" "flakes"];
+      substituters = [
+        "https://nix-community.cachix.org"
+      ];
+      trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+    };
+  };
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.11"; # Did you read the comment?
+
   imports = [
     # ./wm/bspwm.nix
     ./xserver/default.nix