From 86b9b25e10ef155a17ce252d80e543ab830d59c5 Mon Sep 17 00:00:00 2001 From: mrflos Date: Thu, 30 May 2024 13:16:42 +0300 Subject: [PATCH 01/12] wip macos config --- darwin-configuration.nix | 8 + dotfiles/init_yeswiki_repos.sh | 2 +- machines/MacMiniM2-darwin-configuration.nix | 34 +++ modules/console.nix | 41 +-- modules/home-config.nix | 275 +++++++++----------- modules/home-plasma.nix | 10 +- modules/local-dev.nix | 158 ++++++----- {home-manager => users}/mrflos-cli.nix | 0 8 files changed, 279 insertions(+), 249 deletions(-) create mode 100644 darwin-configuration.nix mode change 100644 => 100755 dotfiles/init_yeswiki_repos.sh create mode 100644 machines/MacMiniM2-darwin-configuration.nix rename {home-manager => users}/mrflos-cli.nix (100%) diff --git a/darwin-configuration.nix b/darwin-configuration.nix new file mode 100644 index 0000000..ef1869f --- /dev/null +++ b/darwin-configuration.nix @@ -0,0 +1,8 @@ +# NixOS config entry point +# import the hardware and configuration files specific to your machine +{ + imports = + [ + ./machines/MacMiniM2-darwin-configuration.nix + ]; +} diff --git a/dotfiles/init_yeswiki_repos.sh b/dotfiles/init_yeswiki_repos.sh old mode 100644 new mode 100755 index 16db261..34be1b2 --- a/dotfiles/init_yeswiki_repos.sh +++ b/dotfiles/init_yeswiki_repos.sh @@ -14,7 +14,7 @@ corebranch="doryphore-dev" 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 printf "\n================ Install YesWiki core ================\n" diff --git a/machines/MacMiniM2-darwin-configuration.nix b/machines/MacMiniM2-darwin-configuration.nix new file mode 100644 index 0000000..c7d403c --- /dev/null +++ b/machines/MacMiniM2-darwin-configuration.nix @@ -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; +} diff --git a/modules/console.nix b/modules/console.nix index f2bbdde..b0fbbb2 100644 --- a/modules/console.nix +++ b/modules/console.nix @@ -3,24 +3,24 @@ { programs.zsh.enable = true; - programs.fzf = { - fuzzyCompletion = true; - keybindings = true; - }; + # programs.fzf = { + # fuzzyCompletion = true; + # keybindings = true; + # }; - services = { - mpd.enable = true; - mpd.musicDirectory = "/home/mrflos/Musique"; - mpd.user = "mrflos"; - mpd.group = "users"; - mpd.startWhenNeeded = true; - mpd.extraConfig = '' - audio_output { - type "pulse" - name "mpd" - } -''; - }; +# services = { +# mpd.enable = true; +# mpd.musicDirectory = "/home/mrflos/Musique"; +# mpd.user = "mrflos"; +# mpd.group = "users"; +# mpd.startWhenNeeded = true; +# mpd.extraConfig = '' +# audio_output { +# type "pulse" +# name "mpd" +# } +# ''; +# }; # List packages installed in system profile. To search, run: @@ -55,11 +55,12 @@ mpc-cli mpd neofetch + neovim ollama pandoc pass pciutils - pinentry + #pinentry ripgrep rustc slides @@ -69,11 +70,11 @@ tokei tree unzip - usbutils + #usbutils wget whois wl-clipboard - wirelesstools + #wirelesstools yt-dlp zellij zsh-autosuggestions diff --git a/modules/home-config.nix b/modules/home-config.nix index 18df11c..a8c1bb6 100644 --- a/modules/home-config.nix +++ b/modules/home-config.nix @@ -1,72 +1,33 @@ -# Inject the right home-manager config for the machine. { config, pkgs, lib, ... }: let - plasma-manager = pkgs.fetchFromGitHub { - owner = "pjones"; - repo = "plasma-manager"; - rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5"; - sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw="; - }; - treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ - p.bash - p.comment - p.css - p.dockerfile - p.fish - p.gitattributes - p.gitignore - p.go - p.gomod - p.gowork - p.hcl - p.html - p.php - p.javascript - p.jq - p.json5 - p.json - p.lua - p.make - p.markdown - p.nix - p.python - p.rust - p.twig - p.toml - p.typescript - p.vue - p.yaml - ])); - startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" '' - ${pkgs.waybar}/bin/waybar & - ${pkgs.swww}/bin/swww init & + #startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" '' + # ${pkgs.waybar}/bin/waybar & + # ${pkgs.swww}/bin/swww init & + # + # sleep 1 - 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 { - # TODO can we automate the installation of home-manager ? # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager imports = [ - + # + ]; - - # Let Home Manager install and manage itself. - #programs.home-manager.enable = true; home-manager.useGlobalPkgs = true; users.users.mrflos = { - isNormalUser = true; + #isNormalUser = true; description = "mrflos"; createHome = true; - extraGroups = ["users" "docker" "libvirtd" "lxd" "networkmanager" "wheel" ]; + #extraGroups = ["users" "docker" "libvirtd" "lxd" "networkmanager" "wheel" ]; uid = 1000; shell = pkgs.zsh; + home = "/Users/mrflos"; }; nix.settings.trusted-users = [ "mrflos" ]; - + home-manager.backupFileExtension = "backup"; home-manager.users.mrflos = { pkgs, ... }: { home.stateVersion = "23.05"; home.packages = with pkgs; [ @@ -78,17 +39,17 @@ in { rust-analyzer-unwrapped php83Packages.composer nodejs_20 - swww - grimblast - swaylock - waybar + # swww + # grimblast + #swaylock + #waybar yarn ]; - imports = [ - (plasma-manager + "/modules") - ./home-plasma.nix - ]; + #imports = [ + # (plasma-manager + "/modules") + # ./home-plasma.nix + #]; home.file = { "./.config/kitty/" = { source = ../dotfiles/kitty; @@ -107,10 +68,10 @@ in { # Treesitter is configured as a locally developed module in lazy.nvim # we hardcode a symlink here so that we can refer to it in our lazy config - "./.local/share/nvim/nix/nvim-treesitter/" = { - recursive = true; - source = treesitterWithGrammars; - }; + #"./.local/share/nvim/nix/nvim-treesitter/" = { + # recursive = true; + # source = treesitterWithGrammars; + #}; }; home.sessionVariables = { EDITOR = "nvim"; @@ -149,23 +110,23 @@ in { port = 465; }; }; - "mrflos@saint-ex.deuxfleurs.org" = { - realName = "Florian Schmitt"; - userName = "mrflos"; - address = "mrflos@saint-ex.deuxfleurs.org"; + #"mrflos@saint-ex.deuxfleurs.org" = { + # realName = "Florian Schmitt"; + # userName = "mrflos"; + # address = "mrflos@saint-ex.deuxfleurs.org"; - primary = false; - thunderbird = { enable = true; }; - imap = { - host = "imap.saint-ex.deuxfleurs.org"; - port = 993; - }; + #primary = false; + #thunderbird = { enable = true; }; + #imap = { + # host = "imap.saint-ex.deuxfleurs.org"; + # port = 993; + #}; - smtp = { - host = "smtp.saint-ex.deuxfleurs.org"; - port = 465; - }; - }; + #smtp = { + # host = "smtp.saint-ex.deuxfleurs.org"; + # port = 465; + #}; + #}; "mrflos@mrflos.pw" = { realName = "Florian Schmitt"; userName = "mrflos"; @@ -250,7 +211,7 @@ in { vimAlias = true; coc.enable = false; - plugins = [ treesitterWithGrammars ]; + #plugins = [ treesitterWithGrammars ]; }; password-store = { @@ -263,10 +224,10 @@ in { }; }; - thunderbird = { - enable = true; - profiles.default = { isDefault = true; }; - }; + #thunderbird = { + # enable = true; + # profiles.default = { isDefault = true; }; + #}; starship = { enable = true; @@ -275,7 +236,7 @@ in { zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; shellAliases = { #tmux = "tmux -f ~/.config/tmux/tmux.conf attach || tmux -f ~/.config/tmux/tmux.conf new"; @@ -305,105 +266,105 @@ in { }; }; - services.ssh-agent.enable = true; - wayland.windowManager.hyprland.enable = true; - wayland.windowManager.hyprland.settings = { - exec-once = ''${startupScript}/bin/hyprland-start''; - "$mod" = "SUPER"; + #services.ssh-agent.enable = true; + #wayland.windowManager.hyprland.enable = true; + #wayland.windowManager.hyprland.settings = { + # exec-once = ''${startupScript}/bin/hyprland-start''; + # "$mod" = "SUPER"; # assign apps - "$term" = "kitty"; - "$editor" = "nvim"; - "$file" = "dolphin"; - "$browser" = "firefox"; + # "$term" = "kitty"; + # "$editor" = "nvim"; + # "$file" = "dolphin"; + # "$browser" = "firefox"; - bind = [ - ", Print, exec, grimblast copy area" + # bind = [ + # ", Print, exec, grimblast copy area" # Window/Session actions - "$mod, Q, killactive" - "ALT, F4, killactive" - "$mod, delete, exit" # kill hyperland session - "$mod, W, togglefloating" # 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 - "$mod, L, exec, swaylock" # lock screen + # "$mod, Q, killactive" + # "ALT, F4, killactive" + # "$mod, delete, exit" # kill hyperland session + # "$mod, W, togglefloating" # 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 + # "$mod, L, exec, swaylock" # lock screen # "$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 - "$mod, T, exec, $term" # open terminal - "$mod, E, exec, $file" # open file manager - "$mod, C, exec, $editor" # open vscode - "$mod, F, exec, $browser" # open browser +# "$mod, T, exec, $term" # open terminal +# "$mod, E, exec, $file" # open file manager +# "$mod, C, exec, $editor" # open vscode +# "$mod, F, exec, $browser" # open browser # Move focus with mainMod + arrow keys - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - "ALT, Tab, movefocus, d" +# "$mod, left, movefocus, l" +# "$mod, right, movefocus, r" + # "$mod, up, movefocus, u" + # "$mod, down, movefocus, d" + # "ALT, Tab, movefocus, d" # Switch workspaces relative to the active workspace with mainMod + CTRL + [←→] - "$mod CTRL, right, workspace, r+1" - "$mod CTRL, left, workspace, r-1" + # "$mod CTRL, right, workspace, r+1" + # "$mod CTRL, left, workspace, r-1" # 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 + [←→] - "$mod CTRL ALT, right, movetoworkspace, r+1" - "$mod CTRL ALT, left, movetoworkspace, r-1" + # "$mod CTRL ALT, right, movetoworkspace, r+1" + # "$mod CTRL ALT, left, movetoworkspace, r-1" # Move active window around current workspace with mainMod + SHIFT + CTRL [←→↑↓] - "$mod SHIFT $CONTROL, left, movewindow, l" - "$mod SHIFT $CONTROL, right, movewindow, r" - "$mod SHIFT $CONTROL, up, movewindow, u" - "$mod SHIFT $CONTROL, down, movewindow, d" + # "$mod SHIFT $CONTROL, left, movewindow, l" + # "$mod SHIFT $CONTROL, right, movewindow, r" + # "$mod SHIFT $CONTROL, up, movewindow, u" + # "$mod SHIFT $CONTROL, down, movewindow, d" # Scroll through existing workspaces with mainMod + scroll - "$mod, mouse_down, workspace, e+1" - "$mod, mouse_up, workspace, e-1" + # "$mod, mouse_down, workspace, e+1" + # "$mod, mouse_up, workspace, e-1" # Special workspaces (scratchpad) - "$mod ALT, S, movetoworkspacesilent, special" - "$mod, S, togglespecialworkspace," + # "$mod ALT, S, movetoworkspacesilent, special" + # "$mod, S, togglespecialworkspace," # Toggle Layout - "$mod, J, togglesplit," # dwindle - ] - ++ ( + # "$mod, J, togglesplit," # dwindle + # ] + # ++ ( # workspaces # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} - builtins.concatLists (builtins.genList ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, workspace, ${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] - ] - ) - 10) - ); + # builtins.concatLists (builtins.genList ( + # x: let + # ws = let + # c = (x + 1) / 10; + # in + # builtins.toString (x + 1 - (c * 10)); + # in [ + # "$mod, ${ws}, workspace, ${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] + # ] + # ) + # 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 - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - ]; - - # 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" - ]; - }; + # # 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" + # ]; + # }; }; } diff --git a/modules/home-plasma.nix b/modules/home-plasma.nix index 1955138..7028ec1 100644 --- a/modules/home-plasma.nix +++ b/modules/home-plasma.nix @@ -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 = { enable = true; shortcuts = { diff --git a/modules/local-dev.nix b/modules/local-dev.nix index 4907359..66e8ef6 100644 --- a/modules/local-dev.nix +++ b/modules/local-dev.nix @@ -1,84 +1,101 @@ # Local developpement { pkgs, config, lib, ... }: { - virtualisation = { - docker.enable = true; - #docker.rootless = { - # enable = true; - # setSocketVariable = true; - #}; - #libvirtd.enable = true; - #lxd.enable = true; - #waydroid.enable = true; - }; + # virtualisation = { + # docker.enable = true; + # #docker.rootless = { + # # enable = true; + # # setSocketVariable = true; + # #}; + # #libvirtd.enable = true; + # #lxd.enable = true; + # #waydroid.enable = true; + # }; - systemd.services.yeswikidev = { - enable = true; - script = '' - ${pkgs.systemd}/bin/systemctl start mysql - # etc - ''; - 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; + # systemd.services.yeswikidev = { + # enable = true; + # script = '' + # ${pkgs.systemd}/bin/systemctl start mysql + # # etc + # ''; + # 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]}"; - }; - }; + # #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; - }; +# services.mysql = { +# enable = true; +# package = pkgs.mariadb; +# }; + homebrew.enable = true; + homebrew.brews = [ + # `brew install` + #"imagemagick" + + # `brew install`, always `brew services restart`, `brew link`, `brew unlink mysql` (if it is installed) + { + name = "mariadb"; + restart_service = true; + link = true; + conflicts_with = [ "mysql" ]; + } + ]; # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ - #clang + environment.systemPackages = with pkgs; + let + php83 = pkgs.php83.buildEnv { extraConfig = "max_upload_size = 2G"; }; + in [ + cmake dart-sass - dbeaver docker-compose + fd + fzf gcc - gitkraken go - nixfmt + lua-language-server + nixfmt-classic nixpkgs-fmt nodejs nodePackages.eslint @@ -88,7 +105,8 @@ php83Packages.php-cs-fixer python3 python311Packages.virtualenv - rpi-imager + ripgrep + rust-analyzer-unwrapped ruff-lsp stylelint symfony-cli diff --git a/home-manager/mrflos-cli.nix b/users/mrflos-cli.nix similarity index 100% rename from home-manager/mrflos-cli.nix rename to users/mrflos-cli.nix From 85d40d0a250676ee01d1e38926b792b1a01eb899 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Thu, 30 May 2024 15:39:25 +0300 Subject: [PATCH 02/12] desactivate tiling --- modules/home-plasma.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home-plasma.nix b/modules/home-plasma.nix index 1955138..01b6159 100644 --- a/modules/home-plasma.nix +++ b/modules/home-plasma.nix @@ -1014,7 +1014,7 @@ "kwinrc"."Plugins"."bismuthEnabled" = false; "kwinrc"."Plugins"."blurEnabled" = false; "kwinrc"."Plugins"."contrastEnabled" = false; - "kwinrc"."Plugins"."grid-tilingEnabled" = false; + "kwinrc"."Plugins"."grid-tilingEnabled" = true; "kwinrc"."Plugins"."krohnkiteEnabled" = false; "kwinrc"."Plugins"."kwin4_effect_fullscreenEnabled" = false; "kwinrc"."Plugins"."kwin4_effect_maximizeEnabled" = false; @@ -1022,7 +1022,7 @@ "kwinrc"."Plugins"."magnifierEnabled" = true; "kwinrc"."Plugins"."poloniumEnabled" = false; "kwinrc"."Plugins"."zoomEnabled" = false; - "kwinrc"."Script-bismuth"."floatingClass" = "audacious,signal"; + "kwinrc"."Script-bismuth"."floatingClass" = "audacious"; "kwinrc"."Script-bismuth"."newWindowAsMaster" = true; "kwinrc"."Script-bismuth"."noTileBorder" = true; "kwinrc"."Script-bismuth"."preventProtrusion" = false; From 274954af8699a4363e01813ac1350db8b7149903 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 3 Jul 2024 10:02:15 +0300 Subject: [PATCH 03/12] remove unused stuff, add nicer sddm theme --- modules/console.nix | 15 --------------- modules/desktop.nix | 10 ++++++---- modules/home-config.nix | 4 ++++ modules/local-dev.nix | 1 - modules/sddm-rose-pine.nix | 26 ++++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 modules/sddm-rose-pine.nix diff --git a/modules/console.nix b/modules/console.nix index f2bbdde..72ff0d0 100644 --- a/modules/console.nix +++ b/modules/console.nix @@ -8,21 +8,6 @@ keybindings = true; }; - services = { - mpd.enable = true; - mpd.musicDirectory = "/home/mrflos/Musique"; - mpd.user = "mrflos"; - mpd.group = "users"; - mpd.startWhenNeeded = true; - mpd.extraConfig = '' - audio_output { - type "pulse" - name "mpd" - } -''; - }; - - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ diff --git a/modules/desktop.nix b/modules/desktop.nix index 0d84baf..8ca4757 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -32,6 +32,7 @@ desktopManager.plasma5.enable = true; displayManager.sddm.wayland.enable = true; displayManager.sddm.enableHidpi = true; + displayManager.sddm.theme = "rose-pine"; }; dbus.enable = true; }; @@ -90,6 +91,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + (callPackage ./sddm-rose-pine.nix {}) (vscode-with-extensions.override { vscode = vscodium; vscodeExtensions = with vscode-extensions; [ @@ -130,15 +132,15 @@ gimp-with-plugins hunspell hunspellDicts.fr-moderne - hyprpaper + #hyprpaper inkscape-with-extensions - kde-rounded-corners + #kde-rounded-corners kitty latte-dock libreoffice-qt libsForQt5.ark #libsForQt5.krohnkite - libsForQt5.bismuth + #libsForQt5.bismuth mixxx mumble neochat @@ -147,7 +149,7 @@ signal-desktop thunderbird tigervnc - tor-browser-bundle-bin + #tor-browser-bundle-bin transmission-qt unetbootin vlc diff --git a/modules/home-config.nix b/modules/home-config.nix index 18df11c..48cbe65 100644 --- a/modules/home-config.nix +++ b/modules/home-config.nix @@ -115,6 +115,10 @@ in { home.sessionVariables = { EDITOR = "nvim"; }; + home.sessionPath = [ + "$HOME/.local/bin" + "$HOME/go/bin" + ]; accounts.email.accounts = { "mrflos@chmok.net" = { realName = "Florian Schmitt"; diff --git a/modules/local-dev.nix b/modules/local-dev.nix index 4907359..3886b37 100644 --- a/modules/local-dev.nix +++ b/modules/local-dev.nix @@ -76,7 +76,6 @@ dbeaver docker-compose gcc - gitkraken go nixfmt nixpkgs-fmt diff --git a/modules/sddm-rose-pine.nix b/modules/sddm-rose-pine.nix new file mode 100644 index 0000000..a614282 --- /dev/null +++ b/modules/sddm-rose-pine.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC +, fetchFromGitHub +, libsForQt5 +}: + +stdenvNoCC.mkDerivation rec { + pname = "sddm-rose-pine-theme"; + version = "1.2"; + dontBuild = true; + + propagatedUserEnvPkgs = [ + libsForQt5.qt5.qtgraphicaleffects + ]; + + src = fetchFromGitHub { + owner = "lwndhrst"; + repo = "sddm-rose-pine"; + rev = "v${version}"; + sha256 = "+WOdazvkzpOKcoayk36VLq/6lLOHDWkDykDsy8p87JE="; + }; + + installPhase = '' + mkdir -p $out/share/sddm/themes + cp -aR $src $out/share/sddm/themes/rose-pine + ''; +} From 637d902291d672436f4350a82a2a49ed210c614f Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 3 Jul 2024 10:46:47 +0300 Subject: [PATCH 04/12] upgrades from macbookpro --- machines/MacBookPro12.1-configuration.nix | 6 ++- modules/console.nix | 1 + modules/desktop.nix | 6 ++- modules/home-config.nix | 63 ++--------------------- modules/local-dev.nix | 5 +- 5 files changed, 16 insertions(+), 65 deletions(-) diff --git a/machines/MacBookPro12.1-configuration.nix b/machines/MacBookPro12.1-configuration.nix index 7eb5971..171e23b 100644 --- a/machines/MacBookPro12.1-configuration.nix +++ b/machines/MacBookPro12.1-configuration.nix @@ -25,6 +25,8 @@ networking.hostName = "luffy"; # Define your hostname. networking.extraHosts = '' 127.0.0.1 yeswiki.test + 192.168.36.206 chmok.net + fd72:51a6:d583:0:984a:cc56:cf75:dc6 chmok.net ''; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -61,8 +63,8 @@ # Configure keymap in X11 services.xserver = { - layout = "us,ru"; - xkbVariant = "mac"; + xkb.layout = "us,ru"; + xkb.variant = "mac"; }; imports = [ diff --git a/modules/console.nix b/modules/console.nix index 72ff0d0..bd00742 100644 --- a/modules/console.nix +++ b/modules/console.nix @@ -61,6 +61,7 @@ wirelesstools yt-dlp zellij + zoxide zsh-autosuggestions ]; } diff --git a/modules/desktop.nix b/modules/desktop.nix index 8ca4757..6a03423 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -22,13 +22,15 @@ printing.drivers = [ pkgs.brlaser ]; avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; openFirewall = true; }; + displayManager.defaultSession = "plasmawayland"; + displayManager.sddm.wayland.enable = true; + displayManager.sddm.enableHidpi = true; xserver = { enable = true; - displayManager.defaultSession = "plasmawayland"; desktopManager.plasma5.enable = true; displayManager.sddm.wayland.enable = true; displayManager.sddm.enableHidpi = true; diff --git a/modules/home-config.nix b/modules/home-config.nix index 48cbe65..79c3f34 100644 --- a/modules/home-config.nix +++ b/modules/home-config.nix @@ -7,36 +7,6 @@ let rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5"; sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw="; }; - treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ - p.bash - p.comment - p.css - p.dockerfile - p.fish - p.gitattributes - p.gitignore - p.go - p.gomod - p.gowork - p.hcl - p.html - p.php - p.javascript - p.jq - p.json5 - p.json - p.lua - p.make - p.markdown - p.nix - p.python - p.rust - p.twig - p.toml - p.typescript - p.vue - p.yaml - ])); startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" '' ${pkgs.waybar}/bin/waybar & ${pkgs.swww}/bin/swww init & @@ -47,7 +17,7 @@ let ''; in { # TODO can we automate the installation of home-manager ? - # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager + # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager imports = [ ]; @@ -55,7 +25,6 @@ in { # Let Home Manager install and manage itself. #programs.home-manager.enable = true; home-manager.useGlobalPkgs = true; - users.users.mrflos = { isNormalUser = true; description = "mrflos"; @@ -104,13 +73,6 @@ in { source = ../dotfiles/tmux; recursive = true; }; - - # Treesitter is configured as a locally developed module in lazy.nvim - # we hardcode a symlink here so that we can refer to it in our lazy config - "./.local/share/nvim/nix/nvim-treesitter/" = { - recursive = true; - source = treesitterWithGrammars; - }; }; home.sessionVariables = { EDITOR = "nvim"; @@ -247,29 +209,11 @@ in { core.fileMode = false; }; }; - neovim = { enable = true; + defaultEditor = true; viAlias = true; vimAlias = true; - coc.enable = false; - - plugins = [ treesitterWithGrammars ]; - }; - - password-store = { - enable = true; - package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]); - settings = { - PASSWORD_STORE_DIR = "$XDG_DATA_HOME/password-store"; - PASSWORD_STORE_KEY = "How to Hide This ?"; - PASSWORD_STORE_CLIP_TIME = "60"; - }; - }; - - thunderbird = { - enable = true; - profiles.default = { isDefault = true; }; }; starship = { @@ -279,7 +223,7 @@ in { zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; shellAliases = { #tmux = "tmux -f ~/.config/tmux/tmux.conf attach || tmux -f ~/.config/tmux/tmux.conf new"; @@ -295,6 +239,7 @@ in { initExtra = '' export BUN_INSTALL="$HOME/.bun" export PATH="$HOME/.local/bin:$BUN_INSTALL/bin:$PATH" + eval "$(zoxide init zsh)" ''; oh-my-zsh = { enable = true; diff --git a/modules/local-dev.nix b/modules/local-dev.nix index 3886b37..0ae71d3 100644 --- a/modules/local-dev.nix +++ b/modules/local-dev.nix @@ -73,11 +73,11 @@ environment.systemPackages = with pkgs; [ #clang dart-sass - dbeaver + dbeaver-bin docker-compose gcc go - nixfmt + nixfmt-rfc-style nixpkgs-fmt nodejs nodePackages.eslint @@ -91,6 +91,7 @@ ruff-lsp stylelint symfony-cli + tree-sitter virt-manager yarn zig From 8b18da737a369b197f904d9b4310911fcf51b25d Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 3 Jul 2024 14:53:55 +0300 Subject: [PATCH 05/12] post 24.05 fixes --- README.md | 8 ++++++-- machines/Segotep-desktop-tower-configuration.nix | 7 +++---- modules/desktop.nix | 4 +--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2e438d4..a26aa38 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,16 @@ NixOS config files to make a perfect (for me) server or desktop environment and Mostly all was stolen, I mean inspired by [tazjin's nix files from TVL's repo](https://code.tvl.fyi/tree/users/tazjin/) ## Installation and setup + On a fresh NixOS installation + - check out this repository, for example in your home `git clone https://code.mrflos.pw/mrflos/nixos-config.git ~/nixos-config` (ideally fork this repo and clone it with ssh to be able to commit your customs) - copy the NixOS generated configuration to the `machines` folder `cp /etc/hardware-configuration.nix ~/nixos-config/machines/-hardware-configuration.nix` -- copy the example configuration file in the `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/-configuration.nix` +- copy the example configuration file in the `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/-configuration.nix` - edit your machine configuration file `~/nixos-config/machines/-configuration.nix`, make changes and uncomment modules according to your needs for this machine -- copy the example configuration file `~/nixos-config/configuration.example.nix` to `~/nixos-config/configuration.nix` +- copy the example configuration file `~/nixos-config/configuration.example.nix` to `~/nixos-config/configuration.nix` - edit the main configuration file `~/nixos-config/configuration.nix` and point to the right files + ```nix # NixOS config entry point # import the hardware and configuration files specific to your machine @@ -22,6 +25,7 @@ On a fresh NixOS installation ]; } ``` + - move the old `/etc/nixos` folder `sudo mv /etc/nixos /etc/nixos.old` and symlink your custom one `sudo ln -s ~/nixos-config /etc/nixos` - run the install `sudo nixos-rebuild switch` - if all good don't forget to commit your changes diff --git a/machines/Segotep-desktop-tower-configuration.nix b/machines/Segotep-desktop-tower-configuration.nix index 03fb5d0..309ed2a 100644 --- a/machines/Segotep-desktop-tower-configuration.nix +++ b/machines/Segotep-desktop-tower-configuration.nix @@ -47,13 +47,13 @@ services.xserver.videoDrivers = [ "amdgpu" ]; # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; + services.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; # Configure keymap in X11 services.xserver = { - layout = "us"; - xkbVariant = ""; + xkb.layout = "us"; + xkb.variant = ""; }; fileSystems."/mnt/nas/music" = @@ -110,7 +110,6 @@ ../modules/desktop.nix ../modules/fonts.nix ../modules/home-config.nix -# ../modules/laptop.nix ../modules/local-dev.nix ../modules/nixos.nix ]; diff --git a/modules/desktop.nix b/modules/desktop.nix index 6a03423..c54ccfa 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -29,12 +29,10 @@ displayManager.defaultSession = "plasmawayland"; displayManager.sddm.wayland.enable = true; displayManager.sddm.enableHidpi = true; + displayManager.sddm.theme = "rose-pine"; xserver = { enable = true; desktopManager.plasma5.enable = true; - displayManager.sddm.wayland.enable = true; - displayManager.sddm.enableHidpi = true; - displayManager.sddm.theme = "rose-pine"; }; dbus.enable = true; }; From 90511c630d522555fb4a71404dfebeb8c86df284 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 3 Jul 2024 15:11:19 +0300 Subject: [PATCH 06/12] refacto kde plasma in desktop module --- machines/Segotep-desktop-tower-configuration.nix | 4 ---- modules/desktop.nix | 10 ++++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/machines/Segotep-desktop-tower-configuration.nix b/machines/Segotep-desktop-tower-configuration.nix index 309ed2a..2005eb8 100644 --- a/machines/Segotep-desktop-tower-configuration.nix +++ b/machines/Segotep-desktop-tower-configuration.nix @@ -46,10 +46,6 @@ services.xserver.enable = true; services.xserver.videoDrivers = [ "amdgpu" ]; - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - # Configure keymap in X11 services.xserver = { xkb.layout = "us"; diff --git a/modules/desktop.nix b/modules/desktop.nix index c54ccfa..1e9d641 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -26,14 +26,16 @@ openFirewall = true; }; + xserver.desktopManager.plasma5.enable = true; displayManager.defaultSession = "plasmawayland"; displayManager.sddm.wayland.enable = true; + displayManager.sddm.enable = true; displayManager.sddm.enableHidpi = true; displayManager.sddm.theme = "rose-pine"; - xserver = { - enable = true; - desktopManager.plasma5.enable = true; - }; + #xserver = { + # enable = true; + # desktopManager.plasma5.enable = true; + #}; dbus.enable = true; }; From 54ae2da9cf699c1883149304246d9c8b48e9d5de Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 28 Jul 2024 12:10:46 +0300 Subject: [PATCH 07/12] feat(terminal): add atuin , remove 2fleurs mail --- modules/console.nix | 2 ++ modules/home-config.nix | 18 +----------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/modules/console.nix b/modules/console.nix index bd00742..b09f1bf 100644 --- a/modules/console.nix +++ b/modules/console.nix @@ -12,6 +12,7 @@ # $ nix search wget environment.systemPackages = with pkgs; [ ansible + atuin bat btop cargo @@ -59,6 +60,7 @@ whois wl-clipboard wirelesstools + yazi yt-dlp zellij zoxide diff --git a/modules/home-config.nix b/modules/home-config.nix index 79c3f34..8c7ed1d 100644 --- a/modules/home-config.nix +++ b/modules/home-config.nix @@ -115,23 +115,6 @@ in { port = 465; }; }; - "mrflos@saint-ex.deuxfleurs.org" = { - realName = "Florian Schmitt"; - userName = "mrflos"; - address = "mrflos@saint-ex.deuxfleurs.org"; - - primary = false; - thunderbird = { enable = true; }; - imap = { - host = "imap.saint-ex.deuxfleurs.org"; - port = 993; - }; - - smtp = { - host = "smtp.saint-ex.deuxfleurs.org"; - port = 465; - }; - }; "mrflos@mrflos.pw" = { realName = "Florian Schmitt"; userName = "mrflos"; @@ -239,6 +222,7 @@ in { initExtra = '' export BUN_INSTALL="$HOME/.bun" export PATH="$HOME/.local/bin:$BUN_INSTALL/bin:$PATH" + eval "$(atuin init zsh)" eval "$(zoxide init zsh)" ''; oh-my-zsh = { From 80edf0e878a845af2d204c63672ae5cf846ed885 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 28 Jul 2024 12:28:49 +0300 Subject: [PATCH 08/12] fix(kde): no more meta+E dolphin opening --- modules/home-plasma.nix | 521 +++++++++++++++++++++++----------------- 1 file changed, 304 insertions(+), 217 deletions(-) diff --git a/modules/home-plasma.nix b/modules/home-plasma.nix index 01b6159..c646356 100644 --- a/modules/home-plasma.nix +++ b/modules/home-plasma.nix @@ -3,34 +3,37 @@ enable = true; shortcuts = { "ActivityManager"."switch-to-activity-0d7360e3-b5e5-4164-a195-cc361ec3810d" = [ ]; + "ActivityManager"."switch-to-activity-fafb9b79-7584-45d5-a80a-955413897298" = [ ]; + "KDE Keyboard Layout Switcher"."Switch keyboard layout to English (Macintosh)" = [ ]; + "KDE Keyboard Layout Switcher"."Switch keyboard layout to Russian (Macintosh)" = [ ]; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; "bismuth"."decrease_master_size" = [ ]; "bismuth"."decrease_master_win_count" = [ ]; - "bismuth"."decrease_window_height" = "Meta+Shift+Down"; - "bismuth"."decrease_window_width" = "Meta+Shift+Left"; - "bismuth"."focus_bottom_window" = "Meta+Down"; - "bismuth"."focus_left_window" = "Meta+Left"; + "bismuth"."decrease_window_height" = "Meta+Shift+Down,none"; + "bismuth"."decrease_window_width" = "Meta+Shift+Left,none"; + "bismuth"."focus_bottom_window" = "Meta+Down,none"; + "bismuth"."focus_left_window" = "Meta+Left,none"; "bismuth"."focus_next_window" = [ ]; "bismuth"."focus_prev_window" = [ ]; - "bismuth"."focus_right_window" = "Meta+Right"; - "bismuth"."focus_upper_window" = "Meta+Up"; + "bismuth"."focus_right_window" = "Meta+Right,none"; + "bismuth"."focus_upper_window" = "Meta+Up,none"; "bismuth"."increase_master_size" = [ ]; "bismuth"."increase_master_win_count" = [ ]; - "bismuth"."increase_window_height" = "Meta+Shift+Up"; - "bismuth"."increase_window_width" = "Meta+Shift+Right"; - "bismuth"."move_window_to_bottom_pos" = "Meta+Shift+J"; - "bismuth"."move_window_to_left_pos" = "Meta+Shift+H"; + "bismuth"."increase_window_height" = "Meta+Shift+Up,none"; + "bismuth"."increase_window_width" = "Meta+Shift+Right,none"; + "bismuth"."move_window_to_bottom_pos" = "Meta+Shift+J,none"; + "bismuth"."move_window_to_left_pos" = "Meta+Shift+H,none"; "bismuth"."move_window_to_next_pos" = [ ]; "bismuth"."move_window_to_prev_pos" = [ ]; - "bismuth"."move_window_to_right_pos" = "Meta+Shift+L"; - "bismuth"."move_window_to_upper_pos" = "Meta+Shift+K"; - "bismuth"."next_layout" = "Meta+,Meta+,Switch to the Next Layout"; - "bismuth"."prev_layout" = "Meta+|"; - "bismuth"."push_window_to_master" = "Meta+Return"; - "bismuth"."rotate" = "Meta+R"; - "bismuth"."rotate_part" = "Meta+Shift+R"; + "bismuth"."move_window_to_right_pos" = "Meta+Shift+L,none"; + "bismuth"."move_window_to_upper_pos" = "Meta+Shift+K,none"; + "bismuth"."next_layout" = "\\, \\, ,none"; + "bismuth"."prev_layout" = "Meta+|,none"; + "bismuth"."push_window_to_master" = "Meta+Return,none"; + "bismuth"."rotate" = "Meta+R,none"; + "bismuth"."rotate_part" = "Meta+Shift+R,none"; "bismuth"."rotate_reverse" = [ ]; - "bismuth"."toggle_float_layout" = "Meta+Shift+F"; + "bismuth"."toggle_float_layout" = "Meta+Shift+F,none"; "bismuth"."toggle_monocle_layout" = [ ]; "bismuth"."toggle_quarter_layout" = [ ]; "bismuth"."toggle_spiral_layout" = [ ]; @@ -38,31 +41,33 @@ "bismuth"."toggle_stair_layout" = [ ]; "bismuth"."toggle_three_column_layout" = [ ]; "bismuth"."toggle_tile_layout" = [ ]; - "bismuth"."toggle_window_floating" = "Meta+F"; + "bismuth"."toggle_window_floating" = "Meta+F,none"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = "Touchpad Toggle"; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kded5"."Show System Activity" = "Ctrl+Esc"; - "kded5"."display" = ["" "Display" "Meta+P"]; + "kded5"."display" = ["Display" "Meta+P,Display" "Meta+P,Changer d'affichage"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ]; - "kitty.desktop"."_launch" = "Meta+T"; + "kitty.desktop"."_launch" = "Meta+T,none"; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; - "kmix"."mic_mute" = ["" "Microphone Mute" "Meta+Volume Mute"]; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Couper le son du microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = [ ]; - "ksmserver"."Lock Session" = "Screensaver"; + "konversation"."next_active_tab" = [ ]; + "konversation"."toggle_mainwindow_visibility" = [ ]; + "ksmserver"."Halt Without Confirmation" = "none,,Éteindre sans confirmation"; + "ksmserver"."Lock Session" = ["Screensaver,Meta+L" "Screensaver,Verrouiller la session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = [ ]; - "ksmserver"."Reboot Without Confirmation" = [ ]; + "ksmserver"."Log Out Without Confirmation" = "none,,Déconnexion sans confirmation"; + "ksmserver"."Reboot Without Confirmation" = "none,,Redémarrer sans confirmation"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."Decrease Opacity" = [ ]; - "kwin"."Edit Tiles" = [ ]; + "kwin"."Decrease Opacity" = "none,,Diminuer l'opacité de la fenêtre active de 5 %"; + "kwin"."Edit Tiles" = "none,Meta+T,Basculer ou sortir de l'éditeur de recouvrement"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["" "Ctrl+F10" "Launch (C)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Activer / désactiver la présentation des fenêtres (tous les bureaux)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = [ ]; "kwin"."Grid-Tiling: Close Desktop" = [ ]; @@ -76,7 +81,7 @@ "kwin"."Grid-Tiling: Maximize Size" = [ ]; "kwin"."Grid-Tiling: Maximize Width" = [ ]; "kwin"."Grid-Tiling: Minimize Height" = [ ]; - "kwin"."Grid-Tiling: Minimize Size" = "Meta+_"; + "kwin"."Grid-Tiling: Minimize Size" = "Meta+_,none"; "kwin"."Grid-Tiling: Minimize Width" = [ ]; "kwin"."Grid-Tiling: Move/Swap Left" = [ ]; "kwin"."Grid-Tiling: Move/Swap Right" = [ ]; @@ -86,21 +91,22 @@ "kwin"."Grid-Tiling: Swap Up" = [ ]; "kwin"."Grid-Tiling: Tile/Float" = [ ]; "kwin"."Grid-Tiling: Toggle Border" = [ ]; - "kwin"."Grid-Tiling: Toggle Gap" = "Meta+G"; + "kwin"."Grid-Tiling: Toggle Gap" = "Meta+G,none"; "kwin"."Grid-Tiling: Toggle Minimize Desktop" = [ ]; - "kwin"."Grid-Tiling: Toggle Tile" = "Meta+Shift+T"; - "kwin"."Increase Opacity" = [ ]; + "kwin"."Grid-Tiling: Toggle Tile" = "Meta+Shift+T,none"; + "kwin"."Increase Opacity" = "none,,Augmenter l'opacité de la fenêtre active de 5 %"; + "kwin"."Invert Screen Colors" = [ ]; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Krohnkite: Cycle Layout" = [ ]; "kwin"."Krohnkite: Decrease" = [ ]; - "kwin"."Krohnkite: Down/Next" = "Meta+J"; + "kwin"."Krohnkite: Down/Next" = "Meta+J,none"; "kwin"."Krohnkite: Float" = [ ]; "kwin"."Krohnkite: Float All" = [ ]; "kwin"."Krohnkite: Floating Layout" = [ ]; - "kwin"."Krohnkite: Grow Height" = "Meta+Ctrl+J"; - "kwin"."Krohnkite: Grow Width" = "Meta+Ctrl+L"; - "kwin"."Krohnkite: Increase" = "Meta+I"; - "kwin"."Krohnkite: Left" = "Meta+H"; + "kwin"."Krohnkite: Grow Height" = "Meta+Ctrl+J,none"; + "kwin"."Krohnkite: Grow Width" = "Meta+Ctrl+L,none"; + "kwin"."Krohnkite: Increase" = "Meta+I,none"; + "kwin"."Krohnkite: Left" = "Meta+H,none"; "kwin"."Krohnkite: Monocle Layout" = [ ]; "kwin"."Krohnkite: Move Down/Next" = [ ]; "kwin"."Krohnkite: Move Left" = [ ]; @@ -113,22 +119,22 @@ "kwin"."Krohnkite: Rotate" = [ ]; "kwin"."Krohnkite: Rotate Part" = [ ]; "kwin"."Krohnkite: Set master" = [ ]; - "kwin"."Krohnkite: Shrink Height" = "Meta+Ctrl+K"; - "kwin"."Krohnkite: Shrink Width" = "Meta+Ctrl+H"; + "kwin"."Krohnkite: Shrink Height" = "Meta+Ctrl+K,none"; + "kwin"."Krohnkite: Shrink Width" = "Meta+Ctrl+H,none"; "kwin"."Krohnkite: Spread Layout" = [ ]; "kwin"."Krohnkite: Stair Layout" = [ ]; "kwin"."Krohnkite: Three Column Layout" = [ ]; "kwin"."Krohnkite: Tile Layout" = [ ]; - "kwin"."Krohnkite: Up/Prev" = "Meta+K"; + "kwin"."Krohnkite: Up/Prev" = "Meta+K,none"; "kwin"."Move Tablet to Next Output" = [ ]; - "kwin"."MoveMouseToCenter" = "Meta+F6"; - "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveMouseToCenter" = "Meta+F6,none"; + "kwin"."MoveMouseToFocus" = "Meta+F5,none"; "kwin"."MoveZoomDown" = [ ]; "kwin"."MoveZoomLeft" = [ ]; "kwin"."MoveZoomRight" = [ ]; "kwin"."MoveZoomUp" = [ ]; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = [ ]; + "kwin"."Setup Window Shortcut" = "none,,Raccourci de configuration pour une fenêtre"; "kwin"."Show Desktop" = "Meta+D"; "kwin"."ShowDesktopGrid" = "Meta+F8"; "kwin"."Suspend Compositing" = "Alt+Shift+F12"; @@ -141,160 +147,160 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; - "kwin"."Switch to Desktop 10" = [ ]; - "kwin"."Switch to Desktop 11" = [ ]; - "kwin"."Switch to Desktop 12" = [ ]; - "kwin"."Switch to Desktop 13" = [ ]; - "kwin"."Switch to Desktop 14" = [ ]; - "kwin"."Switch to Desktop 15" = [ ]; - "kwin"."Switch to Desktop 16" = [ ]; - "kwin"."Switch to Desktop 17" = [ ]; - "kwin"."Switch to Desktop 18" = [ ]; - "kwin"."Switch to Desktop 19" = [ ]; + "kwin"."Switch to Desktop 10" = "none,,Passer au bureau 10"; + "kwin"."Switch to Desktop 11" = "none,,Passer au bureau 11"; + "kwin"."Switch to Desktop 12" = "none,,Passer au bureau 12"; + "kwin"."Switch to Desktop 13" = "none,,Passer au bureau 13"; + "kwin"."Switch to Desktop 14" = "none,,Passer au bureau 14"; + "kwin"."Switch to Desktop 15" = "none,,Passer au bureau 15"; + "kwin"."Switch to Desktop 16" = "none,,Passer au bureau 16"; + "kwin"."Switch to Desktop 17" = "none,,Passer au bureau 17"; + "kwin"."Switch to Desktop 18" = "none,,Passer au bureau 18"; + "kwin"."Switch to Desktop 19" = "none,,Passer au bureau 19"; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; - "kwin"."Switch to Desktop 20" = [ ]; + "kwin"."Switch to Desktop 20" = "none,,Passer au bureau 20"; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; - "kwin"."Switch to Desktop 5" = [ ]; - "kwin"."Switch to Desktop 6" = [ ]; - "kwin"."Switch to Desktop 7" = [ ]; - "kwin"."Switch to Desktop 8" = [ ]; - "kwin"."Switch to Desktop 9" = [ ]; - "kwin"."Switch to Next Desktop" = [ ]; - "kwin"."Switch to Next Screen" = [ ]; - "kwin"."Switch to Previous Desktop" = [ ]; - "kwin"."Switch to Previous Screen" = [ ]; - "kwin"."Switch to Screen 0" = [ ]; - "kwin"."Switch to Screen 1" = [ ]; - "kwin"."Switch to Screen 2" = [ ]; - "kwin"."Switch to Screen 3" = [ ]; - "kwin"."Switch to Screen 4" = [ ]; - "kwin"."Switch to Screen 5" = [ ]; - "kwin"."Switch to Screen 6" = [ ]; - "kwin"."Switch to Screen 7" = [ ]; - "kwin"."Switch to Screen Above" = [ ]; - "kwin"."Switch to Screen Below" = [ ]; - "kwin"."Switch to Screen to the Left" = [ ]; - "kwin"."Switch to Screen to the Right" = [ ]; + "kwin"."Switch to Desktop 5" = "none,,Passer au bureau 5"; + "kwin"."Switch to Desktop 6" = "none,,Passer au bureau 6"; + "kwin"."Switch to Desktop 7" = "none,,Passer au bureau 7"; + "kwin"."Switch to Desktop 8" = "none,,Passer au bureau 8"; + "kwin"."Switch to Desktop 9" = "none,,Passer au bureau 9"; + "kwin"."Switch to Next Desktop" = "none,,Passer au bureau suivant"; + "kwin"."Switch to Next Screen" = "none,,Passer sur l'écran suivant"; + "kwin"."Switch to Previous Desktop" = "none,,Passer au bureau précédent"; + "kwin"."Switch to Previous Screen" = "none,,Passer sur l'écran précédent"; + "kwin"."Switch to Screen 0" = "none,,Passer sur l'écran 0"; + "kwin"."Switch to Screen 1" = "none,,Passer sur l'écran 1"; + "kwin"."Switch to Screen 2" = "none,,Passer sur l'écran 2"; + "kwin"."Switch to Screen 3" = "none,,Passer sur l'écran 3"; + "kwin"."Switch to Screen 4" = "none,,Passer sur l'écran 4"; + "kwin"."Switch to Screen 5" = "none,,Passer sur l'écran 5"; + "kwin"."Switch to Screen 6" = "none,,Passer sur l'écran 6"; + "kwin"."Switch to Screen 7" = "none,,Passer sur l'écran 7"; + "kwin"."Switch to Screen Above" = "none,,Basculer vers l'écran ci-dessus"; + "kwin"."Switch to Screen Below" = "none,,Basculer vers l'écran ci-dessous"; + "kwin"."Switch to Screen to the Left" = "none,,Basculer vers l'écran sur la gauche"; + "kwin"."Switch to Screen to the Right" = "none,,Basculer vers l'écran sur la droite"; "kwin"."Toggle Night Color" = [ ]; - "kwin"."Toggle Window Raise/Lower" = [ ]; - "kwin"."Walk Through Desktop List" = [ ]; - "kwin"."Walk Through Desktop List (Reverse)" = [ ]; - "kwin"."Walk Through Desktops" = "Meta+Tab"; - "kwin"."Walk Through Desktops (Reverse)" = [ ]; + "kwin"."Toggle Window Raise/Lower" = "none,,Passer une fenêtre au-dessus / en dessous"; + "kwin"."Walk Through Desktop List" = "none,,Naviguer dans la liste des bureaux"; + "kwin"."Walk Through Desktop List (Reverse)" = "none,,Naviguer dans la liste des bureaux (en ordre inverse)"; + "kwin"."Walk Through Desktops" = "Meta+Tab,,Naviguer parmi les bureaux"; + "kwin"."Walk Through Desktops (Reverse)" = "none,,Naviguer parmi les bureaux (en ordre inverse)"; "kwin"."Walk Through Windows" = "Alt+Tab"; "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; - "kwin"."Walk Through Windows Alternative" = [ ]; - "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "kwin"."Walk Through Windows Alternative" = "none,,Naviguer parmi les alternatives de fenêtres"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Naviguer parmi les alternatives de fenêtres (en ordre inverse)"; "kwin"."Walk Through Windows of Current Application" = "Alt+`"; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; - "kwin"."Walk Through Windows of Current Application Alternative" = [ ]; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; - "kwin"."Window Above Other Windows" = [ ]; - "kwin"."Window Below Other Windows" = [ ]; - "kwin"."Window Close" = ["" "Alt+F4" "Meta+Q"]; - "kwin"."Window Fullscreen" = [ ]; - "kwin"."Window Grow Horizontal" = [ ]; - "kwin"."Window Grow Vertical" = [ ]; - "kwin"."Window Lower" = [ ]; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Naviguer parmi les fenêtres de l'application alternative courante"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Naviguer parmi les fenêtres de l'application alternative courante (en ordre inverse)"; + "kwin"."Window Above Other Windows" = "none,,Conserver une fenêtre au-dessus des autres"; + "kwin"."Window Below Other Windows" = "none,,Conserver une fenêtre au-dessous des autres"; + "kwin"."Window Close" = ["Alt+F4" "Meta+Q,Alt+F4,Fermer une fenêtre"]; + "kwin"."Window Fullscreen" = "none,,Mettre une fenêtre en plein écran"; + "kwin"."Window Grow Horizontal" = "none,,Maximiser horizontalement une fenêtre"; + "kwin"."Window Grow Vertical" = "none,,Maximiser verticalement une fenêtre"; + "kwin"."Window Lower" = "none,,Enrouler une fenêtre"; "kwin"."Window Maximize" = "Meta+PgUp"; - "kwin"."Window Maximize Horizontal" = [ ]; - "kwin"."Window Maximize Vertical" = [ ]; - "kwin"."Window Minimize" = ["" "Meta+PgDown" "Meta+M"]; - "kwin"."Window Move" = [ ]; - "kwin"."Window Move Center" = [ ]; - "kwin"."Window No Border" = [ ]; - "kwin"."Window On All Desktops" = [ ]; + "kwin"."Window Maximize Horizontal" = "none,,Maximiser horizontalement une fenêtre"; + "kwin"."Window Maximize Vertical" = "none,,Maximiser verticalement une fenêtre"; + "kwin"."Window Minimize" = ["Meta+PgDown" "Meta+M,Meta+PgDown,Réduire une fenêtre"]; + "kwin"."Window Move" = "none,,Déplacer une fenêtre"; + "kwin"."Window Move Center" = "none,,Déplacer la fenêtre au centre"; + "kwin"."Window No Border" = "none,,Afficher / Masquer la barre de titre et la bordure"; + "kwin"."Window On All Desktops" = "none,,Conserver une fenêtre sur tous les bureaux"; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; - "kwin"."Window One Screen Down" = [ ]; - "kwin"."Window One Screen Up" = [ ]; - "kwin"."Window One Screen to the Left" = [ ]; - "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window One Screen Down" = "none,,Envoyer la fenêtre sur l'écran ci-dessous"; + "kwin"."Window One Screen Up" = "none,,Envoyer la fenêtre sur l'écran ci-dessus"; + "kwin"."Window One Screen to the Left" = "none,,Envoyer la fenêtre sur l'écran sur la gauche"; + "kwin"."Window One Screen to the Right" = "none,,Envoyer la fenêtre sur l'écran sur la droite"; "kwin"."Window Operations Menu" = "Alt+F3"; - "kwin"."Window Pack Down" = [ ]; - "kwin"."Window Pack Left" = [ ]; - "kwin"."Window Pack Right" = [ ]; - "kwin"."Window Pack Up" = [ ]; - "kwin"."Window Quick Tile Bottom" = [ ]; - "kwin"."Window Quick Tile Bottom Left" = [ ]; - "kwin"."Window Quick Tile Bottom Right" = [ ]; - "kwin"."Window Quick Tile Left" = [ ]; - "kwin"."Window Quick Tile Right" = [ ]; - "kwin"."Window Quick Tile Top" = [ ]; - "kwin"."Window Quick Tile Top Left" = [ ]; - "kwin"."Window Quick Tile Top Right" = [ ]; - "kwin"."Window Raise" = [ ]; - "kwin"."Window Resize" = [ ]; - "kwin"."Window Shade" = [ ]; - "kwin"."Window Shrink Horizontal" = [ ]; - "kwin"."Window Shrink Vertical" = [ ]; - "kwin"."Window to Desktop 1" = [ ]; - "kwin"."Window to Desktop 10" = [ ]; - "kwin"."Window to Desktop 11" = [ ]; - "kwin"."Window to Desktop 12" = [ ]; - "kwin"."Window to Desktop 13" = [ ]; - "kwin"."Window to Desktop 14" = [ ]; - "kwin"."Window to Desktop 15" = [ ]; - "kwin"."Window to Desktop 16" = [ ]; - "kwin"."Window to Desktop 17" = [ ]; - "kwin"."Window to Desktop 18" = [ ]; - "kwin"."Window to Desktop 19" = [ ]; - "kwin"."Window to Desktop 2" = [ ]; - "kwin"."Window to Desktop 20" = [ ]; - "kwin"."Window to Desktop 3" = [ ]; - "kwin"."Window to Desktop 4" = [ ]; - "kwin"."Window to Desktop 5" = [ ]; - "kwin"."Window to Desktop 6" = [ ]; - "kwin"."Window to Desktop 7" = [ ]; - "kwin"."Window to Desktop 8" = [ ]; - "kwin"."Window to Desktop 9" = [ ]; - "kwin"."Window to Next Desktop" = [ ]; - "kwin"."Window to Next Screen" = [ ]; - "kwin"."Window to Previous Desktop" = [ ]; - "kwin"."Window to Previous Screen" = [ ]; - "kwin"."Window to Screen 0" = [ ]; - "kwin"."Window to Screen 1" = [ ]; - "kwin"."Window to Screen 2" = [ ]; - "kwin"."Window to Screen 3" = [ ]; - "kwin"."Window to Screen 4" = [ ]; - "kwin"."Window to Screen 5" = [ ]; - "kwin"."Window to Screen 6" = [ ]; - "kwin"."Window to Screen 7" = [ ]; + "kwin"."Window Pack Down" = "none,,Déplacer une fenêtre vers le bas"; + "kwin"."Window Pack Left" = "none,,Déplacer une fenêtre vers la gauche"; + "kwin"."Window Pack Right" = "none,,Déplacer une fenêtre vers la droite"; + "kwin"."Window Pack Up" = "none,,Déplacer une fenêtre vers le haut"; + "kwin"."Window Quick Tile Bottom" = "none,Meta+Down,Mettre rapidement en mosaïque une fenêtre en bas"; + "kwin"."Window Quick Tile Bottom Left" = "none,,Mettre rapidement en mosaïque une fenêtre en bas et à gauche"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Mettre rapidement en mosaïque une fenêtre en bas et à droite"; + "kwin"."Window Quick Tile Left" = "none,Meta+Left,Mettre rapidement en mosaïque une fenêtre à gauche"; + "kwin"."Window Quick Tile Right" = "none,Meta+Right,Mettre rapidement en mosaïque une fenêtre à droite"; + "kwin"."Window Quick Tile Top" = "none,Meta+Up,Mettre rapidement en mosaïque une fenêtre en haut"; + "kwin"."Window Quick Tile Top Left" = "none,,Mettre rapidement en mosaïque une fenêtre en haut et à gauche"; + "kwin"."Window Quick Tile Top Right" = "none,,Mettre rapidement en mosaïque une fenêtre en haut et à droite"; + "kwin"."Window Raise" = "none,,Dérouler une fenêtre"; + "kwin"."Window Resize" = "none,,Redimensionner une fenêtre"; + "kwin"."Window Shade" = "none,,Enrouler une fenêtre"; + "kwin"."Window Shrink Horizontal" = "none,,Réduire horizontalement une fenêtre"; + "kwin"."Window Shrink Vertical" = "none,,Réduire verticalement une fenêtre"; + "kwin"."Window to Desktop 1" = "none,,Envoyer une fenêtre sur le bureau 1"; + "kwin"."Window to Desktop 10" = "none,,Envoyer une fenêtre sur le bureau 10"; + "kwin"."Window to Desktop 11" = "none,,Envoyer une fenêtre sur le bureau 11"; + "kwin"."Window to Desktop 12" = "none,,Envoyer une fenêtre sur le bureau 12"; + "kwin"."Window to Desktop 13" = "none,,Envoyer une fenêtre sur le bureau 13"; + "kwin"."Window to Desktop 14" = "none,,Envoyer une fenêtre sur le bureau 14"; + "kwin"."Window to Desktop 15" = "none,,Envoyer une fenêtre sur le bureau 15"; + "kwin"."Window to Desktop 16" = "none,,Envoyer une fenêtre sur le bureau 16"; + "kwin"."Window to Desktop 17" = "none,,Envoyer une fenêtre sur le bureau 17"; + "kwin"."Window to Desktop 18" = "none,,Envoyer une fenêtre sur le bureau 18"; + "kwin"."Window to Desktop 19" = "none,,Envoyer une fenêtre sur le bureau 19"; + "kwin"."Window to Desktop 2" = "none,,Envoyer une fenêtre sur le bureau 2"; + "kwin"."Window to Desktop 20" = "none,,Envoyer une fenêtre sur le bureau 20"; + "kwin"."Window to Desktop 3" = "none,,Envoyer une fenêtre sur le bureau 3"; + "kwin"."Window to Desktop 4" = "none,,Envoyer une fenêtre sur le bureau 4"; + "kwin"."Window to Desktop 5" = "none,,Envoyer une fenêtre sur le bureau 5"; + "kwin"."Window to Desktop 6" = "none,,Envoyer une fenêtre sur le bureau 6"; + "kwin"."Window to Desktop 7" = "none,,Envoyer une fenêtre sur le bureau 7"; + "kwin"."Window to Desktop 8" = "none,,Envoyer une fenêtre sur le bureau 8"; + "kwin"."Window to Desktop 9" = "none,,Envoyer une fenêtre sur le bureau 9"; + "kwin"."Window to Next Desktop" = "none,,Envoyer une fenêtre sur le bureau suivant"; + "kwin"."Window to Next Screen" = "none,Meta+Shift+Right,Envoyer une fenêtre sur l'écran suivant"; + "kwin"."Window to Previous Desktop" = "none,,Envoyer une fenêtre sur le bureau précédent"; + "kwin"."Window to Previous Screen" = "none,Meta+Shift+Left,Envoyer une fenêtre sur l'écran précédent"; + "kwin"."Window to Screen 0" = "none,,Envoyer la fenêtre sur l'écran 0"; + "kwin"."Window to Screen 1" = "none,,Envoyer la fenêtre sur l'écran 1"; + "kwin"."Window to Screen 2" = "none,,Envoyer la fenêtre sur l'écran 2"; + "kwin"."Window to Screen 3" = "none,,Envoyer la fenêtre sur l'écran 3"; + "kwin"."Window to Screen 4" = "none,,Envoyer la fenêtre sur l'écran 4"; + "kwin"."Window to Screen 5" = "none,,Envoyer la fenêtre sur l'écran 5"; + "kwin"."Window to Screen 6" = "none,,Envoyer la fenêtre sur l'écran 6"; + "kwin"."Window to Screen 7" = "none,,Envoyer la fenêtre sur l'écran 7"; "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["" "Meta++" "Meta+="]; + "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom avant"]; "kwin"."view_zoom_out" = "Meta+-"; - "lattedock"."activate entry 1" = [ ]; - "lattedock"."activate entry 10" = [ ]; + "lattedock"."activate entry 1" = "none,Meta+1,Activer l'entrée 1"; + "lattedock"."activate entry 10" = "none,Meta+0,Activer l'entrée 10"; "lattedock"."activate entry 11" = "Meta+Z"; "lattedock"."activate entry 12" = "Meta+X"; "lattedock"."activate entry 13" = "Meta+C"; - "lattedock"."activate entry 14" = [ ]; + "lattedock"."activate entry 14" = "none,Meta+V,Activer l'entrée 14"; "lattedock"."activate entry 15" = "Meta+B"; "lattedock"."activate entry 16" = "Meta+N"; - "lattedock"."activate entry 17" = [ ]; - "lattedock"."activate entry 18" = "Meta+,"; - "lattedock"."activate entry 19" = [ ]; - "lattedock"."activate entry 2" = [ ]; - "lattedock"."activate entry 3" = [ ]; - "lattedock"."activate entry 4" = [ ]; - "lattedock"."activate entry 5" = [ ]; - "lattedock"."activate entry 6" = [ ]; - "lattedock"."activate entry 7" = [ ]; - "lattedock"."activate entry 8" = [ ]; - "lattedock"."activate entry 9" = [ ]; + "lattedock"."activate entry 17" = "none,Meta+M,Activer l'entrée 17"; + "lattedock"."activate entry 18" = "Meta+\\,,Meta+\\,,Activer l'entrée 18"; + "lattedock"."activate entry 19" = "none,Meta+.,Activer l'entrée 19"; + "lattedock"."activate entry 2" = "none,Meta+2,Activer l'entrée 2"; + "lattedock"."activate entry 3" = "none,Meta+3,Activer l'entrée 3"; + "lattedock"."activate entry 4" = "none,Meta+4,Activer l'entrée 4"; + "lattedock"."activate entry 5" = "none,Meta+5,Activer l'entrée 5"; + "lattedock"."activate entry 6" = "none,Meta+6,Activer l'entrée 6"; + "lattedock"."activate entry 7" = "none,Meta+7,Activer l'entrée 7"; + "lattedock"."activate entry 8" = "none,Meta+8,Activer l'entrée 8"; + "lattedock"."activate entry 9" = "none,Meta+9,Activer l'entrée 9"; "lattedock"."new instance for entry 1" = "Meta+Ctrl+1"; "lattedock"."new instance for entry 10" = "Meta+Ctrl+0"; "lattedock"."new instance for entry 11" = "Meta+Ctrl+Z"; - "lattedock"."new instance for entry 12" = [ ]; + "lattedock"."new instance for entry 12" = "none,Meta+Ctrl+X,Nouvelle instance pour l'entrée 12"; "lattedock"."new instance for entry 13" = "Meta+Ctrl+C"; "lattedock"."new instance for entry 14" = "Meta+Ctrl+V"; "lattedock"."new instance for entry 15" = "Meta+Ctrl+B"; "lattedock"."new instance for entry 16" = "Meta+Ctrl+N"; "lattedock"."new instance for entry 17" = "Meta+Ctrl+M"; - "lattedock"."new instance for entry 18" = "Meta+Ctrl+,"; + "lattedock"."new instance for entry 18" = "Meta+Ctrl+\\,,Meta+Ctrl+\\,,Nouvelle instance pour l'entrée 18"; "lattedock"."new instance for entry 19" = "Meta+Ctrl+."; "lattedock"."new instance for entry 2" = "Meta+Ctrl+2"; "lattedock"."new instance for entry 3" = "Meta+Ctrl+3"; @@ -304,31 +310,31 @@ "lattedock"."new instance for entry 7" = "Meta+Ctrl+7"; "lattedock"."new instance for entry 8" = "Meta+Ctrl+8"; "lattedock"."new instance for entry 9" = "Meta+Ctrl+9"; - "lattedock"."show latte global settings" = [ ]; + "lattedock"."show latte global settings" = "none,,Afficher la configuration globale de Latte"; "lattedock"."show latte view" = "Meta+`"; "lattedock"."show view settings" = "Meta+A"; - "mediacontrol"."mediavolumedown" = [ ]; - "mediacontrol"."mediavolumeup" = [ ]; + "mediacontrol"."mediavolumedown" = "none,,Diminuer le volume du média"; + "mediacontrol"."mediavolumeup" = "none,,Augmenter le volume du média"; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; - "mediacontrol"."playmedia" = [ ]; + "mediacontrol"."playmedia" = "none,,Lancer la lecture du média"; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; - "org.kde.dolphin.desktop"."_launch" = "Meta+E"; + "org.kde.dolphin.desktop"."_launch" = [ ]; "org.kde.konsole.desktop"."NewTab" = [ ]; "org.kde.konsole.desktop"."NewWindow" = [ ]; - "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T"; - "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2"; - "org.kde.krunner.desktop"."_launch" = ["" "Alt+Space" "Alt+F2" "Search"]; - "org.kde.plasma.emojier.desktop"."_launch" = ["" "Meta+." "Meta+Ctrl+Alt+Shift+Space"]; - "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = "Meta+Print"; + "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T,none"; + "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2,none"; + "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search,none"]; + "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space,none"]; + "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = "Meta+Print,none"; "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = [ ]; - "org.kde.spectacle.desktop"."FullScreenScreenShot" = "Shift+Print"; + "org.kde.spectacle.desktop"."FullScreenScreenShot" = "Shift+Print,none"; "org.kde.spectacle.desktop"."OpenWithoutScreenshot" = [ ]; - "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = "Meta+Shift+Print"; - "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = "Meta+Ctrl+Print"; - "org.kde.spectacle.desktop"."_launch" = "Print"; + "org.kde.spectacle.desktop"."RectangularRegionScreenShot" = "Meta+Shift+Print,none"; + "org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = "Meta+Ctrl+Print,none"; + "org.kde.spectacle.desktop"."_launch" = "Print,none"; "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; "org_kde_powerdevil"."Hibernate" = "Hibernate"; @@ -340,7 +346,7 @@ "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; "org_kde_powerdevil"."Turn Off Screen" = [ ]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = [ ]; + "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activer l'entrée du gestionnaire de tâches 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -349,24 +355,24 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = [ ]; + "plasmashell"."clear-history" = "none,,Effacer l'historique du presse-papier"; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; - "plasmashell"."cycleNextAction" = [ ]; - "plasmashell"."cyclePrevAction" = [ ]; - "plasmashell"."edit_clipboard" = [ ]; - "plasmashell"."manage activities" = [ ]; + "plasmashell"."cycleNextAction" = "none,,Élément suivant de l'historique"; + "plasmashell"."cyclePrevAction" = "none,,Élément précédent de l'historique"; + "plasmashell"."edit_clipboard" = "none,,Modifier les contenus..."; + "plasmashell"."manage activities" = "none,Meta+Q,Afficher le sélecteur d'activités"; "plasmashell"."next activity" = [ ]; - "plasmashell"."previous activity" = "Meta+Shift+Tab"; + "plasmashell"."previous activity" = "Meta+Shift+Tab,none,Parcourir les activités (à l'envers)"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; - "plasmashell"."show-barcode" = [ ]; + "plasmashell"."show-barcode" = "none,,Afficher le code barre..."; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "plasmashell"."switch to next activity" = [ ]; - "plasmashell"."switch to previous activity" = [ ]; - "plasmashell"."toggle do not disturb" = [ ]; - "systemsettings.desktop"."_launch" = "Tools"; + "plasmashell"."switch to next activity" = "none,,Basculer vers l'activité suivante"; + "plasmashell"."switch to previous activity" = "none,,Basculer vers l'activité précédente"; + "plasmashell"."toggle do not disturb" = "none,,Basculer « Ne pas déranger »"; + "systemsettings.desktop"."_launch" = "Tools,none"; "systemsettings.desktop"."kcm-kscreen" = [ ]; "systemsettings.desktop"."kcm-lookandfeel" = [ ]; "systemsettings.desktop"."kcm-users" = [ ]; @@ -374,18 +380,34 @@ "systemsettings.desktop"."screenlocker" = [ ]; }; configFile = { + "baloofilerc"."Basic Settings"."Indexing-Enabled" = false; "baloofilerc"."General"."dbVersion" = 2; "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found"; "baloofilerc"."General"."exclude filters version" = 8; "dolphinrc"."DetailsMode"."PreviewSize" = 16; + "dolphinrc"."ExtractDialog"."1463x914 screen: Height" = 862; + "dolphinrc"."ExtractDialog"."1463x914 screen: Width" = 1463; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/run/media/mrflos/128 __/,$HOME/Téléchargements/Switch/firmware/"; + "dolphinrc"."General"."ConfirmClosingMultipleTabs" = false; + "dolphinrc"."General"."ConfirmClosingTerminalRunningProgram" = false; + "dolphinrc"."General"."ViewPropsTimestamp" = "2023,3,21,15,45,33.598"; "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; + "dolphinrc"."KFileDialog Settings"."detailViewIconSize" = 16; + "dolphinrc"."Open-with settings"."CompletionMode" = 1; + "dolphinrc"."Open-with settings"."History" = ""; + "dolphinrc"."PreviewSettings"."Plugins" = "comicbookthumbnail,kraorathumbnail,opendocumentthumbnail,directorythumbnail,windowsexethumbnail,audiothumbnail,blenderthumbnail,fontthumbnail,djvuthumbnail,ffmpegthumbs,mobithumbnail,gsthumbnail,rawthumbnail,imagethumbnail,exrthumbnail,jpegthumbnail,windowsimagethumbnail,svgthumbnail,ebookthumbnail"; "dolphinrc"."Search"."Location" = "Everywhere"; "kactivitymanagerdrc"."activities"."0d7360e3-b5e5-4164-a195-cc361ec3810d" = "Défaut"; + "kactivitymanagerdrc"."activities"."fafb9b79-7584-45d5-a80a-955413897298" = "Default"; "kactivitymanagerdrc"."main"."currentActivity" = "0d7360e3-b5e5-4164-a195-cc361ec3810d"; "kcminputrc"."Keyboard"."NumLock" = 0; + "kcminputrc"."Libinput/1452/627/bcm5974"."ClickMethod" = 1; + "kcminputrc"."Libinput/1452/627/bcm5974"."NaturalScroll" = false; "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true; + "kcminputrc"."Mouse"."cursorTheme" = "Dracula-cursors"; "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; + "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "872,584"; @@ -432,27 +454,6 @@ "kdeglobals"."WM"."inactiveForeground" = "224,222,245"; "kdeglobals"."WM"."inactiveFrame" = "239,240,241"; "kgammarc"."ConfigFile"."use" = "kgammarc"; - "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Gestion des activités"; - "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Commutateur de dispositions de clavier"; - "kglobalshortcutsrc"."bismuth"."_k_friendly_name" = "Window Tiling"; - "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibilité"; - "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Pavé tactile"; - "kglobalshortcutsrc"."kded5"."_k_friendly_name" = "KDE Daemon"; - "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; - "kglobalshortcutsrc"."kitty.desktop"."_k_friendly_name" = "kitty"; - "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Volume audio"; - "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Gestion des sessions"; - "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; - "kglobalshortcutsrc"."lattedock"."_k_friendly_name" = "Latte Dock"; - "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Contrôleur de média"; - "kglobalshortcutsrc"."org.kde.dolphin.desktop"."_k_friendly_name" = "Dolphin"; - "kglobalshortcutsrc"."org.kde.konsole.desktop"."_k_friendly_name" = "Konsole"; - "kglobalshortcutsrc"."org.kde.krunner.desktop"."_k_friendly_name" = "KRunner"; - "kglobalshortcutsrc"."org.kde.plasma.emojier.desktop"."_k_friendly_name" = "Sélecteur d'émoticônes"; - "kglobalshortcutsrc"."org.kde.spectacle.desktop"."_k_friendly_name" = "Spectacle"; - "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "Gestion de l'énergie"; - "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "Plasma"; - "kglobalshortcutsrc"."systemsettings.desktop"."_k_friendly_name" = "Configuration du système"; "khotkeysrc"."Data"."DataCount" = 3; "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; "khotkeysrc"."Data_1"."DataCount" = 1; @@ -979,8 +980,11 @@ "khotkeysrc"."KFileDialog Settings"."View Style[$d]" = ""; "khotkeysrc"."KScreen"."ScaleFactor[$d]" = ""; "khotkeysrc"."KScreen"."ScreenScaleFactors[$d]" = ""; + "khotkeysrc"."KScreen"."XwaylandClientsScale[$d]" = ""; + "khotkeysrc"."KShortcutsDialog Settings"."Dialog Size[$d]" = ""; "khotkeysrc"."Main"."AlreadyImported" = "defaults,kde32b1,konqueror_gestures_kde321"; "khotkeysrc"."Main"."Disabled" = false; + "khotkeysrc"."PreviewSettings"."MaximumRemoteSize[$d]" = ""; "khotkeysrc"."Voice"."Shortcut" = ""; "khotkeysrc"."WM"."activeBackground[$d]" = ""; "khotkeysrc"."WM"."activeBlend[$d]" = ""; @@ -991,11 +995,25 @@ "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; "khotkeysrc"."WM"."inactiveFrame[$d]" = ""; + "kiorc"."Confirmations"."ConfirmDelete" = false; "kiorc"."Confirmations"."ConfirmEmptyTrash" = false; + "kiorc"."Confirmations"."ConfirmTrash" = false; + "kiorc"."Executable scripts"."behaviourOnLaunch" = "execute"; "klipperrc"."General"."IgnoreImages" = false; "klipperrc"."General"."MaxClipItems" = 100; "krunnerrc"."General"."FreeFloating" = true; + "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "kscreenlockerrc"."Daemon"."LockGrace" = 0; + "kscreenlockerrc"."Daemon"."Timeout" = 10; + "kscreenlockerrc"."Greeter/LnF/General"."showMediaControls" = false; + "kscreenlockerrc"."Greeter/Wallpaper/org.kde.image/General"."Image" = "/home/mrflos/Nextcloud/Images/Wallpapers/photo-1542708993627-b6e5bbae43c4.avif"; + "kscreenlockerrc"."Greeter/Wallpaper/org.kde.image/General"."PreviewImage" = "/home/mrflos/Nextcloud/Images/Wallpapers/photo-1542708993627-b6e5bbae43c4.avif"; + "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."Image" = "/nix/store/mksd7zsz91jk88n36pcr0m8cacm9fp5r-plasma-workspace-wallpapers-5.27.10/share/wallpapers/summer_1am/"; + "kscreenlockerrc"."Greeter/Wallpaper/org/kde/image/General"."PreviewImage" = "/nix/store/mksd7zsz91jk88n36pcr0m8cacm9fp5r-plasma-workspace-wallpapers-5.27.10/share/wallpapers/summer_1am/"; + "ksmserverrc"."General"."confirmLogout" = false; + "ksmserverrc"."General"."loginMode" = "emptySession"; "ksplashrc"."KSplash"."Engine" = "none"; + "ksplashrc"."KSplash"."Theme" = "None"; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "ca1ae6da-1855-409c-9c91-bcbb286e900b"; "kwinrc"."Desktops"."Id_2" = "9d1002ff-62a3-4074-b2cf-5c6828cee68d"; @@ -1003,6 +1021,7 @@ "kwinrc"."Desktops"."Name_2" = "Mail, Chat, Obsidian"; "kwinrc"."Desktops"."Number" = 2; "kwinrc"."Desktops"."Rows" = 1; + "kwinrc"."Effect-desktopgrid"."DesktopNameAlignment" = 132; "kwinrc"."Effect-kwin4_effect_translucency"."Inactive" = 95; "kwinrc"."Effect-kwin4_effect_translucency"."MoveResize" = 97; "kwinrc"."Effect-windowview"."BorderActivateAll" = 9; @@ -1021,8 +1040,12 @@ "kwinrc"."Plugins"."kwin4_effect_shapecornersEnabled" = false; "kwinrc"."Plugins"."magnifierEnabled" = true; "kwinrc"."Plugins"."poloniumEnabled" = false; + "kwinrc"."Plugins"."quicktile-enhancementsEnabled" = false; + "kwinrc"."Plugins"."tilegapsEnabled" = true; "kwinrc"."Plugins"."zoomEnabled" = false; + "kwinrc"."Script-bismuth"."enableFloatingLayout" = true; "kwinrc"."Script-bismuth"."floatingClass" = "audacious"; + "kwinrc"."Script-bismuth"."maximizeSoleTile" = true; "kwinrc"."Script-bismuth"."newWindowAsMaster" = true; "kwinrc"."Script-bismuth"."noTileBorder" = true; "kwinrc"."Script-bismuth"."preventProtrusion" = false; @@ -1032,30 +1055,94 @@ "kwinrc"."Script-bismuth"."screenGapTop" = 10; "kwinrc"."Script-bismuth"."tileLayoutGap" = 20; "kwinrc"."Script-grid-tiling"."gapValue" = 20; + "kwinrc"."Script-krohnkite"."screenGapBottom" = 15; + "kwinrc"."Script-krohnkite"."screenGapLeft" = 15; + "kwinrc"."Script-krohnkite"."screenGapRight" = 15; + "kwinrc"."Script-krohnkite"."screenGapTop" = 15; + "kwinrc"."Script-krohnkite"."tileLayoutGap" = 15; + "kwinrc"."Script-tilegaps"."gapBottom" = 10; + "kwinrc"."Script-tilegaps"."gapLeft" = 10; + "kwinrc"."Script-tilegaps"."gapMid" = 10; + "kwinrc"."Script-tilegaps"."gapRight" = 10; + "kwinrc"."Script-tilegaps"."gapTop" = 10; + "kwinrc"."Script-tilegaps"."includeMaximized" = true; "kwinrc"."TabBox"."LayoutName" = "informative"; + "kwinrc"."TabBox"."OrderMinimizedMode" = 1; + "kwinrc"."TabBox"."ShowDesktopMode" = 1; + "kwinrc"."TabBoxAlternative"."LayoutName" = "compact"; + "kwinrc"."TabBoxAlternative"."OrderMinimizedMode" = 1; + "kwinrc"."TabBoxAlternative"."ShowDesktopMode" = 1; "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling/06108a9c-7f28-5085-be83-2b59829dd4f9"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/1756be3e-61ce-541b-b8f0-f1b278e189f4"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/1b8225ce-ea51-54e3-a24c-d19cfae75cfc"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/506e0533-6db8-5c94-a16c-5ea5a8699508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/6b051440-dade-5f44-a158-3fb7f7583c96"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}"; + "kwinrc"."Tiling/7c4d900b-d5d0-5cdd-a916-1bb1c1319d7c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/7e7288c8-534e-5383-8c02-e5302a6cd905"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/92e842d7-5928-5c43-884a-4912e7cc82ed"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/976cf4d7-870e-5127-9fd7-af7aa3c51908"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/97deb48e-346f-510e-8a57-046aa6f372e8"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/d4e40046-e4f4-54f5-a0c6-a11fd5d995f4"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/d7ce7540-205d-51b2-b3a5-25a32ffd440a"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.15},{\"width\":0.15},{\"width\":0.5},{\"width\":0.19999999999999996}]}"; + "kwinrc"."Tiling/e5ae5f20-2c3a-5283-8766-6d6c5b928523"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/ea1a53db-92fb-5402-8528-484755598c44"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/ed6da6d2-dc03-5e69-aae5-b2fee83fe2cd"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Windows"."AutoRaise" = true; "kwinrc"."Windows"."AutoRaiseInterval" = 300; "kwinrc"."Windows"."ElectricBorderCornerRatio" = 0.01; + "kwinrc"."Windows"."Placement" = "Maximizing"; + "kwinrc"."Windows"."RollOverDesktops" = true; "kwinrc"."Xwayland"."Scale" = 1.75; + "kwinrc"."org.kde.kdecoration2"."ButtonsOnLeft" = "XIA"; + "kwinrc"."org.kde.kdecoration2"."ButtonsOnRight" = ""; + "kwinrc"."org.kde.kdecoration2"."theme" = "Breeze"; + "kwinrc"."org/kde/kdecoration2"."BorderSize" = "Tiny"; + "kwinrc"."org/kde/kdecoration2"."BorderSizeAuto" = false; + "kwinrc"."org/kde/kdecoration2"."ButtonsOnLeft" = "XIA"; + "kwinrc"."org/kde/kdecoration2"."ButtonsOnRight" = ""; "kwinrulesrc"."1"."Description" = "Taille minimum"; + "kwinrulesrc"."1"."above" = true; + "kwinrulesrc"."1"."aboverule" = 2; "kwinrulesrc"."1"."minsize" = "1,1"; "kwinrulesrc"."1"."minsizerule" = 2; "kwinrulesrc"."1"."types" = 1; + "kwinrulesrc"."1"."wmclass" = "codium"; + "kwinrulesrc"."1"."wmclassmatch" = 2; "kwinrulesrc"."1fb1a97f-c87b-4a09-a944-0178ea0f1050"."Description" = "Ecran mail"; "kwinrulesrc"."1fb1a97f-c87b-4a09-a944-0178ea0f1050"."desktops" = "9d1002ff-62a3-4074-b2cf-5c6828cee68d"; "kwinrulesrc"."1fb1a97f-c87b-4a09-a944-0178ea0f1050"."desktopsrule" = 2; "kwinrulesrc"."1fb1a97f-c87b-4a09-a944-0178ea0f1050"."wmclass" = "signal|thunderbird|obsidian"; "kwinrulesrc"."1fb1a97f-c87b-4a09-a944-0178ea0f1050"."wmclassmatch" = 3; + "kwinrulesrc"."8e2ffc3c-3324-426d-88d5-47f52c0ebee2"."Description" = "Vscodium open"; + "kwinrulesrc"."8e2ffc3c-3324-426d-88d5-47f52c0ebee2"."above" = true; + "kwinrulesrc"."8e2ffc3c-3324-426d-88d5-47f52c0ebee2"."aboverule" = 2; + "kwinrulesrc"."8e2ffc3c-3324-426d-88d5-47f52c0ebee2"."types" = 32; + "kwinrulesrc"."8e2ffc3c-3324-426d-88d5-47f52c0ebee2"."wmclass" = "codium"; + "kwinrulesrc"."8e2ffc3c-3324-426d-88d5-47f52c0ebee2"."wmclassmatch" = 2; "kwinrulesrc"."General"."count" = 1; "kwinrulesrc"."General"."rules" = 1; "kwinrulesrc"."e70af7df-3446-4756-aa23-43165fe9b9df"."Description" = "Taille minimum"; "kwinrulesrc"."e70af7df-3446-4756-aa23-43165fe9b9df"."minsize" = "1,1"; "kwinrulesrc"."e70af7df-3446-4756-aa23-43165fe9b9df"."minsizerule" = 2; "kwinrulesrc"."e70af7df-3446-4756-aa23-43165fe9b9df"."types" = 66494; + "kxkbrc"."Layout"."DisplayNames" = ","; + "kxkbrc"."Layout"."LayoutList" = "us,ru"; + "kxkbrc"."Layout"."Model" = "pc105"; "kxkbrc"."Layout"."Options" = "compose:ralt,compose:rctrl"; "kxkbrc"."Layout"."ResetOldOptions" = true; + "kxkbrc"."Layout"."Use" = true; + "kxkbrc"."Layout"."VariantList" = "mac,mac"; "plasma-localerc"."Formats"."LANG" = "fr_FR.UTF-8"; + "plasma-localerc"."Translations"."LANGUAGE" = "fr"; + "plasmanotifyrc"."Applications/Mattermost"."Seen" = true; + "plasmanotifyrc"."Applications/audacious"."Seen" = true; + "plasmanotifyrc"."Applications/chromium-browser"."Seen" = true; + "plasmanotifyrc"."Applications/com.nextcloud.desktopclient.nextcloud"."Seen" = true; + "plasmanotifyrc"."Applications/firefox"."Seen" = true; + "plasmanotifyrc"."Applications/librewolf"."Seen" = true; + "plasmanotifyrc"."Applications/org.telegram.desktop"."Seen" = true; + "plasmanotifyrc"."Applications/thunderbird"."Seen" = true; "plasmarc"."OSD"."Enabled" = false; "plasmarc"."PlasmaToolTips"."Delay" = "-1"; "plasmarc"."Theme"."name" = "rose-pine-moon"; From 35ad28c03a1636d78decf980b555b2a1b7fc8109 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 28 Jul 2024 13:40:28 +0300 Subject: [PATCH 09/12] fix(local-dev): php memory limit --- modules/local-dev.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/local-dev.nix b/modules/local-dev.nix index 0ae71d3..21ebb43 100644 --- a/modules/local-dev.nix +++ b/modules/local-dev.nix @@ -70,7 +70,10 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs; + let + php83 = pkgs.php83.buildEnv { extraConfig = "memory_limit = 2G"; }; + in [ #clang dart-sass dbeaver-bin From f1589a8d156acf4c7eff0563c852a3937400950a Mon Sep 17 00:00:00 2001 From: mrflos Date: Fri, 9 Aug 2024 12:34:10 +0300 Subject: [PATCH 10/12] macos custom tweaks --- .gitignore | 1 + dotfiles/kitty/kitty.conf | 2 ++ dotfiles/nvim/lua/plugins/markdownpreview.lua | 21 +++++++++++++++++++ modules/local-dev.nix | 5 ++++- 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 dotfiles/nvim/lua/plugins/markdownpreview.lua diff --git a/.gitignore b/.gitignore index 40c7108..cc56fe3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +.DS_Store configuration.nix diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/kitty/kitty.conf index 5e74838..a4de263 100644 --- a/dotfiles/kitty/kitty.conf +++ b/dotfiles/kitty/kitty.conf @@ -91,3 +91,5 @@ background_opacity 1 #background_tint 0.99 modify_font cell_height 130% startup_session ~/.config/kitty/session.conf +hide_window_decorations titlebar-only + diff --git a/dotfiles/nvim/lua/plugins/markdownpreview.lua b/dotfiles/nvim/lua/plugins/markdownpreview.lua new file mode 100644 index 0000000..9c52ab5 --- /dev/null +++ b/dotfiles/nvim/lua/plugins/markdownpreview.lua @@ -0,0 +1,21 @@ +return { + { + -- Install markdown preview, use npx if available. + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + ft = { "markdown" }, + build = function(plugin) + if vim.fn.executable("npx") then + vim.cmd("!cd " .. plugin.dir .. " && cd app && npx --yes yarn install") + else + vim.cmd([[Lazy load markdown-preview.nvim]]) + vim.fn["mkdp#util#install"]() + end + end, + init = function() + if vim.fn.executable("npx") then + vim.g.mkdp_filetypes = { "markdown" } + end + end, + }, +} diff --git a/modules/local-dev.nix b/modules/local-dev.nix index 66e8ef6..4ca0118 100644 --- a/modules/local-dev.nix +++ b/modules/local-dev.nix @@ -85,7 +85,10 @@ # $ nix search wget environment.systemPackages = with pkgs; let - php83 = pkgs.php83.buildEnv { extraConfig = "max_upload_size = 2G"; }; + php83 = pkgs.php83.buildEnv { extraConfig = '' + max_upload_size = 2G + memory_limit = 1G + ''; }; in [ cmake dart-sass From 232b3546e1db7aa29ed9c81af54f6632d7fdbf65 Mon Sep 17 00:00:00 2001 From: mrflos Date: Thu, 30 May 2024 13:16:42 +0300 Subject: [PATCH 11/12] wip macos config --- darwin-configuration.nix | 8 + dotfiles/init_yeswiki_repos.sh | 2 +- machines/MacMiniM2-darwin-configuration.nix | 34 ++++ modules/console.nix | 15 +- modules/home-config.nix | 194 ++++++++++---------- modules/home-plasma.nix | 10 +- modules/local-dev.nix | 93 +++------- {home-manager => users}/mrflos-cli.nix | 0 8 files changed, 176 insertions(+), 180 deletions(-) create mode 100644 darwin-configuration.nix mode change 100644 => 100755 dotfiles/init_yeswiki_repos.sh create mode 100644 machines/MacMiniM2-darwin-configuration.nix rename {home-manager => users}/mrflos-cli.nix (100%) diff --git a/darwin-configuration.nix b/darwin-configuration.nix new file mode 100644 index 0000000..ef1869f --- /dev/null +++ b/darwin-configuration.nix @@ -0,0 +1,8 @@ +# NixOS config entry point +# import the hardware and configuration files specific to your machine +{ + imports = + [ + ./machines/MacMiniM2-darwin-configuration.nix + ]; +} diff --git a/dotfiles/init_yeswiki_repos.sh b/dotfiles/init_yeswiki_repos.sh old mode 100644 new mode 100755 index 16db261..34be1b2 --- a/dotfiles/init_yeswiki_repos.sh +++ b/dotfiles/init_yeswiki_repos.sh @@ -14,7 +14,7 @@ corebranch="doryphore-dev" 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 printf "\n================ Install YesWiki core ================\n" diff --git a/machines/MacMiniM2-darwin-configuration.nix b/machines/MacMiniM2-darwin-configuration.nix new file mode 100644 index 0000000..c7d403c --- /dev/null +++ b/machines/MacMiniM2-darwin-configuration.nix @@ -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; +} diff --git a/modules/console.nix b/modules/console.nix index b09f1bf..c67aed7 100644 --- a/modules/console.nix +++ b/modules/console.nix @@ -3,10 +3,10 @@ { programs.zsh.enable = true; - programs.fzf = { - fuzzyCompletion = true; - keybindings = true; - }; + # programs.fzf = { + # fuzzyCompletion = true; + # keybindings = true; + # }; # List packages installed in system profile. To search, run: # $ nix search wget @@ -41,11 +41,12 @@ mpc-cli mpd neofetch + neovim ollama pandoc pass pciutils - pinentry + #pinentry ripgrep rustc slides @@ -55,12 +56,12 @@ tokei tree unzip - usbutils + #usbutils wget whois wl-clipboard - wirelesstools yazi + #wirelesstools yt-dlp zellij zoxide diff --git a/modules/home-config.nix b/modules/home-config.nix index 8c7ed1d..4b4e2b7 100644 --- a/modules/home-config.nix +++ b/modules/home-config.nix @@ -1,41 +1,33 @@ -# Inject the right home-manager config for the machine. { config, pkgs, lib, ... }: let - plasma-manager = pkgs.fetchFromGitHub { - owner = "pjones"; - repo = "plasma-manager"; - rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5"; - sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw="; - }; - startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" '' - ${pkgs.waybar}/bin/waybar & - ${pkgs.swww}/bin/swww init & + #startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" '' + # ${pkgs.waybar}/bin/waybar & + # ${pkgs.swww}/bin/swww init & + # + # sleep 1 - 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 { # 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 imports = [ - + # + ]; - - # Let Home Manager install and manage itself. - #programs.home-manager.enable = true; home-manager.useGlobalPkgs = true; users.users.mrflos = { - isNormalUser = true; + #isNormalUser = true; description = "mrflos"; createHome = true; - extraGroups = ["users" "docker" "libvirtd" "lxd" "networkmanager" "wheel" ]; + #extraGroups = ["users" "docker" "libvirtd" "lxd" "networkmanager" "wheel" ]; uid = 1000; shell = pkgs.zsh; + home = "/Users/mrflos"; }; nix.settings.trusted-users = [ "mrflos" ]; - + home-manager.backupFileExtension = "backup"; home-manager.users.mrflos = { pkgs, ... }: { home.stateVersion = "23.05"; home.packages = with pkgs; [ @@ -47,17 +39,17 @@ in { rust-analyzer-unwrapped php83Packages.composer nodejs_20 - swww - grimblast - swaylock - waybar + # swww + # grimblast + #swaylock + #waybar yarn ]; - imports = [ - (plasma-manager + "/modules") - ./home-plasma.nix - ]; + #imports = [ + # (plasma-manager + "/modules") + # ./home-plasma.nix + #]; home.file = { "./.config/kitty/" = { source = ../dotfiles/kitty; @@ -238,105 +230,105 @@ in { }; }; - services.ssh-agent.enable = true; - wayland.windowManager.hyprland.enable = true; - wayland.windowManager.hyprland.settings = { - exec-once = ''${startupScript}/bin/hyprland-start''; - "$mod" = "SUPER"; + #services.ssh-agent.enable = true; + #wayland.windowManager.hyprland.enable = true; + #wayland.windowManager.hyprland.settings = { + # exec-once = ''${startupScript}/bin/hyprland-start''; + # "$mod" = "SUPER"; # assign apps - "$term" = "kitty"; - "$editor" = "nvim"; - "$file" = "dolphin"; - "$browser" = "firefox"; + # "$term" = "kitty"; + # "$editor" = "nvim"; + # "$file" = "dolphin"; + # "$browser" = "firefox"; - bind = [ - ", Print, exec, grimblast copy area" + # bind = [ + # ", Print, exec, grimblast copy area" # Window/Session actions - "$mod, Q, killactive" - "ALT, F4, killactive" - "$mod, delete, exit" # kill hyperland session - "$mod, W, togglefloating" # 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 - "$mod, L, exec, swaylock" # lock screen + # "$mod, Q, killactive" + # "ALT, F4, killactive" + # "$mod, delete, exit" # kill hyperland session + # "$mod, W, togglefloating" # 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 + # "$mod, L, exec, swaylock" # lock screen # "$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 - "$mod, T, exec, $term" # open terminal - "$mod, E, exec, $file" # open file manager - "$mod, C, exec, $editor" # open vscode - "$mod, F, exec, $browser" # open browser +# "$mod, T, exec, $term" # open terminal +# "$mod, E, exec, $file" # open file manager +# "$mod, C, exec, $editor" # open vscode +# "$mod, F, exec, $browser" # open browser # Move focus with mainMod + arrow keys - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - "ALT, Tab, movefocus, d" +# "$mod, left, movefocus, l" +# "$mod, right, movefocus, r" + # "$mod, up, movefocus, u" + # "$mod, down, movefocus, d" + # "ALT, Tab, movefocus, d" # Switch workspaces relative to the active workspace with mainMod + CTRL + [←→] - "$mod CTRL, right, workspace, r+1" - "$mod CTRL, left, workspace, r-1" + # "$mod CTRL, right, workspace, r+1" + # "$mod CTRL, left, workspace, r-1" # 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 + [←→] - "$mod CTRL ALT, right, movetoworkspace, r+1" - "$mod CTRL ALT, left, movetoworkspace, r-1" + # "$mod CTRL ALT, right, movetoworkspace, r+1" + # "$mod CTRL ALT, left, movetoworkspace, r-1" # Move active window around current workspace with mainMod + SHIFT + CTRL [←→↑↓] - "$mod SHIFT $CONTROL, left, movewindow, l" - "$mod SHIFT $CONTROL, right, movewindow, r" - "$mod SHIFT $CONTROL, up, movewindow, u" - "$mod SHIFT $CONTROL, down, movewindow, d" + # "$mod SHIFT $CONTROL, left, movewindow, l" + # "$mod SHIFT $CONTROL, right, movewindow, r" + # "$mod SHIFT $CONTROL, up, movewindow, u" + # "$mod SHIFT $CONTROL, down, movewindow, d" # Scroll through existing workspaces with mainMod + scroll - "$mod, mouse_down, workspace, e+1" - "$mod, mouse_up, workspace, e-1" + # "$mod, mouse_down, workspace, e+1" + # "$mod, mouse_up, workspace, e-1" # Special workspaces (scratchpad) - "$mod ALT, S, movetoworkspacesilent, special" - "$mod, S, togglespecialworkspace," + # "$mod ALT, S, movetoworkspacesilent, special" + # "$mod, S, togglespecialworkspace," # Toggle Layout - "$mod, J, togglesplit," # dwindle - ] - ++ ( + # "$mod, J, togglesplit," # dwindle + # ] + # ++ ( # workspaces # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} - builtins.concatLists (builtins.genList ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, workspace, ${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] - ] - ) - 10) - ); + # builtins.concatLists (builtins.genList ( + # x: let + # ws = let + # c = (x + 1) / 10; + # in + # builtins.toString (x + 1 - (c * 10)); + # in [ + # "$mod, ${ws}, workspace, ${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] + # ] + # ) + # 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 - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - ]; - - # 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" - ]; - }; + # # 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" + # ]; + # }; }; } diff --git a/modules/home-plasma.nix b/modules/home-plasma.nix index c646356..a3b4b83 100644 --- a/modules/home-plasma.nix +++ b/modules/home-plasma.nix @@ -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 = { enable = true; shortcuts = { diff --git a/modules/local-dev.nix b/modules/local-dev.nix index 21ebb43..8876b9e 100644 --- a/modules/local-dev.nix +++ b/modules/local-dev.nix @@ -1,86 +1,38 @@ # Local developpement { pkgs, config, lib, ... }: { - virtualisation = { - docker.enable = true; - #docker.rootless = { - # enable = true; - # setSocketVariable = true; - #}; - #libvirtd.enable = true; - #lxd.enable = true; - #waydroid.enable = true; - }; + homebrew.enable = true; + homebrew.brews = [ + # `brew install` + #"imagemagick" - systemd.services.yeswikidev = { - enable = true; - script = '' - ${pkgs.systemd}/bin/systemctl start mysql - # etc - ''; - 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; - }; + # `brew install`, always `brew services restart`, `brew link`, `brew unlink mysql` (if it is installed) + { + name = "mariadb"; + restart_service = true; + link = true; + conflicts_with = [ "mysql" ]; + } + ]; # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; let - php83 = pkgs.php83.buildEnv { extraConfig = "memory_limit = 2G"; }; + php83 = pkgs.php83.buildEnv { extraConfig = "" + memory_limit = 2G + max_upload_size = 2G + ""; }; in [ - #clang dart-sass - dbeaver-bin + cmake + dart-sass docker-compose + fd + fzf gcc go nixfmt-rfc-style + lua-language-server nixpkgs-fmt nodejs nodePackages.eslint @@ -90,7 +42,8 @@ php83Packages.php-cs-fixer python3 python311Packages.virtualenv - rpi-imager + ripgrep + rust-analyzer-unwrapped ruff-lsp stylelint symfony-cli diff --git a/home-manager/mrflos-cli.nix b/users/mrflos-cli.nix similarity index 100% rename from home-manager/mrflos-cli.nix rename to users/mrflos-cli.nix From 6891dbfaf28123d76271ada8805e7ee7a4996eab Mon Sep 17 00:00:00 2001 From: mrflos Date: Fri, 9 Aug 2024 12:34:10 +0300 Subject: [PATCH 12/12] macos custom tweaks --- .gitignore | 1 + dotfiles/kitty/kitty.conf | 2 ++ dotfiles/nvim/lua/plugins/markdownpreview.lua | 21 +++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 dotfiles/nvim/lua/plugins/markdownpreview.lua diff --git a/.gitignore b/.gitignore index 40c7108..cc56fe3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +.DS_Store configuration.nix diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/kitty/kitty.conf index 5e74838..a4de263 100644 --- a/dotfiles/kitty/kitty.conf +++ b/dotfiles/kitty/kitty.conf @@ -91,3 +91,5 @@ background_opacity 1 #background_tint 0.99 modify_font cell_height 130% startup_session ~/.config/kitty/session.conf +hide_window_decorations titlebar-only + diff --git a/dotfiles/nvim/lua/plugins/markdownpreview.lua b/dotfiles/nvim/lua/plugins/markdownpreview.lua new file mode 100644 index 0000000..9c52ab5 --- /dev/null +++ b/dotfiles/nvim/lua/plugins/markdownpreview.lua @@ -0,0 +1,21 @@ +return { + { + -- Install markdown preview, use npx if available. + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + ft = { "markdown" }, + build = function(plugin) + if vim.fn.executable("npx") then + vim.cmd("!cd " .. plugin.dir .. " && cd app && npx --yes yarn install") + else + vim.cmd([[Lazy load markdown-preview.nvim]]) + vim.fn["mkdp#util#install"]() + end + end, + init = function() + if vim.fn.executable("npx") then + vim.g.mkdp_filetypes = { "markdown" } + end + end, + }, +}