Compare commits

..

9 Commits

Author SHA1 Message Date
mir
bf25a52e74 relink starscream hardware 2024-02-26 17:23:16 -09:00
mir
00c8613d3a move starscream hardware into directory 2024-02-26 17:22:40 -09:00
mir
4087cd4668 simplify fonts 2024-02-25 21:51:21 -09:00
mir
b9668408dc re-indent 2024-02-25 21:50:01 -09:00
mir
e17ccda136 add back meslo nerd font 2024-02-25 21:49:40 -09:00
mir
3a45491b0f un ignore hardware because flake 2024-02-25 21:38:49 -09:00
mir
160a30dc18 move hardware config ask to flake, does this work? 2024-02-25 21:29:57 -09:00
mir
8be626d8ae add flake.lock file. y tho? 2024-02-25 21:28:33 -09:00
mir
3fbb0cc09d don't ignore flake.lock... why tho? 2024-02-25 21:27:54 -09:00
6 changed files with 108 additions and 19 deletions

2
.gitignore vendored
View File

@ -1,2 +0,0 @@
flake.lock
hardware-configuration.nix

View File

@ -7,12 +7,12 @@
# home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz"; # home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
# in # in
{ {
imports = # imports =
[ # Include the results of the hardware scan. # [ # Include the results of the hardware scan.
./hardware-configuration.nix # # ./hardware-configuration.nix
# (import "${home-manager}/nixos") # # (import "${home-manager}/nixos")
# <home-manager>/nixos # # <home-manager>/nixos
]; # ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

49
flake.lock Normal file
View File

@ -0,0 +1,49 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1701282334,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

View File

@ -13,6 +13,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
./hardware/starscream-hw.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View File

@ -0,0 +1,39 @@
# 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" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" "wl" ];
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/b9b84795-44a7-46c7-803b-0e26cac8ee6f";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CB3C-90B6";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/1c45df54-fb11-4ff6-8765-ed7f33679c98"; }
];
# 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.enp0s20u2i1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View File

@ -23,6 +23,7 @@
pkgs.wget pkgs.wget
pkgs.yt-dlp pkgs.yt-dlp
pkgs.mpv pkgs.mpv
pkgs.nerdfonts
# pkgs.gnupg # pkgs.gnupg
# pkgs.python3 # pkgs.python3
(pkgs.python3.withPackages( (pkgs.python3.withPackages(
@ -67,6 +68,7 @@
# (python3.withPackages( # (python3.withPackages(
# ps: with ps; [epc sexpdata six pynput inflect PyQt6 PyQt6-Qt6 PyQt6-sip])) # ps: with ps; [epc sexpdata six pynput inflect PyQt6 PyQt6-Qt6 PyQt6-sip]))
# ]; # ];
fonts.fontconfig.enable = true;
programs.git = { programs.git = {
enable = true; enable = true;
userName = "mir"; userName = "mir";
@ -102,17 +104,17 @@
}; };
programs.gpg = { programs.gpg = {
enable = true; enable = true;
package = pkgs.gnupg.overrideAttrs (orig: { package = pkgs.gnupg.overrideAttrs (orig: {
version = "2.4.0"; version = "2.4.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2"; url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2";
hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM=";
}; };
}); });
# agent = { # agent = {
# pinentryFlavor = "gnome3"; # pinentryFlavor = "gnome3";
# }; # };
}; };
services.gpg-agent = { services.gpg-agent = {