marty/config.nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: marty:69242277a163edace8a16da36e444af4c74479c4
Branches Tags
marty:main
...
compare: marty:3fea6b47f31bd5f769dc1168a9837c0d47240f3c
Branches Tags
marty:main

2 commits
69242277a1 ... 3fea6b47f3

Author SHA1 Message Date
marty
3fea6b47f3 hoe manager part 3 2025-12-17 16:36:05 +00:00
marty
00c7b72fcd laptop lives! 2025-12-17 15:53:35 +00:00
5 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
flake.nix
View file

@ -25,7 +25,7 @@
./marty-pc.nix ./marty-pc.nix
./configuration.nix ./configuration.nix
./user/marty.nix ./user/marty.nix
home-manager.nixosModules.default home-manager.nixosModules.home-manager
]; ];
}; };
marty-server = nixpkgs.lib.nixosSystem { marty-server = nixpkgs.lib.nixosSystem {
@ -34,7 +34,7 @@
./marty-server.nix ./marty-server.nix
./configuration.nix ./configuration.nix
./user/marty.nix ./user/marty.nix
home-manager.nixosModules.default home-manager.nixosModules.home-manager
]; ];
}; };
@ -44,7 +44,12 @@
./marty-latitude.nix ./marty-latitude.nix
./configuration.nix ./configuration.nix
./user/marty.nix ./user/marty.nix
home-manager.nixosModules.default home-manager.nixosModules.home-manager
# {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.users.marty = import ./config.nix/modules/home.nix
# }
]; ];
}; };

48
marty-latitude.nix
View file

@ -15,44 +15,35 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
# users = { users = {
# marty = ./nixos/modules/home.nix; marty = import ./modules/home.nix;
# }; };
}; };
# PREVIOUSLY HARDWARE-CONFIGURATION.NIX # PREVIOUSLY HARDWARE-CONFIGURATION.NIX
imports = [ imports =
(modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "/dev/disk/by-uuid/757b8bfc-0b5d-4ec1-9ab7-7876848ae411"; { device = "/dev/disk/by-uuid/867e1bdf-87c8-4f74-9a9e-c2d897644518";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = { fileSystems."/boot" =
device = "/dev/disk/by-uuid/C8A8-A568"; { device = "/dev/disk/by-uuid/D9F7-437B";
fsType = "vfat"; fsType = "vfat";
options = [ options = [ "fmask=0077" "dmask=0077" ];
"fmask=0077" };
"dmask=0077"
swapDevices =
[ { device = "/dev/disk/by-uuid/8dff6670-2f63-44e3-a2e5-1966ebbd4fbf"; }
]; ];
};
swapDevices = [
{ device = "/dev/disk/by-uuid/a1838708-fb00-4ecb-8010-432d06182591"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
@ -64,5 +55,4 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

6
marty-pc.nix
View file

@ -22,9 +22,9 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
# users = { users = {
# marty = ./nixos/modules/home.nix; marty = import ./config.nix/modules/home.nix;
# }; };
}; };
# PREVIOUSLY HARDWARE-CONFIGURATION.NIX # PREVIOUSLY HARDWARE-CONFIGURATION.NIX

6
marty-server.nix
View file

@ -22,9 +22,9 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
# users = { users = {
# marty = ./nixos/modules/home.nix; marty = import ./config.nix/modules/home.nix;
# }; };
}; };
# PREVIOUSLY HARDWARE-CONFIGURATION.NIX # PREVIOUSLY HARDWARE-CONFIGURATION.NIX

6
modules/home.nix
View file

@ -17,10 +17,12 @@
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = [ home.packages = with pkgs; [
# # Adds the 'hello' command to your environment. It prints a friendly # # Adds the 'hello' command to your environment. It prints a friendly
# # "Hello, world!" when run. # # "Hello, world!" when run.
# pkgs.hello hello
rbw
pinentry-curses
# # It is sometimes useful to fine-tune packages, for example, by applying # # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the # # overrides. You can do that directly here, just don't forget the