Compare commits
	
		
			No commits in common. 'nixos-unstable' and '2020-03-15-hydra' have entirely different histories. 
		
	
	
		
			nixos-unst
			...
			2020-03-15
		
	
		
	| @ -1,28 +1,20 @@ | ||||
| {pkgs, ... }: | ||||
| with import <nixpkgs> {}; | ||||
| 
 | ||||
| let | ||||
|   myVim = pkgs.vim_configurable.customize { | ||||
|     # Specifies the vim binary name. | ||||
|     # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim | ||||
|     # This allows to have multiple vim packages installed (e.g. with a different set of plugins) | ||||
|     name = "vim"; | ||||
|     vimrcConfig.customRC = builtins.readFile ./vimrc; | ||||
|     vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { | ||||
|       start = [ | ||||
|         wombat256-vim | ||||
|       ]; | ||||
|       opt = [ | ||||
|         elm-vim | ||||
|         vim-fish | ||||
|         vim-nix | ||||
|         vimwiki | ||||
|       ]; | ||||
|     }; | ||||
|   }; | ||||
| 
 | ||||
| in { | ||||
|   programs.vim = { | ||||
|     defaultEditor = true; | ||||
|     package = myVim; | ||||
|   }; | ||||
| vim_configurable.customize { | ||||
|   # Specifies the vim binary name. | ||||
|   # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim | ||||
|   # This allows to have multiple vim packages installed (e.g. with a different set of plugins) | ||||
|   name = "vim"; | ||||
|   vimrcConfig.customRC = builtins.readFile ./vimrc; | ||||
|   vimrcConfig.vam.knownPlugins = pkgs.vimPlugins; | ||||
|   vimrcConfig.vam.pluginDictionaries = [ | ||||
|     { names = [ | ||||
|       # Here you can place all your vim plugins | ||||
|       # They are installed managed by `vam` (a vim plugin manager) | ||||
|       #"vim-addon-nix" | ||||
|       "elm-vim" | ||||
|       "vim-nix" | ||||
|       "wombat256-vim" | ||||
|     ]; } | ||||
|   ]; | ||||
| } | ||||
|  | ||||
| @ -0,0 +1,16 @@ | ||||
| { config, lib, pkgs, ... }: | ||||
| 
 | ||||
| let | ||||
|   inherit (lib) mkIf mkMerge mkThenElse; | ||||
|   annuaire = config.r6d.machines; | ||||
|   currentMachine = annuaire."${config.networking.hostName}"; | ||||
|   flags = currentMachine.configurationFlags; | ||||
| in | ||||
| 
 | ||||
| mkIf flags.auto-upgrade { | ||||
| 
 | ||||
|   # Automatic update & automatic clean | ||||
| 
 | ||||
|   system.autoUpgrade.enable = true; | ||||
|   nix.gc.automatic = true; | ||||
| } | ||||
| @ -0,0 +1,27 @@ | ||||
| # http://www.git-attitude.fr/2014/09/15/30-options-git-qui-gagnent-a-etre-connues/ | ||||
| [color] | ||||
|     diff = auto | ||||
|     branch = auto | ||||
|     interactive = auto | ||||
|     pager = true | ||||
|     showbranch = auto | ||||
|     status = auto | ||||
| [alias] | ||||
|     a  = add -p | ||||
|     br = for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short)\t%(authorname)\t%(refname:short)' | ||||
|     ci = commit | ||||
|     co = checkout | ||||
|     ff = pull --ff-only | ||||
|     oops = commit --amend --no-edit | ||||
|     # Show files ignored by git | ||||
|     ignored = ls-files -o -i --exclude-standard | ||||
|     ls = ls-files | ||||
|     st = status | ||||
|     # Logs | ||||
|     lol = log --graph --decorate --pretty=oneline --abbrev-commit | ||||
|     lola = log --graph --decorate --pretty=oneline --abbrev-commit --all | ||||
|     not-pushed = log --branches --not --remotes | ||||
| [push] | ||||
|     default = simple | ||||
| [core] | ||||
|     editor = /usr/bin/env vim | ||||
| @ -1,30 +0,0 @@ | ||||
| { config, lib, pkgs, ... }: | ||||
| 
 | ||||
| let | ||||
|   inherit (lib) mkIf mkMerge mkThenElse; | ||||
|   annuaire = config.r6d.machines; | ||||
|   currentMachine = annuaire."${config.networking.fqdn}"; | ||||
|   flags = currentMachine.configurationFlags; | ||||
| in | ||||
| 
 | ||||
| { | ||||
| 
 | ||||
|   # Automatic update & automatic clean | ||||
| 
 | ||||
|   system.autoUpgrade.enable = flags.auto-upgrade; | ||||
|   nix = { | ||||
|     extraOptions = '' | ||||
|       experimental-features = nix-command flakes | ||||
|     ''; | ||||
|     settings = { | ||||
|       auto-optimise-store = true; | ||||
|       # Nombre de process d'installation en parrallèle effectués par Nix | ||||
|       cores = 0; | ||||
|     }; | ||||
|     gc = { | ||||
|       automatic = true; | ||||
|       dates = "daily"; | ||||
|       options = "--delete-older-than 7d"; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
| @ -0,0 +1,13 @@ | ||||
| { config, lib, pkgs, ... }: | ||||
| 
 | ||||
| let | ||||
|   inherit (lib) mkIf mkMerge mkThenElse; | ||||
|   annuaire = config.r6d.machines; | ||||
|   currentMachine = annuaire."${config.networking.hostName}"; | ||||
|   flags = currentMachine.configurationFlags; | ||||
| in | ||||
| 
 | ||||
| mkIf true { | ||||
|   # Lancement de dbus pour les utilisateurs | ||||
|   services.dbus.socketActivated = true; | ||||
| } | ||||
| @ -1,35 +0,0 @@ | ||||
| { config, lib, pkgs, ... }: | ||||
| 
 | ||||
| let | ||||
|   inherit (lib) mkIf mkMerge mkThenElse; | ||||
|   annuaire = config.r6d.machines; | ||||
|   currentMachine = annuaire."${config.networking.fqdn}"; | ||||
|   flags = currentMachine.configurationFlags; | ||||
| in | ||||
| 
 | ||||
| mkIf flags.pipewire { | ||||
| 
 | ||||
|   # Paquets | ||||
|   environment.systemPackages = with pkgs; [ | ||||
|     helvum        # patchbay pipewire | ||||
|     paprefs       # préferences pulseaudio | ||||
|     pavucontrol   # mixer pulseaudio | ||||
|     pa_applet     # status et contrôle dans le system tray | ||||
|   ]; | ||||
| 
 | ||||
|   security.rtkit.enable = true; | ||||
| 
 | ||||
|   services.pipewire = { | ||||
|     enable = true; | ||||
|     alsa.enable = true; | ||||
|     alsa.support32Bit = true; | ||||
|     pulse.enable = true; | ||||
|     # If you want to use JACK applications, uncomment this | ||||
|     jack.enable = true; | ||||
|    | ||||
|     # use the example session manager (no others are packaged yet so this is enabled by default, | ||||
|     # no need to redefine it in your config for now) | ||||
|     #media-session.enable = true; | ||||
|   }; | ||||
| 
 | ||||
| } | ||||
					Loading…
					
					
				
		Reference in New Issue