749 current 2024-06-15 16:05:25 24.11.20240615.24b048f 6.9.3-zen1 *

This commit is contained in:
zackartz 2024-06-15 16:05:26 -04:00
parent 7df8db13d9
commit b169d37282
No known key found for this signature in database
GPG key ID: 5B53E53A9A514DBA
7 changed files with 65 additions and 43 deletions

64
flake.lock generated
View file

@ -623,11 +623,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717181720, "lastModified": 1718368322,
"narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +669,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1718376341, "lastModified": 1718480796,
"narHash": "sha256-Xm8EyYgn752O61QHBera4ygQc/izCLyzhwIqYXqUOdA=", "narHash": "sha256-BMLFzvIn5Qdrfc1zyIXWTMA5FHx+R9JNDJ7dkwbvdzk=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a357fa3e0a60b4f96a1924e0d9753d23001ab00e", "rev": "1f5fd7e64a1c0e8d1815bdd6d168193bf9c28d6d",
"revCount": 4826, "revCount": 4839,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -774,11 +774,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717881334, "lastModified": 1718271409,
"narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", "narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", "rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,11 +799,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717784906, "lastModified": 1718119275,
"narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "rev": "1419520d5f7f38d35e05504da5c1b38212a38525",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -917,11 +917,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1718298978, "lastModified": 1718424280,
"narHash": "sha256-7jIX4cUdn6LYP4l38S38nsSNbGMF5eXP9qKe69SR02k=", "narHash": "sha256-Y1Bjk8e9KJQ+5gwxNcRSz4l6k0yDLQ28MZ9qoeEeCII=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "84299e229226207721e142246ff8343f8a8c6e5d", "rev": "450744cea2778415ff8c23553d37048d01df6c5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -933,11 +933,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718209811, "lastModified": 1718407238,
"narHash": "sha256-hZYLBealuoS3bL3eXFeQVAoasThqf7DDwg8kW0ASTOE=", "narHash": "sha256-eJ0qrdEWH7WRwLTBIXIOYB/DvBHvgvm6x4bBonkzXLQ=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "53afdf360cf195c02c22865f4e63b273d1ef152e", "rev": "199d852d9f8584217be38efb56b725aa3db62931",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1060,11 +1060,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1717974879, "lastModified": 1718318537,
"narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1092,11 +1092,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1718149104, "lastModified": 1718276985,
"narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", "rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1108,16 +1108,16 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1718160348, "lastModified": 1718419000,
"narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "narHash": "sha256-v4+aJpRDbJil691DXo5SydqowcB01B6E9+wFH/pNk6k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "rev": "24b048f70e34020c93ed7c11491bc050ff6eb142",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1656,11 +1656,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717918856, "lastModified": 1718272114,
"narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "72907822c19afc0983c69d59d299204381623725", "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -11,7 +11,7 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";

View file

@ -12,8 +12,8 @@
tools.git.enable = true; tools.git.enable = true;
tools.tmux.enable = true; tools.tmux.enable = true;
tools.neovim.enable = true; tools.neovim.enable = true;
tools.starship.enable = true;
tools.skim.enable = true; tools.skim.enable = true;
tools.ohmyposh.enable = true;
tools.direnv.enable = true; tools.direnv.enable = true;
tools.tealdeer.enable = true; tools.tealdeer.enable = true;
tools.bat.enable = true; tools.bat.enable = true;
@ -87,6 +87,8 @@
pkgs.nh pkgs.nh
pkgs.dwl pkgs.dwl
pkgs.foliate
pkgs.killall pkgs.killall
pkgs.custom.rebuild pkgs.custom.rebuild
pkgs.custom.powermenu pkgs.custom.powermenu

View file

@ -51,7 +51,6 @@ in {
lua-language-server lua-language-server
nixd nixd
rust-analyzer rust-analyzer
nodePackages.bash-language-server
vscode-langservers-extracted vscode-langservers-extracted
nodePackages.vscode-json-languageserver nodePackages.vscode-json-languageserver
nodePackages.typescript-language-server nodePackages.typescript-language-server

View file

@ -0,0 +1,22 @@
{
lib,
config,
pkgs,
...
}:
with lib;
with lib.custom; let
cfg = config.apps.tools.ohmyposh;
in {
options.apps.tools.ohmyposh = with types; {
enable = mkBoolOpt false "Enable OhMyPosh";
};
config = mkIf cfg.enable {
programs.oh-my-posh = {
enable = true;
enableZshIntegration = true;
useTheme = "catppuccin";
};
};
}

View file

@ -18,18 +18,19 @@ in {
dreamsofcode-io-catppuccin-tmux = dreamsofcode-io-catppuccin-tmux =
pkgs.tmuxPlugins.mkTmuxPlugin pkgs.tmuxPlugins.mkTmuxPlugin
{ {
pluginName = "catppuccin"; pluginName = "tokyo-night-tmux";
version = "unstable-2023-01-06"; version = "v1.5.3";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "dreamsofcode-io"; owner = "janoamaral";
repo = "catppuccin-tmux"; repo = "tokyo-night-tmux";
rev = "b4e0715356f820fc72ea8e8baf34f0f60e891718"; rev = "v1.5.3";
sha256 = "sha256-FJHM6LJkiAwxaLd5pnAoF3a7AE1ZqHWoCpUJE0ncCA8="; sha256 = "sha256-3rMYYzzSS2jaAMLjcQoKreE0oo4VWF9dZgDtABCUOtY=";
}; };
}; };
in { in {
enable = true; enable = true;
shell = "${pkgs.zsh}/bin/zsh"; shell = "${pkgs.zsh}/bin/zsh";
catppuccin.enable = false;
historyLimit = 100000; historyLimit = 100000;
plugins = with pkgs; [ plugins = with pkgs; [
{ {

View file

@ -16,8 +16,6 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
programs.zsh = { programs.zsh = {
enable = true; enable = true;
sessionVariables = { sessionVariables = {