From 76b0a998992104896e925b5c6f864816c596bdc3 Mon Sep 17 00:00:00 2001 From: Patrick Stevens Date: Sun, 20 Feb 2022 09:46:28 +0000 Subject: [PATCH] Update Nixpkgs (#7) --- flake.lock | 18 +++++++++--------- home.nix | 35 +++++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 7147618..3dad4c3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1642495030, - "narHash": "sha256-u1ZlFbLWzkM6zOfuZ1tr0tzTuDWucOYwALPWDWLorkE=", + "lastModified": 1645007752, + "narHash": "sha256-FQZMiVP/1vgR7x+TWonMf0NZczrZ4ZjhSTj3rM+kglY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bcdb6022b3a300abf59cb5d0106c158940f5120e", + "rev": "c944b5ee82a829ddf7fa6bd9300bc2fe3d005fa1", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1643933104, - "narHash": "sha256-NZPuFxRsZKN8pjRuHPpzlMyt6JQhcjiduBG8bMghSjE=", + "lastModified": 1645140957, + "narHash": "sha256-WTJzLSCDLBI537o2L/3kRyqEV5YRT7+1QSGryeKReHE=", "owner": "nix-community", "repo": "home-manager", - "rev": "63dccc4e60422c1db2c3929b2fd1541f36b7e664", + "rev": "4f4165a8b9108818ab0193bbd1a252106870b2a2", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643653624, - "narHash": "sha256-+8hLMsQrZ2rkvcEtEId6HMe8GPxVb5ga+Vh1fdsqJDU=", + "lastModified": 1644972330, + "narHash": "sha256-hEDWZcTDopnz4jRDhCmnH9VztdKSfR6mrudSM8+Jfco", "owner": "nixos", "repo": "nixpkgs", - "rev": "a529f0c125a78343b145a8eb2b915b0295e4f459", + "rev": "1a5ff5ea0297dc8ec5a33b87dfb4fc78687068e6", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 3d14646..28c2f15 100644 --- a/home.nix +++ b/home.nix @@ -1,12 +1,19 @@ -{ nixpkgs, ... }: - -let username = "Patrick"; in -let dotnet = nixpkgs.dotnet-sdk_6; in - { - imports = [ ./rider ]; + nixpkgs, + ... +}: +let + username = "Patrick"; +in let + dotnet = nixpkgs.dotnet-sdk_6; +in { + imports = [./rider]; - rider = { enable = true; username = username; dotnet = dotnet; }; + rider = { + enable = true; + username = username; + dotnet = dotnet; + }; # Let Home Manager install and manage itself. programs.home-manager.enable = true; @@ -93,7 +100,7 @@ let dotnet = nixpkgs.dotnet-sdk_6; in }; oh-my-zsh = { enable = true; - plugins = [ "git" "macos" "dircycle" "timer" ]; + plugins = ["git" "macos" "dircycle" "timer"]; theme = "robbyrussell"; }; sessionVariables = { @@ -168,11 +175,11 @@ let dotnet = nixpkgs.dotnet-sdk_6; in } { plugin = syntastic; - config = ''let g:syntastic_rust_checkers = ['cargo'] -let g:syntastic_always_populate_loc_list = 1 -let g:syntastic_auto_loc_list = 1 -let g:syntastic_check_on_open = 1 -let g:syntastic_check_on_wq = 0''; + config = '' let g:syntastic_rust_checkers = ['cargo'] + let g:syntastic_always_populate_loc_list = 1 + let g:syntastic_auto_loc_list = 1 + let g:syntastic_check_on_open = 1 + let g:syntastic_check_on_wq = 0''; } YouCompleteMe @@ -193,7 +200,7 @@ let g:syntastic_check_on_wq = 0''; programs.emacs = { enable = true; package = nixpkgs.emacsGcc; - extraPackages = (epkgs: [ ]); + extraPackages = (epkgs: []); extraConfig = '' (load-file (let ((coding-system-for-read 'utf-8)) (shell-command-to-string "agda-mode locate")))