update: lock, emacs, hyprland binds

Author: RaySlash

flake.lock

@@ -50,6 +50,9 @@
     };
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
     nixCats.url = "github:BirdeeHub/nixCats-nvim";
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+    };
     neovim-nightly-overlay = {
       url = "github:nix-community/neovim-nightly-overlay";
     };

flake.nix

@@ -9,6 +9,7 @@
 
   home.packages = with pkgs; [
     btop
+    qbittorrent
     obsidian
     fd
     unzip
@@ -21,7 +22,6 @@
     swww
     grimblast
     zen-browser
-    # wineWowPackages.waylandFull
     virt-manager
     vlc
     vesktop
@@ -69,6 +69,18 @@
       enable = true;
       server.enable = true;
     };
+    lutris = {
+      enable = true;
+      extraPackages = with pkgs; [
+        protonup-qt
+        mangohud
+        winetricks
+        gamescope
+        gamemode
+      ];
+      protonPackages = with pkgs; [proton-ge-bin];
+      winePackages = with pkgs; [wineWowPackages.waylandFull];
+    };
     bat = {
       enable = true;
       extraPackages = with pkgs.bat-extras; [

home/hosts/frost/default.nix

@@ -77,8 +77,7 @@
   bind = [
     "$mod, return, exec, foot"
     "$mod_SHIFT, Q, killactive,"
-    "$mod_SHIFT, M, exit,"
-    "$mod_SHIFT, L, exec, wlogout"
+    "$mod_SHIFT, M, exec, wlogout"
     "$mod, D, exec, foot yazi"
     "$mod, F, togglefloating"
     "$mod_SHIFT, return, exec, fuzzel --show-actions"
@@ -90,12 +89,12 @@
     "$mod, XF86AudioLowerVolume, exec, hyprctl hyprsunset gamma +10"
     "$mod, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
     "$mod, p, exec, grimblast copysave area"
-    "$mod, x, togglespecialworkspace, scratch"
-    "$mod_SHIFT, x, movetoworkspace, special:scratch"
-    "$mod, left, movefocus, l"
-    "$mod, right, movefocus, r"
-    "$mod, up, movefocus, u"
-    "$mod, down, movefocus, d"
+    "$mod, `, togglespecialworkspace, scratch"
+    "$mod_SHIFT, `, movetoworkspace, special:scratch"
+    "$mod, h, movefocus, l"
+    "$mod, l, movefocus, r"
+    "$mod, k, movefocus, u"
+    "$mod, j, movefocus, d"
     "$mod, 1, workspace, 1"
     "$mod, 2, workspace, 2"
     "$mod, 3, workspace, 3"
@@ -116,7 +115,7 @@
     "$mod_SHIFT, 9, movetoworkspace, 9"
     "$mod, mouse_down, workspace, e+1"
     "$mod, mouse_up, workspace, e-1"
-    "$mod, N, layoutmsg, cyclenext"
+    "$mod, n, layoutmsg, cyclenext"
     "$mod, B, layoutmsg, swapwithmaster master"
   ];
   bindm = [

home/hosts/frost/hyprland.nix

@@ -7,42 +7,43 @@
 }: let
   inherit (lib) mkEnableOption mkIf;
   cfg = config.custom.programs.emacs;
-  myEmacs = with pkgs; ((emacsPackagesFor emacs-pgtk).emacsWithPackages
-    (epkgs: (with epkgs; [
-      lsp-mode
-      lsp-ui
-      lsp-ivy
-      lsp-treemacs
-      consult
-      company
-      diff-hl
-      doom-modeline
-      which-key
-      tree-sitter
-      dap-mode
-      orderless
-      nix-mode
-      rust-mode
-      rustic
-      nixfmt
-      vertico
-      marginalia
-      base16-theme
-      flycheck
-      evil
-      evil-commentary
-      evil-matchit
-      ivy
-    ]) ++ (with pkgs; [
-      alejandra
-      clang-tools
-      prettierd
-      rust-analyzer
-      ccls
-      nixd
-      vscode-langservers-extracted
-      tinymist
-    ])));
+  # myEmacs = pkgs.emacsWithPackagesFromUsePackage {
+  myEmacs = (pkgs.emacsPackagesFor pkgs.emacs-git-pgtk).emacsWithPackages (
+    epkgs:
+      (with epkgs; [
+        base16-theme
+        dashboard
+        consult
+        diff-hl
+        doom-modeline
+        which-key
+        tree-sitter
+        dap-mode
+        orderless
+        nix-mode
+        typst-ts-mode
+        web-mode
+        lsp-mode
+        rustic
+        nixfmt
+        vertico
+        marginalia
+        flycheck
+        corfu
+        cape
+        magit
+        evil
+        evil-collection
+        evil-commentary
+        evil-matchit
+      ])
+      ++ (with pkgs; [
+        prettierd
+        nixd
+        vscode-langservers-extracted
+        tinymist
+      ])
+  );
 in {
   options.custom.programs.emacs = {enable = mkEnableOption "programs.emacs";};
 
@@ -52,13 +53,13 @@ in {
       package = myEmacs;
       extraConfig = builtins.readFile ./init.el;
     };
-
-    services.emacs = {
-      enable = true;
-      client.enable = true;
-      defaultEditor = true;
-      socketActivation.enable = true;
-      startWithUserSession = true;
-    };
   };
+
+  # services.emacs = {
+  #   enable = true;
+  #   client.enable = true;
+  #   defaultEditor = true;
+  #   socketActivation.enable = true;
+  #   startWithUserSession = true;
+  # };
 }