1 Commits

Author SHA1 Message Date
9ce216da8f added reshade
wip: there are other packages available, might be advantageous of me to
added those other packages as optional values
2025-06-19 21:46:34 -04:00
7 changed files with 85 additions and 60 deletions

75
flake.lock generated
View File

@ -115,18 +115,37 @@
"type": "github"
}
},
"nixpkgs": {
"nix-reshade": {
"inputs": {
"nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1747953325,
"narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
"lastModified": 1749858810,
"narHash": "sha256-xg/MnKlnI6G/mLrh2apPuXUq8wjYSBbt8RtilM5cutI=",
"owner": "LovingMelody",
"repo": "nix-reshade",
"rev": "e1a7e702b052e4a98a9f15796f048270b2aca679",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"owner": "LovingMelody",
"repo": "nix-reshade",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1749285348,
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -163,13 +182,30 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1747953325,
"narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"darwin": "darwin",
"ghostty": "ghostty",
"home-manager": "home-manager",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs"
"nix-reshade": "nix-reshade",
"nixpkgs": "nixpkgs_2"
}
},
"systems": {
@ -187,6 +223,27 @@
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nix-reshade",
"nixpkgs"
]
},
"locked": {
"lastModified": 1749194973,
"narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"zig": {
"inputs": {
"flake-compat": [

View File

@ -12,6 +12,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
ghostty.url = "github:ghostty-org/ghostty";
nix-reshade.url = "github:LovingMelody/nix-reshade";
};
outputs = inputs @ {
@ -47,7 +48,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
home-manager.extraSpecialArgs = extraSpecialArgs;
home-manager.users.${userName} = import ./home;
}
];
@ -70,7 +71,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
home-manager.extraSpecialArgs = extraSpecialArgs;
home-manager.users.${userName}.imports = [
./home
];
@ -94,7 +95,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = extraSpecialArgs // { role = "server"; };
home-manager.extraSpecialArgs = extraSpecialArgs;
home-manager.users.${userName}.imports = [
./home
];

View File

@ -1,5 +1,4 @@
{
role,
pkgs,
lib,
...
@ -10,7 +9,7 @@
};
programs.chromium = {
enable = pkgs.stdenv.isLinux && role == "devel";
enable = pkgs.stdenv.isLinux;
package = pkgs.ungoogled-chromium.override {
enableWideVine = true;
commandLineArgs = [

View File

@ -4,7 +4,6 @@
userName,
userEmail,
ghostty,
role,
...
}: let
# Have a file sturcture that holds all the configuration files that can't be configured by Nix
@ -14,7 +13,7 @@
};
in {
# Import sub modules
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty role;}) [
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
./atuin.nix
./shell.nix
./packages

View File

@ -1,10 +1,8 @@
{
lib,
pkgs,
role,
...
}: let
isDevel = pkgs.stdenv.isLinux && role == "devel";
dirs = {
defaults = ../defaults;
};
@ -18,7 +16,7 @@
};
in {
wayland.windowManager.sway = {
enable = isDevel;
enable = pkgs.stdenv.isLinux;
extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
xwayland = true;
systemd.enable = true;
@ -31,11 +29,11 @@ in {
xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
programs.rofi.enable = isDevel;
services.mako.enable = isDevel;
programs.rofi.enable = pkgs.stdenv.isLinux;
services.mako.enable = pkgs.stdenv.isLinux;
programs.waybar = {
enable = isDevel;
enable = pkgs.stdenv.isLinux;
systemd.enable = true;
package = pkgs.waybar.overrideAttrs (old: {

View File

@ -2,6 +2,7 @@
config,
lib,
pkgs,
inputs,
...
}: let
cfg = config.gaming;
@ -108,6 +109,10 @@ in {
ffxiv = {
enable = lib.mkEnableOption "Final Fantasy XIV and it's accompanied (unofficial) launcher";
};
reshade = {
enable = lib.mkEnableOption "ReShade, a post-processing injector for games and video software";
};
};
config = {
@ -154,6 +159,7 @@ in {
cfg.lutris.extraPackages
)) ++
(lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
(lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]);
(lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]) ++
(lib.optionals cfg.reshade.enable [inputs.packages.${pkgs.system}.reshade]);
};
}

View File

@ -87,12 +87,7 @@
# Core networking module (see ../../networking/core.nix)
network = {
firewall = {
enable = true;
tcpPorts = {
allowedPorts = [8123];
};
};
firewall.enable = true;
networkManager.enable = true;
};
@ -102,37 +97,7 @@
};
# Add username to groups "wheel" and "video" - more may be added here later
users.users.${userName} = {
extraGroups = ["wheel" "podman" "network"];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
];
};
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
];
# Add Home Assistant service
services.home-assistant = {
enable = true;
extraComponents = [
"esphome"
"met"
"radio_browser"
"homeassistant_hardware"
"zha"
"group"
"mikrotik"
];
config = {
# Includes dependencies for a basic setup
# https://www.home-assistant.io/integrations/default_config/
default_config = {};
};
};
security.sudo.wheelNeedsPassword = false;
users.users.${userName}.extraGroups = ["wheel" "podman" "network"];
system.stateVersion = "24.11";
}