douzeb/mrflos-nixos-config-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip macos config

Browse source
This commit is contained in:
mrflos 2024-05-30 13:16:42 +03:00
parent 35ad28c03a
commit 232b3546e1
8 changed files with 176 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
darwin-configuration.nix Normal file
View file

@ -0,0 +1,8 @@
# NixOS config entry point
# import the hardware and configuration files specific to your machine
{
imports =
[
./machines/MacMiniM2-darwin-configuration.nix
];
}

2
dotfiles/init_yeswiki_repos.sh Normal file → Executable file
View file

@ -14,7 +14,7 @@
corebranch="doryphore-dev" corebranch="doryphore-dev"
curdir="$HOME/Developpements" #${PWD} curdir="$HOME/Developpements" #${PWD}
repos=$(curl --request GET --url "https://api.github.com/orgs/yeswiki/repos" | jq '.[].full_name' | tr -d "\"" | sort) repos=$(curl --request GET --url "https://api.github.com/orgs/yeswiki/repos?per_page=100" | jq '.[].full_name' | tr -d "\"" | sort)
# core # core
printf "\n================ Install YesWiki core ================\n" printf "\n================ Install YesWiki core ================\n"

34
machines/MacMiniM2-darwin-configuration.nix Normal file
View file

@ -0,0 +1,34 @@
{ config, pkgs, ... }:
{
imports = [
../modules/console.nix
../modules/local-dev.nix
../modules/home-config.nix
];
fonts = {
fontDir.enable = true;
fonts = with pkgs; [
inter
(nerdfonts.override { fonts = [ "Iosevka" ]; })
];
};
# 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;
networking.hostName = "ace";
# Create /etc/zshrc 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;
}

15
modules/console.nix
View file

