From 08dd2dca50c116a8eb7eec561ec123ce1ecd4dae Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 18 Dec 2023 16:35:32 +0100 Subject: [PATCH 1/4] play around with nix settings --- nix/devShells.nix | 8 ++++++++ nix/os/snippets/nix-settings.nix | 9 +++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/nix/devShells.nix b/nix/devShells.nix index 4d74ee5..37ac5e4 100644 --- a/nix/devShells.nix +++ b/nix/devShells.nix @@ -68,6 +68,14 @@ pkgs.stdenv.mkDerivation { hedgedoc-cli xwayland + + (pkgs.writeShellScriptBin "rflk" '' + exec nix run nixpkgs#$@ + '') + + (pkgs.writeShellScriptBin "r11" '' + exec env NIXOS_OZONE_WL="" WAYLAND_DISPLAY="" $@ + '') ]); # Set Environment Variables diff --git a/nix/os/snippets/nix-settings.nix b/nix/os/snippets/nix-settings.nix index 7e2fd37..36db65e 100644 --- a/nix/os/snippets/nix-settings.nix +++ b/nix/os/snippets/nix-settings.nix @@ -1,4 +1,6 @@ { + nodeFlake, + pkgs, lib, ... @@ -26,10 +28,5 @@ "nixos-test" ]; - nix.registry = { - nixpkgs.to = { - type = "path"; - path = pkgs.path; - }; - }; + nix.registry.nixpkgs.flake = nodeFlake.inputs.nixpkgs; } From 565d862e233f1a553e77175b28efc922744ae34b Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 20 Dec 2023 11:54:14 +0100 Subject: [PATCH 2/4] nix/os/devices/steveej-t14: bump versions --- nix/os/devices/steveej-t14/flake.lock | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nix/os/devices/steveej-t14/flake.lock b/nix/os/devices/steveej-t14/flake.lock index b171000..ea5e68a 100644 --- a/nix/os/devices/steveej-t14/flake.lock +++ b/nix/os/devices/steveej-t14/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1702676849, - "narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=", + "lastModified": 1702814678, + "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a", + "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-2305": { "locked": { - "lastModified": 1702350026, - "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", + "lastModified": 1702759837, + "narHash": "sha256-u3XeJVRe/Q975nwFE+6ALEwypMKJEELMJKDAhSKyq3M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9463103069725474698139ab10f17a9d125da859", + "rev": "b2566f4f897ac6224e094b167d9488d03e157f28", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs-2311": { "locked": { - "lastModified": 1702346276, - "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", + "lastModified": 1702921762, + "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", + "rev": "d02ffbbe834b5599fc5f134e644e49397eb07188", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1702743713, - "narHash": "sha256-vcoIM8IyCwGER/1CcP8j5bq8izM/uzFNipbv5MS4JSE=", + "lastModified": 1703068121, + "narHash": "sha256-E6QeGdAIvIehAZNQkmjAVazgG0jBRWBoabqGPO88t18=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bb6cf10a57b762ca24e4a1b791b49e2216816cf2", + "rev": "2c19d7b41cd739198271be54a1df4f78da7b9809", "type": "github" }, "original": { @@ -87,11 +87,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1702723167, - "narHash": "sha256-cIxAF4Do+B7mQxzRDo/8B9QO0i2ap3i/i6Ujk8kx+Ws=", + "lastModified": 1702987609, + "narHash": "sha256-m2hErow1pxz2KcpCH0LGykgf/LVy9tOkXnNOnssDBmw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7d6929828a2d28eda9d37254ff6be3b6819506ca", + "rev": "fa5e0f2ed065dd00cfa0347c1421b67da6a5a10e", "type": "github" }, "original": { From 535632e6918aa50c07f36f2827618c038dac9147 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 22 Dec 2023 20:58:14 +0100 Subject: [PATCH 3/4] nix/os/devices/elias-e525: bump versions --- nix/os/devices/elias-e525/flake.lock | 16 ++++++++-------- nix/os/devices/elias-e525/flake.nix | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nix/os/devices/elias-e525/flake.lock b/nix/os/devices/elias-e525/flake.lock index dc66cc4..9616d4f 100644 --- a/nix/os/devices/elias-e525/flake.lock +++ b/nix/os/devices/elias-e525/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1687871164, - "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", + "lastModified": 1703113038, + "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=", "owner": "nix-community", "repo": "home-manager", - "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", + "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1688868408, - "narHash": "sha256-RR9N5XTAxSBhK8MCvLq9uxfdkd7etC//seVXldy0k48=", + "lastModified": 1703068421, + "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "510d721ce097150ae3b80f84b04b13b039186571", + "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/nix/os/devices/elias-e525/flake.nix b/nix/os/devices/elias-e525/flake.nix index 81d8a95..3f73b91 100644 --- a/nix/os/devices/elias-e525/flake.nix +++ b/nix/os/devices/elias-e525/flake.nix @@ -1,8 +1,8 @@ { - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; inputs.home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; From 0b749729920fe662cd41deadcb3e5d3d873c0d44 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 22 Dec 2023 20:59:12 +0100 Subject: [PATCH 4/4] update elias-e525 --- nix/os/devices/elias-e525/boot.nix | 2 +- nix/os/devices/elias-e525/configuration.nix | 1 + nix/os/devices/elias-e525/default.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/os/devices/elias-e525/boot.nix b/nix/os/devices/elias-e525/boot.nix index 4d8c1d1..ab6c098 100644 --- a/nix/os/devices/elias-e525/boot.nix +++ b/nix/os/devices/elias-e525/boot.nix @@ -1,4 +1,4 @@ {lib, ...}: { - boot.loader.grub.efiInstallAsRemovable = lib.mkForce true; + boot.loader.grub.efiSupport = lib.mkForce false; boot.loader.efi.canTouchEfiVariables = lib.mkForce false; } diff --git a/nix/os/devices/elias-e525/configuration.nix b/nix/os/devices/elias-e525/configuration.nix index 8974207..d39da6f 100644 --- a/nix/os/devices/elias-e525/configuration.nix +++ b/nix/os/devices/elias-e525/configuration.nix @@ -9,5 +9,6 @@ ./hw.nix ./pkg.nix ./user.nix + ./boot.nix ]; } diff --git a/nix/os/devices/elias-e525/default.nix b/nix/os/devices/elias-e525/default.nix index c169019..4b4d676 100644 --- a/nix/os/devices/elias-e525/default.nix +++ b/nix/os/devices/elias-e525/default.nix @@ -16,7 +16,7 @@ in { }; ${nodeName} = { - deployment.targetHost = "192.168.15.198"; + deployment.targetHost = "elias-e525.lan"; deployment.replaceUnknownProfiles = false; # deployment.allowLocalDeployment = true;