gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 08:53:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

prismlauncher unborked, nerdfonts borked

Browse source
This commit is contained in:
Gerg-L 2023-05-07 15:27:35 -04:00
parent caf9f55939
commit 1231534d40
4 changed files with 52 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

98
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683188822, "lastModified": 1683451313,
"narHash": "sha256-ZE+/n31vB5dRRt9qQI0x1MBjbu6c+SZLOxCq4gXus14=", "narHash": "sha256-BBpDeKFVRKScdLgcpJLeMGjwJXgfccYJOZ2Q0gWwg4o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "081f86329ca1bb4cff31b48b165db8aabe736500", "rev": "35c3426fece22a6084c0bd64eccc37ff546da6ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -109,12 +109,15 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": {
"systems": "systems_3"
},
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1681202837,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,11 +144,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1683243893, "lastModified": 1683485721,
"narHash": "sha256-OfHwcjJy5pm99/BFVl/kKK/TIDCG9fqzOgG45gPWmVU=", "narHash": "sha256-xEalZlIy1Ky+NdblYAZwxL9DMZHnhzPYljiol23RSpE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7382229070c6b93d16d40dcb2f57b75af9ac65f", "rev": "494f8e2a53ce7d6b413070d7a1e1ef5f92114cb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,18 +170,17 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1682581904, "lastModified": 1683417608,
"narHash": "sha256-9P4T2erXXrPxXTTLgD29U/IdKCOYqP4xbwdYswtVBA8=", "narHash": "sha256-qdWRY50WhpjHKLKe7ngYdEnA+gYjOnE3PScQws0YofY=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "d321deb4a9b05e9d81b79ac166274f4a6e7981bf", "rev": "fa1baa9a47cdb3eed17d48b6011a164d4009d2ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
"dir": "contrib", "dir": "contrib",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "d321deb4a9b05e9d81b79ac166274f4a6e7981bf",
"type": "github" "type": "github"
} }
}, },
@ -274,11 +276,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1682817260, "lastModified": 1683401577,
"narHash": "sha256-kFMXzKNj4d/0Iqbm5l57rHSLyUeyCLMuvlROZIuuhvk=", "narHash": "sha256-sOtJKZZ9HWqcGg2hRj6O4HX9pOFfTzgYgSi+MN1HEWo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36", "rev": "d724b57823f2ab2c879a840a426a607bbab2b730",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -297,11 +299,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683064038, "lastModified": 1683428547,
"narHash": "sha256-XXNmm/eKfuGCAwSoZ5WJDHbI9mCYhgpnP+JsKMRJH4Q=", "narHash": "sha256-eiFIcb4N5YXTLYQuF/U/2kieE9sd1CRybeT/aDHDS1M=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "nvim-flake", "repo": "nvim-flake",
"rev": "0b2653e59a06837e0065079f7be64d8ea124bdd9", "rev": "c7a6bfc8d8e25958b33d8f3ba0c302b301cf3026",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +336,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1682823324, "lastModified": 1683428115,
"narHash": "sha256-KNu3OAqVyoKwnDP+gqptjQYCnZXxEwXccR89c0r1/8k=", "narHash": "sha256-sxkM4upCCdsaWVpDWxYgQXooobex8QHbFkGj40Uf9uQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4f308f76633f81253a12b80e7b05b80d325005b2", "rev": "fd2d857ce2450a3ba5700d1e95eb110070e0dbc3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -347,36 +349,19 @@
"type": "github" "type": "github"
} }
}, },
"spicetify-cli": {
"flake": false,
"locked": {
"lastModified": 1677851665,
"narHash": "sha256-C5J+OJjoiPOo/scVd48lTBJKKWial3TCkCIDBSerO+4=",
"owner": "spicetify",
"repo": "spicetify-cli",
"rev": "c9d8068d58d8c45f961ca42edcea47d7be904164",
"type": "github"
},
"original": {
"owner": "spicetify",
"repo": "spicetify-cli",
"type": "github"
}
},
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
], ]
"spicetify-cli": "spicetify-cli"
}, },
"locked": { "locked": {
"lastModified": 1679401262, "lastModified": 1683481928,
"narHash": "sha256-6HuFHrkQsjrP7bOUUN501q8FFsTwpMsw5+brsIUDJuY=", "narHash": "sha256-G7LsEjKE+EEYNkKcJsy+iplw/6STjK506w/8ImisN5Q=",
"owner": "the-argus", "owner": "the-argus",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "f89305a9af65abf3edfba10d12c2d1a572caddb6", "rev": "c1abe3d0bc44868e4ba04e3fccce7b620522ab5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +372,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1683207485, "lastModified": 1683383741,
"narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=", "narHash": "sha256-rAQSBnFGNKNomUUyVl+7v0tnp45677t4Ovlh9f57k6Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1", "rev": "adc7c6f1bbaa73cda26be2323353b63a05b42f61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -451,13 +436,28 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1683014792, "lastModified": 1683408522,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/theming.nix
View file

@ -1,4 +1,4 @@
_: { {stable, ...}: {
pkgs, pkgs,
options, options,
config, config,
@ -60,7 +60,7 @@ in {
''; '';
fonts = { fonts = {
fonts = [ fonts = [
(pkgs.nerdfonts.override (stable.legacyPackages.${pkgs.system}.nerdfonts.override
{ {
fonts = ["Overpass"]; fonts = ["Overpass"];
}) })

1
systems/game-laptop/default.nix
View file

@ -27,7 +27,6 @@ inputs: {
pkgs.heroic pkgs.heroic
pkgs.legendary-gl pkgs.legendary-gl
pkgs.prismlauncher pkgs.prismlauncher
inputs.master.legacyPackages.${pkgs.system}.prismlauncher
pkgs.pcmanfm #file manager pkgs.pcmanfm #file manager
pkgs.librewolf #best browser pkgs.librewolf #best browser
pkgs.obs-studio pkgs.obs-studio

9
systems/gerg-desktop/default.nix
View file

@ -35,7 +35,6 @@ inputs: {
"nvidia-x11" "nvidia-x11"
"steam" "steam"
"steam-original" "steam-original"
"discord"
]; ];
overlays = [ overlays = [
@ -53,7 +52,6 @@ inputs: {
pkgs.librewolf #best browser pkgs.librewolf #best browser
pkgs.vlc #play stuff pkgs.vlc #play stuff
pkgs.ripgrep pkgs.ripgrep
pkgs.lutris
pkgs.xautoclick pkgs.xautoclick
# wrap webcord to remove state file https://github.com/SpacingBat3/WebCord/issues/360 # wrap webcord to remove state file https://github.com/SpacingBat3/WebCord/issues/360
(pkgs.symlinkJoin { (pkgs.symlinkJoin {
@ -66,12 +64,7 @@ inputs: {
wrapProgram "$out/bin/webcord" --run 'rm -f $HOME/.config/WebCord/windowState.json' wrapProgram "$out/bin/webcord" --run 'rm -f $HOME/.config/WebCord/windowState.json'
''; '';
}) })
inputs.master.legacyPackages.${pkgs.system}.prismlauncher pkgs.prismlauncher
#pkgs.prismlauncher
(pkgs.discord.override {
withOpenASAR = true;
nss = pkgs.nss_latest;
})
]; ];
etc = { etc = {
"jdks/17".source = pkgs.openjdk17 + /bin; "jdks/17".source = pkgs.openjdk17 + /bin;