modularise config

This commit is contained in:
Felix Schröter 2019-10-19 12:55:35 +02:00
parent ae44502f36
commit 79bba316c2
No known key found for this signature in database
GPG key ID: A12D7C9D2FD34458
28 changed files with 407 additions and 432 deletions

13
home/common/chromium.nix Normal file
View file

@ -0,0 +1,13 @@
{ config, pkgs, ... }:
{
nixpkgs.overlays = [
(self: super: {
chromium = super.chromium.override {
commandLineArgs = "--force-dark-mode";
};
})
];
programs.chromium.enable = true;
}

22
home/common/dotnet.nix Normal file
View file

@ -0,0 +1,22 @@
{ config, pkgs, ... }:
with pkgs;
let
unstable = import <nixos-unstable> {
config = removeAttrs config.nixpkgs.config [ "packageOverrides" ];
};
dotnet-sdk_3 = pkgs.callPackage (import (pkgs.fetchFromGitHub {
name = "nixos-pr-dotnet-sdk_3";
owner = "NixOS";
repo = "nixpkgs";
rev = "c3978355e1b1b23a0e1af5abe4a8901321126f49";
sha256 = "006jxl07kfl2qbsglx0nsnmygdj3wvwfl98gpl3bprrja0l4gplk";
} + /pkgs/development/compilers/dotnet/sdk/3.nix )) {};
in
{
home.packages = [
# dotnet-sdk
dotnet-sdk_3
omnisharp-roslyn
];
}

6
home/common/emacs.nix Normal file
View file

@ -0,0 +1,6 @@
{ config, pkgs, ... }:
{
services.emacs.enable = true;
programs.emacs.enable = true;
}

22
home/common/gnome.nix Normal file
View file

@ -0,0 +1,22 @@
{ config, pkgs, ... }:
{
dconf.enable = true;
dconf.settings = {
"org/gnome/shell" = {
enabled-extensions = [
"dash-to-panel@jderose9.github.com"
"TopIcons@phocean.net"
];
favorite-apps = [
"org.gnome.Nautilus.desktop"
"chromium-browser.desktop"
"code.desktop"
];
};
"org/gnome/shell/extensions/dash-to-panel" = {
appicon-padding = 4;
panel-size = 36;
};
};
}

9
home/common/gui.nix Normal file
View file

@ -0,0 +1,9 @@
{ config, pkgs, ... }:
{
gtk.enable = true;
gtk.theme.name = "Adwaita-dark";
gtk.gtk3.extraConfig = {
gtk-application-prefer-dark-theme = true;
};
}

8
home/common/keybase.nix Normal file
View file

@ -0,0 +1,8 @@
{ config, pkgs, ... }:
{
services.keybase.enable = true;
services.kbfs.enable = true;
home.packages = [ pkgs.keybase-gui ];
}

16
home/common/mimeapps.nix Normal file
View file

@ -0,0 +1,16 @@
{ config, pkgs, ... }:
{
xdg.mimeApps.enable = true;
xdg.mimeApps.defaultApplications = {
"text/html" = [ "chromium-browser.desktop" ];
"text/calendar" = [ "chromium-browser.desktop" ];
"x-scheme-handler/http" = [ "chromium-browser.desktop" ];
"x-scheme-handler/https" = [ "chromium-browser.desktop" ];
"x-scheme-handler/about" = [ "chromium-browser.desktop" ];
"x-scheme-handler/unknown" = [ "chromium-browser.desktop" ];
"x-scheme-handler/mailto" = [ "chromium-browser.desktop" ];
"x-scheme-handler/webcal" = [ "chromium-browser.desktop" ];
"x-scheme-handler/sgnl" = [ "signal-desktop.desktop" ];
};
}

12
home/common/neovim.nix Normal file
View file

@ -0,0 +1,12 @@
{ config, pkgs, ... }:
{
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
plugins = with pkgs.vimPlugins; [
vim-nix
];
};
}

18
home/common/sh.nix Normal file
View file

@ -0,0 +1,18 @@
{ config, pkgs, ... }:
let
shellAliases = {
emacs = "emacsclient -c";
};
in
{
programs.fish = {
enable = true;
inherit shellAliases;
};
programs.bash = {
enable = true;
inherit shellAliases;
};
}

5
home/common/signal.nix Normal file
View file

@ -0,0 +1,5 @@
{ config, pkgs, ... }:
{
home.packages = [ pkgs.signal-desktop ];
}

5
home/common/vscode.nix Normal file
View file

@ -0,0 +1,5 @@
{ config, pkgs, ... }:
{
programs.vscode.enable = true;
}

View file

