From 3ecc4a55bfd542970758c76aadd49f15a3883c2d Mon Sep 17 00:00:00 2001 From: Tomas Rivera Date: Thu, 4 Jun 2026 18:01:15 +0200 Subject: [PATCH] snapshot pre-cleanup-2026-06-04T16-01-15Z --- flake.nix | 2 +- modules/applications/zsh.nix | 6 +++--- modules/hardware/bootloader.nix | 2 +- modules/hardware/disko/disko-config.nix | 2 +- modules/hosts/desktop.nix | 6 ++++-- modules/utilities/autoCleanup.nix | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index ed6a709..c812399 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ url = "github:tomasriveral/nixpkgs-notifier"; inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; + }; caelestia-shell = { # based on quickshell. See https://github.com/caelestia-dots/shell url = "github:caelestia-dots/shell"; diff --git a/modules/applications/zsh.nix b/modules/applications/zsh.nix index 6e82f18..ba63c59 100644 --- a/modules/applications/zsh.nix +++ b/modules/applications/zsh.nix @@ -1,4 +1,4 @@ -{self, ...}: { +_: { flake.homeModules.zsh-laptop = _: { programs.zsh = { shellAliases = { @@ -15,7 +15,7 @@ }; }; }; - flake.homeModules.zsh = {pkgs, pkgs-unstable, ...}: { + flake.homeModules.zsh = {pkgs-unstable, ...}: { home.packages = [ #self.packages.${pkgs.system}.dejaManuallyDerived pkgs-unstable.deja @@ -33,7 +33,7 @@ command cat "$@" fi } - + custom-eza() { # behaves differently if we just call it or if we pipe initContent if [[ -t 1 ]]; then eza -hlF -aa --color=always --hyperlink --group-directories-first --show-symlinks --icons=always --git --no-permissions "$@" diff --git a/modules/hardware/bootloader.nix b/modules/hardware/bootloader.nix index 54b6a3d..cd6ad2a 100644 --- a/modules/hardware/bootloader.nix +++ b/modules/hardware/bootloader.nix @@ -13,7 +13,7 @@ _: { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; }; - flake.nixosModules.bootloader-desktop = { + flake.nixosModules.bootloader-desktop = { inputs, pkgs, ... diff --git a/modules/hardware/disko/disko-config.nix b/modules/hardware/disko/disko-config.nix index 65d5c14..57bdd43 100644 --- a/modules/hardware/disko/disko-config.nix +++ b/modules/hardware/disko/disko-config.nix @@ -119,4 +119,4 @@ disk = { }; }; }; -} +}; diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index 6d348d8..e12e963 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -112,7 +112,8 @@ home-manager.users.tomasr = self.homeModules.desktop; }; # this is a copy of what is in laptop.nix - /*flake.homeModules.tomasr = _: { + /* + flake.homeModules.tomasr = _: { home.username = "tomasr"; home.homeDirectory = "/home/tomasr"; @@ -133,5 +134,6 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; - };*/ + }; + */ } diff --git a/modules/utilities/autoCleanup.nix b/modules/utilities/autoCleanup.nix index d11d824..2215006 100644 --- a/modules/utilities/autoCleanup.nix +++ b/modules/utilities/autoCleanup.nix @@ -122,8 +122,8 @@ }; }; -## Desktop -flake.nixosModules.autoCleanup-desktop = { + ## Desktop + flake.nixosModules.autoCleanup-desktop = { pkgs, pkgs-unstable, ...