From 7b7dc776217b6596555fed4b79ad142bfb9fcbbd Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 28 May 2024 17:01:27 +0200 Subject: [PATCH] update upgrade-diff.nix --- flake.lock | 32 +++++------ flake.nix | 75 +++---------------------- nixos/components/nixos/upgrade-diff.nix | 4 +- 3 files changed, 26 insertions(+), 85 deletions(-) diff --git a/flake.lock b/flake.lock index 12c7be7..e8719c2 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716834774, - "narHash": "sha256-Xl0e3GaRW4WwrginQUSm6I8TtLtc/ruSA1J3pL+5dSQ=", + "lastModified": 1716901339, + "narHash": "sha256-LGlFJ0+bydJdbvLLkfUx95mYMNHewyN3daq+UfhhRLs=", "ref": "refs/heads/main", - "rev": "c68a8306ba21dccab642afd45c249217ca901398", - "revCount": 2872, + "rev": "52584662a8b8217e11b6e057bcca1846b4cb2934", + "revCount": 2887, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -542,11 +542,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1716736760, - "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", + "lastModified": 1716847642, + "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", + "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", "type": "github" }, "original": { @@ -675,11 +675,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716714838, - "narHash": "sha256-Wg/AitJwhglJQGP+8siy7vsmfaqfe4iBQljSzmFtYLk=", + "lastModified": 1716883520, + "narHash": "sha256-yVTR7ccimP8fDMeEZUFZOi7gSedRSha7Sog8Qcq/Q6Q=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "d8b8cc69b057601a090df1dddd9df7f09975be5b", + "rev": "663d4b2bc0174e85e633563bc6ec5c515fd1c3bd", "type": "github" }, "original": { @@ -712,11 +712,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716798306, - "narHash": "sha256-s8+OhT1WSPMoqbTawT30hj4NVMg+w03/a+2HVqcNhY0=", + "lastModified": 1716881121, + "narHash": "sha256-oTf3enbe/lbiNzsyZ8ria+422hx4e/FB3xQcY2LPnJw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9a20e17a73b052d6be912adcee220cb483477094", + "rev": "806e9d4a933dd1e75592e88894d4bd2f296f5bbf", "type": "github" }, "original": { @@ -1344,11 +1344,11 @@ ] }, "locked": { - "lastModified": 1716744577, - "narHash": "sha256-YvYYKLuf+SNj129k6SS/bhVybaLYgUlnznTa7rKv904=", + "lastModified": 1716895458, + "narHash": "sha256-W9Y/+K4L7JcF5xcXO4MVGQk/0DgzHrp/IjlHyLeYExY=", "owner": "danth", "repo": "stylix", - "rev": "00a11ba2f0b52f761c0bc77daebb00cb4d44ba09", + "rev": "5234b3d467aa803ad8d3fe898ef5673246045984", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 10b4492..a2fd312 100644 --- a/flake.nix +++ b/flake.nix @@ -209,19 +209,6 @@ _module.args.self = self; _module.args.inputs = self.inputs; } - #({ pkgs, lib, ... }: - # { - # # todo : check if this is still needed - # nix = { - # # no channesl needed this way - # nixPath = [ "nixpkgs=${pkgs.path}" ]; - # # make flakes available - # package = pkgs.nixUnstable; - # extraOptions = '' - # experimental-features = nix-command flakes - # ''; - # }; - # }) ({ pkgs, ... }: { nix.settings.substituters = [ "https://cache.nixos.org/" ]; @@ -331,7 +318,6 @@ }; root = { programs.atuin.enable = lib.mkForce false; - }; }; }) @@ -366,6 +352,7 @@ modules = [ nixos-hardware.nixosModules.framework-13th-gen-intel homeManagerModules + { home-manager.users.mainUser.gui.enable = true; } { home-manager.users.mainUser = import ./nixos/homes/palo; @@ -384,6 +371,8 @@ homeManagerModules retiolum.nixosModules.retiolum private_assets.nixosModules.chungus + srvos.nixosModules.server + srvos.nixosModules.mixins-terminfo { home-manager.users.mainUser = import ./nixos/homes/palo; home-manager.users.root = import ./nixos/homes/root; @@ -403,7 +392,11 @@ srvos.nixosModules.hardware-hetzner-online-intel srvos.nixosModules.server srvos.nixosModules.mixins-terminfo - #{ home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; } + { + # not needed for servers in general + boot.initrd.systemd.emergencyAccess = false; + systemd.enableEmergencyMode = false; + } { home-manager.users.mainUser = import ./nixos/homes/palo; home-manager.users.root = import ./nixos/homes/root; @@ -414,21 +407,6 @@ ]; }; - robi = clanSetup { - name = "robi"; - host = "robi.private"; - modules = [ - homeManagerModules - #{ home-manager.sharedModules = [{ programs.doom-emacs.enable = false; }]; } - { - home-manager.users.mainUser = import ./nixos/homes/palo; - home-manager.users.root = import ./nixos/homes/root; - } - { - clanCore.machineDescription = "Don't exist anymore, delete robi"; - } - ]; - }; }; }; @@ -436,40 +414,3 @@ }); } - - -# devShells.${system}.default = -# pkgs.mkShell { -# buildInputs = [ -# nixpkgs-fmt.defaultPackage.${system} -# nixos-anywhere.packages.${system}.nixos-anywhere -# ]; -# }; - -#apps = nixinate.nixinate.x86_64-linux self; - -# packages = with nixpkgs.lib; { -# ${system} = -# let -# vms = mapAttrs' -# (host: sys: { -# name = "vm-${host}"; -# value = sys.config.system.build.vm; -# }) -# self.nixosConfigurations; -# sds = mapAttrs' -# (host: sys: { -# name = "sd-${host}"; -# value = sys.config.system.build.sdImage; -# }) -# (filterAttrs -# (n: hasAttrByPath [ "config" "system" "build" "sdImage" ]) -# self.nixosConfigurations); -# in -# vms // sds; -# }; - -# nixosConfigurations = -# }; - - diff --git a/nixos/components/nixos/upgrade-diff.nix b/nixos/components/nixos/upgrade-diff.nix index e28e53a..c5bf7d0 100644 --- a/nixos/components/nixos/upgrade-diff.nix +++ b/nixos/components/nixos/upgrade-diff.nix @@ -1,5 +1,5 @@ # MIT Jörg Thalheim - https://github.com/Mic92/dotfiles/blob/c6cad4e57016945c4816c8ec6f0a94daaa0c3203/nixos/modules/upgrade-diff.nix -{ config, lib, ... }: +{ config, lib, pkgs, ... }: { options.components.nixos.update-diff.enable = lib.mkOption { @@ -13,7 +13,7 @@ text = '' if [[ -e /run/current-system ]]; then echo "--- diff to current-system" - ${config.nix.package}/bin/nix --extra-experimental-features nix-command store diff-closures /run/current-system "$systemConfig" + ${pkgs.nvd}/bin/nvd --nix-bin-dir=${config.nix.package}/bin diff /run/current-system "$systemConfig" echo "---" fi '';