mirror of
https://github.com/JulienMalka/snowfield.git
synced 2025-04-07 04:28:10 +02:00
Converted macbook to wayland
This commit is contained in:
parent
adc777b381
commit
c0bf8aefb8
GPG key ID:
6FC74C847011FD83
2 changed files with 126 additions and 74 deletions
machines/macintosh
|
|
@ -22,20 +22,16 @@
|
|||
networking.hostName = "macintosh"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
networking.wireless.enable = false;
|
||||
|
||||
hardware.asahi.addEdgeKernelConfig = true;
|
||||
hardware.asahi.useExperimentalGPUDriver = true;
|
||||
# Enables wireless support via wpa_supplicant.
|
||||
|
||||
hardware.video.hidpi.enable = true;
|
||||
|
||||
services.tailscale.enable = true;
|
||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
|
||||
|
||||
# Set your time zone.
|
||||
# time.timeZone = "Europe/Amsterdam";
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
time.timeZone = "Europe/Paris";
|
||||
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
|
@ -43,38 +39,19 @@
|
|||
font = "Lat2-Terminus16";
|
||||
useXkbConfig = true; # use xkbOptions in tty.
|
||||
};
|
||||
|
||||
hardware.asahi.peripheralFirmwareDirectory = ./firmware;
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.libinput.enable = true;
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
hardware.opengl.driSupport = true;
|
||||
hardware.opengl.extraPackages = [ pkgs.mesa ];
|
||||
|
||||
# Configure keymap in X11
|
||||
# services.xserver.layout = "fr";
|
||||
# services.xserver.xkbOptions = {
|
||||
# "eurosign:e";
|
||||
# "caps:escape" # map caps to escape.
|
||||
# };
|
||||
programs.dconf.enable = true;
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
# services.printing.enable = true;
|
||||
programs.sway.enable = true;
|
||||
|
||||
# Enable sound.
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
};
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
security.polkit.enable = true;
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users.users.julien = {
|
||||
|
|
@ -87,43 +64,10 @@
|
|||
};
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||
wget
|
||||
tailscale
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = {
|
||||
# enable = true;
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# Copy the NixOS configuration file and link it from the resulting system
|
||||
# (/run/current-system/configuration.nix). This is useful in case you
|
||||
# accidentally delete configuration.nix.
|
||||
# system.copySystemConfiguration = true;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "23.05"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
let
|
||||
modifier = "Mod4";
|
||||
terminal = "alacritty";
|
||||
in
|
||||
{
|
||||
sops.secrets.ssh-macintosh-pub = {
|
||||
owner = "julien";
|
||||
|
|
@ -17,10 +21,114 @@
|
|||
};
|
||||
|
||||
|
||||
luj.hmgr.julien = {
|
||||
home.stateVersion = "22.11";
|
||||
luj.programs.neovim.enable = true;
|
||||
luj.programs.ssh-client.enable = true;
|
||||
luj.programs.git.enable = true;
|
||||
};
|
||||
luj.hmgr.julien =
|
||||
{
|
||||
home.stateVersion = "22.11";
|
||||
luj.programs.neovim.enable = true;
|
||||
luj.programs.ssh-client.enable = true;
|
||||
luj.programs.git.enable = true;
|
||||
luj.programs.gtk.enable = true;
|
||||
luj.polybar.enable = true;
|
||||
|
||||
wayland.windowManager.sway.enable = true;
|
||||
wayland.windowManager.sway.config.terminal = terminal;
|
||||
wayland.windowManager.sway.config.modifier = modifier;
|
||||
wayland.windowManager.sway.config.input = {
|
||||
"*" = {
|
||||
xkb_layout = "fr";
|
||||
xkb_variant = "mac";
|
||||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.sway.config.gaps = {
|
||||
right = 2;
|
||||
left = 2;
|
||||
top = 2;
|
||||
bottom = 2;
|
||||
inner = 7;
|
||||
};
|
||||
wayland.windowManager.sway.config.keybindings = lib.mkOptionDefault {
|
||||
|
||||
"${modifier}+ampersand" = "workspace 1";
|
||||
"${modifier}+eacute" = "workspace 2";
|
||||
"${modifier}+quotedbl" = "workspace 3";
|
||||
"${modifier}+apostrophe" = "workspace 4";
|
||||
"${modifier}+parenleft" = "workspace 5";
|
||||
"${modifier}+egrave" = "workspace 6";
|
||||
"${modifier}+minus" = "workspace 7";
|
||||
"${modifier}+underscore" = "workspace 8";
|
||||
"${modifier}+ccedilla" = "workspace 9";
|
||||
"${modifier}+agrave" = "workspace 10";
|
||||
|
||||
"${modifier}+Shift+ampersand" = "move container to workspace 1";
|
||||
"${modifier}+Shift+eacute" = "move container to workspace 2";
|
||||
"${modifier}+Shift+quotedbl" = "move container to workspace 3";
|
||||
"${modifier}+Shift+apostrophe" = "move container to workspace 4";
|
||||
"${modifier}+Shift+parenleft" = "move container to workspace 5";
|
||||
"${modifier}+Shift+egrave" = "move container to workspace 6";
|
||||
"${modifier}+Shift+minus" = "move container to workspace 7";
|
||||
"${modifier}+Shift+underscore" = "move container to workspace 8";
|
||||
"${modifier}+Shift+ccedilla" = "move container to workspace 9";
|
||||
"${modifier}+Shift+agrave" = "move container to workspace 10";
|
||||
|
||||
"${modifier}+h" = "focus left";
|
||||
"${modifier}+j" = "focus down";
|
||||
"${modifier}+k" = "focus up";
|
||||
"${modifier}+l" = "focus right";
|
||||
|
||||
"${modifier}+Shift+h" = "move left";
|
||||
"${modifier}+Shift+j" = "move down";
|
||||
"${modifier}+Shift+k" = "move up";
|
||||
"${modifier}+Shift+l" = "move right";
|
||||
|
||||
|
||||
"${modifier}+q" = "kill";
|
||||
"${modifier}+space" = "exec rofi -show run";
|
||||
"${modifier}+Return" = "exec ${terminal}";
|
||||
"${modifier}+f" = "fullscreen toggle";
|
||||
|
||||
};
|
||||
|
||||
programs.alacritty =
|
||||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
window.dimensions = {
|
||||
lines = 3;
|
||||
columns = 200;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
unstable.rofi
|
||||
unstable.firefox
|
||||
feh
|
||||
meld
|
||||
vlc
|
||||
nerdfonts
|
||||
font-awesome
|
||||
nodejs
|
||||
fira-code
|
||||
neomutt
|
||||
htop
|
||||
evince
|
||||
mosh
|
||||
flameshot
|
||||
networkmanagerapplet
|
||||
sops
|
||||
];
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
xsession.enable = true;
|
||||
|
||||
home.keyboard = {
|
||||
layout = "fr";
|
||||
};
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue