bad/devos
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Switch to nixpkgs-unstable

Browse source
This commit is contained in:
Bad 2022-10-20 18:26:28 +02:00
parent 15806203c1
commit ea347ed312
7 changed files with 92 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664140963, "lastModified": 1665870395,
"narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", "rev": "a630400067c6d03c9b3e0455347dc8559db14288",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1659622306, "lastModified": 1665848456,
"narHash": "sha256-Kpfm2PNs+kZU0W7qcugoPATLG8I2P7FJFGTgsf1LJiU=", "narHash": "sha256-UwJ2bY/K5rK5oa+uIQjyz9EXyNoGYBlKXZCcdav5w14=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "d1193743a535d7fbbc7f3eda4e51295b10bd4d2c", "rev": "1f97cb28f13aa0770947568589116468c68b3f26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +169,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1665470981, "lastModified": 1666248064,
"narHash": "sha256-ybKBuDqIq4ZDa1QQqkDVDYewUuxPGs3akEWuhEF2ltw=", "narHash": "sha256-boxI58K2KSi8MLP+DJkQEbZcVjr0OOZ2ocEJm37Zl+w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "0ba1e28f8810df02d9cd20e05b1957a782c7d9d1", "rev": "d87c114ae9d074bcb1d73c2b4debef86dffeddc0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +365,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1665476539, "lastModified": 1666253070,
"narHash": "sha256-NDs0qfTSfG+vEvB3HN2GOOZgMBPAYBpFeIC4hrN5wjk=", "narHash": "sha256-MtaNgghmfp+ywh5mv9FcspFT4ACaYINSN+D98PCkrP0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b37a909508edb8d7fdcd04ac90761b2cfa2a5f28", "rev": "c485669ca529e01c1505429fa9017c9a93f15559",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,16 +396,16 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1665349835, "lastModified": 1666282307,
"narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", "narHash": "sha256-O1T2HGLARLKDLfdOmjPBfn3eC4cSIaQD71wUN4I/6/s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", "rev": "b7d8c687782c8f9a1d425a7e486eb989654f6468",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -451,26 +451,27 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1665349835, "lastModified": 1666198336,
"narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", "narHash": "sha256-VTrWD8Bb48h2pi57P1++LuvZIgum3gSLiRzZ/8q3rg0=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", "rev": "db25c4da285c5989b39e4ce13dea651a88b7a9d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1665321371, "lastModified": 1665987993,
"narHash": "sha256-0SO6MTW0bX6lxZmz1AZW/Xmk+hnTd7/hp1vF7Tp7jg0=", "narHash": "sha256-MvlaIYTRiqefG4dzI5p6vVCfl+9V8A1cPniUjcn6Ngc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "236ba4df714131059945d7754c0aa3fbe9d2f74c", "rev": "0e6593630071440eb89cd97a52921497482b22c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,11 +482,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1665259268, "lastModified": 1666109165,
"narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=", "narHash": "sha256-BMLyNVkr0oONuq3lKlFCRVuYqF75CO68Z8EoCh81Zdk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5924154f000e6306030300592f4282949b2db6c", "rev": "32096899af23d49010bd8cf6a91695888d9d9e73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -612,17 +613,18 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nvfetcher": "nvfetcher", "nvfetcher": "nvfetcher",
"peerix": "peerix", "peerix": "peerix",
"pwnix": "pwnix" "pwnix": "pwnix",
"stable": "stable"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1665438197, "lastModified": 1666216399,
"narHash": "sha256-uVkoQqUHyeu1j3DucZDmp0w89WaY91eP/p2BmPFIPaY=", "narHash": "sha256-0evdMjhsffxZBn4ZnICnsc4J8Zv8qmSfFZfwnI+h34Q=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "5d4995191326a3710206d152a710470e196e4466", "rev": "a77ac93b2a6bfada6641a9067045ef6b3ec46951",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -632,6 +634,22 @@
"type": "github" "type": "github"
} }
}, },
"stable": {
"locked": {
"lastModified": 1666164185,
"narHash": "sha256-5v+YB4ijeUfg5LCz9ck4gIpCPhIS+qn02OyPJO48bCE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c5203abb1329f7ea084c04acda330ca75d5b9fb5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1637014545, "lastModified": 1637014545,

6
flake.nix
View file

@ -4,9 +4,9 @@
nixConfig.extra-experimental-features = "nix-command flakes"; nixConfig.extra-experimental-features = "nix-command flakes";
inputs = inputs =
{ {
# nixos.url = "github:nixos/nixpkgs/nixos-22.05"; stable.url = "github:nixos/nixpkgs/nixos-22.05";
nixos.url = "nixpkgs/nixos-unstable"; nixos.url = "github:nixos/nixpkgs/nixos-unstable";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/master";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";

28
overlays/overrides.nix
View file

@ -3,36 +3,10 @@ let
latest = channels.latest; latest = channels.latest;
in in
{ {
__dontExport = true; # overrides clutter up actual creations __dontExport = true; # overrides clutter up actual creations
inherit (latest) inherit (latest)
cachix asdf;
nix-direnv
minetest
dhall
discord
element-desktop
rage
ghidra
podman
nixpkgs-fmt
qutebrowser
nvfetcher
signal-desktop
delve
neovim
polymc
lutris
sumneko-lua-language-server
cargo-crev
cargo-fuzz
tdesktop
vimPlugins
mako
neovim-unwrapped;
latest = latest; latest = latest;
haskellPackages = prev.haskellPackages.override haskellPackages = prev.haskellPackages.override

70
profiles/core/default.nix
View file

@ -2,16 +2,44 @@
let inherit (lib) fileContents; let inherit (lib) fileContents;
in in
{ {
# Cachix # Cachix
nix = { nix = {
binaryCaches = [ settings = {
"https://cache.nixos.org/" substituters = [
"https://nix-community.cachix.org" "https://cache.nixos.org/"
]; "https://nix-community.cachix.org"
binaryCachePublicKeys = [ ];
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" trusted-public-keys = [
]; "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
trusted-users = [ "root" "@wheel" ];
system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
sandbox = true;
auto-optimise-store = true;
};
registry = {
nixpkgs.flake = self.inputs.nixos;
latest.flake = self.inputs.latest;
stable.flake = self.inputs.stable;
pwnix.flake = self.inputs.pwnix;
};
# Improve nix store disk usage
gc.automatic = true;
optimise.automatic = true;
# Generally useful nix option defaults
extraOptions = ''
keep-outputs = true
keep-derivations = true
fallback = true
'';
}; };
# For rage encryption, all hosts need a ssh key pair # For rage encryption, all hosts need a ssh key pair
@ -20,11 +48,6 @@ in
openFirewall = lib.mkDefault false; openFirewall = lib.mkDefault false;
}; };
# This is just a representation of the nix default
nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
nix.registry.nixpkgs.flake = self.inputs.nixos;
nix.registry.latest.flake = self.inputs.latest;
nix.registry.pwnix.flake = self.inputs.pwnix;
# Fix zsh autocompletion with home-manager # Fix zsh autocompletion with home-manager
environment.pathsToLink = [ "/share/zsh" ]; environment.pathsToLink = [ "/share/zsh" ];
@ -92,27 +115,6 @@ in
}; };
}; };
nix = {
# Improve nix store disk usage
autoOptimiseStore = true;
gc.automatic = true;
optimise.automatic = true;
# Prevents impurities in builds
useSandbox = true;
# give root and @wheel special privileges with nix
trustedUsers = [ "root" "@wheel" ];
# Generally useful nix option defaults
extraOptions = ''
keep-outputs = true
keep-derivations = true
fallback = true
'';
};
time.timeZone = "Europe/Warsaw"; time.timeZone = "Europe/Warsaw";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";

1
profiles/game/default.nix
View file

@ -6,7 +6,6 @@
steam-run steam-run
minetest minetest
mumble mumble
polymc
(retroarch.override { cores = [ libretro.snes9x ]; }) (retroarch.override { cores = [ libretro.snes9x ]; })
olympus olympus
godot godot

1
users/modules/neovim/default.nix
View file

@ -42,6 +42,7 @@ in
set termguicolors set termguicolors
set ic set ic
set mouse=
set number set number
set autoindent set autoindent

2
users/profiles/core/default.nix
View file

@ -1,3 +1,3 @@
{ {
home.sessionPath = ["$HOME/.local/bin" "$HOME/.cargo/bin/"]; home.sessionPath = [ "$HOME/.local/bin" "$HOME/.cargo/bin/" ];
} }