removed mossdeep and jovian dependencies

This commit is contained in:
Aly Raffauf 2024-06-09 19:14:09 -04:00
parent 36760c90f3
commit 233e9ba5b0
7 changed files with 16 additions and 268 deletions

View file

@ -18,15 +18,15 @@ NixOS flake for all of mine + my husband's hosts. Modules for Hyprland, Sway (wi
| Storage | 1TB Sk hynix P41 | 512GB M.2 PCIe 4.0 | 512GB SATA SSD | | Storage | 1TB Sk hynix P41 | 512GB M.2 PCIe 4.0 | 512GB SATA SSD |
| Desktop | Hyprland | Sway (tablet mode) | Sway | | Desktop | Hyprland | Sway (tablet mode) | Sway |
| Host | mossdeep | fallarbor | mauville | | Host | fallarbor | mauville |
|---------|-------------------------|------------------------|-------------------------| |---------|------------------------|-------------------------|
| Model | Steam Deck OLED | Framework Laptop 13 | Custom Mini-ITX Desktop | | Model | Framework Laptop 13 | Custom Mini-ITX Desktop |
| Display | 7.4" 1280x800 90Hz OLED | 13.5" 2256x1504 60Hz | 34" 3440x1440 160Hz VA | | Display | 13.5" 2256x1504 60Hz | 34" 3440x1440 160Hz VA |
| CPU | AMD "Sephiroth" APU | Intel Core i5-1135G7 | AMD Ryzen 5 2600 | | CPU | Intel Core i5-1135G7 | AMD Ryzen 5 2600 |
| RAM | 16GB LPDDR5 6400 MT/s | 16GB DDR4-3200Mhz | 16GB DDR4-3200Mhz | | RAM | 16GB DDR4-3200Mhz | 16GB DDR4-3200Mhz |
| GPU | AMD RDNA 2 | Intel Iris Xe Graphics | AMD Radeon Rx 6700 | | GPU | Intel Iris Xe Graphics | AMD Radeon Rx 6700 |
| Storage | 512GB M.2 PCIe SSD | 512GB M.2 PCIe 3.0 | 1TB M.2 PCIe 3.0 | | Storage | 512GB M.2 PCIe 3.0 | 1TB M.2 PCIe 3.0 |
| Desktop | Hyprland | Hyprland | Sway | | Desktop | Hyprland | Sway |
## Home Lab Services ## Home Lab Services
| Service | Description | Source/Runtime | Domain | | Service | Description | Source/Runtime | Domain |

View file

