diff --git a/flake.lock b/flake.lock index b052958..5203f64 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1693064156, - "narHash": "sha256-EnZntHnlPqWZIoa593zDV4GSkfbLLAL6VAreMvM6JN4=", + "lastModified": 1695000433, + "narHash": "sha256-CYB6YD+NLpmj/ORWlmeS/58PIHONF1G7cQMyXHo9ILo=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "bef25f9cdfd8513a42c175b88a1cb619e3ef5951", + "rev": "096dc63e5426e17f70b4a8bf7716c3dd3430ba8c", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1692248770, - "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=", + "lastModified": 1695686713, + "narHash": "sha256-rJATx5B/nwlBpt7CJUf85LV27qWPbul5UVV8fu6ABPg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b", + "rev": "e236a1e598a9a59265897948ac9874c364b9555f", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1693193430, - "narHash": "sha256-6qsW+c7CTlrOkY3PuZksNgNVrRSqUhlA/Uzq7Kb/3IY=", + "lastModified": 1696012364, + "narHash": "sha256-UvVsjzwYvsDmiXijFA6VPzhyI92KC7ALXtgOBuNuUSc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "78ec4983ba820b37fc2e7c998ead39be6bec7f6d", + "rev": "a3807ae37389f6effb13e30cc12933cfdd325d80", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1693187908, - "narHash": "sha256-cTcNpsqi1llmUFl9bmCdD0mTyfjhBrNFPhu2W12WXzA=", + "lastModified": 1695984718, + "narHash": "sha256-LQwKgaaaFOkIcxarf0xQXeDJFwZ5BZWcgmPeo3xp2CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8bde7a651b94ba30bd0baaa9c4a08aae88cc2e92", + "rev": "4f02e35f9d150573e1a710afa338846c2f6d850c", "type": "github" }, "original": { @@ -118,27 +118,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692913444, - "narHash": "sha256-1SvMQm2DwofNxXVtNWWtIcTh7GctEVrS/Xel/mdc6iY=", + "lastModified": 1694767346, + "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18324978d632ffc55ef1d928e81630c620f4f447", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "18324978d632ffc55ef1d928e81630c620f4f447", + "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1693087214, - "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1693097136, - "narHash": "sha256-fBZSMdBaoZ0INFbyZ5s0DOF7zDNcLsLxgkwdDh3l9Pc=", + "lastModified": 1694908564, + "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9117c4e9dc117a6cd0319cca40f2349ed333669d", + "rev": "596611941a74be176b98aeba9328aa9d01b8b322", "type": "github" }, "original": { @@ -166,16 +166,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1693145325, - "narHash": "sha256-Gat9xskErH1zOcLjYMhSDBo0JTBZKfGS0xJlIRnj6Rc=", - "owner": "nixos", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "cddebdb60de376c1bdb7a4e6ee3d98355453fe56", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -214,11 +214,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1693105804, - "narHash": "sha256-nlqNjW7dfucUJQqRGuG08MKPOSME8fLOCx/bd9hiEPs=", + "lastModified": 1695284550, + "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0618c8f0ed5255ad74ee08d1618841ff5af85c86", + "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4d72521..a915bf0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,9 @@ description = "Patrick's Darwin Nix setup"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs = { + url = "github:NixOS/nixpkgs/nixos-unstable"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/home.nix b/home-manager/home.nix index 978fa1f..a70863e 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -72,7 +72,11 @@ co = "checkout"; st = "status"; }; + delta = {enable = true;}; extraConfig = { + core = { + autocrlf = "input"; + }; rerere = { enabled = true; }; @@ -104,6 +108,9 @@ diff = { colorMoved = "default"; }; + "protocol.file" = { + allow = "always"; + }; }; }; @@ -133,6 +140,8 @@ programs.neovim.plugins = with nixpkgs.vimPlugins; [ molokai tagbar + fzf-vim + Ionide-vim { plugin = rust-vim; config = "let g:rustfmt_autosave = 1"; @@ -201,6 +210,11 @@ nixpkgs.poetry nixpkgs.woodpecker-agent nixpkgs.alacritty + nixpkgs.lynx + nixpkgs.alejandra + nixpkgs.ffmpeg + nixpkgs.bat + nixpkgs.pandoc ]; home.file.".ideavimrc".source = ./ideavimrc; diff --git a/home-manager/init.vim b/home-manager/init.vim index cdca473..a9d3ed4 100644 --- a/home-manager/init.vim +++ b/home-manager/init.vim @@ -249,19 +249,6 @@ set laststatus=2 " => Editing mappings """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Move a line of text using ALT+[jk] or Command+[jk] on mac -nmap mz:m+`z -nmap mz:m-2`z -vmap :m'>+`mzgv`yo`z -vmap :m'<-2`>my` - nmap - vmap - vmap -endif - " Delete trailing white space on save, useful for some filetypes ;) fun! CleanExtraSpaces() let save_cursor = getpos(".") @@ -367,3 +354,18 @@ set statusline+=%* " Format the status line set statusline=\ %{HasPaste()}%F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:\ %c +set fileformat=unix + +let g:fsharp#fsautocomplete_command = + \ [ 'dotnet', + \ 'fsautocomplete', + \ '--background-service-enabled' + \ ] + +let g:fsharp#show_signature_on_cursor_move = 1 +if has('nvim') && exists('*nvim_open_win') + augroup FSharpGroup + autocmd! + autocmd FileType fsharp nnoremap t :call fsharp#showTooltip() + augroup END +endif diff --git a/home-manager/mailcap b/home-manager/mailcap new file mode 100644 index 0000000..942f0ba --- /dev/null +++ b/home-manager/mailcap @@ -0,0 +1,3 @@ +text/html; lynx -force_html %s; needsterminal +image/png; qlmanage -p %s +image/jpeg; qlmanage -p %s