diff --git a/home/home.nix b/home/home.nix index 42f155362..af289c8d0 100644 --- a/home/home.nix +++ b/home/home.nix @@ -13,9 +13,11 @@ let machine = ./machines/chupacabra.nix; in ./modules/shell.nix ./modules/tarsnap.nix ./modules/vim.nix - ./modules/alsi.nix + ./modules/lib/cloneRepo.nix + ./modules/urbint + machine ]; @@ -47,6 +49,9 @@ let machine = ./machines/chupacabra.nix; in peek signal-desktop apvlv # pdf viewer + vlc + irssi + gnutls # System utilities htop @@ -60,18 +65,12 @@ let machine = ./machines/chupacabra.nix; in zip tree ncat + unzip # Security gnupg - - # Programming - jq - gitAndTools.hub - gitAndTools.tig - shellcheck - httpie - entr - gnumake + keybase + openssl # Spotify...etc spotify @@ -87,25 +86,6 @@ let machine = ./machines/chupacabra.nix; in nixpkgs.config.allowUnfree = true; - programs.git = { - enable = true; - userEmail = "root@gws.fyi"; - userName = "Griffin Smith"; - ignores = [ - "*.sw*" - ".classpath" - ".project" - ".settings/" - ".dir-locals.el" - ".stack-work-profiling" - ".projectile" - ]; - extraConfig = { - github.user = "glittershark"; - merge.conflictstyle = "diff3"; - }; - }; - programs.password-store.enable = true; services.redshift = { @@ -125,4 +105,11 @@ let machine = ./machines/chupacabra.nix; in services.gpg-agent = { enable = true; }; + + gtk = { + enable = true; + gtk3.bookmarks = [ + "file:///home/grfn/code" + ]; + }; } diff --git a/home/modules/development.nix b/home/modules/development.nix index fecb48f16..6403858ff 100644 --- a/home/modules/development.nix +++ b/home/modules/development.nix @@ -21,6 +21,12 @@ sha256 = "0zz2lrwn3y3rb8gzaiwxgz02dvy3s552zc70zvfqc0zh5dhydgn7"; }) { inherit pkgs; }).yarn2nix julia + (pkgs.callPackage (pkgs.fetchFromGitHub { + owner = "hlolli"; + repo = "clj2nix"; + rev = "3ab3480a25e850b35d1f532a5e4e7b3202232383"; + sha256 = "1lry026mlpxp1j563qs13nhxf37i2zpl7lh0lgfdwc44afybqka6"; + }) {}) ]; programs.git = {