feliix42/dotfiles
1
0
Fork 0
mirror of https://github.com/Feliix42/dotfiles.git synced 2024-11-25 23:16:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update packages, fix indentation

Browse source
This commit is contained in:
Felix Suchert 2023-03-02 16:02:34 +01:00
parent 1e7c040499
commit 6c820a3ae5
Signed by: feliix42
GPG key ID: 24363525EA0E8A99
3 changed files with 33 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
entropy/nixos/configuration.nix
View file

@ -5,7 +5,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let 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 --add https://nixos.org/channels/nixos-unstable nixos-unstable
# sudo nix-channel --update # sudo nix-channel --update
unstable = import <nixos-unstable> { config = config.nixpkgs.config; }; unstable = import <nixos-unstable> { config = config.nixpkgs.config; };
@ -82,41 +82,41 @@ in
# ------------ Nix Config --------------------------------------------------- # ------------ Nix Config ---------------------------------------------------
nix = { nix = {
package = pkgs.nixFlakes; 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 = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
builders-use-substitutes = true builders-use-substitutes = true
''; '';
buildMachines = [{ buildMachines = [{
# hostName = "ada"; # hostName = "ada";
hostName = "141.30.52.34"; hostName = "141.30.52.34";
sshUser = "builder"; sshUser = "builder";
system = "x86_64-linux"; system = "x86_64-linux";
# if the builder supports building for multiple architectures, # if the builder supports building for multiple architectures,
# replace the previous line by, e.g., # replace the previous line by, e.g.,
# systems = ["x86_64-linux" "aarch64-linux"]; # systems = ["x86_64-linux" "aarch64-linux"];
maxJobs = 2; maxJobs = 2;
speedFactor = 2; speedFactor = 2;
supportedFeatures = [ "big-parallel" "kvm" ]; supportedFeatures = [ "big-parallel" "kvm" ];
mandatoryFeatures = [ ]; mandatoryFeatures = [ ];
# base64 -w0 /etc/ssh/ssh_host_ed25519_key.pub # base64 -w0 /etc/ssh/ssh_host_ed25519_key.pub
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUlTcFY3cVJUZEdXVlpYNFlITnFYZXBYNjZUK0U1dGdCbnAwTlJOTmtKbzcgcm9vdEBhZGEK"; publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUlTcFY3cVJUZEdXVlpYNFlITnFYZXBYNjZUK0U1dGdCbnAwTlJOTmtKbzcgcm9vdEBhZGEK";
sshKey = "/home/felix/.ssh/id_ed25519"; sshKey = "/home/felix/.ssh/id_ed25519";
# } # }
# { # {
# hostName = "elm"; # hostName = "elm";
# sshUser = "builder"; # sshUser = "builder";
# system = "x86_64-linux"; # system = "x86_64-linux";
# # if the builder supports building for multiple architectures, # # if the builder supports building for multiple architectures,
# # replace the previous line by, e.g., # # replace the previous line by, e.g.,
# # systems = ["x86_64-linux" "aarch64-linux"]; # # systems = ["x86_64-linux" "aarch64-linux"];
# maxJobs = 1; # maxJobs = 1;
# speedFactor = 1; # speedFactor = 1;
# supportedFeatures = [ "big-parallel" "kvm" ]; # supportedFeatures = [ "big-parallel" "kvm" ];
# mandatoryFeatures = [ ]; # mandatoryFeatures = [ ];
# publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUNXTk9oL3ozQjZmSXRGd2lTenlqeDBUTnIveUl6bHNsazdEeEtNcE5sdmwgcm9vdEBlbG0K"; # publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUNXTk9oL3ozQjZmSXRGd2lTenlqeDBUTnIveUl6bHNsazdEeEtNcE5sdmwgcm9vdEBlbG0K";
# sshKey = "/home/felix/.ssh/id_ed25519"; # sshKey = "/home/felix/.ssh/id_ed25519";
}] ; }] ;
distributedBuilds = true; distributedBuilds = true;
settings.trusted-users = [ settings.trusted-users = [
@ -209,7 +209,7 @@ in
unstable.rust-analyzer unstable.rust-analyzer
unstable.helix unstable.helix
## other programming languages and compilers ## other programming languages and compilers
stack stack
unstable.haskell-language-server unstable.haskell-language-server
@ -225,6 +225,8 @@ in
## nix-community/comma ## nix-community/comma
comma comma
nix-output-monitor nix-output-monitor
nix-index
nil
# provided by my own overlay # provided by my own overlay
mlir mlir
@ -268,7 +270,7 @@ in
libreoffice-fresh libreoffice-fresh
## video and media applications ## video and media applications
unstable.zoom-us unstable.zoom-us
unstable.teams #unstable.teams
mpv mpv
ffmpeg-full ffmpeg-full
musikcube musikcube

12
entropy/nixos/flake.lock
View file

@ -23,11 +23,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1676924492, "lastModified": 1677591639,
"narHash": "sha256-78278eyP55JRFe7UCpmFwdkrTY6H2arzTpVeteWo8kM=", "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d24ea777c57b69c6b143cf11d83184ef71b0dbbf", "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677075010, "lastModified": 1677624842,
"narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=", "narHash": "sha256-4DF9DbDuK4/+KYx0L6XcPBeDHUFVCtzok2fWtwXtb5w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c95bf18beba4290af25c60cbaaceea1110d0f727", "rev": "d70f5cd5c3bef45f7f52698f39e7cc7a89daa7f0",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
entropy/nvim/init.vim
View file

@ -5,7 +5,7 @@
" enable autocompletion of ale " enable autocompletion of ale
let g:ale_completion_enabled = 1 let g:ale_completion_enabled = 1
" disable latex linting from ale as i've got my own plugin for that " 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']} "let g:ale_fixers = {'c': ['clang-format']}