diff --git a/home.nix b/home.nix index 3c2dfdb..8685e7a 100644 --- a/home.nix +++ b/home.nix @@ -13,7 +13,7 @@ programs.vscode = { enable = true; - extensions = []; + extensions = [ ]; }; services.unclutter.enable = true; @@ -26,22 +26,24 @@ terminal = "sakura"; }; - xsession.windowManager.i3 = let - modifier = "Mod4"; - in { - enable = true; - config = { - assigns = { - # https://rycee.gitlab.io/home-manager/options.html#opt-xsession.windowManager.i3.config.assigns - }; - focus = { - mouseWarping = false; # Whether mouse cursor should be warped to the center of the window when switching focus to a window on a different output. - }; + xsession.windowManager.i3 = + let + modifier = "Mod4"; + in + { + enable = true; + config = { + assigns = { + # https://rycee.gitlab.io/home-manager/options.html#opt-xsession.windowManager.i3.config.assigns + }; + focus = { + mouseWarping = false; # Whether mouse cursor should be warped to the center of the window when switching focus to a window on a different output. + }; - modifier = modifier; + modifier = modifier; - # see https://rycee.gitlab.io/home-manager/options.html#opt-xsession.windowManager.i3.config.keybindings - keybindings = pkgs.lib.mkOptionDefault { + # see https://rycee.gitlab.io/home-manager/options.html#opt-xsession.windowManager.i3.config.keybindings + keybindings = pkgs.lib.mkOptionDefault { "${modifier}+Return" = "exec sakura"; #i3-sensible-terminal ### BÉPO ### @@ -99,21 +101,21 @@ "XF86MonBrightnessDown" = "exec light -U 2"; # decrease screen brightness }; - startup = [ - { command = "nextcloud"; notification = false; } - { command = "setxkbmap -layout fr -variant bepo"; notification = false; } - { command = "udiskie"; notification = false; } - { command = "copyq"; notification = false; } - { command = "numlockx on"; notification = false; } # turn verr num on + startup = [ + { command = "nextcloud"; notification = false; } + { command = "setxkbmap -layout fr -variant bepo"; notification = false; } + { command = "udiskie"; notification = false; } + { command = "copyq"; notification = false; } + { command = "numlockx on"; notification = false; } # turn verr num on - { command = "autorandr -c"; notification = false; } - { command = "feh --bg-scale /home/pierre/Documents/Graphisme/fc-bg-light-black.png"; notification = false; } + { command = "autorandr -c"; notification = false; } + { command = "feh --bg-scale /home/pierre/Documents/Graphisme/fc-bg-light-black.png"; notification = false; } - # docker run -d --net traefik --ip 172.10.0.10 --restart always -v /var/run/docker.sock:/var/run/docker.sock:ro --name traefik -p 80:80 -p 8080:8080 traefik:2.4.9 --api.insecure=true --providers.docker - { command = "docker start traefik"; notification = false; } - ]; + # docker run -d --net traefik --ip 172.10.0.10 --restart always -v /var/run/docker.sock:/var/run/docker.sock:ro --name traefik -p 80:80 -p 8080:8080 traefik:2.4.9 --api.insecure=true --providers.docker + { command = "docker start traefik"; notification = false; } + ]; + }; }; - }; programs.zsh = { enable = true; @@ -145,43 +147,43 @@ # `$` must be escaped with `''` :metal: # source: https://nixos.org/nix-dev/2015-December/019018.html initExtra = '' - bindkey ' ' forward-word - zstyle ':completion:*:hosts' hosts ''${=''${''${''${''${(@M)''${(f)"''$(cat ~/.ssh/config 2>/dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}} - setopt PROMPT_CR - setopt PROMPT_SP + bindkey ' ' forward-word + zstyle ':completion:*:hosts' hosts ''${=''${''${''${''${(@M)''${(f)"''$(cat ~/.ssh/config 2>/dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}} + setopt PROMPT_CR + setopt PROMPT_SP -m2wipe() { - echo "Pouf pouf pouf…" - sudo rm -rf $1/generated $1/var/cache/**/* $1/pub/static/* $1/var/page_cache $1/var/view_preprocessed - mkdir $1/generated - sudo chmod -R 777 $1/{var,pub,generated,app/etc} - echo "… tchak !" -} + m2wipe() { + echo "Pouf pouf pouf…" + sudo rm -rf $1/generated $1/var/cache/**/* $1/pub/static/* $1/var/page_cache $1/var/view_preprocessed + mkdir $1/generated + sudo chmod -R 777 $1/{var,pub,generated,app/etc} + echo "… tchak !" + } -dcrefresh() { - dc stop -t0 $1 && dc rm -vf $1 && dc up -d $1 -} + dcrefresh() { + dc stop -t0 $1 && dc rm -vf $1 && dc up -d $1 + } -akamai() { - # see https://gist.github.com/saml/4758360 - curl -v -s -H "Pragma: akamai-x-cache-on, akamai-x-cache-remote-on, akamai-x-check-cacheable, akamai-x-get-cache-key, akamai-x-get-extracted-values, akamai-x-get-nonces, akamai-x-get-ssl-client-session-id, akamai-x-get-true-cache-key, akamai-x-ser" "$1" 2>&1 > /dev/null -} + akamai() { + # see https://gist.github.com/saml/4758360 + curl -v -s -H "Pragma: akamai-x-cache-on, akamai-x-cache-remote-on, akamai-x-check-cacheable, akamai-x-get-cache-key, akamai-x-get-extracted-values, akamai-x-get-nonces, akamai-x-get-ssl-client-session-id, akamai-x-get-true-cache-key, akamai-x-ser" "$1" 2>&1 > /dev/null + } -unalias v + unalias v -# see https://github.com/cantino/mcfly -export MCFLY_FUZZY=true -eval "$(mcfly init zsh)" + # see https://github.com/cantino/mcfly + export MCFLY_FUZZY=true + eval "$(mcfly init zsh)" -eval "$(op completion zsh)"; compdef _op op + eval "$(op completion zsh)"; compdef _op op -eval "$(glab completion -s zsh)" + eval "$(glab completion -s zsh)" -# K8s -source <(helm completion zsh) -source <(k3d completion zsh) -source <(kubectl completion zsh) -''; + # K8s + source <(helm completion zsh) + source <(k3d completion zsh) + source <(kubectl completion zsh) + ''; sessionVariables = { EDITOR = "vim"; @@ -191,14 +193,14 @@ source <(kubectl completion zsh) }; shellAliases = { - a = "fasd -a"; # any - s = "fasd -si"; # show / search / select - d = "fasd -d"; # directory - f = "fasd -f"; # file - sd = "fasd -sid"; # interactive directory selection - sf = "fasd -sif"; # interactive file selection - z = "fasd_cd -d"; # cd, same functionality as j in autojump - j = "fasd_cd -d"; # cd, same functionality as j in autojump + a = "fasd -a"; # any + s = "fasd -si"; # show / search / select + d = "fasd -d"; # directory + f = "fasd -f"; # file + sd = "fasd -sid"; # interactive directory selection + sf = "fasd -sif"; # interactive file selection + z = "fasd_cd -d"; # cd, same functionality as j in autojump + j = "fasd_cd -d"; # cd, same functionality as j in autojump zz = "fasd_cd -d -i"; # cd with interactive selection dc = "docker-compose"; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 93d77d8..d8b560e 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -6,7 +6,8 @@ { imports = - [ # Include the results of the hardware scan. + [ + # Include the results of the hardware scan. ./hardware-configuration.nix ./framework.nix @@ -70,9 +71,9 @@ users.users.pierre = { isNormalUser = true; description = "Pierre"; - extraGroups = [ "networkmanager" "wheel" "audio" "docker" "video" ]; + extraGroups = [ "networkmanager" "wheel" "audio" "docker" "video" ]; shell = pkgs.zsh; - packages = with pkgs; []; + packages = with pkgs; [ ]; }; home-manager.users.pierre = import /home/pierre/dotfiles/home.nix; diff --git a/nixos/framework.nix b/nixos/framework.nix index bff8e7c..923d4d6 100644 --- a/nixos/framework.nix +++ b/nixos/framework.nix @@ -74,4 +74,4 @@ # Backlight (see https://wiki.archlinux.org/title/Backlight#xbacklight_returns_:_No_outputs_have_backlight_property) hardware.acpilight.enable = true; -} \ No newline at end of file +} diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index 277db7a..57018c8 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; @@ -14,18 +15,19 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/db660732-f520-4e68-9141-b0899f221e82"; + { + device = "/dev/disk/by-uuid/db660732-f520-4e68-9141-b0899f221e82"; fsType = "ext4"; }; fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/D7D6-B4C6"; + { + device = "/dev/disk/by-uuid/D7D6-B4C6"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/da431bdf-cec4-4928-b44b-e6d2c3419063"; } - ]; + [{ device = "/dev/disk/by-uuid/da431bdf-cec4-4928-b44b-e6d2c3419063"; }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/packages.nix b/packages.nix index ddc3fcc..8115c8c 100644 --- a/packages.nix +++ b/packages.nix @@ -109,6 +109,7 @@ playerctl numlockx + nixpkgs-fmt nodejs-16_x cypress docker