Update fg42 and add a few handy aliases

This commit is contained in:
Sameer Rahmani 2024-04-05 20:56:04 +01:00
parent a3743f7de0
commit 53be6fe1d9
Signed by: lxsameer
GPG Key ID: 8741FACBF412FFA5
3 changed files with 176 additions and 20 deletions

View File

@ -231,18 +231,40 @@
"type": "github"
}
},
"emacs-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1707815184,
"narHash": "sha256-WFoDXgaPdhjgQB3ut+ZN+VT7e60Yw+KUyvUkOSu5Wto=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "0f7f3b39157419f3035a2dad39fbaf8a4ba0448d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "0f7f3b39157419f3035a2dad39fbaf8a4ba0448d",
"type": "github"
}
},
"fg42": {
"inputs": {
"emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_3",
"noether": "noether"
},
"locked": {
"lastModified": 1711583444,
"narHash": "sha256-RJ6N4aZ9RQLoZc69sQ8rJT9bW1urxCbu1OnXG+vb5eo=",
"lastModified": 1712346876,
"narHash": "sha256-q0h8umWquvehCeeQ67wWDsFXCrNJuN8wp6Bc5tIcdN4=",
"ref": "v4",
"rev": "477f24b67b5518f243cae3ad4ab225c0f7dd2fb5",
"revCount": 1066,
"rev": "23365a55cc868220592bfafe9d56dafe0d4fa368",
"revCount": 1069,
"type": "git",
"url": "https://devheroes.codes/FG42/FG42"
},
@ -304,10 +326,46 @@
"type": "github"
}
},
"flake_utils": {
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake_utils": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@ -501,6 +559,22 @@
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1707650010,
"narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1707689078,
@ -534,6 +608,38 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1707689078,
"narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1707451808,
"narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "442d407992384ed9c0e6d352de75b69079904e4e",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "442d407992384ed9c0e6d352de75b69079904e4e",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1707451808,
"narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=",
@ -549,7 +655,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_7": {
"locked": {
"lastModified": 1700856099,
"narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
@ -565,6 +671,27 @@
"type": "github"
}
},
"noether": {
"inputs": {
"emacs-overlay": "emacs-overlay_2",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1712346647,
"narHash": "sha256-flVg6BjO8umCjYpjRhCmvXeJxF7OoQ+bdh1ZZt2gvUM=",
"ref": "refs/heads/main",
"rev": "17e766cb320eea770ae169745d2e47bfbe80fdfe",
"revCount": 45,
"type": "git",
"url": "https://devheroes.codes/lxsameer/noether"
},
"original": {
"rev": "17e766cb320eea770ae169745d2e47bfbe80fdfe",
"type": "git",
"url": "https://devheroes.codes/lxsameer/noether"
}
},
"root": {
"inputs": {
"agenix": "agenix",
@ -574,7 +701,7 @@
"home-manager": "home-manager_2",
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_6",
"stylix": "stylix"
}
},
@ -592,7 +719,7 @@
"flake-compat": "flake-compat",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1708896938,
@ -668,6 +795,36 @@
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View File

@ -53,10 +53,8 @@
pretty = { fixes = ''Fixes: %h ("%s")''; };
# url."git@github.com:" = { insteadOf = "https://github.com/"; };
status.submoduleSummary = true;
pull.rebase = false;
pull.rebase = true;
http.sslVerify = true;
} // extraConfig;
};

View File

@ -13,13 +13,9 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
{ config, lib, pkgs, inputs, ... }@params:
{ lib, pkgs, inputs, ... }@params:
let
modules = import ../../modules params;
rager = pkgs.callPackage ../../derivations/rager.nix {
ageBin = "${pkgs.rage}/bin/rage";
};
in {
imports = [
@ -219,6 +215,8 @@ in {
enableAutosuggestions = true;
enableCompletion = true;
historySubstringSearch.enable = false;
shellAliases = {
sl = "exa";
ls = "exa";
@ -229,17 +227,19 @@ in {
g = "git";
pu = "git push origin $(git branch --show-current)";
pl = "git pull origin $(git branch --show-current)";
ga = "g add $(g st -s |fzf -m|awk {'print $2'})";
Ps = "ps -aux |grep ";
d = "podman";
bat = "bat --theme base16-256";
n = "nix";
nd = "nix develop";
nr = "nix run";
nb = "nix build";
ew = "emacs -nw";
ec = "emacsclient -n -q -u";
F = "find . -iname";
f = "fd";
_ = "sudo";
@ -385,9 +385,11 @@ in {
homedir = lib.mkForce "/home/lxsameer/.gnupg";
};
services.ssh-agent.enable = true;
services.gpg-agent = {
enable = true;
enableSshSupport = lib.mkForce false;
enableSshSupport = true;
};
gtk = {
@ -403,7 +405,6 @@ in {
storePath = "$HOME/.pass_store";
};
services.ssh-agent.enable = true;
programs.direnv = {
enable = true;