Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'prism/staging/jeschli'

Browse Source
This commit is contained in:
lassulus 2018-01-30 18:20:10 +01:00
commit de21c3d6bc
2 changed files with 95 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
jeschli/1systems/bolide/config.nix
View File

@ -42,93 +42,101 @@
# List packages installed in system profile. To search by name, run: # List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
nixpkgs.config.allowUnfree = true; environment.shellAliases = {
environment.systemPackages = with pkgs; [ n = "nix-shell";
wget vim stocki = pkgs.writeDash "deploy" ''
# system helper cd ~/stockholm
ag exec nix-shell -I stockholm="$PWD" --run 'deploy --system="bolide"'
curl '';
copyq };
dmenu nixpkgs.config.allowUnfree = true;
git environment.systemPackages = with pkgs; [
i3lock wget vim
keepass # system helper
networkmanagerapplet ag
rsync curl
terminator copyq
tmux dmenu
wget git
# rxvt_unicode i3lock
# editors keepass
emacs networkmanagerapplet
# internet rsync
thunderbird terminator
chromium tmux
google-chrome wget
# programming languages # rxvt_unicode
go # editors
gcc emacs
ghc # internet
python35 thunderbird
python35Packages.pip chromium
# go tools google-chrome
golint # programming languages
gotools go
# dev tools gcc
gnumake ghc
jetbrains.pycharm-professional python35
jetbrains.webstorm python35Packages.pip
jetbrains.goland # go tools
# document viewer golint
zathura gotools
]; # dev tools
elmPackages.elm
gnumake
jetbrains.pycharm-professional
jetbrains.webstorm
jetbrains.goland
# document viewer
zathura
];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
# programs.bash.enableCompletion = true; # programs.bash.enableCompletion = true;
# programs.mtr.enable = true; # programs.mtr.enable = true;
# programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; # programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
# List services that you want to enable: # List services that you want to enable:
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
# Enable CUPS to print documents. # Enable CUPS to print documents.
# services.printing.enable = true; # services.printing.enable = true;
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
# services.xserver.layout = "us"; # services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e"; # services.xserver.xkbOptions = "eurosign:e";
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.xmonad.enable = true;
services.xserver.windowManager.xmonad.enableContribAndExtras = true; services.xserver.windowManager.xmonad.enableContribAndExtras = true;
# Enable touchpad support. # Enable touchpad support.
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
# Enable the KDE Desktop Environment. # Enable the KDE Desktop Environment.
# services.xserver.displayManager.sddm.enable = true; # services.xserver.displayManager.sddm.enable = true;
# services.xserver.desktopManager.plasma5.enable = true; # services.xserver.desktopManager.plasma5.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.extraUsers.jeschli = { users.extraUsers.jeschli = {
isNormalUser = true; isNormalUser = true;
uid = 1000; uid = 1000;
}; };
# This value determines the NixOS release with which your system is to be # This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database # compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you # servers. You should change this only after NixOS release notes say you
# should. # should.
system.stateVersion = "17.09"; # Did you read the comment? system.stateVersion = "17.09"; # Did you read the comment?
} }

10
jeschli/2configs/vim.nix
View File

@ -20,6 +20,7 @@ let
sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a"; sha256 = "1z3yhhbmbzfw68qjzyvpbmlyv2a1p814sy5q2knn04kcl30vx94a";
}; };
}; };
in { in {
environment.systemPackages = [ environment.systemPackages = [
(pkgs.vim_configurable.customize { (pkgs.vim_configurable.customize {
@ -65,11 +66,17 @@ in {
let g:molokai_original = 1 let g:molokai_original = 1
let g:rehash256 = 1 let g:rehash256 = 1
''; '';
settingsForElm = ''
let g:polyglot_disabled = ['elm']
let g:elm_detailed_complete = 1
let g:elm_format_autosave = 1
let g:elm_syntastic_show_warnings = 1
'';
in '' in ''
${colorscheme} ${colorscheme}
${remapStatements} ${remapStatements}
${setStatements} ${setStatements}
${settingsForElm}
${settingsForGo} ${settingsForGo}
" I dont know what this line is about " I dont know what this line is about
autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4 autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
@ -85,6 +92,7 @@ in {
"surround" "surround"
"Syntastic" "Syntastic"
"undotree" "undotree"
"elm-vim"
]; ];
} }
{ names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; } { names = [ "vim-addon-nix" ]; ft_regex = "^nix\$"; }