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

updated and switch stringify-ing strategy

Browse source
This commit is contained in:
Gerg-L 2023-06-26 22:45:04 -04:00
parent da8e226c3a
commit 2057ff5d17
6 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

46
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687134796, "lastModified": 1687747614,
"narHash": "sha256-gjBAkEtNPMQzqK4IHjTQBUv3VhggszOHLJbhXZy0OVQ=", "narHash": "sha256-KXspKgtdO2YRL12Jv0sUgkwOwHrAFwdIG/90pDx8Ydg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "4823509bb3b014dc85abefc13efcfa076d36338a", "rev": "fef67a1ddc293b595d62a660f57deabbcb70ff95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1687388587, "lastModified": 1687829807,
"narHash": "sha256-TILQ4Ch+Y9Q6Hczm5vwgGWXD2ow29uxXPJuGzqS6jj0=", "narHash": "sha256-3frHlJgnHai4BCR67iAn8rpOpVMYGGsxXP/RD9CJeug=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "563afe26c68c2323e817345687c367ab5ca06dfa", "rev": "71a84fc822c1d8f41d6b70ce31c600dd45dc7ac3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,11 +127,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1687049841, "lastModified": 1687654967,
"narHash": "sha256-FBNZQfWtA7bb/rwk92mfiWc85x4hXta2OAouDqO5W8w=", "narHash": "sha256-ki8vItcjn8Z8n+QD9NEoCQbbbG7VzWy71hyOkFFwCkM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "908af6d1fa3643c5818ea45aa92b21d6385fbbe5", "rev": "b3ec8fb525fc0c8f08eff5ef93c684b4c6d0e777",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687183443, "lastModified": 1687743756,
"narHash": "sha256-foX4pkph2AwUdJL3JURa7IHog+YRIheZ54vwHwxqwhU=", "narHash": "sha256-WhDERdaMGX73CBxpDfoauKU2Z4NC10+/4khdBbpXjWs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "09140f23f5ffce828db4ef040070bdd9595b1f3a", "rev": "844ce2ab9a0ba819b30df1fff2c48c9b2b2344be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1687267549, "lastModified": 1687398569,
"narHash": "sha256-jpg5zwhEQlovGH/xrml9X5ciPKpIZr/3Z04+Fh3VtQY=", "narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d299d0538295e71e194aa0dfa896ad399f4508e3", "rev": "2ff6973350682f8d16371f8c071a304b8067f192",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -290,8 +290,8 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687747647, "lastModified": 1687749665,
"narHash": "sha256-1gkAQLFAnlzp2P55Wql8fV0o8dJjsosRtyEFSdxGj8k=", "narHash": "sha256-wvpL4zqF5DoqkKuEkNVuvwXPBz7pnxc2c0z/a5FgndU=",
"path": "/home/gerg/Projects/spicetify-nix", "path": "/home/gerg/Projects/spicetify-nix",
"type": "path" "type": "path"
}, },
@ -302,11 +302,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1687379288, "lastModified": 1687729501,
"narHash": "sha256-cSuwfiqYfeVyqzCRkU9AvLTysmEuSal8nh6CYr+xWog=", "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef0bc3976340dab9a4e087a0bcff661a8b2e87f3", "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -338,11 +338,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1686960236, "lastModified": 1687681650,
"narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
hosts/game-laptop/default.nix
View file

@ -38,8 +38,8 @@ _: {
; ;
}; };
etc = { etc = {
"jdks/17".source = pkgs.openjdk17 + /bin; "jdks/17".source = "${pkgs.openjdk17}/bin";
"jdks/8".source = pkgs.openjdk8 + /bin; "jdks/8".source = "${pkgs.openjdk8}/bin";
}; };
}; };
networking = { networking = {

2
hosts/gerg-desktop/containers/minecraft.nix_
View file

@ -1,4 +1,4 @@
_:{ _: {
containers."minecraft" = { containers."minecraft" = {
ephemeral = true; ephemeral = true;
autoStart = true; autoStart = true;

4
hosts/gerg-desktop/default.nix
View file

@ -57,8 +57,8 @@
inherit (nvim-flake.packages.${pkgs.system}) neovim; inherit (nvim-flake.packages.${pkgs.system}) neovim;
}; };
etc = { etc = {
"jdks/17".source = pkgs.openjdk17 + /bin; "jdks/17".source = "${pkgs.openjdk17}/bin";
"jdks/8".source = pkgs.openjdk8 + /bin; "jdks/8".source = "${pkgs.openjdk8}/bin";
}; };
}; };

6
hosts/gerg-desktop/vfio.nix
View file

@ -46,8 +46,8 @@ let
echo 'EndSection' >> $out echo 'EndSection' >> $out
echo >> $out echo >> $out
''; '';
oneMonitor = pkgs.writeText "1-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/1-monitor.conf))]); oneMonitor = pkgs.writeText "1-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile "${self}/misc/1-monitor.conf")]);
twoMonitor = pkgs.writeText "2-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile (self + /misc/2-monitor.conf))]); twoMonitor = pkgs.writeText "2-monitor.conf" (lib.concatStrings [(builtins.readFile xserverbase) (builtins.readFile "${self}/misc/2-monitor.conf")]);
in { in {
####VM SOUND BORKED ####VM SOUND BORKED
services.pipewire.package = pipewire_fix.legacyPackages.${pkgs.system}.pipewire; services.pipewire.package = pipewire_fix.legacyPackages.${pkgs.system}.pipewire;
@ -151,6 +151,6 @@ in {
in [ in [
"L /tmp/xorg.conf - - - - ${twoMonitor}" "L /tmp/xorg.conf - - - - ${twoMonitor}"
"L+ /var/lib/libvirt/hooks/qemu - - - - ${qemuHook}" "L+ /var/lib/libvirt/hooks/qemu - - - - ${qemuHook}"
"L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${self + /misc/Windows.xml}" "L+ /var/lib/libvirt/qemu/Windows.xml - - - - ${self}/misc/Windows.xml"
]; ];
} }

2
pkgs/parrot.nix
View file

@ -43,7 +43,7 @@ in
ffmpeg ffmpeg
]}''; ]}'';
cargoLock.lockFile = src + /Cargo.lock; cargoLock.lockFile = "${src}/Cargo.lock";
RUSTC_BOOTSTRAP = 1; RUSTC_BOOTSTRAP = 1;
} }