@ -5,139 +5,63 @@ let
unstable = import <nixos-unstable> {
config = removeAttrs config.nixpkgs.config [ "packageOverrides" ];
};
shellAliases = {
chromium = "chromium --force-dark-mode";
emacs = "emacsclient -c";
};
dotnet-sdk_3 = pkgs.callPackage (import (pkgs.fetchFromGitHub {
name = "nixos-pr-dotnet-sdk_3";
owner = "NixOS";
repo = "nixpkgs";
rev = "c3978355e1b1b23a0e1af5abe4a8901321126f49";
sha256 = "006jxl07kfl2qbsglx0nsnmygdj3wvwfl98gpl3bprrja0l4gplk";
} + /pkgs/development/compilers/dotnet/sdk/3.nix )) {};
in
{
imports = [
# ./vscode.nix
./common/sh.nix
./common/mimeapps.nix
./common/gui.nix
./common/gnome.nix
./common/neovim.nix
./common/emacs.nix
./common/vscode.nix
./common/keybase.nix
./common/signal.nix
./common/chromium.nix
./common/dotnet.nix
];
home-manager.users.felschr = {
nixpkgs.config.allowUnfree = true;
nixpkgs.config.allowBroken = true; # needed for steam
xdg.mimeApps.enable = true;
xdg.mimeApps.defaultApplications = {
"text/html" = [ "chromium-browser.desktop" ];
"text/calendar" = [ "chromium-browser.desktop" ];
"x-scheme-handler/mailto" = [ "chromium-browser.desktop" ];
};
nixpkgs.config.allowUnfree = true;
# xsession.enable = true;
# xsession.windowManager.xmonad.enable = true;
# xsession.windowManager.command = "gnome-shell";
dconf.enable = true;
dconf.settings = {
"org/gnome/shell" = {
enabled-extensions = [
"dash-to-panel@jderose9.github.com"
"TopIcons@phocean.net"
];
favorite-apps = [
"org.gnome.Nautilus.desktop"
"chromium-browser.desktop"
"code.desktop"
];
};
"org/gnome/shell/extensions/dash-to-panel" = {
appicon-padding = 4;
panel-size = 36;
};
};
gtk.enable = true;
gtk.theme.name = "Adwaita-dark";
gtk.gtk3.extraConfig = {
gtk-application-prefer-dark-theme = true;
};
services.redshift = {
enable = true;
latitude = "53.2603609";
longitude = "10.4014691";
};
programs.direnv = {
enable = true;
enableBashIntegration = true;
enableFishIntegration = true;
};
programs.bash = {
inherit shellAliases;
};
programs.fish = {
enable = true;
inherit shellAliases;
};
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
plugins = with pkgs.vimPlugins; [
vim-nix
];
};
programs.git = {
enable = true;
userName = "Felix Schroeter";
userEmail = "fs@upsquared.com";
};
services.emacs.enable = true;
programs.emacs.enable = true;
services.keybase.enable = true;
services.kbfs.enable = true;
programs.chromium = {
enable = true;
};
programs.firefox.enable = true;
home.file.".envrc".text = ''
dotenv
'';
home.sessionVariables = {
};
home.packages = with pkgs; [
gparted
# productivity
signal-desktop
discord
keybase-gui
libreoffice
skypeforlinux
vscode
# development tools
unzip
# dotnet-sdk
dotnet-sdk_3
omnisharp-roslyn
kubectl
kubernetes-helm
awscli
];
home.stateVersion = "19.09";
services.redshift = {
enable = true;
latitude = "53.2472211";
longitude = "10.4021562";
};
programs.direnv = {
enable = true;
enableBashIntegration = true;
enableFishIntegration = true;
};
programs.git = {
enable = true;
userName = "Felix Schroeter";
userEmail = "fs@upsquared.com";
};
programs.firefox.enable = true;
home.file.".envrc".text = ''
dotenv
'';
home.packages = with pkgs; [
# system
gparted
# productivity
discord
libreoffice
skypeforlinux
# development
unzip
kubectl
kubernetes-helm
awscli
];
home.stateVersion = "19.09";
}

View file

@ -1,77 +1,55 @@
{ config, pkgs, ... }:
with pkgs;
let
unstable = import <nixos-unstable> {
config = removeAttrs config.nixpkgs.config [ "packageOverrides" ];
};
in
{
imports = [
./common/sh.nix
./common/mimeapps.nix
./common/gui.nix
./common/gnome.nix
./common/neovim.nix
./common/emacs.nix
./common/vscode.nix
./common/keybase.nix
./common/signal.nix
./common/chromium.nix
];
nixpkgs.config.allowUnfree = true;
# xsession.enable = true;
gtk.enable = true;
gtk.theme.name = "Adwaita-dark";
gtk.gtk3.extraConfig = {
gtk-application-prefer-dark-theme = true;
};
services.redshift = {
enable = true;
latitude = "53.2603609";
longitude = "10.4014691";
};
programs.fish = {
enable = true;
};
programs.neovim = {
enable = true;
viAlias = true;
vimAlias = true;
};
programs.termite = {
enable = true;
};
programs.git = {
enable = true;
userName = "Felix Tenley";
userEmail = "dev@felschr.com";
};
programs.emacs = {
enable = true;
};
programs.vscode = {
enable = true;
# userSettings = {}
};
services.keybase.enable = true;
services.kbfs.enable = true;
programs.chromium = {
enable = true;
};
programs.firefox.enable = true;
home.packages = with pkgs; [
# system
gparted
# productivity
discord
# development
haskellPackages.ghc
signal-desktop
discord
keybase-gui
# gaming
unstable.steam
unstable.linux-steam-integration
unstable.lutris
# other
unstable.ledger-live-desktop
];