From db3c09ee30d6923711eaa4215facaa57feb842dd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 11 Jun 2023 10:12:42 +0200 Subject: [PATCH] 22.11 fixer up --- .envrc | 2 +- .remoteignore.toml | 2 +- flake.lock | 48 +++++++++++++++++++++++++++----- flake.nix | 9 +++--- hosts/nord/default.nix | 3 +- hosts/noximilien/default.nix | 4 +-- profiles/code-remote/default.nix | 3 ++ 7 files changed, 54 insertions(+), 17 deletions(-) diff --git a/.envrc b/.envrc index 17cddaa..3030433 100644 --- a/.envrc +++ b/.envrc @@ -10,8 +10,8 @@ if ! test -s .direnv/pull-date || test "$now" != "$(cat .direnv/pull-date)"; the --update-input nixpkgs \ --update-input unstable \ --update-input home-manager \ - --update-input nixos-hardware \ --update-input pbsds-papers + #--update-input nixos-hardware echo "$now" > .direnv/pull-date fi diff --git a/.remoteignore.toml b/.remoteignore.toml index 04b0426..7a33597 100644 --- a/.remoteignore.toml +++ b/.remoteignore.toml @@ -7,5 +7,5 @@ exclude = ["*"] include = [] [both] -exclude = [ ".remote.toml",] +exclude = [ ".remote.toml", "result", ".direnv"] include = [] diff --git a/flake.lock b/flake.lock index db69385..61f034b 100644 --- a/flake.lock +++ b/flake.lock @@ -4,18 +4,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1686391840, - "narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=", + "lastModified": 1681092193, + "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "owner": "nix-community", "repo": "home-manager", - "rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f", + "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -77,9 +79,8 @@ "type": "github" }, "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" + "id": "nur", + "type": "indirect" } }, "pbsds-papers": { @@ -144,6 +145,21 @@ "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": { "locked": { "lastModified": 1686412476, @@ -159,6 +175,24 @@ "repo": "nixpkgs", "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", diff --git a/flake.nix b/flake.nix index 21a7314..e25d813 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,9 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nur.url = "github:nix-community/NUR"; - home-manager.url = "github:nix-community/home-manager"; #/release-22.11"; + #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"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware"; @@ -65,8 +66,8 @@ (final: prev: { unstable = unstable.legacyPackages.${final.system}; #unstable = import unstable { inherit system; }; - 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 = prev.pkgs; }; + ##nur = import nur { inherit (prev) pkgs; nurpkgs = import nixpkgs { inherit final.system: }; }; # TODO: nurpkgs? }) ]; # This makes commandline tools like 'nix run nixpkgs#hello' diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix index 14cd5be..7a3c495 100644 --- a/hosts/nord/default.nix +++ b/hosts/nord/default.nix @@ -90,8 +90,7 @@ # System fonts # Nice to have when X-forwading on headless machines - # TODO: move? - hardware.video.hidpi.enable = true; # highdpi (for nord only) + hardware.video.hidpi.enable = true; # highdpi (TODO: for nord only? move?) #fonts.fontconfig.hinting.enable = true; # lowdpi fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix index c83cfbf..ac73bc0 100644 --- a/hosts/noximilien/default.nix +++ b/hosts/noximilien/default.nix @@ -73,8 +73,8 @@ #../../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/autossh-reverse-tunnels #../../profiles/xrdp diff --git a/profiles/code-remote/default.nix b/profiles/code-remote/default.nix index ca32080..05a861b 100644 --- a/profiles/code-remote/default.nix +++ b/profiles/code-remote/default.nix @@ -45,6 +45,9 @@ in { config = let host-cfg = config; in { config, pkgs, lib, ... }: { nixpkgs.overlays = host-cfg.nixpkgs.overlays; system.stateVersion = "22.11"; + nixpkgs.config.permittedInsecurePackages = [ + "nodejs-16.20.0" # TODO: remove + ]; imports = [ inputs.home-manager.nixosModule ]; home-manager.useGlobalPkgs = true; # brrr