Merge pull request #27 from datsfilipe/feat-add-linux-shimeji

feat: add linux shimeji to the config
datsfilipe · Jan 12, 2025 · f050bad · f050bad
2 parents e17740f + 36cf017
commit f050bad
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 3 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,6 +8,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:nix-community/home-manager/master";
     };
+    linux-shimeji = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:datsfilipe/linux-shimeji/main";
+    };
     sops-nix = {
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:Mic92/sops-nix/master";

diff --git a/home/linux/gui/i3/values/picom.nix b/home/linux/gui/i3/values/picom.nix
@@ -18,6 +18,7 @@
       "class_g ?= 'Polybar'"
       "class_g ?= 'Rofi'"
       "_GTK_FRAME_EXTENTS"
+      "name = 'win'"
     ];
 
     corner-radius = 0;
@@ -28,6 +29,13 @@
       "class_g = 'Polybar'"
       "class_g = 'Rofi'"
       "window_type = 'tooltip'"
+      "name = 'win'"
+    ];
+    blur-background-exclude = [
+      "name = 'win'"
+    ];
+    focus-exclude = [
+      "name = 'win'"
     ];
   };
 

diff --git a/hosts/dtsf-pc/home/default.nix b/hosts/dtsf-pc/home/default.nix
@@ -53,6 +53,13 @@
           style = "Regular";
           size = 8.0;
         };
+
+        window.commands = [
+          {
+            command = "floating enable, sticky enable";
+            criteria = { title = "^win"; };
+          }
+        ];
       };
     };
   };

diff --git a/hosts/dtsf-pc/home/keymaps.nix b/hosts/dtsf-pc/home/keymaps.nix
@@ -1,6 +1,7 @@
 { mod, alt, pkgs, lib, ... }: let 
   mod = "Mod4";
   alt = "Mod1";
+  print = "Print";
   workspaceBindings = builtins.listToAttrs (
     (map (i: {
       name = "${mod}+${toString i}";
@@ -21,10 +22,13 @@
     "${mod}+Return" = "exec ${pkgs.alacritty}/bin/alacritty -e ${pkgs.zellij}/bin/zellij attach dtsf -c";
     "${mod}+a" = "exec chromium --wv --force-dark-mode --enable-features=WebUIDarkMode";
     "${mod}+d" = "exec $HOME/.local/bin/dmenu-theme";
-    "Print" = "exec flameshot gui";
+    "${mod}+Shift+m" = "exec shimeji";
+
     "${alt}+k" = "exec $HOME/.local/bin/switch-kb-variant";
     "${alt}+i" = "exec $HOME/.local/bin/switch-kb-variant intl";
 
+    "${print}" = "exec flameshot gui";
+
     "${mod}+h" = "focus left";
     "${mod}+j" = "focus down";
     "${mod}+k" = "focus up";

diff --git a/hosts/dtsf-pc/home/packages.nix b/hosts/dtsf-pc/home/packages.nix
@@ -9,6 +9,7 @@
 
   modules.desktop.nupkgs.packages = with mypkgs; [
     devtunnel-cli
+    linux-shimeji
   ];
 
   programs.i3status = {

diff --git a/modules/nupkgs/default.nix b/modules/nupkgs/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, mylib, zellij-switch, ... }: let
+{ lib, pkgs, mylib, zellij-switch, linux-shimeji, ... }: let
   packageFiles = lib.filter
     (path: !lib.strings.hasPrefix (toString ./overlays) (toString path))
     (mylib.file.scanPaths ./.);
@@ -14,6 +14,7 @@
       packageFiles
   ) // {
     inherit (pkgsWithOverlays) zellij-switch;
+    linux-shimeji = linux-shimeji.packages.${pkgs.system}.little-ghost-polite;
   };
 in
   packages
diff --git a/templates/flake.template.nix b/templates/flake.template.nix
@@ -23,6 +23,7 @@ in genFlake ./flake.template.nix
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
+    linux-shimeji = (ext "github:datsfilipe/linux-shimeji/main");
     zellij-switch = (ext "github:datsfilipe/zellij-switch/flake");
     home-manager = (ext "github:nix-community/home-manager/master");
     sops-nix = (ext "github:Mic92/sops-nix/master");