4 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
fefa6dd3de added presence.nvim 2025-06-16 21:55:22 -04:00
8785247675 added git merge backup settings 2025-06-12 13:01:59 -04:00
4afb47e881 update browser extensions 2025-06-01 14:28:28 -04:00
8 changed files with 84 additions and 22 deletions

View File

@ -0,0 +1,5 @@
return {
{
'andweeb/presence.nvim',
}
}

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,7 +12,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
ghostty.url = "github:ghostty-org/ghostty";
ucodenix.url = "github:e-tho/ucodenix";
nix-reshade.url = "github:LovingMelody/nix-reshade";
};
outputs = inputs @ {
@ -22,7 +22,6 @@
darwin,
home-manager,
ghostty,
ucodenix,
...
}: let
userName = "wyatt";
@ -65,7 +64,6 @@
};
modules = [
nix-flatpak.nixosModules.nix-flatpak
ucodenix.nixosModules.default
./modules/common
./modules/machine/cloud

View File

@ -39,13 +39,15 @@
# ublock origin
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
version = "1.63.2";
# sha256 = lib.fakeSha256;
version = "1.64.0";
})
(createChromiumExtension {
# bitwarden
id = "nngceckbapebfimnlniiiahkandclblb";
sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
version = "2025.3.1";
# sha256 = lib.fakeSha256;
version = "2025.5.0";
})
];
};

View File

@ -17,6 +17,7 @@
push.autoSetupRemote = true;
pull.merge = true;
merge.tool = "nvimdiff";
mergetool.keepBackup = false;
};
ignores = [

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

@ -24,7 +24,6 @@ in {
../../graphics
../../pwrMgmt
../../networking/core.nix
../../security/sudo.nix
../../sound/pipewire.nix
../../sound/shairport.nix
../../virtualization/podman.nix
@ -177,10 +176,5 @@ in {
};
};
# security.sudo.needsPassword = false;
# Enable microcode updates
services.ucodenix.enable = true;
system.stateVersion = "24.11";
}

View File

@ -1,4 +1,3 @@
# FIXME: this file is broken but i don't know what is wrong with it
{
config,
lib,