lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Daniel Flanagan 2024-01-06 17:25:33 -06:00
commit 48932dc77e
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
10 changed files with 115 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
disko/default.nix
View file

@ -183,9 +183,9 @@
format = "gpt";
partitions = [
{
label = "EFI";
name = "ESP";
start = "1M";
end = "500M";
size = "512M";
bootable = true;
content = {
type = "filesystem";

71
modules/home-manager/dragon.nix
View file

@ -1,71 +0,0 @@
{
config,
lib,
outputs,
...
}: {
imports = with outputs.homeManagerModules; [
melee
sway
hyprland
];
wayland.windowManager.hyprland = {
settings = {
env = [
"EWW_BAR_MON,1"
];
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
monitor = [
"DP-3,3840x2160@120,0x0,1"
];
input = {
force_no_accel = true;
sensitivity = 1; # -1.0 - 1.0, 0 means no modification.
};
};
};
wayland.windowManager.sway = {
config = {
output = {
"GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" = {
mode = "3840x2160@120Hz";
position = "${toString (builtins.ceil (2160 / 1.5))},0";
};
"Dell Inc. DELL U2720Q D3TM623" = {
# desktop left vertical monitor
mode = "3840x2160@60Hz";
transform = "90";
scale = "1.5";
position = "0,0";
};
};
workspaceOutputAssign =
(
map
(ws: {
output = "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307";
workspace = toString ws;
})
(lib.range 1 7)
)
++ (
map
(ws: {
output = "Dell Inc. DELL U2720Q D3TM623";
workspace = toString ws;
})
(lib.range 8 9)
);
};
};
ssbm = {
slippi-launcher = {
isoPath = "${config.home.homeDirectory}/../games/roms/dolphin/melee.iso";
};
};
}

16
modules/home-manager/melee.nix
View file

@ -1,18 +1,6 @@
{
# flake,
inputs,
# outputs,
# lib,
# config,
# pkgs,
# system,
# modulesPath,
...
}: {
{inputs, ...}: {
imports = [
{
nixpkgs.overlays = [inputs.ssbm.overlay];
}
{nixpkgs.overlays = [inputs.ssbm.overlay];}
inputs.ssbm.homeManagerModule
];

2
modules/nixos/default.nix
View file

@ -9,7 +9,7 @@ with builtins;
"desktop-usage"
"intel"
"pipewire"
"pipewire"
"pipewire-low-latency"
"podman"
"postgres"
"sway"

17
modules/nixos/melee.nix
View file

@ -1,18 +1,11 @@
{
# flake,
inputs,
# outputs,
# lib,
# config,
# pkgs,
# system,
# modulesPath,
...
}: {
imports = [inputs.ssbm.nixosModule];
{inputs, ...}: {
imports = [
inputs.ssbm.nixosModule
];
ssbm = {
cache.enable = true;
overlay.enabled = true;
gcc = {
rules.enable = true;

5
modules/nixos/sway.nix
View file

@ -8,10 +8,13 @@
# services.xserver.libinput.enable = true;
services.gnome.gnome-keyring.enable = true;
programs.gnupg.agent = {
enable = true;
pinentryFlavor = "gnome3";
enableSSHSupport = true;
# settings = {
# pinentry-program = "/run/current-system/sw/bin/pinentry";
# };
};
programs.sway = {

2
nixos/base.nix
View file

@ -11,6 +11,6 @@
wifi
];
# TODO: may not work for UEFI?
# TODO: may not work for non-UEFI?
boot.loader.systemd-boot.enable = true;
}

11
nixos/default.nix
View file

@ -6,11 +6,12 @@ with builtins; (listToAttrs (map (name: {
};
}) [
"base"
"beefcake"
"dragon"
"foxtrot"
"musicbox"
"rascal"
"router"
"thablet"
"thinker"
"foxtrot"
"beefcake"
"rascal"
"musicbox"
"router"
]))

106
nixos/dragon.nix
View file

@ -1,10 +1,10 @@
{
# config,
flake,
inputs,
outputs,
lib,
pkgs,
modulesPath,
...
}: {
networking.hostName = "dragon";
@ -12,26 +12,90 @@
# support interacting with the windows drive
boot.supportedFilesystems = ["ntfs"];
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
inputs.disko.nixosModules.disko
flake.diskoConfigurations.standard
inputs.hardware.nixosModules.common-cpu-amd
inputs.hardware.nixosModules.common-pc-ssd
outputs.nixosModules.pipewire-low-latency
]
++ (with outputs.nixosModules; [
common
melee
desktop-usage
podman
postgres
wifi
hyprland
printing
ewwbar
]);
imports = with outputs.nixosModules; [
flake.diskoConfigurations.standard
inputs.hardware.nixosModules.common-cpu-amd
inputs.hardware.nixosModules.common-pc-ssd
outputs.nixosModules.pipewire-low-latency
desktop-usage
podman
postgres
wifi
hyprland
printing
ewwbar
melee
];
home-manager.users.daniel = {
imports = with outputs.homeManagerModules; [
sway
pass
# melee
# sway-laptop
# hyprland
];
# ssbm = {
# slippi-launcher = {
# isoPath = "${config.home.homeDirectory}/../games/roms/dolphin/melee.iso";
# };
# };
wayland.windowManager.hyprland = {
settings = {
env = [
"EWW_BAR_MON,1"
];
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
monitor = [
"DP-3,3840x2160@120,0x0,1"
];
input = {
force_no_accel = true;
sensitivity = 1; # -1.0 - 1.0, 0 means no modification.
};
};
};
wayland.windowManager.sway = {
config = {
output = {
"GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" = {
mode = "3840x2160@120Hz";
position = "${toString (builtins.ceil (2160 / 1.5))},0";
};
"Dell Inc. DELL U2720Q D3TM623" = {
# desktop left vertical monitor
mode = "3840x2160@60Hz";
transform = "90";
scale = "1.5";
position = "0,0";
};
};
workspaceOutputAssign =
(
map
(ws: {
output = "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307";
workspace = toString ws;
})
(lib.range 1 7)
)
++ (
map
(ws: {
output = "Dell Inc. DELL U2720Q D3TM623";
workspace = toString ws;
})
(lib.range 8 9)
);
};
};
};
services.printing.enable = true;

21
nixos/foxtrot.nix
View file

@ -11,18 +11,15 @@
in {
networking.hostName = "foxtrot";
imports =
[
flake.diskoConfigurations.standard
inputs.hardware.nixosModules.framework-13-7040-amd
]
++ (with outputs.nixosModules; [
desktop-usage
podman
postgres
wifi
# hyprland
]);
imports = with outputs.nixosModules; [
flake.diskoConfigurations.standard
inputs.hardware.nixosModules.framework-13-7040-amd
desktop-usage
podman
postgres
wifi
# hyprland
];
programs.steam.enable = true;
programs.steam.remotePlay.openFirewall = true;