formatted

This commit is contained in:
2025-03-18 03:33:27 -05:00
parent 9c2e5587cf
commit e9c321b8e2
15 changed files with 885 additions and 699 deletions

View File

@@ -1,4 +1,11 @@
{ pkgs, customPackageOverlay, stateVersion, modulesPath, hostname, ... }:
{
pkgs,
customPackageOverlay,
stateVersion,
modulesPath,
hostname,
...
}:
let
custom-fonts = import ../fonts { inherit pkgs; };
@@ -20,7 +27,7 @@ in
# Enable integration with Docker Desktop (needs to be installed)
# docker-desktop.enable = true;
# nativeSystemd = true;
# nativeSystemd = true;
wslConf.interop.appendWindowsPath = false;
@@ -34,7 +41,6 @@ in
experimental-features = nix-command flakes
'';
nixpkgs.overlays = [
customPackageOverlay
];
@@ -46,7 +52,10 @@ in
isNormalUser = true;
home = "/home/deepak";
description = "Deepak Mallubhotla";
extraGroups = [ "wheel" "networkmanager" ]; # Enable sudo for the user.
extraGroups = [
"wheel"
"networkmanager"
]; # Enable sudo for the user.
shell = pkgs.zsh;
};
@@ -65,7 +74,7 @@ in
# try this out to fix WSL issue
# environment.noXlibs = false;
fonts.packages = with pkgs; [
fira-code
fira-code-symbols
@@ -73,7 +82,6 @@ in
custom-fonts.custom-fonts
];
programs.gnupg.agent = {
enable = true;
pinentryPackage = pkgs.pinentry-qt;

View File

@@ -1,125 +1,140 @@
{ lib, inputs, nixpkgs-24-05, homeManager, homeManager-24-05, NixOS-WSL-2405, customPackageOverlay, ... }:
let
linuxSystem = "x86_64-linux";
nixpkgs-unstable = import inputs.nixpkgs {
system = linuxSystem;
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"claude-code"
];
};
in
{
"maxos" = lib.nixosSystem {
system = linuxSystem;
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
};
modules = [
./maxos/configuration.nix
homeManager.nixosModules.home-manager {
home-manager.extraSpecialArgs = {
withGUI = true;
gitSigningKey = "976F3357369149AB";
rundirnum = "1000";
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [ ../home/deepak/home.nix ];
};
}
];
};
"nixosWalrus" = inputs.nixpkgs-24-11.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
hostname = "nixosWalrus";
stateVersion = "24.11";
};
modules = [
./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops
inputs.homeManager-24-11.nixosModules.home-manager {
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "8F904A3FC7021497";
inherit nixpkgs-unstable;
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [
../home/deepak/home.nix
];
};
home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
}
lib,
inputs,
nixpkgs-24-05,
homeManager,
homeManager-24-05,
NixOS-WSL-2405,
customPackageOverlay,
...
}:
let
linuxSystem = "x86_64-linux";
nixpkgs-unstable = import inputs.nixpkgs {
system = linuxSystem;
config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
"claude-code"
];
};
in
{
"maxos" = lib.nixosSystem {
system = linuxSystem;
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
};
modules = [
./maxos/configuration.nix
homeManager.nixosModules.home-manager
{
home-manager.extraSpecialArgs = {
withGUI = true;
gitSigningKey = "976F3357369149AB";
rundirnum = "1000";
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [ ../home/deepak/home.nix ];
};
}
];
};
"nixosWalrus" = inputs.nixpkgs-24-11.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
hostname = "nixosWalrus";
stateVersion = "24.11";
};
modules = [
./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops
inputs.homeManager-24-11.nixosModules.home-manager
{
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "8F904A3FC7021497";
inherit nixpkgs-unstable;
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [
../home/deepak/home.nix
];
};
home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
inputs.NixOS-WSL-2411.nixosModules.wsl
];
};
"nixosWSL" = nixpkgs-24-05.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
hostname = "nixosWSL";
stateVersion = "22.05";
};
modules = [
./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops
homeManager-24-05.nixosModules.home-manager {
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "8F904A3FC7021497";
inherit nixpkgs-unstable;
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [
../home/deepak/home.nix
];
};
home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
}
}
NixOS-WSL-2405.nixosModules.wsl
];
};
"nixosEggYoke" = inputs.nixpkgs-24-11.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
hostname = "nixosEggYoke";
stateVersion = "22.05";
};
modules = [
./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops
inputs.homeManager-24-11.nixosModules.home-manager {
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "47831B15427F5A55";
inherit nixpkgs-unstable;
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [ ../home/deepak/home.nix ];
};
home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
}
inputs.NixOS-WSL-2411.nixosModules.wsl
];
};
inputs.NixOS-WSL-2411.nixosModules.wsl
];
};
"nixosWSL" = nixpkgs-24-05.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
hostname = "nixosWSL";
stateVersion = "22.05";
};
modules = [
./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops
homeManager-24-05.nixosModules.home-manager
{
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "8F904A3FC7021497";
inherit nixpkgs-unstable;
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [
../home/deepak/home.nix
];
};
home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
}
NixOS-WSL-2405.nixosModules.wsl
];
};
"nixosEggYoke" = inputs.nixpkgs-24-11.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit customPackageOverlay;
inherit nixpkgs-unstable;
hostname = "nixosEggYoke";
stateVersion = "22.05";
};
modules = [
./commonWSL-configuration.nix
inputs.sops-nix.nixosModules.sops
inputs.homeManager-24-11.nixosModules.home-manager
{
home-manager.extraSpecialArgs = {
withGUI = false;
gitSigningKey = "47831B15427F5A55";
inherit nixpkgs-unstable;
};
home-manager.useGlobalPkgs = true;
home-manager.users.deepak = {
imports = [ ../home/deepak/home.nix ];
};
home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
}
inputs.NixOS-WSL-2411.nixosModules.wsl
];
};
}

