Compare commits

...

3 commits

Author SHA1 Message Date
Trolli Schmittlauch 8c50e3a074 init nix-darwin system config
TODO: symlink creation
2022-05-17 14:39:29 +02:00
Trolli Schmittlauch 0d8baaf276 install pre-commit util 2022-05-12 23:10:32 +02:00
Trolli Schmittlauch 4b35e44873 initial adaptation for macOS work device 2022-05-12 23:10:29 +02:00
3 changed files with 67 additions and 37 deletions

View file

@ -0,0 +1,24 @@
{ config, pkgs, ... }:
{
# List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget
environment.systemPackages =
[ pkgs.vim
];
# Use a custom configuration.nix location.
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
# Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
# nix.package = pkgs.nix;
# Create /etc/bashrc that loads the nix-darwin environment.
programs.zsh.enable = true; # default shell on catalina
# Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog
system.stateVersion = 4;
}

View file

@ -3,7 +3,7 @@
with pkgs; with pkgs;
let let
# nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable # nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
unstable = import <nixos-unstable> { }; #unstable = import <nixos-unstable> { };
# nix-channel --add https://github.com/nix-community/NUR/archive/master.tar.gz NUR # nix-channel --add https://github.com/nix-community/NUR/archive/master.tar.gz NUR
nur = import <NUR> { inherit pkgs; }; nur = import <NUR> { inherit pkgs; };
myNur = nur.repos.schmittlauch; myNur = nur.repos.schmittlauch;
@ -103,9 +103,9 @@ let
lsof lsof
mosh mosh
openssh openssh
sshfsFuse sshfs-fuse
cryfs cryfs
smbnetfs # for FUSE smb mounting #smbnetfs # for FUSE smb mounting
sshuttle sshuttle
thefuck thefuck
gnupg gnupg
@ -118,12 +118,12 @@ let
pdfgrep pdfgrep
torsocks torsocks
ncdu ncdu
psmisc # for killall #psmisc # for killall
dos2unix dos2unix
reptyr # re-bind running program to other tty #reptyr # re-bind running program to other tty
xclip xclip
unzip unzip
myNur.lolcommits # from NUR #myNur.lolcommits # from NUR
]; ];
nixHelpers = [ nixHelpers = [
@ -172,15 +172,16 @@ let
curl curl
httpie httpie
gdb gdb
strace #strace
ltrace #ltrace
valgrind #valgrind
zeal #zeal
gcc gcc
shellcheck shellcheck
mtr mtr
ripgrep ripgrep
gitui gitui
pre-commit
# Haskell # Haskell
ghc ghc
@ -242,7 +243,7 @@ let
fira-code fira-code
ubuntu_font_family ubuntu_font_family
twemoji-color-font twemoji-color-font
opensans-ttf open-sans
(iosevka-bin.override { (iosevka-bin.override {
variant = "curly-slab"; variant = "curly-slab";
}) })
@ -259,22 +260,27 @@ in
{ {
home.packages = home.packages =
desktopApps cliApps
++ latexApps #++ desktopApps
#++ latexApps
++ pythonApps ++ pythonApps
++ graphicsApps #++ graphicsApps
++ cliApps #++ multimediaApps
++ multimediaApps
++ devTools ++ devTools
++ kdeTools #++ kdeTools
++ fonts ++ fonts
++ nixHelpers ++ nixHelpers
++ games #++ games
; ;
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager"; #programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager";
home.stateVersion = "18.09"; home.stateVersion = "22.05";
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "os";
home.homeDirectory = "/Users/os";
programs.direnv = programs.direnv =
{ {
@ -288,20 +294,20 @@ in
programs.bat.enable = true; programs.bat.enable = true;
services.gpg-agent = # services.gpg-agent =
{ # {
enable = true; # enable = true;
enableSshSupport = true; # enableSshSupport = true;
pinentryFlavor = "qt"; # pinentryFlavor = "qt";
}; # };
programs.ssh = # programs.ssh =
{ # {
enable = true; # enable = true;
# ssh host config # # ssh host config
matchBlocks = # matchBlocks =
import ./secrets/ssh_hosts.nix; # import ./secrets/ssh_hosts.nix;
}; # };
programs.tmux = { programs.tmux = {
enable = true; enable = true;
@ -319,12 +325,12 @@ in
terminal = "screen-256color"; terminal = "screen-256color";
}; };
systemd.user.startServices = true; #systemd.user.startServices = true;
services.lorri.enable = true; #services.lorri.enable = true;
# media button control support from Bluetooth devices # media button control support from Bluetooth devices
services.mpris-proxy.enable = true; #services.mpris-proxy.enable = true;
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;

View file

@ -4,7 +4,7 @@
self: super: self: super:
rec { rec {
#jami-ring-daemon = super.qt5.callPackage ./ov/jami/ring-daemon.nix {}; #jami-ring-daemon = super.qt5.callPackage ./ov/jami/ring-daemon.nix {};
myVim = with super; (vim_configurable.override { python = python3; }).customize { myVim = with super; vim_configurable.customize {
# executable/ package name # executable/ package name
name = "vim"; name = "vim";
vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {