From 03eecab630cfe5be8537c0ebab99c021fdfbba1e Mon Sep 17 00:00:00 2001 From: Arpit Chakladar <54011232+arpitchakladar@users.noreply.github.com> Date: Sun, 30 Nov 2025 00:24:09 +0530 Subject: Using unstable branches for nixpkgs and home manager. --- flake.lock | 16 ++--- flake.nix | 4 +- modules/tools/bat/default.nix | 22 ------ modules/tools/bat/theme.mustache.tmTheme | 120 ------------------------------- modules/tools/default.nix | 1 - modules/tools/git/default.nix | 6 +- modules/tools/zsh/default.nix | 2 +- users/arpit.nix | 1 - 8 files changed, 14 insertions(+), 158 deletions(-) delete mode 100644 modules/tools/bat/default.nix delete mode 100644 modules/tools/bat/theme.mustache.tmTheme diff --git a/flake.lock b/flake.lock index 00b793f..648a543 100644 --- a/flake.lock +++ b/flake.lock @@ -41,32 +41,32 @@ ] }, "locked": { - "lastModified": 1752391422, - "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "c26266790678863cce8e7460fdbf0d80991b1906", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "master", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1752308619, - "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 670de5f..74d9de8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "Home Manager configuration of arpit."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; base16.url = "github:SenchoPens/base16.nix"; diff --git a/modules/tools/bat/default.nix b/modules/tools/bat/default.nix deleted file mode 100644 index d459042..0000000 --- a/modules/tools/bat/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.tools.bat = { - enable = lib.mkEnableOption "Enables bat."; - }; - - config = lib.mkIf config.tools.bat.enable { - programs.bat.enable = true; - programs.bat.config = { - tabs = "4"; - theme = "custom-theme"; - }; - # shell.alias."cat" = "${pkgs.bat}/bin/bat -pp"; - # shell.alias."less" = "${pkgs.bat}/bin/bat --paging always"; - # home.sessionVariables."PAGER" = "${pkgs.bat}/bin/bat --paging always"; - xdg.configFile."bat/themes/custom-theme.tmTheme".source - = config.scheme { - template = builtins.readFile ./theme.mustache.tmTheme; - }; - }; -} diff --git a/modules/tools/bat/theme.mustache.tmTheme b/modules/tools/bat/theme.mustache.tmTheme deleted file mode 100644 index 844b80d..0000000 --- a/modules/tools/bat/theme.mustache.tmTheme +++ /dev/null @@ -1,120 +0,0 @@ - - - - name - customTheme - settings - - - - settings - - background - #{{base00-hex}} - foreground - #{{base05-hex}} - caret - #{{base07-hex}} - invisibles - #{{base03-hex}} - lineHighlight - #{{base02-hex}} - selection - #{{base03-hex}} - - - - - - scope - comment - settings - - foreground - #{{base04-hex}} - - - - - scope - string - settings - - foreground - #{{base0A-hex}} - - - - - scope - constant.numeric - settings - - foreground - #{{base09-hex}} - - - - - scope - variable - settings - - foreground - #{{base08-hex}} - - - - - scope - keyword - settings - - foreground - #{{base0D-hex}} - - - - - scope - support.function - settings - - foreground - #{{base0E-hex}} - - - - - scope - constant.language - settings - - foreground - #{{base0B-hex}} - - - - - scope - entity.name.tag - settings - - foreground - #{{base0C-hex}} - - - - - scope - invalid - settings - - foreground - #{{base0F-hex}} - - - - - - diff --git a/modules/tools/default.nix b/modules/tools/default.nix index f288dd3..243d2f2 100644 --- a/modules/tools/default.nix +++ b/modules/tools/default.nix @@ -2,7 +2,6 @@ { imports = [ - ./bat ./bluetui ./bottom ./brave diff --git a/modules/tools/git/default.nix b/modules/tools/git/default.nix index d1dee35..fc90cef 100644 --- a/modules/tools/git/default.nix +++ b/modules/tools/git/default.nix @@ -16,9 +16,9 @@ config = lib.mkIf config.tools.git.enable { programs.git = { enable = true; - userName = config.tools.git.username; - userEmail = config.tools.git.email; - extraConfig = { + settings = { + user.name = config.tools.git.username; + user.email = config.tools.git.email; credential.helper = "store --file ${config.xdg.cacheHome}/git/credential"; core.askPass = ""; }; diff --git a/modules/tools/zsh/default.nix b/modules/tools/zsh/default.nix index 0011da4..e508509 100644 --- a/modules/tools/zsh/default.nix +++ b/modules/tools/zsh/default.nix @@ -8,7 +8,7 @@ config = lib.mkIf config.tools.zsh.enable { programs.zsh = { enable = true; - dotDir = ".config/zsh"; + dotDir = "${config.xdg.configHome}/zsh"; history.path = "${config.xdg.cacheHome}/zsh/history"; initContent = '' ${if config.tools.fzf.enable then diff --git a/users/arpit.nix b/users/arpit.nix index 7c3d929..d7deb23 100644 --- a/users/arpit.nix +++ b/users/arpit.nix @@ -14,7 +14,6 @@ scripts.enable = true; # Tools - tools.bat.enable = true; tools.bluetui.enable = true; tools.bottom.enable = true; tools.brave.enable = true; -- cgit v1.2.3