factorio prep and reorg

This commit is contained in:
Simon Gardling 2024-10-17 23:56:09 -04:00
parent 49220edd9a
commit 385c0ff0c1
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
6 changed files with 177 additions and 167 deletions

View File

@ -181,6 +181,11 @@
enableSSHSupport = false; enableSSHSupport = false;
}; };
programs.steam = {
enable = true;
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
};
#System packages #System packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
mullvad-vpn mullvad-vpn

View File

@ -107,10 +107,7 @@
}; };
programs.steam = { programs.steam = {
enable = true;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
# dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
}; };
# services.ollama = { # services.ollama = {

View File

@ -205,11 +205,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729184663, "lastModified": 1729218602,
"narHash": "sha256-uNyi5vQrzaLkt4jj6ZEOs4+4UqOAwP6jFG2s7LIDwIk=", "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "16fb78d443c1970dda9a0bbb93070c9d8598a925", "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -73,6 +73,7 @@
optimizeWithFlags optimizeWithFlags
; ;
}; };
modules = [ modules = [
./system-${hostname}.nix ./system-${hostname}.nix
niri.homeModules.config niri.homeModules.config
@ -83,6 +84,7 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
rust-overlay.overlays.default rust-overlay.overlays.default
inputs.niri.overlays.niri
]; ];
# home-manager stuff # home-manager stuff

View File

@ -2,8 +2,12 @@
config, config,
pkgs, pkgs,
homeDirectory, homeDirectory,
...
}: }:
{ {
programs.niri = {
package = pkgs.niri-unstable;
settings = {
prefer-no-csd = true; prefer-no-csd = true;
spawn-at-startup = [ spawn-at-startup = [
@ -20,6 +24,8 @@
"${homeDirectory}/.wallpaper.png" "${homeDirectory}/.wallpaper.png"
]; ];
} }
{ command = [ "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" ]; }
]; ];
window-rules = [ window-rules = [
@ -164,4 +170,6 @@
"Mod+Shift+F".action = fullscreen-window; "Mod+Shift+F".action = fullscreen-window;
"Mod+C".action = center-column; "Mod+C".action = center-column;
}; };
};
};
} }

View File

@ -6,7 +6,10 @@
... ...
}: }:
{ {
imports = [ ./gui.nix ]; imports = [
./gui.nix
./progs/niri.nix
];
home.packages = with pkgs; [ home.packages = with pkgs; [
wdisplays wdisplays
@ -16,7 +19,7 @@
# manage bluetooth devices # manage bluetooth devices
blueman blueman
niri xwayland-satellite-unstable
]; ];
# bluetooth manager # bluetooth manager
@ -28,11 +31,6 @@
package = pkgs.dunst; package = pkgs.dunst;
}; };
# window manager
programs.niri = {
settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; };
};
programs.swaylock = { programs.swaylock = {
enable = true; enable = true;
settings = import ./progs/swaylock.nix; settings = import ./progs/swaylock.nix;