aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

unstable was so unstable...

Browse source
This commit is contained in:
Andrea Ciceri 2022-03-13 20:57:59 +01:00
parent e5ca6feeff
commit 7ce23b1055
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
20 changed files with 115 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/check.yml vendored
View file

@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: cachix/install-nix-action@v13
- uses: cachix/install-nix-action@v16
with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/8d8xah1f6ypccpmw9cfsl8ziw1chj4cl/install
install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"

2
.github/workflows/release.yml vendored
View file

@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: cachix/install-nix-action@v13
- uses: cachix/install-nix-action@v16
with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/8d8xah1f6ypccpmw9cfsl8ziw1chj4cl/install
install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"

100
flake.lock generated
View file

@ -22,11 +22,11 @@
]
},
"locked": {
"lastModified": 1645293039,
"narHash": "sha256-PwdDu+SkX8dreeuJ/4av1sEluNZdrpdXv8JsRKKg1Yc=",
"lastModified": 1647173930,
"narHash": "sha256-8oca3Pc68VrCp8HeOtHmzs5g0rdQnPO9beDEEZJ02W0=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "1df878b6f8351795a3bebfbe4fd2d02e1e8b29d6",
"rev": "17fbc68a6110edbff67e55f7450230a697ecb17e",
"type": "github"
},
"original": {
@ -38,10 +38,7 @@
"deploy": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"digga",
"latest"
],
"nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
@ -85,19 +82,19 @@
],
"latest": "latest",
"nixlib": [
"stable"
"unstable"
],
"nixos-generators": "nixos-generators",
"nixpkgs": [
"stable"
"unstable"
]
},
"locked": {
"lastModified": 1646514950,
"narHash": "sha256-mlpCjnpwACmQ8qisIMep20likgT0anOjuo+3aVMFtnE=",
"lastModified": 1646846683,
"narHash": "sha256-s13XKw1xjGlmdY9qMwla/mDKaE/8xAVJ/+ZTJ9Q7CTY=",
"owner": "divnix",
"repo": "digga",
"rev": "8b88f511dbef2af60c95f9202b45c0b20795b58c",
"rev": "396b04b62b885963c467aa8ade3c19398ade2d69",
"type": "github"
},
"original": {
@ -108,11 +105,11 @@
},
"emacs-overlay": {
"locked": {
"lastModified": 1646818969,
"narHash": "sha256-35Ymee1xFKYgGSvpteI0ZT+Fc8qPygYleCy3vyeXj2w=",
"lastModified": 1647162387,
"narHash": "sha256-TK3jhGCsQkzlz43iKwUYk5c1xDZm2LkPn9LxpWczYs8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "55a555f10b76f1e632a429dc6b9d10b81fa86023",
"rev": "43fa2ef6dc8e0f9dbbbb26564b22b75478b7ef0b",
"type": "github"
},
"original": {
@ -209,11 +206,11 @@
]
},
"locked": {
"lastModified": 1643933536,
"narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
"lastModified": 1647175256,
"narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2860d7e3bb350f18f7477858f3513f9798896831",
"rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
"type": "github"
},
"original": {
@ -268,10 +265,7 @@
"nixos-generators": {
"inputs": {
"nixlib": "nixlib",
"nixpkgs": [
"digga",
"blank"
]
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1637655461,
@ -289,11 +283,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1646751686,
"narHash": "sha256-hnHZ2qaXVIm05+1EqWNg/yaaeTTNR8TPd7jaOM/DNZA=",
"lastModified": 1646825982,
"narHash": "sha256-uWvS4UFkdE4Iqk1pXhxkZqPsqI+Z2V9VRmLxGUFejbY=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "c730530902842de8968fe234b6e0833fa669d466",
"rev": "816a935bf5aa5f77cb1f03ebfe20ab13b112d0f1",
"type": "github"
},
"original": {
@ -302,6 +296,22 @@
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1646955661,
"narHash": "sha256-AYLta1PubJnrkv15+7G+6ErW5m9NcI9wSdJ+n7pKAe0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e9545762b032559c27d8ec9141ed63ceca1aa1ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": {
"inputs": {
"cachix": [
@ -313,11 +323,11 @@
]
},
"locked": {
"lastModified": 1646813742,
"narHash": "sha256-Tv9O9Ip2dA4zSuQaFcV08QPuipP5gVZOqfJejJ5n9/8=",
"lastModified": 1647197191,
"narHash": "sha256-mePuThjupptYITaIifJjvhsCEyeCDvIKbAPinGAQSKc=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "85bc72b1ffe2651c7d271c65b42d34f832d381e6",
"rev": "f37272174d19e2706d73fcf8a613e546b38d1b52",
"type": "github"
},
"original": {
@ -326,13 +336,29 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1646955661,
"narHash": "sha256-AYLta1PubJnrkv15+7G+6ErW5m9NcI9wSdJ+n7pKAe0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e9545762b032559c27d8ec9141ed63ceca1aa1ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1646821226,
"narHash": "sha256-CjeiKHCqwWGJ1hec4Z5GsUTKOswEIDWdpJZq5lbX0FU=",
"lastModified": 1647193423,
"narHash": "sha256-CFHS4wP+PzZj6xlAm7fsXWnJBx5eE2MFA4NJ/+f3YOQ=",
"owner": "nix-community",
"repo": "NUR",
"rev": "000ff96f578e82c8c0357157fcecf359acc4798e",
"rev": "f7cfdfc2307a38ed92a7df2cf820d8118c124ef8",
"type": "github"
},
"original": {
@ -379,11 +405,11 @@
},
"stable": {
"locked": {
"lastModified": 1646813037,
"narHash": "sha256-oEc4qfgYaEmo76odve3xzOu3LgU11Qv+Vf5n/gFmR60=",
"lastModified": 1647193095,
"narHash": "sha256-REihWQ2xl+vB1UiFOZ0PdTNMjSJ+Kyq8XIykP4W092I=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "056010084ef1f48710a26df902d3a52106e4aaf2",
"rev": "a39763f7264a418b4da2d4ab3d5b54043eca85e2",
"type": "github"
},
"original": {
@ -395,11 +421,11 @@
},
"unstable": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"lastModified": 1646939531,
"narHash": "sha256-bxOjVqcsccCNm+jSmEh/bm0tqfE3SdjwS+p+FZja3ho=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"rev": "fcd48a5a0693f016a5c370460d0c2a8243b882dc",
"type": "github"
},
"original": {

10
flake.nix
View file

@ -9,8 +9,8 @@
nur.url = "github:nix-community/NUR";
digga.url = "github:divnix/digga";
digga.inputs.nixpkgs.follows = "stable";
digga.inputs.nixlib.follows = "stable";
digga.inputs.nixpkgs.follows = "unstable";
digga.inputs.nixlib.follows = "unstable";
digga.inputs.home-manager.follows = "unstable";
home.url = "github:nix-community/home-manager/release-21.11";
@ -96,7 +96,8 @@
nixos = {
hostDefaults = {
channelName = "unstable";
# channelName = "unstable";
channelName = "stable";
imports = [ (digga.lib.importExportableModules ./modules) ];
modules = [
{ lib.our = self.lib; }
@ -132,6 +133,9 @@
suites = with profiles; rec {
base = [ core users.ccr users.root ];
};
unstableKernelForPBP = (import inputs.unstable {
system = "aarch64-linux";
}).pkgs.linuxPackages_latest;
};
};

3
hosts/hs/configuration.nix
View file

@ -72,7 +72,7 @@
workgroup = WORKGROUP
server string = nas
netbios name = nas
security = user
security = user
map to guest = bad user
vfs objects = recycle
recycle:repository = .recycle
@ -279,7 +279,6 @@
};
nix = {
package = pkgs.nixUnstable;
gc = {
automatic = true;
options = "--delete-older-than 3d";

1
hosts/mbp/configuration.nix
View file

@ -20,7 +20,6 @@
};
nix = {
package = pkgs.nixUnstable;
gc = {
automatic = true;
user = "andreaciceri";

5
hosts/pbp/configuration.nix
View file

@ -1,11 +1,11 @@
{ config, lib, pkgs, profiles, ... }:
{ config, lib, pkgs, unstableKernelForPBP, profiles, ... }:
{
imports = with profiles; [ mount-nas sshd dbus avahi printing xdg syncthing ];
boot = {
initrd.availableKernelModules = [ "usbhid" ];
kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = unstableKernelForPBP;
extraModulePackages = with config.boot.kernelPackages; [
v4l2loopback
];
@ -48,7 +48,6 @@
nix = {
package = pkgs.nixUnstable;
gc = {
automatic = true;
options = "--delete-older-than 3d";

1
hosts/pc/configuration.nix
View file

@ -44,7 +44,6 @@
[{ device = "/dev/disk/by-label/swap"; }];
nix = {
package = pkgs.nixUnstable;
gc = {
automatic = true;
options = "--delete-older-than 3d";

22
overlays/overrides.nix
View file

@ -14,15 +14,15 @@ channels: final: prev: {
# starship;
haskellPackages = prev.haskellPackages.override
(old: {
overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev:
let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
in
{
# same for haskell packages, matching ghc versions
inherit (channels.unstable.haskell.packages."ghc${version}")
haskell-language-server;
});
});
# haskellPackages = prev.haskellPackages.override
# (old: {
# overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev:
# let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
# in
# {
# # same for haskell packages, matching ghc versions
# inherit (channels.unstable.haskell.packages."ghc${version}")
# haskell-language-server;
# });
# });
}

6
profiles/cachix/aciceri-fleet.nix
View file

@ -1,9 +1,9 @@
{
nix.settings = {
substituters = [
nix = {
binaryCaches = [
"https://aciceri-fleet.cachix.org"
];
trusted-public-keys = [
binaryCachePublicKeys = [
"aciceri-fleet.cachix.org-1:WiHJIK4UFTdfvWx0lG3mCR4EddyYsRhIuMGSje3/YGI="
];
};

6
profiles/cachix/arm.nix
View file

@ -1,9 +1,9 @@
{
nix.settings = {
substituters = [
nix = {
binaryCaches = [
"https://arm.cachix.org"
];
trusted-public-keys = [
binaryCachePublicKeys = [
"arm.cachix.org-1:K3XjAeWPgWkFtSS9ge5LJSLw3xgnNqyOaG7MDecmTQ8="
];
};

2
profiles/cachix/default.nix
View file

@ -7,5 +7,5 @@ let
in
{
inherit imports;
nix.settings.substituters = [ "https://cache.nixos.org/" ];
nix.binaryCaches = [ "https://cache.nixos.org/" ];
}

6
profiles/cachix/haskell.nix
View file

@ -1,9 +1,9 @@
{
nix.settings = {
substituters = [
nix = {
binaryCaches = [
"https://hydra.iohk.io"
];
trusted-public-keys = [
binaryCachePublicKeys = [
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
];
};

6
profiles/cachix/nix-community.nix
View file

@ -1,9 +1,9 @@
{
nix.settings = {
substituters = [
nix = {
binaryCaches = [
"https://nix-community.cachix.org"
];
trusted-public-keys = [
binaryCachePublicKeys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};

6
profiles/cachix/nixpkgs-wayland.nix
View file

@ -1,9 +1,9 @@
{
nix.settings = {
substituters = [
nix = {
binaryCaches = [
"https://nixpkgs-wayland.cachix.org"
];
trusted-public-keys = [
binaryCachePublicKeys = [
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
];
};

6
profiles/cachix/nrdxp.nix
View file

@ -1,9 +1,9 @@
{
nix.settings = {
substituters = [
nix = {
binaryCaches = [
"https://nrdxp.cachix.org"
];
trusted-public-keys = [
binaryCachePublicKeys = [
"nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="
];
};

12
profiles/core/default.nix
View file

@ -15,6 +15,7 @@ in
dosfstools
fd
git
htop
bottom
gptfdisk
iputils
@ -52,13 +53,10 @@ in
nix = {
gc.automatic = true;
optimise.automatic = true;
settings = {
sandbox = true;
trusted-users = [ "root" "@wheel" ];
allowed-users = [ "@wheel" ];
system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
auto-optimise-store = true;
};
autoOptimiseStore = true;
useSandbox = true;
allowedUsers = [ "@wheel" ];
trustedUsers = [ "root" "@wheel" ];
extraOptions = ''
min-free = 536870912
keep-outputs = true

3
users/ccr/default.nix
View file

@ -24,10 +24,11 @@
texlive.combined.scheme-full
gphoto2
rawtherapee
deploy-rs.deploy-rs
] ++
(if !stdenv.hostPlatform.isAarch64 then [
wineWowPackages.full
vial
deploy-rs.deploy-rs # to slow to cross compile for aarch64
#digikam # broken
] else [ ])
else [ ]);

4
users/profiles/emacs/default.nix
View file

@ -7,7 +7,7 @@
};
programs.emacs = {
enable = !pkgs.stdenv.hostPlatform.isDarwin;
enable = false;
package = pkgs.customEmacs;
};
@ -56,7 +56,7 @@
comment = "Org protocol";
desktopName = "org-protocol";
type = "Application";
mimeTypes = [ "x-scheme-handler/org-protocol" ];
mimeType = "x-scheme-handler/org-protocol";
}
)
] ++ (if pkgs.system == "x86_64-linux" then [

3
users/profiles/qmk/default.nix
View file

@ -2,8 +2,7 @@
home.packages = [
gnumake
qmk
vial
#qmk
];
}