Commit f662bd1a8814
Changed files (14)
configuration
machine
configuration/common.nix
@@ -1,13 +0,0 @@
-{ configs, pkgs, ...}:
-
-# This is the common configuration shared by any of my machine
-# You should include it in `configuration.nix`.
-
-{
- imports =
- [
- # ./security.nix
- ./users.nix
- ./packages.nix
- ];
-}
configuration/custom-packages.nix
@@ -1,35 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- nixpkgs.config = {
- packageOverrides = self: with self; let
- fetchNixPkgs = { rev, sha256, owner, repo }:
- fetchFromGitHub {
- inherit sha256 rev owner repo;
- };
- dockerUnstablePkgs = import (fetchNixPkgs {
- owner = "NixOS";
- repo = "nixpkgs-channels";
- rev = "8ecadc12502d59fc8117ca0ed41ede010448fca4";
- sha256 = "102wvwixvnbkr547ay6psvv1x31001mb5y17ibkplyikb91xi2ak";
- }) {};
- # nixos-unstable
- unstablePkgs = import (fetchNixPkgs {
- owner = "NixOS";
- repo = "nixpkgs-channels";
- rev = "9c048f4fb66adc33c6b379f2edefcb615fd53de6";
- sha256 = "18xbnfzj753bphzmgp74rn9is4n5ir4mvb4gp9lgpqrbfyy5dl2j";
- }) {};
- sbrPkgs = import (fetchNixPkgs {
- owner = "vdemeester";
- repo = "sbrpkgs";
- rev = "df281994c5e438c25af6c054ebfbd19333f3e132";
- sha256 = "0636k102vw1pmbcch75xvhjlkfk9553bcf6rba5i69m7b5bdsfd0";
- }) {};
- in {
- inherit (dockerUnstablePkgs) docker docker-edge docker-proxy containerd runc tini docker-compose docker-machine;
- inherit (unstablePkgs) keybase ipfs mpv doctl vndr emacs ledger-cli youtube-dl go hasklig i3lock-color certstrap pipenv;
- inherit (sbrPkgs) dobi ape tuck clasp;
- };
- };
-}
configuration/packages.nix
@@ -1,23 +0,0 @@
-{ config, pkgs, ... }:
-
-{
- environment = {
- systemPackages = with pkgs; [
- aspell
- aspellDicts.en
- aspellDicts.fr
- cryptsetup
- direnv
- #dobi
- doctl
- gcc
- gnumake
- gnupg
- pinentry
- gptfdisk
- haskellPackages.git-annex
- msmtp
- offlineimap
- ];
- };
-}
machine/ehime.nix
@@ -4,8 +4,6 @@
imports =
[ # Include the results of the hardware scan.
../hardware-configuration.nix
- ../configuration/custom-packages.nix
- ../configuration/common.nix
../profiles/desktop.nix
../profiles/dev.nix
../profiles/dev.python.nix
machine/honshu.nix
@@ -4,8 +4,6 @@
imports =
[ # Include the results of the hardware scan.
../hardware-configuration.nix
- ../configuration/custom-packages.nix
- ../configuration/common.nix
../profiles/ssh.nix
../profiles/laptop.nix
../profiles/dev.python.nix
machine/shikoku.nix
@@ -4,8 +4,6 @@
imports =
[ # Include the results of the hardware scan.
../hardware-configuration.nix
- ../configuration/custom-packages.nix
- ../configuration/common.nix
../profiles/ssh.nix
../profiles/desktop.nix
../profiles/audio.nix
machine/vm.nix
@@ -4,8 +4,6 @@
imports =
[ # Include the results of the hardware scan.
../hardware-configuration.nix
- ../configuration/custom-packages.nix
- ../configuration/common.nix
../profiles/desktop.nix
../profiles/ssh.nix
../profiles/virtualization.nix
machine/wakasu.nix
@@ -4,8 +4,7 @@
imports =
[ # Include the results of the hardware scan.
../hardware-configuration.nix
- ../configuration/custom-packages.nix
- ../configuration/common.nix
+ #../configuration/custom-packages.nix
../profiles/laptop.nix
../profiles/ssh.nix
../profiles/virtualization.nix
profiles/default.nix
@@ -1,6 +1,10 @@
{ config, pkgs, ... }:
{
+ imports =
+ [
+ ./users.nix
+ ];
programs = {
zsh.enable = true;
fish.enable = true;
@@ -10,8 +14,12 @@
EDITOR = pkgs.lib.mkOverride 0 "vim";
};
systemPackages = with pkgs; [
+ aspell
+ aspellDicts.en
+ aspellDicts.fr
+ cryptsetup
+ direnv
file
- git
htop
iotop
lsof
@@ -29,7 +37,6 @@
consoleFont = "Lat2-Terminus16";
consoleKeyMap = "fr";
defaultLocale = "en_US.UTF-8";
- # supportedLocales = [ "en_US/ISO-8859-1" "fr_FR/ISO-8859-1" "fr_FR@euro/ISO-8859-15" ];
};
nix = {
useSandbox = true;
@@ -53,10 +60,6 @@
system = {
stateVersion = "17.09";
- # autoUpgrade = {
- # enable = true;
- # dates = "13:00";
- # };
};
systemd.services.nixos-update = {
description = "NixOS Upgrade";
@@ -73,7 +76,6 @@
git pull --autostash --rebase
nix-channel --update nixos
'';
- #startAt = "12:00";
startAt = "weekly";
};
}
profiles/desktop.nix
@@ -13,6 +13,29 @@
boot.loader.efi.canTouchEfiVariables = true;
boot.tmpOnTmpfs = true;
+ nixpkgs.config = {
+ packageOverrides = self: with self; let
+ fetchNixPkgs = { rev, sha256, owner, repo }:
+ fetchFromGitHub {
+ inherit sha256 rev owner repo;
+ };
+ unstablePkgs = import (fetchNixPkgs {
+ owner = "NixOS";
+ repo = "nixpkgs-channels";
+ rev = "9c048f4fb66adc33c6b379f2edefcb615fd53de6";
+ sha256 = "18xbnfzj753bphzmgp74rn9is4n5ir4mvb4gp9lgpqrbfyy5dl2j";
+ }) {};
+ sbrPkgs = import (fetchNixPkgs {
+ owner = "vdemeester";
+ repo = "sbrpkgs";
+ rev = "df281994c5e438c25af6c054ebfbd19333f3e132";
+ sha256 = "0636k102vw1pmbcch75xvhjlkfk9553bcf6rba5i69m7b5bdsfd0";
+ }) {};
+ in {
+ inherit (unstablePkgs) keybase mpv emacs ledger-cli youtube-dl i3lock-color pipenv;
+ inherit (sbrPkgs) ape tuck clasp;
+ };
+ };
environment.systemPackages = with pkgs; [
dmenu2
rofi
@@ -48,6 +71,8 @@
unzip
peco
networkmanagerapplet
+ gnupg
+ pinentry
];
hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
networking.networkmanager.enable = true;
profiles/dev.nix
@@ -8,6 +8,7 @@
./gitconfig.nix
];
environment.systemPackages = with pkgs; [
+ git
jq
grc
platinum-searcher
profiles/dockerization.nix
@@ -7,6 +7,22 @@
# Remove once containerd module is upstream
../service/containerd.nix
];
+ nixpkgs.config = {
+ packageOverrides = self: with self; let
+ fetchNixPkgs = { rev, sha256, owner, repo }:
+ fetchFromGitHub {
+ inherit sha256 rev owner repo;
+ };
+ dockerUnstablePkgs = import (fetchNixPkgs {
+ owner = "NixOS";
+ repo = "nixpkgs-channels";
+ rev = "8ecadc12502d59fc8117ca0ed41ede010448fca4";
+ sha256 = "102wvwixvnbkr547ay6psvv1x31001mb5y17ibkplyikb91xi2ak";
+ }) {};
+ in {
+ inherit (dockerUnstablePkgs) docker docker-edge docker-proxy containerd runc tini docker-compose docker-machine;
+ };
+ };
environment.systemPackages = with pkgs; [
python27Packages.docker_compose
docker-machine
configuration/users.nix → profiles/users.nix
File renamed without changes
configuration/security.nix → profiles/yubikey.nix
File renamed without changes