initial adaptation for macOS work device

This commit is contained in:
Trolli Schmittlauch 2022-05-02 02:00:30 +02:00
parent fa9e6e81e1
commit 4b35e44873
2 changed files with 42 additions and 37 deletions

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,10 +172,10 @@ let
curl curl
httpie httpie
gdb gdb
strace #strace
ltrace #ltrace
valgrind #valgrind
zeal #zeal
gcc gcc
shellcheck shellcheck
mtr mtr
@ -242,7 +242,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 +259,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 +293,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 +324,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; {