View File

@@ -8,10 +8,10 @@ let
custom-fonts = import ../../fonts { inherit pkgs; };
in
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
nix = {
package = pkgs.nixFlakes;
@@ -97,14 +97,19 @@ in
isNormalUser = true;
home = "/home/deepak";
description = "Deepak Mallubhotla";
extraGroups = [ "wheel" "networkmanager" "docker" ]; # Enable sudo for the user.
extraGroups = [
"wheel"
"networkmanager"
"docker"
]; # Enable sudo for the user.
shell = pkgs.zsh;
};
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
wget vim
wget
vim
firefox
git
pinentry
@@ -135,7 +140,6 @@ in
# Optional (default: 41641):
services.tailscale.port = 62532;
# List services that you want to enable:
# Enable the OpenSSH daemon.

View File

@@ -1,33 +1,48 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" "wl" ];
boot.kernelModules = [
"kvm-intel"
"wl"
];
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/6d9433c6-2dab-4936-a924-d0a205381189";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/6d9433c6-2dab-4936-a924-d0a205381189";
fsType = "ext4";
};
boot.initrd.luks.devices."nixosroot".device = "/dev/disk/by-uuid/3b0d4c02-d9e5-44ab-8461-30797547ed70";
boot.initrd.luks.devices."nixosroot".device =
"/dev/disk/by-uuid/3b0d4c02-d9e5-44ab-8461-30797547ed70";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/67E3-17ED";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/67E3-17ED";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/1e0f60e9-cf43-451d-8466-81887f27c7cf"; }
];
swapDevices = [
{ device = "/dev/disk/by-uuid/1e0f60e9-cf43-451d-8466-81887f27c7cf"; }
];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
}

View File

@@ -1,4 +1,9 @@
{ pkgs, customPackageOverlay, modulesPath, ... }:
{
pkgs,
customPackageOverlay,
modulesPath,
...
}:
let
custom-fonts = import ../../fonts { inherit pkgs; };
@@ -34,7 +39,6 @@ in
experimental-features = nix-command flakes
'';
nixpkgs.overlays = [
customPackageOverlay
];
@@ -46,7 +50,10 @@ in
isNormalUser = true;
home = "/home/deepak";
description = "Deepak Mallubhotla";
extraGroups = [ "wheel" "networkmanager" ]; # Enable sudo for the user.
extraGroups = [
"wheel"
"networkmanager"
]; # Enable sudo for the user.
shell = pkgs.zsh;
};
@@ -65,7 +72,7 @@ in
# try this out to fix WSL issue
environment.noXlibs = false;
fonts.packages = with pkgs; [
fira-code
fira-code-symbols
@@ -73,7 +80,6 @@ in
custom-fonts.custom-fonts
];
programs.gnupg.agent = {
enable = true;
pinentryPackage = pkgs.pinentry-qt;
@@ -85,5 +91,4 @@ in
# Optional (default: 41641):
services.tailscale.port = 62532;
}

View File

@@ -1,4 +1,9 @@
{ pkgs, customPackageOverlay, modulesPath, ... }:
{
pkgs,
customPackageOverlay,
modulesPath,
...
}:
let
custom-fonts = import ../../fonts { inherit pkgs; };
@@ -34,7 +39,6 @@ in
experimental-features = nix-command flakes
'';
nixpkgs.overlays = [
customPackageOverlay
];
@@ -46,7 +50,10 @@ in
isNormalUser = true;
home = "/home/deepak";
description = "Deepak Mallubhotla";
extraGroups = [ "wheel" "networkmanager" ]; # Enable sudo for the user.
extraGroups = [
"wheel"
"networkmanager"
]; # Enable sudo for the user.
shell = pkgs.zsh;
};
@@ -65,7 +72,7 @@ in
# Fix of WSL issue
environment.noXlibs = false;
fonts.packages = with pkgs; [
fira-code
fira-code-symbols
@@ -73,10 +80,9 @@ in
custom-fonts.custom-fonts
];
programs.gnupg.agent = {
enable = true;
pinentryPackage = pkgs.pinentry-qt;
pinentryPackage = pkgs.pinentry-qt;
enableSSHSupport = true;
};
@@ -85,5 +91,4 @@ in
# Optional (default: 41641):
services.tailscale.port = 62532;
}