Lots of cleanup in preparation for killing specialargs
This commit is contained in:
parent
3135d7b4ab
commit
c6e835d726
GPG key ID:
5B2020A0F9921EF4
14 changed files with 51 additions and 75 deletions
32
flake.lock
32
flake.lock
|
|
@ -313,22 +313,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1707689078,
|
||||
"narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"api-lyte-dev": "api-lyte-dev",
|
||||
|
|
@ -370,11 +354,11 @@
|
|||
"slippi-desktop": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1706482760,
|
||||
"narHash": "sha256-l6KunEEwadCGaL8MPSOJB1ZB41TXmDsoh27eVdxojoM=",
|
||||
"lastModified": 1707981080,
|
||||
"narHash": "sha256-Qd1jLAXWvxA5SHcafgHFRs1+XYz8yXLdQ27+qZ8MYxk=",
|
||||
"owner": "project-slippi",
|
||||
"repo": "slippi-desktop-app",
|
||||
"rev": "5a32466751445f9963a3c0dedbe513ad127440f7",
|
||||
"rev": "16ab255406f7ab86846a7786ff15e3543501397c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -408,15 +392,17 @@
|
|||
},
|
||||
"ssbm": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"slippi-desktop": "slippi-desktop"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707778705,
|
||||
"narHash": "sha256-iTOcSrZgxLHotWJT0LZU5FYyfANgblsO6lsxt7nyyA8=",
|
||||
"lastModified": 1708119120,
|
||||
"narHash": "sha256-SuZbD4eGwS9OYeGL0V9uPVsW2SyL7MbLXBd5rngZB4c=",
|
||||
"owner": "lytedev",
|
||||
"repo": "ssbm-nix",
|
||||
"rev": "1f73c658a5327023f6ea01fcb9e040a551e90acd",
|
||||
"rev": "041f495ab6446e6edd22c1a5fbd48dd704c5b9a6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
ssbm.url = "github:lytedev/ssbm-nix";
|
||||
# I think if I force this to follow nixpkgs, I won't get caching benefits
|
||||
# ssbm.inputs.nixpkgs.follows = "nixpkgs";
|
||||
ssbm.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# TODO: doesn't (can't?) support the forge mod loader yet
|
||||
# nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{inputs, ...}: {
|
||||
imports = [
|
||||
{nixpkgs.overlays = [inputs.ssbm.overlay];}
|
||||
inputs.ssbm.homeManagerModule
|
||||
# inputs.ssbm.homeManagerModules.default
|
||||
];
|
||||
|
||||
ssbm = {
|
||||
slippi-launcher = {
|
||||
enable = true;
|
||||
launchMeleeOnPlay = false;
|
||||
};
|
||||
};
|
||||
# ssbm = {
|
||||
# slippi-launcher = {
|
||||
# enable = false;
|
||||
# launchMeleeOnPlay = false;
|
||||
# };
|
||||
# };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,12 @@
|
|||
lib,
|
||||
inputs,
|
||||
outputs,
|
||||
system,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
}: let
|
||||
inherit (pkgs) system;
|
||||
in {
|
||||
networking.hostName = lib.mkDefault "nixoslyte";
|
||||
|
||||
imports =
|
||||
|
|
@ -84,10 +85,10 @@
|
|||
zellij
|
||||
# zstd
|
||||
]
|
||||
++ (with inputs.home-manager.packages.${pkgs.system}; [
|
||||
++ (with inputs.home-manager.packages.${system}; [
|
||||
home-manager
|
||||
])
|
||||
++ (with inputs.helix.packages.${pkgs.system}; [
|
||||
++ (with inputs.helix.packages.${system}; [
|
||||
helix
|
||||
]);
|
||||
};
|
||||
|
|
@ -261,14 +262,15 @@
|
|||
};
|
||||
|
||||
nix = {
|
||||
# This will additionally add your inputs to the system's legacy channels
|
||||
# Making legacy nix commands consistent as well, awesome!
|
||||
# Not sure why I would need this...
|
||||
# nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
||||
|
||||
# This will add each flake input as a registry
|
||||
# To make nix3 commands consistent with your flake
|
||||
registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
|
||||
|
||||
# This will additionally add your inputs to the system's legacy channels
|
||||
# Making legacy nix commands consistent as well, awesome!
|
||||
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
||||
|
||||
settings = {
|
||||
trusted-users = ["root" "daniel"];
|
||||
experimental-features = lib.mkDefault ["nix-command" "flakes"];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{inputs, ...}: {
|
||||
imports = [
|
||||
{nixpkgs.overlays = [inputs.ssbm.overlay];}
|
||||
inputs.ssbm.nixosModule
|
||||
inputs.ssbm.nixosModules.default
|
||||
];
|
||||
|
||||
ssbm = {
|
||||
cache.enable = true;
|
||||
# overlay.enabled = true;
|
||||
# overlay.enable = true;
|
||||
|
||||
gcc = {
|
||||
rules.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
{
|
||||
outputs,
|
||||
flake,
|
||||
...
|
||||
}: {
|
||||
{outputs, ...}: {
|
||||
# a minimal, familiar setup that I can bootstrap atop
|
||||
imports = with outputs.nixosModules; [
|
||||
# may need to be tweaked based on the machine's paritioning scheme
|
||||
flake.diskoConfigurations.standard
|
||||
outputs.diskoConfigurations.standard
|
||||
desktop-usage
|
||||
wifi
|
||||
];
|
||||
|
|
|
|||
|
|
@ -690,8 +690,9 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
|
|||
|
||||
virtualisation.oci-containers.backend = "podman";
|
||||
virtualisation.oci-containers.containers = {
|
||||
autoStart = false;
|
||||
minecraft-jland = {
|
||||
autoStart = false;
|
||||
|
||||
# sending commands: https://docker-minecraft-server.readthedocs.io/en/latest/commands/
|
||||
image = "docker.io/itzg/minecraft-server";
|
||||
user = "${toString config.users.users.jland.uid}:${toString config.users.groups.jland.gid}";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
boot.supportedFilesystems = ["ntfs"];
|
||||
|
||||
imports = with outputs.nixosModules; [
|
||||
flake.diskoConfigurations.standard
|
||||
outputs.diskoConfigurations.standard
|
||||
inputs.hardware.nixosModules.common-cpu-amd
|
||||
inputs.hardware.nixosModules.common-pc-ssd
|
||||
outputs.nixosModules.pipewire-low-latency
|
||||
|
|
@ -36,15 +36,14 @@
|
|||
pass
|
||||
firefox-no-tabs
|
||||
melee
|
||||
# sway-laptop
|
||||
hyprland
|
||||
# hyprland
|
||||
];
|
||||
|
||||
ssbm = {
|
||||
slippi-launcher = {
|
||||
isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso";
|
||||
};
|
||||
};
|
||||
# ssbm = {
|
||||
# slippi-launcher = {
|
||||
# isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso";
|
||||
# };
|
||||
# };
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
flake,
|
||||
inputs,
|
||||
outputs,
|
||||
# lib,
|
||||
|
|
@ -12,7 +11,7 @@ in {
|
|||
networking.hostName = "foxtrot";
|
||||
|
||||
imports = with outputs.nixosModules; [
|
||||
flake.diskoConfigurations.standard
|
||||
outputs.diskoConfigurations.standard
|
||||
inputs.hardware.nixosModules.framework-13-7040-amd
|
||||
desktop-usage
|
||||
# gnome
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
services.gnome.gnome-remote-desktop.enable = true;
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
home-manager.users.daniel = {
|
||||
imports = with outputs.homeManagerModules; [linux-desktop];
|
||||
|
|
@ -85,7 +84,7 @@
|
|||
|
||||
powerManagement.enable = false;
|
||||
|
||||
boot.loader.grub.enable = true;
|
||||
# boot.loader.grub.enable = true;
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
flake,
|
||||
outputs,
|
||||
# lib,
|
||||
# config,
|
||||
|
|
@ -8,14 +7,11 @@
|
|||
}: {
|
||||
networking.hostName = "musicbox";
|
||||
|
||||
imports =
|
||||
[
|
||||
flake.diskoConfigurations.unencrypted
|
||||
]
|
||||
++ (with outputs.nixosModules; [
|
||||
imports = with outputs.nixosModules; [
|
||||
outputs.diskoConfigurations.unencrypted
|
||||
desktop-usage
|
||||
wifi
|
||||
]);
|
||||
];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
flake,
|
||||
outputs,
|
||||
lib,
|
||||
# outputs,
|
||||
# config,
|
||||
|
|
@ -35,7 +35,7 @@ in {
|
|||
networking.useDHCP = false;
|
||||
|
||||
imports = [
|
||||
flake.diskoConfigurations.unencrypted
|
||||
outputs.diskoConfigurations.unencrypted
|
||||
];
|
||||
|
||||
# TODO: perform a hardware scan
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
flake,
|
||||
inputs,
|
||||
outputs,
|
||||
lib,
|
||||
|
|
@ -11,7 +10,7 @@
|
|||
|
||||
imports = with outputs.nixosModules; [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
flake.diskoConfigurations.standard
|
||||
outputs.diskoConfigurations.standard
|
||||
inputs.hardware.nixosModules.lenovo-thinkpad-x1-yoga
|
||||
desktop-usage
|
||||
fonts
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{
|
||||
flake,
|
||||
inputs,
|
||||
outputs,
|
||||
lib,
|
||||
|
|
@ -10,7 +9,7 @@
|
|||
networking.hostName = "thinker";
|
||||
|
||||
imports = with outputs.nixosModules; [
|
||||
flake.diskoConfigurations.thinker
|
||||
outputs.diskoConfigurations.thinker
|
||||
inputs.hardware.nixosModules.lenovo-thinkpad-t480
|
||||
inputs.hardware.nixosModules.common-pc-laptop-ssd
|
||||
desktop-usage
|
||||
|
|
|
|||
Loading…
Reference in a new issue