From 6378d89214550c7b49b8677118e48fd77f9e8890 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Fri, 27 Dec 2024 01:31:27 +1000 Subject: [PATCH] slightly tweaked `home/scripts` --- home/desktop/default.nix | 5 ----- home/desktop/sway.nix | 4 ++-- home/scripts/default.nix | 1 + home/scripts/nix-utils.nix | 37 +++++++++---------------------------- 4 files changed, 12 insertions(+), 35 deletions(-) diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 3b89a4c..d2b85be 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -13,16 +13,11 @@ in { ## Import common desktop configs ./hyprcursor.nix ./hyprlock.nix - #./keybinds.nix - #./xdg-mime.nix ./wlogout.nix ./waybar.nix ./dunst.nix ./wofi.nix ./sway.nix - - ## Import misc. desktop configs - ../scripts/automount ../scripts ]; diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix index 3930c59..dc8fd7c 100755 --- a/home/desktop/sway.nix +++ b/home/desktop/sway.nix @@ -1,4 +1,4 @@ -{ self, inputs, outputs, lib, config, pkgs, ... }: +{ lib, pkgs, ... }: with lib; with pkgs; let @@ -42,7 +42,7 @@ in { settings = { }; }; - config = rec { + config = { output = { eDP-1 = { diff --git a/home/scripts/default.nix b/home/scripts/default.nix index 9ecbd6f..5c37da2 100755 --- a/home/scripts/default.nix +++ b/home/scripts/default.nix @@ -2,6 +2,7 @@ { imports = [ + ./automount ./startup.nix ./desktop.nix ./nix-utils.nix diff --git a/home/scripts/nix-utils.nix b/home/scripts/nix-utils.nix index 418ef4e..3cfb97f 100755 --- a/home/scripts/nix-utils.nix +++ b/home/scripts/nix-utils.nix @@ -1,25 +1,15 @@ -{ pkgs, config, ... }: +{ pkgs, config, flakePath, ... }: let - homedir = config.home.homeDirectory; - - #hostname = config.system.nixos.distroId; + hostname = config.system.nixos.distroId; nixsyu = pkgs.writeShellScriptBin "nixsyu" '' - cd {$homedir}/flakes/nixdots && sudo nix flake update && sudo nixos-rebuild switch --upgrade-all --flake {$homedir}/flakes/nixdots#{$hostname} --show-trace && sudo nix-collect-garbage -d && sudo nix-store --optimise + cd ${flakePath} && sudo nix flake update && sudo nixos-rebuild switch --upgrade-all --flake .#${hostname} --show-trace && sudo nix-collect-garbage -d && sudo nix-store --optimise ''; nixrb = pkgs.writeShellScriptBin "nixrb" '' - sudo nixos-rebuild switch --flake {$homedir}/flakes/nixdots#{$hostname} - ''; - - nixrbt = pkgs.writeShellScriptBin "nixrbt" '' - sudo nixos-rebuild switch --flake {$homedir}/flakes/nixdots#{$hostname} --show-trace - ''; - - nixupg = pkgs.writeShellScriptBin "nixupg" '' - sudo nixos-rebuild switch --upgrade-all --flake {$homedir}/flakes/nixdots#{$hostname} --show-trace + cd ${flakePath} && sudo nixos-rebuild switch --flake .#${hostname} --show-trace ''; nixcb = pkgs.writeShellScriptBin "nixcb" '' @@ -27,29 +17,20 @@ let ''; nixgc = pkgs.writeShellScriptBin "nixgc" '' - cd {$homedir}/flakes/nixdots/nixos && sudo nix-collect-garbage -d + cd ${flakePath} && sudo nix-collect-garbage -d ''; nixu = pkgs.writeShellScriptBin "nixu" '' - cd {$homedir}/flakes/nixdots && sudo nix flake update - ''; - - nixe = pkgs.writeShellScriptBin "nixe" '' - $EDITOR {$homedir}/flakes/nixdots + cd ${flakePath} && sudo nix flake update ''; in { - - home.packages = with pkgs; [ + home.packages = [ nixsyu - nixrbt nixrb - nixupg - nixu - nixe - nixgc nixcb + nixgc + nixu ]; - }