Compare commits
	
		
			49 Commits 
		
	
	
		
			2019-08-25
			...
			nixos-unst
		
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								
									
								
								 | 
						fe50587190 | 3 years ago | 
| 
							
							
								
									
								
								 | 
						c1b40f9d07 | 3 years ago | 
| 
							
							
								 | 
						06d73c9519 | 3 years ago | 
| 
							
							
								 | 
						f7264ae434 | 3 years ago | 
| 
							
							
								 | 
						4fd9d0d7f8 | 3 years ago | 
| 
							
							
								 | 
						963b0b9d4b | 3 years ago | 
| 
							
							
								 | 
						51b98cda4f | 3 years ago | 
| 
							
							
								 | 
						f751e24839 | 3 years ago | 
| 
							
							
								 | 
						1b1aebd0a0 | 3 years ago | 
| 
							
							
								 | 
						812bc511e0 | 3 years ago | 
| 
							
							
								 | 
						e55568d1c6 | 4 years ago | 
| 
							
							
								 | 
						d4f2298518 | 4 years ago | 
| 
							
							
								 | 
						2fad38532f | 4 years ago | 
| 
							
							
								 | 
						28cf2d2071 | 4 years ago | 
| 
							
							
								 | 
						f6f3befe2f | 4 years ago | 
| 
							
							
								 | 
						257f59054d | 4 years ago | 
| 
							
							
								 | 
						518054fd0a | 4 years ago | 
| 
							
							
								 | 
						03bcc056c1 | 4 years ago | 
| 
							
							
								 | 
						7679f865b0 | 4 years ago | 
| 
							
							
								 | 
						2d63aae5a1 | 4 years ago | 
| 
							
							
								 | 
						48a257405a | 4 years ago | 
| 
							
							
								 | 
						30e2f31255 | 4 years ago | 
| 
							
							
								 | 
						0364ea9b29 | 4 years ago | 
| 
							
							
								 | 
						b2505f45c4 | 4 years ago | 
| 
							
							
								 | 
						962c052b29 | 4 years ago | 
| 
							
							
								 | 
						032d7e8e1a | 4 years ago | 
| 
							
							
								 | 
						af35de1639 | 4 years ago | 
| 
							
							
								 | 
						c8ae50be5b | 4 years ago | 
| 
							
							
								 | 
						9310d01af6 | 4 years ago | 
| 
							
							
								 | 
						ea33bac49b | 4 years ago | 
| 
							
							
								 | 
						204fb83207 | 4 years ago | 
| 
							
							
								 | 
						cf3c3c3603 | 4 years ago | 
| 
							
							
								 | 
						edad20c5c0 | 4 years ago | 
| 
							
							
								 | 
						ed937ba5bc | 5 years ago | 
| 
							
							
								 | 
						3de6332c3e | 5 years ago | 
| 
							
							
								 | 
						e26453fc7e | 5 years ago | 
| 
							
							
								 | 
						67b9f5b0f7 | 5 years ago | 
| 
							
							
								 | 
						8f4f8ef953 | 5 years ago | 
| 
							
							
								 | 
						c33f0f9c50 | 5 years ago | 
| 
							
							
								 | 
						2064606f18 | 5 years ago | 
| 
							
							
								 | 
						4a5f0ba1a7 | 5 years ago | 
| 
							
							
								 | 
						9ed945bba8 | 5 years ago | 
| 
							
							
								
									
								
								 | 
						65e5776f86 | 5 years ago | 
| 
							
							
								 | 
						235e636451 | 6 years ago | 
| 
							
							
								 | 
						e849c55297 | 6 years ago | 
| 
							
							
								 | 
						1e51d11778 | 6 years ago | 
| 
							
							
								 | 
						f39f486f51 | 6 years ago | 
| 
							
							
								 | 
						2a5809c3de | 6 years ago | 
| 
							
							
								 | 
						7681f7774e | 6 years ago | 
@ -1,20 +1,28 @@
 | 
			
		||||
with import <nixpkgs> {};
 | 
			
		||||
{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.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"
 | 
			
		||||
    ]; }
 | 
			
		||||
  ];
 | 
			
		||||
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;
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -1,16 +0,0 @@
 | 
			
		||||
{ 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;
 | 
			
		||||
}
 | 
			
		||||
@ -1,27 +0,0 @@
 | 
			
		||||
# 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
 | 
			
		||||
@ -0,0 +1,30 @@
 | 
			
		||||
{ 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";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
@ -1,13 +0,0 @@
 | 
			
		||||
{ 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;
 | 
			
		||||
}
 | 
			
		||||
@ -0,0 +1,35 @@
 | 
			
		||||
{ 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