22.11 fixer up
This commit is contained in:
parent
786c3efd41
commit
db3c09ee30
2
.envrc
2
.envrc
|
@ -10,8 +10,8 @@ if ! test -s .direnv/pull-date || test "$now" != "$(cat .direnv/pull-date)"; the
|
||||||
--update-input nixpkgs \
|
--update-input nixpkgs \
|
||||||
--update-input unstable \
|
--update-input unstable \
|
||||||
--update-input home-manager \
|
--update-input home-manager \
|
||||||
--update-input nixos-hardware \
|
|
||||||
--update-input pbsds-papers
|
--update-input pbsds-papers
|
||||||
|
#--update-input nixos-hardware
|
||||||
echo "$now" > .direnv/pull-date
|
echo "$now" > .direnv/pull-date
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -7,5 +7,5 @@ exclude = ["*"]
|
||||||
include = []
|
include = []
|
||||||
|
|
||||||
[both]
|
[both]
|
||||||
exclude = [ ".remote.toml",]
|
exclude = [ ".remote.toml", "result", ".direnv"]
|
||||||
include = []
|
include = []
|
||||||
|
|
48
flake.lock
48
flake.lock
|
@ -4,18 +4,20 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
],
|
||||||
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686391840,
|
"lastModified": 1681092193,
|
||||||
"narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=",
|
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f",
|
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
|
"ref": "release-22.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -77,9 +79,8 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"id": "nur",
|
||||||
"repo": "NUR",
|
"type": "indirect"
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pbsds-papers": {
|
"pbsds-papers": {
|
||||||
|
@ -144,6 +145,21 @@
|
||||||
"unstable": "unstable"
|
"unstable": "unstable"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems": {
|
||||||
|
"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": 1686412476,
|
"lastModified": 1686412476,
|
||||||
|
@ -159,6 +175,24 @@
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1685518550,
|
||||||
|
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
@ -4,8 +4,9 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
|
||||||
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nur.url = "github:nix-community/NUR";
|
#nur.url = "github:nix-community/NUR";
|
||||||
home-manager.url = "github:nix-community/home-manager"; #/release-22.11";
|
home-manager.url = "github:nix-community/home-manager/release-22.11";
|
||||||
|
#home-manager.url = "github:nix-community/home-manager";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
|
|
||||||
|
@ -65,8 +66,8 @@
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
unstable = unstable.legacyPackages.${final.system};
|
unstable = unstable.legacyPackages.${final.system};
|
||||||
#unstable = import unstable { inherit system; };
|
#unstable = import unstable { inherit system; };
|
||||||
nur = import nur { inherit (prev) pkgs; nurpkgs = prev.pkgs; };
|
#nur = import nur { inherit (prev) pkgs; nurpkgs = prev.pkgs; };
|
||||||
#nur = import nur { inherit (prev) pkgs; nurpkgs = import nixpkgs { inherit final.system: }; }; # TODO: nurpkgs?
|
##nur = import nur { inherit (prev) pkgs; nurpkgs = import nixpkgs { inherit final.system: }; }; # TODO: nurpkgs?
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
# This makes commandline tools like 'nix run nixpkgs#hello'
|
# This makes commandline tools like 'nix run nixpkgs#hello'
|
||||||
|
|
|
@ -90,8 +90,7 @@
|
||||||
|
|
||||||
# System fonts
|
# System fonts
|
||||||
# Nice to have when X-forwading on headless machines
|
# Nice to have when X-forwading on headless machines
|
||||||
# TODO: move?
|
hardware.video.hidpi.enable = true; # highdpi (TODO: for nord only? move?)
|
||||||
hardware.video.hidpi.enable = true; # highdpi (for nord only)
|
|
||||||
#fonts.fontconfig.hinting.enable = true; # lowdpi
|
#fonts.fontconfig.hinting.enable = true; # lowdpi
|
||||||
fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
|
fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts
|
||||||
fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
|
fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji
|
||||||
|
|
|
@ -73,8 +73,8 @@
|
||||||
|
|
||||||
#../../profiles/web/services/trivial-gradios
|
#../../profiles/web/services/trivial-gradios
|
||||||
|
|
||||||
../../profiles/domeneshop-dyndns # TODO: olavtr is hardcoded...
|
#../../profiles/code-remote # TODO: move into web? services?
|
||||||
../../profiles/code-remote # TODO: move into web? services?
|
../../profiles/domeneshop-dyndns
|
||||||
../../profiles/remote-builders
|
../../profiles/remote-builders
|
||||||
../../profiles/autossh-reverse-tunnels
|
../../profiles/autossh-reverse-tunnels
|
||||||
#../../profiles/xrdp
|
#../../profiles/xrdp
|
||||||
|
|
|
@ -45,6 +45,9 @@ in {
|
||||||
config = let host-cfg = config; in { config, pkgs, lib, ... }: {
|
config = let host-cfg = config; in { config, pkgs, lib, ... }: {
|
||||||
nixpkgs.overlays = host-cfg.nixpkgs.overlays;
|
nixpkgs.overlays = host-cfg.nixpkgs.overlays;
|
||||||
system.stateVersion = "22.11";
|
system.stateVersion = "22.11";
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"nodejs-16.20.0" # TODO: remove
|
||||||
|
];
|
||||||
|
|
||||||
imports = [ inputs.home-manager.nixosModule ];
|
imports = [ inputs.home-manager.nixosModule ];
|
||||||
home-manager.useGlobalPkgs = true; # brrr
|
home-manager.useGlobalPkgs = true; # brrr
|
||||||
|
|
Loading…
Reference in New Issue