@ -3,10 +3,10 @@
{ {
programs.zsh.enable = true; programs.zsh.enable = true;
programs.fzf = { # programs.fzf = {
fuzzyCompletion = true; # fuzzyCompletion = true;
keybindings = true; # keybindings = true;
}; # };
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
@ -41,11 +41,12 @@
mpc-cli mpc-cli
mpd mpd
neofetch neofetch
neovim
ollama ollama
pandoc pandoc
pass pass
pciutils pciutils
pinentry #pinentry
ripgrep ripgrep
rustc rustc
slides slides
@ -55,12 +56,12 @@
tokei tokei
tree tree
unzip unzip
usbutils #usbutils
wget wget
whois whois
wl-clipboard wl-clipboard
wirelesstools
yazi yazi
#wirelesstools
yt-dlp yt-dlp
zellij zellij
zoxide zoxide

194
modules/home-config.nix
View file

@ -1,41 +1,33 @@
# Inject the right home-manager config for the machine.
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
plasma-manager = pkgs.fetchFromGitHub { #startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
owner = "pjones"; # ${pkgs.waybar}/bin/waybar &
repo = "plasma-manager"; # ${pkgs.swww}/bin/swww init &
rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5"; #
sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw="; # sleep 1
};
startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
${pkgs.waybar}/bin/waybar &
${pkgs.swww}/bin/swww init &
sleep 1 # ${pkgs.swww}/bin/swww img /home/mrflos/Nextcloud/Images/Wallpapers/chihiro014.jpg &
# '';
${pkgs.swww}/bin/swww img /home/mrflos/Nextcloud/Images/Wallpapers/chihiro014.jpg &
'';
in { in {
# TODO can we automate the installation of home-manager ? # TODO can we automate the installation of home-manager ?
# sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
imports = [ imports = [
<home-manager/nixos> #<home-manager/nixos>
<home-manager/nix-darwin>
]; ];
# Let Home Manager install and manage itself.
#programs.home-manager.enable = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
users.users.mrflos = { users.users.mrflos = {
isNormalUser = true; #isNormalUser = true;
description = "mrflos"; description = "mrflos";
createHome = true; createHome = true;
extraGroups = ["users" "docker" "libvirtd" "lxd" "networkmanager" "wheel" ]; #extraGroups = ["users" "docker" "libvirtd" "lxd" "networkmanager" "wheel" ];
uid = 1000; uid = 1000;
shell = pkgs.zsh; shell = pkgs.zsh;
home = "/Users/mrflos";
}; };
nix.settings.trusted-users = [ "mrflos" ]; nix.settings.trusted-users = [ "mrflos" ];
home-manager.backupFileExtension = "backup";
home-manager.users.mrflos = { pkgs, ... }: { home-manager.users.mrflos = { pkgs, ... }: {
home.stateVersion = "23.05"; home.stateVersion = "23.05";
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -47,17 +39,17 @@ in {
rust-analyzer-unwrapped rust-analyzer-unwrapped
php83Packages.composer php83Packages.composer
nodejs_20 nodejs_20
swww # swww
grimblast # grimblast
swaylock #swaylock
waybar #waybar
yarn yarn
]; ];
imports = [ #imports = [
(plasma-manager + "/modules") # (plasma-manager + "/modules")
./home-plasma.nix # ./home-plasma.nix
]; #];
home.file = { home.file = {
"./.config/kitty/" = { "./.config/kitty/" = {
source = ../dotfiles/kitty; source = ../dotfiles/kitty;
@ -238,105 +230,105 @@ in {
}; };
}; };
services.ssh-agent.enable = true; #services.ssh-agent.enable = true;
wayland.windowManager.hyprland.enable = true; #wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.settings = { #wayland.windowManager.hyprland.settings = {
exec-once = ''${startupScript}/bin/hyprland-start''; # exec-once = ''${startupScript}/bin/hyprland-start'';
"$mod" = "SUPER"; # "$mod" = "SUPER";
# assign apps # assign apps
"$term" = "kitty"; # "$term" = "kitty";
"$editor" = "nvim"; # "$editor" = "nvim";
"$file" = "dolphin"; # "$file" = "dolphin";
"$browser" = "firefox"; # "$browser" = "firefox";
bind = [ # bind = [
", Print, exec, grimblast copy area" # ", Print, exec, grimblast copy area"
# Window/Session actions # Window/Session actions
"$mod, Q, killactive" # "$mod, Q, killactive"
"ALT, F4, killactive" # "ALT, F4, killactive"
"$mod, delete, exit" # kill hyperland session # "$mod, delete, exit" # kill hyperland session
"$mod, W, togglefloating" # toggle the window on focus to float # "$mod, W, togglefloating" # toggle the window on focus to float
"$mod, G, togglegroup" # toggle the window on focus to float # "$mod, G, togglegroup" # toggle the window on focus to float
"ALT, return, fullscreen" # toggle the window on focus to fullscreen # "ALT, return, fullscreen" # toggle the window on focus to fullscreen
"$mod, L, exec, swaylock" # lock screen # "$mod, L, exec, swaylock" # lock screen
# "$mod, backspace, exec, wlogout-launcher-hyprland 1" # logout menu # "$mod, backspace, exec, wlogout-launcher-hyprland 1" # logout menu
"$CONTROL, ESCAPE, exec, systemctl-toggle --user waybar.service" # "$CONTROL, ESCAPE, exec, systemctl-toggle --user waybar.service"
# Application shortcuts # Application shortcuts
"$mod, T, exec, $term" # open terminal # "$mod, T, exec, $term" # open terminal
"$mod, E, exec, $file" # open file manager # "$mod, E, exec, $file" # open file manager
"$mod, C, exec, $editor" # open vscode # "$mod, C, exec, $editor" # open vscode
"$mod, F, exec, $browser" # open browser # "$mod, F, exec, $browser" # open browser
# Move focus with mainMod + arrow keys # Move focus with mainMod + arrow keys
"$mod, left, movefocus, l" # "$mod, left, movefocus, l"
"$mod, right, movefocus, r" # "$mod, right, movefocus, r"
"$mod, up, movefocus, u" # "$mod, up, movefocus, u"
"$mod, down, movefocus, d" # "$mod, down, movefocus, d"
"ALT, Tab, movefocus, d" # "ALT, Tab, movefocus, d"
# Switch workspaces relative to the active workspace with mainMod + CTRL + [←→] # Switch workspaces relative to the active workspace with mainMod + CTRL + [←→]
"$mod CTRL, right, workspace, r+1" # "$mod CTRL, right, workspace, r+1"
"$mod CTRL, left, workspace, r-1" # "$mod CTRL, left, workspace, r-1"
# move to the first empty workspace instantly with mainMod + CTRL + [↓] # move to the first empty workspace instantly with mainMod + CTRL + [↓]
"$mod CTRL, down, workspace, empty" # "$mod CTRL, down, workspace, empty"
# Move active window to a relative workspace with mainMod + CTRL + ALT + [←→] # Move active window to a relative workspace with mainMod + CTRL + ALT + [←→]
"$mod CTRL ALT, right, movetoworkspace, r+1" # "$mod CTRL ALT, right, movetoworkspace, r+1"
"$mod CTRL ALT, left, movetoworkspace, r-1" # "$mod CTRL ALT, left, movetoworkspace, r-1"
# Move active window around current workspace with mainMod + SHIFT + CTRL [←→↑↓] # Move active window around current workspace with mainMod + SHIFT + CTRL [←→↑↓]
"$mod SHIFT $CONTROL, left, movewindow, l" # "$mod SHIFT $CONTROL, left, movewindow, l"
"$mod SHIFT $CONTROL, right, movewindow, r" # "$mod SHIFT $CONTROL, right, movewindow, r"
"$mod SHIFT $CONTROL, up, movewindow, u" # "$mod SHIFT $CONTROL, up, movewindow, u"
"$mod SHIFT $CONTROL, down, movewindow, d" # "$mod SHIFT $CONTROL, down, movewindow, d"
# Scroll through existing workspaces with mainMod + scroll # Scroll through existing workspaces with mainMod + scroll
"$mod, mouse_down, workspace, e+1" # "$mod, mouse_down, workspace, e+1"
"$mod, mouse_up, workspace, e-1" # "$mod, mouse_up, workspace, e-1"
# Special workspaces (scratchpad) # Special workspaces (scratchpad)
"$mod ALT, S, movetoworkspacesilent, special" # "$mod ALT, S, movetoworkspacesilent, special"
"$mod, S, togglespecialworkspace," # "$mod, S, togglespecialworkspace,"
# Toggle Layout # Toggle Layout
"$mod, J, togglesplit," # dwindle # "$mod, J, togglesplit," # dwindle
] # ]
++ ( # ++ (
# workspaces # workspaces
# binds $mod + [shift +] {1..10} to [move to] workspace {1..10} # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
builtins.concatLists (builtins.genList ( # builtins.concatLists (builtins.genList (
x: let # x: let
ws = let # ws = let
c = (x + 1) / 10; # c = (x + 1) / 10;
in # in
builtins.toString (x + 1 - (c * 10)); # builtins.toString (x + 1 - (c * 10));
in [ # in [
"$mod, ${ws}, workspace, ${toString (x + 1)}" # "$mod, ${ws}, workspace, ${toString (x + 1)}"
"$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" # "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
"$mod ALT, ${ws}, movetoworkspacesilent, ${toString (x + 1)}" # Move window silently to workspace Super + Alt + [0-9] # "$mod ALT, ${ws}, movetoworkspacesilent, ${toString (x + 1)}" # Move window silently to workspace Super + Alt + [0-9]
] # ]
) # )
10) # 10)
); # );
#
# # Move/Resize windows with mainMod + LMB/RMB and dragging
# bindm = [
# "$mod, mouse:272, movewindow"
# "$mod, mouse:273, resizewindow"
# ];
# Move/Resize windows with mainMod + LMB/RMB and dragging # # Resize windows
bindm = [ # binde = [
"$mod, mouse:272, movewindow" # "$mod SHIFT, right, resizeactive, 30 0"
"$mod, mouse:273, resizewindow" # "$mod SHIFT, left, resizeactive, -30 0"
]; # "$mod SHIFT, up, resizeactive, 0 -30"
# "$mod SHIFT, down, resizeactive, 0 30"
# Resize windows # ];
binde = [ # };
"$mod SHIFT, right, resizeactive, 30 0"
"$mod SHIFT, left, resizeactive, -30 0"
"$mod SHIFT, up, resizeactive, 0 -30"
"$mod SHIFT, down, resizeactive, 0 30"
];
};
}; };
} }

10
modules/home-plasma.nix
View file

@ -1,4 +1,12 @@
{ { config, pkgs, lib, ... }:
let
plasma-manager = pkgs.fetchFromGitHub {
owner = "pjones";
repo = "plasma-manager";
rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5";
sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=";
};
in {
programs.plasma = { programs.plasma = {
enable = true; enable = true;
shortcuts = { shortcuts = {

93
modules/local-dev.nix
View file

@ -1,86 +1,38 @@
# Local developpement # Local developpement
{ pkgs, config, lib, ... }: { { pkgs, config, lib, ... }: {
virtualisation = { homebrew.enable = true;
docker.enable = true; homebrew.brews = [
#docker.rootless = { # `brew install`
# enable = true; #"imagemagick"
# setSocketVariable = true;
#};
#libvirtd.enable = true;
#lxd.enable = true;
#waydroid.enable = true;
};
systemd.services.yeswikidev = { # `brew install`, always `brew services restart`, `brew link`, `brew unlink mysql` (if it is installed)
enable = true; {
script = '' name = "mariadb";
${pkgs.systemd}/bin/systemctl start mysql restart_service = true;
# etc link = true;
''; conflicts_with = [ "mysql" ];
serviceConfig = let }
startstop = command: ];
(pkgs.writeShellApplication {
name = "yeswikidev";
runtimeInputs = with pkgs; [ systemd ];
text = ''
systemctl ${command} mysql.service
'';
});
#startstopFullShell = pkgs.writeShellApplication {
# name = "yeswikidev";
# runtimeInputs = with pkgs; [ systemd ];
# text = ''
# systemctl "$1" mysql.service
# '';
#});
#commands = [ "start" "stop" ];
#scripts = map (command: (pkgs.writeShellApplication {
# name = "yeswikidev";
# runtimeInputs = with pkgs; [ systemd ];
# text = ''
# systemctl ${command} mysql.service
# '';
#})) commands;
#execs = {
# ExecStart = "start";
# ExecStop = "stop";
#};
# https://nixos.org/manual/nix/stable/language/builtins
# https://nixos.org/manual/nix/stable/language/builtins#builtins-mapAttrs
#execAttrs = attrNames execs; # ["Start" "Stop"];
#execs2 = mapAttrs (k: v: ()) execs;
in {
# pkgs.writeScript, pkgs.writeScriptBin
#ExecStart = startstop "start";
#ExecStop = startstop "stop";
# OR
# ExecStart = "${startstopFullShell} start";
# ExecStop = "${startstopFullShell} stop";
# OR
# ExecStart = "${scripts[0]}";
# ExecStop = "${scripts[1]}";
};
};
services.mysql = {
enable = true;
package = pkgs.mariadb;
};
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
let let
php83 = pkgs.php83.buildEnv { extraConfig = "memory_limit = 2G"; }; php83 = pkgs.php83.buildEnv { extraConfig = ""
memory_limit = 2G
max_upload_size = 2G
""; };
in [ in [
#clang
dart-sass dart-sass
dbeaver-bin cmake
dart-sass
docker-compose docker-compose
fd
fzf
gcc gcc
go go
nixfmt-rfc-style nixfmt-rfc-style
lua-language-server
nixpkgs-fmt nixpkgs-fmt
nodejs nodejs
nodePackages.eslint nodePackages.eslint
@ -90,7 +42,8 @@
php83Packages.php-cs-fixer php83Packages.php-cs-fixer
python3 python3
python311Packages.virtualenv python311Packages.virtualenv
rpi-imager ripgrep
rust-analyzer-unwrapped
ruff-lsp ruff-lsp
stylelint stylelint
symfony-cli symfony-cli

0
home-manager/mrflos-cli.nix → users/mrflos-cli.nix
View file