From c90facac4585e3eb59dab7445c776a9e18e02665 Mon Sep 17 00:00:00 2001 From: nomadics9 Date: Tue, 15 Oct 2024 19:15:19 +0300 Subject: [PATCH] update report option enabled by default --- flake.lock | 12 ++-- flake.lock.up.bk | 82 ------------------------- home/nomad/home.nix | 16 ++--- hosts/common/services/default.nix | 1 + hosts/common/services/update-report.nix | 19 ++++++ hosts/unkown/configuration.nix | 1 + update-report.sh | 1 + 7 files changed, 32 insertions(+), 100 deletions(-) delete mode 100644 flake.lock.up.bk create mode 100644 hosts/common/services/update-report.nix create mode 100755 update-report.sh diff --git a/flake.lock b/flake.lock index fe7d582..8f10e66 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { diff --git a/flake.lock.up.bk b/flake.lock.up.bk deleted file mode 100644 index fe7d582..0000000 --- a/flake.lock.up.bk +++ /dev/null @@ -1,82 +0,0 @@ -{ - "nodes": { - "dotfiles": { - "flake": false, - "locked": { - "lastModified": 1728755658, - "narHash": "sha256-wBITZXL6P5tAbz2jsUzEDxPUaMLIx2I/NT0WXAiQJg8=", - "ref": "refs/heads/main", - "rev": "f2f874c82656d8588c8a611b007f2e35d8eb72f3", - "revCount": 29, - "type": "git", - "url": "https://github.com/nomadics9/dotfiles.git" - }, - "original": { - "type": "git", - "url": "https://github.com/nomadics9/dotfiles.git" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "dotfiles": "dotfiles", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/home/nomad/home.nix b/home/nomad/home.nix index eac9acb..102636a 100644 --- a/home/nomad/home.nix +++ b/home/nomad/home.nix @@ -51,8 +51,8 @@ ripgrep zip #zed-fhs - android-studio - android-tools + # android-studio + # android-tools jre17_minimal # Nvim-Lua lua-language-server @@ -112,13 +112,6 @@ EDITOR = "nvim"; TERMINAL = "kitty"; NIXOS_OZONE_WL = "1"; - #QT_QPA_PLATFORMTHEME = "qt5ct"; - #QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - #QT_QPA_PLATFORM = "wayland-egl"; - #QT_STYLE_OVERRIDE = "kvantum"; - #XCURSOR_SIZE = "24"; - #QT_SCALE_FACTOR = "1.25"; - #QT_AUTO_SCREEN_SCALE_FACTOR = "1"; MOZ_ENABLE_WAYLAND = "1"; SDL_VIDEODRIVER = "wayland"; _JAVA_AWT_WM_NONREPARENTING = "1"; @@ -130,14 +123,13 @@ LIBVA_DRIVER_NAME = "iHD"; WLR_RENDERER = "vulkan"; VK_DRIVER_FILES = "/run/opengl-driver/share/vulkan/icd.d/nvidia_icd.x86_64.json"; - #__GLX_VENDOR_LIBRARY_NAME = "nvidia"; - #__NV_PRIME_RENDER_OFFLOAD="1"; + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + __NV_PRIME_RENDER_OFFLOAD = "1"; XDG_CURRENT_DESKTOP = "Hyprland"; XDG_SESSION_DESKTOP = "Hyprland"; XDG_SESSION_TYPE = "wayland"; GTK_USE_PORTAL = "1"; GTK_THEME = "Nightfox-dark"; - #NIXOS_XDG_OPEN_USE_PORTAL = "1"; XDG_CACHE_HOME = "${config.home.homeDirectory}/.cache"; XDG_CONFIG_HOME = "${config.home.homeDirectory}/.config"; XDG_BIN_HOME = "${config.home.homeDirectory}/.nix-profile/bin"; diff --git a/hosts/common/services/default.nix b/hosts/common/services/default.nix index 630a6b3..d21480d 100644 --- a/hosts/common/services/default.nix +++ b/hosts/common/services/default.nix @@ -7,5 +7,6 @@ ./appimage.nix ./nautilus.nix ./xdgportal.nix + ./update-report.nix ]; } diff --git a/hosts/common/services/update-report.nix b/hosts/common/services/update-report.nix new file mode 100644 index 0000000..11fbecb --- /dev/null +++ b/hosts/common/services/update-report.nix @@ -0,0 +1,19 @@ +{ config +, lib +, pkgs +, ... +}: +with lib; let + cfg = config.common.services.update-report; +in +{ + options.common.services.update-report.enable = mkEnableOption "enable report after a rebuild"; + + config = mkIf cfg.enable { + system.activationScripts.diff = '' + if [[ -e /run/current-system ]]; then + ${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig" + fi + ''; + }; +} diff --git a/hosts/unkown/configuration.nix b/hosts/unkown/configuration.nix index 760b565..8d23d3d 100644 --- a/hosts/unkown/configuration.nix +++ b/hosts/unkown/configuration.nix @@ -15,6 +15,7 @@ # System common.services.polkit.enable = true; common.services.xdgportal.enable = true; + common.services.update-report.enable = true; programs.nix-ld.enable = true; # Non nixos binaries such as mason LSPs # Filemanager common.services.nautilus.enable = true; diff --git a/update-report.sh b/update-report.sh new file mode 100755 index 0000000..21fe654 --- /dev/null +++ b/update-report.sh @@ -0,0 +1 @@ +nix store diff-closures $(ls -d /nix/var/nix/profiles/*|tail -2)