diff --git a/flake.lock b/flake.lock index 139f5c7..8b26e1b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717693678, - "narHash": "sha256-W3vQWNILZRsR3HxWwDDuXauUpH3BvjzztvUwKIvfOzg=", + "lastModified": 1717811460, + "narHash": "sha256-b2HZ9oDtKutADV8WPPsMWozJkNamiRGOqf2K9ekv950=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "aa9303c7769729a544a6c69ee531b9e6ae0e672d", + "rev": "7ff674d6a61f4a3af339e82cfebf5e67d24d1714", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717384422, - "narHash": "sha256-sQ1FBYvO4SoZwoRvUIDY94hQyg+uqakG0UMClRbqyG4=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb0317c4552b5639d7e2d85d2adbf4b9de0ff0d7", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717646450, - "narHash": "sha256-KE+UmfSVk5PG8jdKdclPVcMrUB8yVZHbsjo7ZT1Bm3c=", + "lastModified": 1717681334, + "narHash": "sha256-HlvsMH8BNgdmQCwbBDmWp5/DfkEQYhXZHagJQCgbJU0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "818dbe2f96df233d2041739d6079bb616d3e5597", + "rev": "31f40991012489e858517ec20102f033e4653afb", "type": "github" }, "original": { diff --git a/home-manager/nixpkgs/tmux-sixel/default.nix b/home-manager/nixpkgs/tmux-sixel/default.nix deleted file mode 100644 index 812aaa2..0000000 --- a/home-manager/nixpkgs/tmux-sixel/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, libevent, ncurses -, pkg-config, libsixel, runCommand -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd -, withUtf8proc ? true, utf8proc # gets Unicode updates faster than glibc -, withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: - -let - bashCompletion = fetchFromGitHub { - owner = "imomaliev"; - repo = "tmux-bash-completion"; - rev = "f5d53239f7658f8e8fbaf02535cc369009c436d6"; - sha256 = "0sq2g3w0h3mkfa6qwqdw93chb5f1hgkz5vdl8yw8mxwdqwhsdprr"; - }; - -in stdenv.mkDerivation (finalAttrs: { - name = "tmux-sixel"; - outputs = [ "out" "man" ]; - - src = fetchFromGitHub { - owner = "tmux"; - repo = "tmux"; - rev = "ea7136fb838a2831d38e11ca94094cea61a01e3a"; - sha256 = "0y8j2s1bfvfvq7j539g9q8fknjmcpz3fw7flxa29s87qgpaqm35n"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook bison ]; - - buildInputs = [ ncurses libevent libsixel ] - ++ lib.optionals withSystemd [ systemd ] - ++ lib.optionals withUtf8proc [ utf8proc ] - ++ lib.optionals withUtempter [ libutempter ]; - - configureFlags = - [ "--sysconfdir=/etc" "--localstatedir=/var" "--enable-sixel" ] - ++ lib.optionals withSystemd [ "--enable-systemd" ] - ++ lib.optionals withUtempter [ "--enable-utempter" ] - ++ lib.optionals withUtf8proc [ "--enable-utf8proc" ]; - - enableParallelBuilding = true; - - postInstall = '' - mkdir -p $out/share/bash-completion/completions - cp -v ${bashCompletion}/completions/tmux $out/share/bash-completion/completions/tmux - '' + lib.optionalString stdenv.isDarwin '' - mkdir $out/nix-support - echo "${finalAttrs.passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages - ''; - - passthru = { - terminfo = runCommand "tmux-terminfo" { nativeBuildInputs = [ ncurses ]; } - (if stdenv.isDarwin then '' - mkdir -p $out/share/terminfo/74 - cp -v ${ncurses}/share/terminfo/74/tmux $out/share/terminfo/74 - # macOS ships an old version (5.7) of ncurses which does not include tmux-256color so we need to provide it from our ncurses. - # However, due to a bug in ncurses 5.7, we need to first patch the terminfo before we can use it with macOS. - # https://gpanders.com/blog/the-definitive-guide-to-using-tmux-256color-on-macos/ - tic -o $out/share/terminfo -x <(TERMINFO_DIRS=${ncurses}/share/terminfo infocmp -x tmux-256color | sed 's|pairs#0x10000|pairs#32767|') - '' else '' - mkdir -p $out/share/terminfo/t - ln -sv ${ncurses}/share/terminfo/t/{tmux,tmux-256color,tmux-direct} $out/share/terminfo/t - ''); - }; - - meta = { - homepage = "https://tmux.github.io/"; - description = "Terminal multiplexer"; - longDescription = '' - tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include: - * A powerful, consistent, well-documented and easily scriptable command interface. - * A window may be split horizontally and vertically into panes. - * Panes can be freely moved and resized, or arranged into preset layouts. - * Support for UTF-8 and 256-colour terminals. - * Copy and paste with multiple buffers. - * Interactive menus to select windows, sessions or clients. - * Change the current window by searching for text in the target. - * Terminal locking, manually or after a timeout. - * A clean, easily extended, BSD-licensed codebase, under active development. - ''; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - mainProgram = "tmux"; - maintainers = with lib.maintainers; [ thammers fpletz ]; - }; -}) diff --git a/home-manager/packages/basic.nix b/home-manager/packages/basic.nix index c4f3ecf..cc7ad1e 100644 --- a/home-manager/packages/basic.nix +++ b/home-manager/packages/basic.nix @@ -1,91 +1,50 @@ { pkgs }: -let - tmux-sixel = pkgs.callPackage ../nixpkgs/tmux-sixel { }; - ecspresso = pkgs.callPackage ../nixpkgs/ecspresso { }; - isucrud = pkgs.callPackage ../nixpkgs/isucrud { }; - mitamae = pkgs.callPackage ../nixpkgs/mitamae { }; -in with pkgs; [ - # for language - php83 - nodejs - - # for language specific - gopls - gotools - hadolint - nixfmt-classic - roswell - shellcheck - - # for language server - ccls - haskell-language-server - jsonnet-language-server - nil - nodePackages_latest.bash-language-server - typescript - nodePackages_latest.typescript-language-server - nodePackages_latest.vim-language-server - phpactor - nodePackages_latest.intelephense - rubyPackages.solargraph - terraform-ls - yaml-language-server - - # for gnupg - pinentry-emacs - gnupg - +with pkgs; [ # for essential tools bat - bottom - csvq devbox direnv du-dust - exiftool extract_url eza fd - fzf - gh - ghq - git - gitflow - jq + gnupg nkf openssl peco pv ripgrep rlwrap - tig - tmux-sixel + tmux tokei tree unixtools.procps unixtools.watch wget + + # for query + csvq + jq yq + # for git + ghq + git + tig + # for util tools awscli - ecspresso + exiftool ffmpeg - gibo - graphviz - hub - iftop - imagemagick - isucrud - mitamae - ncurses - neofetch offlineimap + silicon + + # for network tools + bottom speedtest-cli tcpdump - # for pass + # for password tools pwgen (pass.withExtensions (extensions: with extensions; [ pass-otp ])) @@ -98,24 +57,16 @@ in with pkgs; [ # for shell fish - zx # for DB - redis mysql - sqlite - sqldef # for jokes asciiquarium cmatrix - sl - silicon genact + sl # for ai ollama - - # for tmp - heroku ] diff --git a/home-manager/packages/darwin/default.nix b/home-manager/packages/darwin/default.nix index d72dd40..a27b255 100644 --- a/home-manager/packages/darwin/default.nix +++ b/home-manager/packages/darwin/default.nix @@ -4,7 +4,8 @@ with pkgs; [ terminal-notifier # for emacs - emacs-git mu + emacs-git + pinentry-emacs emacsPackages.mu4e ] diff --git a/home-manager/packages/nixos/default.nix b/home-manager/packages/nixos/default.nix index 6c12bb8..2554001 100644 --- a/home-manager/packages/nixos/default.nix +++ b/home-manager/packages/nixos/default.nix @@ -1,9 +1,8 @@ { pkgs }: with pkgs; [ - pinentry-curses - # for emacs emacs-git mu + pinentry-emacs emacsPackages.mu4e ] diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix index 922b89c..7cd0656 100644 --- a/nix-darwin/default.nix +++ b/nix-darwin/default.nix @@ -7,7 +7,7 @@ Hour = 9; Minute = 0; }; - options = "--delete-older-than 7d"; + options = "--delete-older-than 3d"; }; settings.experimental-features = "nix-command flakes"; };