Compare commits

..

4 Commits

Author SHA1 Message Date
randomuser 66f4e6a7b0 changes 2024-01-08 20:44:38 -06:00
randomuser 894230ee8a more changes 2024-01-08 20:32:59 -06:00
randomuser 40fe8061c2 has my pain ended? 2024-01-07 23:08:20 -06:00
randomuser 5b01a13f3e please work 2024-01-07 22:16:14 -06:00
12 changed files with 123 additions and 26 deletions

View File

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
./hardware-configuration.nix # ./hardware-configuration.nix
./nvidia.nix ./nvidia.nix
../../modules/bootstrap.nix ../../modules/bootstrap.nix
../../modules/common.nix ../../modules/common.nix

9
boxes/virtbox/home.nix Normal file
View File

@ -0,0 +1,9 @@
{ lib, inputs, config, pkgs, home, ... }:
{
imports = [
../../home/x11.nix
];
home.stateVersion = "23.11";
}

18
boxes/x230t/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, config, pkgs, ...}:
{
imports = [
./hardware-configuration.nix
../../modules/bootstrap.nix
../../modules/common.nix
../../modules/x11.nix
../../modules/tlp.nix
];
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda";
networking.hostName = "x230t";
system.stateVersion = "23.11";
}

View File

@ -0,0 +1,33 @@
# 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, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/99d9f4ba-5781-4f2d-aa15-f1f911658913";
fsType = "ext4";
};
swapDevices = [ ];
# 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
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s25.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

10
boxes/x230t/home.nix Normal file
View File

@ -0,0 +1,10 @@
{ lib, inputs, config, pkgs, home, ... }:
{
imports = [
../../home/x11.nix
../../home/chromium
];
home.stateVersion = "23.11";
}

View File

@ -10,9 +10,6 @@
lib.fold lib.recursiveUpdate { } ( lib.fold lib.recursiveUpdate { } (
map f [ map f [
"x86_64-linux" "x86_64-linux"
"x86_64-darwin"
"aarch64-linux"
"aarch64-darwin"
] ]
); );
mkPackages = pkgs: { mkPackages = pkgs: {

View File

@ -4,6 +4,7 @@
, bash , bash
, feh , feh
, jq , jq
, fzy
, figlet , figlet
, curl , curl
, xrandr , xrandr
@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
src = ./utils; src = ./utils;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash feh xrandr jq curl ]; buildInputs = [ bash feh xrandr jq curl fzy ];
buildPhase = ""; buildPhase = "";

View File

@ -91,12 +91,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-xCQE9SSKWjmoYOaIkzdlGULeGbEF9Gau5TPgYJxalmw=", "narHash": "sha256-PYg0MoGsZWtACHUwF/teZJ96wUhDs3rHgTe2A0sMQ/A=",
"path": "/nix/store/ngxkaia0jmb6bfn1i5blvqaggxb8sy3f-source/builds", "path": "/nix/store/lnr366wiqiliymnv4j8h8j01m7mvcb5w-source/builds",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/ngxkaia0jmb6bfn1i5blvqaggxb8sy3f-source/builds", "path": "/nix/store/lnr366wiqiliymnv4j8h8j01m7mvcb5w-source/builds",
"type": "path" "type": "path"
} }
} }

View File

@ -24,13 +24,13 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/virtbox ./boxes/virtbox
home-manager.nixosModules.home-manager ];
{ };
home-manager.useGlobalPkgs = true; x230t = nixpkgs.lib.nixosSystem {
home-manager.useUserPackages = true; system = "x86_64-linux";
home-manager.extraSpecialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
home-manager.users.usr = import ./boxes/virtbox/home.nix; modules = [
} ./boxes/x230t
]; ];
}; };
mainsail = nixpkgs.lib.nixosSystem { mainsail = nixpkgs.lib.nixosSystem {
@ -38,15 +38,31 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/mainsail ./boxes/mainsail
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.usr = import ./boxes/mainsail/home.nix;
}
]; ];
}; };
}; };
homeConfigurations = {
"usr@x230t" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs; };
modules = [
./boxes/x230t/home.nix
];
};
"usr@mainsail" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs; };
modules = [
./boxes/x230t/home.nix
];
};
"usr@virtbox" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs; };
modules = [
./boxes/x230t/home.nix
];
};
};
}; };
} }

12
home/chromium/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ lib, inputs, config, pkgs, home, ... }:
{
home.packages = with pkgs; [
ungoogled-chromium
];
programs.chromium = {
enable = true;
package = pkgs.ungoogled-chromium;
};
}

View File

@ -1,10 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [
./hardware-configuration.nix
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
neovim neovim

5
modules/tlp.nix Normal file
View File

@ -0,0 +1,5 @@
{ lib, config, pkgs, inputs, ...}:
{
services.tlp.enable = true;
}