From 8d8bb26d7f1581c36380ede871282178a0dc1290 Mon Sep 17 00:00:00 2001 From: Steph Date: Tue, 10 Dec 2024 15:03:39 +0100 Subject: [PATCH] update --- home.nix | 8 +++++++- nixos.nix | 2 +- platforms/linux/home.nix | 1 + programs/bash.nix | 10 ++++++++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/home.nix b/home.nix index 3165a63..881fc13 100644 --- a/home.nix +++ b/home.nix @@ -13,10 +13,16 @@ config = { home.stateVersion = "22.05"; programs.home-manager.enable = true; + programs.direnv = { + enable = true; + enableBashIntegration = true; # see note on other shells below + nix-direnv.enable = true; + }; + nixpkgs = { config.allowUnfree = true; - overlays = [ inputs.nur.overlay ]; + overlays = [ inputs.nur.overlays.default ]; }; fonts.fontconfig.enable = true; diff --git a/nixos.nix b/nixos.nix index 3375842..8737c9a 100644 --- a/nixos.nix +++ b/nixos.nix @@ -61,7 +61,7 @@ nixpkgs.config.packageOverrides = pkgs: { vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; }; - hardware.opengl = { + hardware.graphics = { enable = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD diff --git a/platforms/linux/home.nix b/platforms/linux/home.nix index 2f1ffc8..0e1b86f 100644 --- a/platforms/linux/home.nix +++ b/platforms/linux/home.nix @@ -33,6 +33,7 @@ zotero signal-desktop freetube + inputs.nixpkgs-2405.legacyPackages.${system}.cura ]; dconf.settings = { diff --git a/programs/bash.nix b/programs/bash.nix index 24b7e3f..d1bcccf 100644 --- a/programs/bash.nix +++ b/programs/bash.nix @@ -46,13 +46,19 @@ tolower = "tr [:upper:] [:lower:]"; rebuild = if (os == "linux") then '' cd $HOME/.local/os && - nix flake update --commit-lock-file + nix flake update --commit-lock-file && nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo && + git add . && + git commit -m "update" && + git push && cd - '' else '' cd $HOME/.local/os && - nix flake update --commit-lock-file + nix flake update --commit-lock-file && home-manager switch && + git add . && + git commit -m "update" && + git push && cd - ''; ":r" = "!!";