Compare commits
1 Commits
ixion-buil
...
ucode-addi
Author | SHA1 | Date | |
---|---|---|---|
8c942769e3 |
38
flake.nix
38
flake.nix
@ -12,7 +12,7 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
ghostty.url = "github:ghostty-org/ghostty";
|
ghostty.url = "github:ghostty-org/ghostty";
|
||||||
quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
|
ucodenix.url = "github:e-tho/ucodenix";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ {
|
outputs = inputs @ {
|
||||||
@ -22,7 +22,7 @@
|
|||||||
darwin,
|
darwin,
|
||||||
home-manager,
|
home-manager,
|
||||||
ghostty,
|
ghostty,
|
||||||
quadlet-nix,
|
ucodenix,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
userName = "wyatt";
|
userName = "wyatt";
|
||||||
@ -65,6 +65,7 @@
|
|||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
nix-flatpak.nixosModules.nix-flatpak
|
||||||
|
ucodenix.nixosModules.default
|
||||||
./modules/common
|
./modules/common
|
||||||
./modules/machine/cloud
|
./modules/machine/cloud
|
||||||
|
|
||||||
@ -112,21 +113,24 @@
|
|||||||
hostname = "ixion";
|
hostname = "ixion";
|
||||||
role = "server";
|
role = "server";
|
||||||
};
|
};
|
||||||
modules = [
|
# modules = [
|
||||||
nix-flatpak.nixosModules.nix-flatpak
|
# nix-flatpak.nixosModules.nix-flatpak
|
||||||
./modules/common
|
# nix-ld.nixosModules.nix-ld
|
||||||
./modules/machine/ixion
|
# ./modules/nixos/hardware-configuration.nix
|
||||||
|
# ./modules/nix-core.nix
|
||||||
home-manager.nixosModules.home-manager
|
# ./modules/nixos/configuration.nix
|
||||||
{
|
# ./modules/host-users.nix
|
||||||
home-manager.useGlobalPkgs = true;
|
#
|
||||||
home-manager.useUserPackages = true;
|
# home-manager.nixosModules.home-manager
|
||||||
home-manager.extraSpecialArgs = extraSpecialArgs;
|
# {
|
||||||
home-manager.users.${userName}.imports = [
|
# home-manager.useGlobalPkgs = true;
|
||||||
./home
|
# home-manager.useUserPackages = true;
|
||||||
];
|
# home-manager.extraSpecialArgs = extraSpecialArgs;
|
||||||
}
|
# home-manager.users.${userName}.imports = [
|
||||||
];
|
# ./home
|
||||||
|
# ];
|
||||||
|
# }
|
||||||
|
# ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -39,15 +39,13 @@
|
|||||||
# ublock origin
|
# ublock origin
|
||||||
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
|
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
|
||||||
sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
|
sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
|
||||||
# sha256 = lib.fakeSha256;
|
version = "1.63.2";
|
||||||
version = "1.64.0";
|
|
||||||
})
|
})
|
||||||
(createChromiumExtension {
|
(createChromiumExtension {
|
||||||
# bitwarden
|
# bitwarden
|
||||||
id = "nngceckbapebfimnlniiiahkandclblb";
|
id = "nngceckbapebfimnlniiiahkandclblb";
|
||||||
sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
|
sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
|
||||||
# sha256 = lib.fakeSha256;
|
version = "2025.3.1";
|
||||||
version = "2025.5.0";
|
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -24,6 +24,7 @@ in {
|
|||||||
../../graphics
|
../../graphics
|
||||||
../../pwrMgmt
|
../../pwrMgmt
|
||||||
../../networking/core.nix
|
../../networking/core.nix
|
||||||
|
../../security/sudo.nix
|
||||||
../../sound/pipewire.nix
|
../../sound/pipewire.nix
|
||||||
../../sound/shairport.nix
|
../../sound/shairport.nix
|
||||||
../../virtualization/podman.nix
|
../../virtualization/podman.nix
|
||||||
@ -176,5 +177,10 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# security.sudo.needsPassword = false;
|
||||||
|
|
||||||
|
# Enable microcode updates
|
||||||
|
services.ucodenix.enable = true;
|
||||||
|
|
||||||
system.stateVersion = "24.11";
|
system.stateVersion = "24.11";
|
||||||
}
|
}
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
userName,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [ ];
|
|
||||||
|
|
||||||
# Enable flakes for NixOS
|
|
||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
|
||||||
|
|
||||||
# Custom kernel/boot stuff
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
{...}: {
|
|
||||||
imports = [
|
|
||||||
./configuration.nix
|
|
||||||
./hardware-configuration.nix
|
|
||||||
];
|
|
||||||
}
|
|
@ -1,46 +0,0 @@
|
|||||||
# --- DO NOT USE ---
|
|
||||||
#
|
|
||||||
# this is copied from ../valefor/hardware-configuration.nix
|
|
||||||
# generate a new hardware-configuration.nix before using this!
|
|
||||||
#
|
|
||||||
# ------------------
|
|
||||||
#
|
|
||||||
# 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" "usb_storage" "usbhid" "sd_mod" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/ff89bde1-4b33-4277-b649-b92700b2406c";
|
|
||||||
fsType = "xfs";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/3A4B-6866";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
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.eno1.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
@ -1,3 +1,4 @@
|
|||||||
|
# FIXME: this file is broken but i don't know what is wrong with it
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
|
@ -40,13 +40,7 @@ Example:
|
|||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
To get a full, comprehensive list of what you can do with the podman module, please check out [podman.nix](./podman.nix)!
|
To get a full, comprehensive list of what you can do with the podman module, please check out (podman.nix)[./podman.nix]!
|
||||||
|
|
||||||
### Podman Quadlets
|
|
||||||
|
|
||||||
This is a wrapper around a project called [`quadlet-nix`](https://github.com/SEIAROTg/quadlet-nix), a way of defining systemd services as containers with Nix! Since I have existing services running inside of containers and don't want to risk breaking _everything_ that I have running, I figured this would be a safe, transitionary approach to handle this.
|
|
||||||
|
|
||||||
This is still a work-in-progress, check back soon on progress on this.
|
|
||||||
|
|
||||||
## Kubernetes
|
## Kubernetes
|
||||||
|
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
# ----------------------
|
|
||||||
# Wrapper for defining Quadlets in Nix via quadlet-nix
|
|
||||||
#
|
|
||||||
# Still WIP
|
|
||||||
# ----------------------
|
|
Reference in New Issue
Block a user