@ -52,11 +52,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717913708, "lastModified": 1717915259,
"narHash": "sha256-WD8XH6j+N/51GF49iw6mW96tgtlWL3YTiLDlAY4oAoM=", "narHash": "sha256-VsGPboaleIlPELHY5cNTrXK4jHVmgUra8uC6h7KVC5c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "69e5942c9dae1f1535ea13c532ec4950f13dce97", "rev": "1bbdb06f14e2621290b250e631cf3d8948e4d19b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +146,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1717860476, "lastModified": 1717970802,
"narHash": "sha256-+ltqQfQljE9L0x743LkYtkjHjJqPQmumEGeA8GZ4DoQ=", "narHash": "sha256-kFnaAmte/N1mrbHEQyrwDu9+laZzVAi4N2nQodCNfgg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "9994b73ad0af5c9ba5fc4058234cea77d0a1ddb1", "rev": "1423707dbefc0329e80895451903a77ab684f7ea",
"revCount": 4782, "revCount": 4789,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -257,49 +257,6 @@
"type": "github" "type": "github"
} }
}, },
"jovian": {
"inputs": {
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1717685136,
"narHash": "sha256-S+C/DX5HOhlhJAmcGxbB+Tv6oqZOkr3z/WzPuydXI14=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "fd13986ede9b94c50e84aecb2c88863e297bbb52",
"type": "github"
},
"original": {
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"jovian",
"nixpkgs"
]
},
"locked": {
"lastModified": 1690328911,
"narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
"owner": "zhaofengli",
"repo": "nix-github-actions",
"rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "matrix-name",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1717828156, "lastModified": 1717828156,
@ -387,7 +344,6 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprland": "hyprland", "hyprland": "hyprland",
"iio-hyprland": "iio-hyprland", "iio-hyprland": "iio-hyprland",
"jovian": "jovian",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgsUnstable": "nixpkgsUnstable" "nixpkgsUnstable": "nixpkgsUnstable"

View file

@ -23,12 +23,6 @@
# Pre-baked hardware support for various devices. # Pre-baked hardware support for various devices.
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
# Useful modules for Steam Deck.
jovian = {
url = "github:Jovian-Experiments/Jovian-NixOS";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
iio-hyprland.url = "github:JeanSchoeller/iio-hyprland"; iio-hyprland.url = "github:JeanSchoeller/iio-hyprland";
@ -94,7 +88,6 @@
"fallarbor" "fallarbor"
"lavaridge" "lavaridge"
"mauville" "mauville"
"mossdeep"
"petalburg" "petalburg"
"rustboro" "rustboro"
] ( ] (

View file

@ -1,81 +0,0 @@
# Steam Deck OLED
{
config,
inputs,
lib,
pkgs,
self,
...
}: {
imports = [
./disko.nix
./hardware.nix
./home.nix
self.nixosModules.default
inputs.jovian.nixosModules.default
];
boot = {
# Bootloader.
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
# Use latest Linux kernel.
kernelPackages = pkgs.linuxPackages_latest;
};
networking.hostName = "mossdeep"; # Define your hostname.
services = {
fwupd.enable = true;
};
alyraffauf = {
system = {
plymouth.enable = true;
zramSwap = {enable = true;};
};
user = {
aly = {
enable = true;
password = "$y$j9T$tFHikyxutxISdByIElNuP/$TLzbG2fCUzKYBsxPXF//9EgjskH4c2O0oXNcVH8hu25";
};
dustin.enable = false;
};
desktop = {
enable = true;
hyprland.enable = true;
};
apps = {
steam.enable = true;
};
scripts = {
hoenn.enable = true;
};
services = {
flatpak.enable = true;
syncthing = {
enable = true;
syncMusic = false;
};
tailscale.enable = true;
};
};
jovian = {
steam = {
user = "aly";
enable = true;
autoStart = true;
desktopSession = "hyprland";
};
decky-loader = {
user = "aly";
enable = true;
};
devices.steamdeck.enable = true;
steamos.useSteamOSConfig = true;
};
system.stateVersion = "24.05";
}

View file

@ -1,59 +0,0 @@
{inputs, ...}: {
imports = [
inputs.disko.nixosModules.disko
];
disko.devices = {
disk = {
vdb = {
type = "disk";
device = "/dev/nvme0n1";
content = {
type = "gpt";
partitions = {
ESP = {
priority = 1;
name = "ESP";
start = "1M";
end = "1024M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
size = "100%";
content = {
type = "btrfs";
extraArgs = ["-f"]; # Override existing partition
# Subvolumes must set a mountpoint in order to be mounted,
# unless their parent is mounted
subvolumes = {
# Subvolume name is different from mountpoint
"rootfs" = {mountpoint = "/";};
# For use with future impermanence setups
"persist" = {
mountpoint = "/persist";
mountOptions = ["compress=zstd" "noatime"];
};
# Subvolume name is the same as the mountpoint
"home" = {
mountOptions = ["compress=zstd"];
mountpoint = "/home";
};
# Parent is not mounted so the mountpoint must be set
"nix" = {
mountOptions = ["compress=zstd" "noatime"];
mountpoint = "/nix";
};
};
mountpoint = "/partition-root";
};
};
};
};
};
};
};
}

View file

@ -1,35 +0,0 @@
# 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,
inputs,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = ["amdgpu"];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
hardware.opengl.driSupport = true;
# 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.enp193s0f3u1c2.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -1,26 +0,0 @@
{
inputs,
config,
pkgs,
lib,
...
}: {
imports = [
inputs.home-manager.nixosModules.home-manager
];
home-manager = {
sharedModules = [
{
alyraffauf.desktop.hyprland = {
enable = true;
tabletMode.enable = true;
};
wayland.windowManager.hyprland.extraConfig = ''
exec-once = ${lib.getExe pkgs.dconf} write /org/gnome/desktop/a11y/applications/screen-keyboard-enabled true
exec-once = ${lib.getExe' pkgs.squeekboard "squeekboard"}
'';
}
];
users.aly = import ../../aly.nix;
};
}