From 6c820a3ae5d987481a96b3b10d49126c81446120 Mon Sep 17 00:00:00 2001 From: Felix Suchert Date: Thu, 2 Mar 2023 16:02:34 +0100 Subject: [PATCH] Update packages, fix indentation --- entropy/nixos/configuration.nix | 50 +++++++++++++++++---------------- entropy/nixos/flake.lock | 12 ++++---- entropy/nvim/init.vim | 2 +- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix index ecae950..38268fb 100644 --- a/entropy/nixos/configuration.nix +++ b/entropy/nixos/configuration.nix @@ -5,7 +5,7 @@ { config, pkgs, ... }: let - # use unstable nixpkgs for some specific packages that are still in-dev: + # use unstable nixpkgs for some specific packages that are still in-dev: # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable # sudo nix-channel --update unstable = import { config = config.nixpkgs.config; }; @@ -82,41 +82,41 @@ in # ------------ Nix Config --------------------------------------------------- nix = { package = pkgs.nixFlakes; - # the builders-use-substitutes is optional; useful when the builder has a faster internet connection than yours + # the builders-use-substitutes is optional; useful when the builder has a faster internet connection than yours extraOptions = '' experimental-features = nix-command flakes - builders-use-substitutes = true + builders-use-substitutes = true ''; buildMachines = [{ # hostName = "ada"; - hostName = "141.30.52.34"; + hostName = "141.30.52.34"; sshUser = "builder"; - system = "x86_64-linux"; - # if the builder supports building for multiple architectures, - # replace the previous line by, e.g., - # systems = ["x86_64-linux" "aarch64-linux"]; - maxJobs = 2; - speedFactor = 2; - supportedFeatures = [ "big-parallel" "kvm" ]; - mandatoryFeatures = [ ]; + system = "x86_64-linux"; + # if the builder supports building for multiple architectures, + # replace the previous line by, e.g., + # systems = ["x86_64-linux" "aarch64-linux"]; + maxJobs = 2; + speedFactor = 2; + supportedFeatures = [ "big-parallel" "kvm" ]; + mandatoryFeatures = [ ]; # base64 -w0 /etc/ssh/ssh_host_ed25519_key.pub publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUlTcFY3cVJUZEdXVlpYNFlITnFYZXBYNjZUK0U1dGdCbnAwTlJOTmtKbzcgcm9vdEBhZGEK"; sshKey = "/home/felix/.ssh/id_ed25519"; # } # { - # hostName = "elm"; + # hostName = "elm"; # sshUser = "builder"; - # system = "x86_64-linux"; - # # if the builder supports building for multiple architectures, - # # replace the previous line by, e.g., - # # systems = ["x86_64-linux" "aarch64-linux"]; - # maxJobs = 1; - # speedFactor = 1; - # supportedFeatures = [ "big-parallel" "kvm" ]; - # mandatoryFeatures = [ ]; + # system = "x86_64-linux"; + # # if the builder supports building for multiple architectures, + # # replace the previous line by, e.g., + # # systems = ["x86_64-linux" "aarch64-linux"]; + # maxJobs = 1; + # speedFactor = 1; + # supportedFeatures = [ "big-parallel" "kvm" ]; + # mandatoryFeatures = [ ]; # publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUNXTk9oL3ozQjZmSXRGd2lTenlqeDBUTnIveUl6bHNsazdEeEtNcE5sdmwgcm9vdEBlbG0K"; # sshKey = "/home/felix/.ssh/id_ed25519"; - }] ; + }] ; distributedBuilds = true; settings.trusted-users = [ @@ -209,7 +209,7 @@ in unstable.rust-analyzer unstable.helix - + ## other programming languages and compilers stack unstable.haskell-language-server @@ -225,6 +225,8 @@ in ## nix-community/comma comma nix-output-monitor + nix-index + nil # provided by my own overlay mlir @@ -268,7 +270,7 @@ in libreoffice-fresh ## video and media applications unstable.zoom-us - unstable.teams + #unstable.teams mpv ffmpeg-full musikcube diff --git a/entropy/nixos/flake.lock b/entropy/nixos/flake.lock index 7ea9b6c..c15e9dd 100644 --- a/entropy/nixos/flake.lock +++ b/entropy/nixos/flake.lock @@ -23,11 +23,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1676924492, - "narHash": "sha256-78278eyP55JRFe7UCpmFwdkrTY6H2arzTpVeteWo8kM=", + "lastModified": 1677591639, + "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d24ea777c57b69c6b143cf11d83184ef71b0dbbf", + "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677075010, - "narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=", + "lastModified": 1677624842, + "narHash": "sha256-4DF9DbDuK4/+KYx0L6XcPBeDHUFVCtzok2fWtwXtb5w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c95bf18beba4290af25c60cbaaceea1110d0f727", + "rev": "d70f5cd5c3bef45f7f52698f39e7cc7a89daa7f0", "type": "github" }, "original": { diff --git a/entropy/nvim/init.vim b/entropy/nvim/init.vim index b56f333..f8e2456 100644 --- a/entropy/nvim/init.vim +++ b/entropy/nvim/init.vim @@ -5,7 +5,7 @@ " enable autocompletion of ale let g:ale_completion_enabled = 1 " disable latex linting from ale as i've got my own plugin for that -let g:ale_linters = {'rust': ['analyzer'], 'haskell': ['hls', 'hindent'], 'tex': []} +let g:ale_linters = {'rust': ['analyzer'], 'nix': ['nil'], 'haskell': ['hls', 'hindent'], 'tex': []} "let g:ale_fixers = {'c': ['clang-format']}