Merge pull request #34 from datsfilipe/general-updates

refactor: general updates

home/base/core/git/default.nix

@@ -19,12 +19,6 @@
       }
     ];
 
-    ignores = [
-      ".trash"
-      ".Trash"
-      ".Trash-1000"
-    ];
-
     extraConfig = {
       core.editor = "nvim";
       init.defaultBranch = "main";

hosts/dtsf-pc/boot.nix

@@ -1,3 +1,4 @@
-{
+{pkgs, ...}: {
   boot.loader.systemd-boot.enable = true;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 }

hosts/dtsf-pc/default.nix

@@ -1,4 +1,4 @@
-{myvars, ...}: let
+let
   hostName = "dtsf-pc";
 in {
   imports = [

hosts/dtsf-pc/home/default.nix

@@ -1,33 +1,34 @@
 {
+  config,
   pkgs,
   mypkgs,
   lib,
   ...
-}: {
-  imports = [./packages.nix];
-
-  modules.desktop.colorscheme.theme = "gruvbox";
-
-  modules.desktop = {
-    sway = let
-      mod = "Mod4";
-      alt = "Mod1";
-      keymaps = import ./keymaps.nix {inherit mod alt pkgs lib;};
-      command = str: always: {
-        command = str;
-        always = always;
-      };
-    in {
-      settings = {
+}: let
+  generate = wm: let
+    mod = "Mod4";
+    alt = "Mod1";
+    msgCmd =
+      if wm == "sway"
+      then "swaymsg"
+      else "i3-msg";
+    keymaps = import ./keymaps.nix {inherit mod alt pkgs lib config;};
+    command = str: always: {
+      command = str;
+      always = always;
+    };
+  in {
+    settings = lib.mkMerge [
+      {
         modifier = mod;
         focus.followMouse = false;
         keybindings = keymaps.allBindings;
 
         startup = [
           (command "udiskie --tray --notify" false)
-          (command "swaymsg 'workspace 1'" false)
+          (command "${msgCmd} 'workspace 1'" false)
           (command "dunst -config $HOME/.config/dunstrc" false)
-          (command "systemctl --user restart wallpaper.service" true)
+          (lib.mkIf (wm == "sway") (command "systemctl --user start wallpaper.service" false))
         ];
 
         modes = {
@@ -61,7 +62,9 @@
             criteria = {title = "^win";};
           }
         ];
+      }
 
+      (lib.mkIf (wm == "sway") {
         input = {
           "1133:16500:Logitech_G305" = {
             accel_profile = "flat";
@@ -74,8 +77,17 @@
             xkb_options = "compose:menu,level3:ralt_switch,grp:win_space_toggle";
           };
         };
-      };
-    };
+      })
+    ];
+  };
+in {
+  imports = [./packages.nix];
+
+  modules.desktop.colorscheme.theme = "gruvbox";
+
+  modules.desktop = {
+    sway = generate "sway";
+    i3 = generate "i3";
   };
 
   programs.ssh = {
@@ -88,7 +100,8 @@
     '';
   };
 
-  modules.desktop.nupkgs.packages = with mypkgs; [
-    astal
-  ];
+  modules.desktop.nupkgs.packages = with mypkgs;
+    lib.mkIf (config.modules.desktop.sway.enable) [
+      astal
+    ];
 }

hosts/dtsf-pc/home/keymaps.nix

@@ -1,4 +1,5 @@
 {
+  config,
   mod,
   alt,
   pkgs,
@@ -8,11 +9,20 @@
   mod = "Mod4";
   alt = "Mod1";
   print = "Print";
+  msgCmd =
+    if config.modules.desktop.sway.enable
+    then "swaymsg"
+    else "i3-msg";
 
-  exit = "-B 'leave' 'exec swaymsg exit && exec loginctl terminate-user $USER'";
+  exit = "-B 'leave' 'exec ${msgCmd} exit && exec loginctl terminate-user $USER'";
   turnoff = "-B 'shutdown' 'exec systemctl poweroff'";
   reboot = "-B 'reboot' 'exec systemctl reboot'";
 
+  nag =
+    if config.modules.desktop.sway.enable
+    then "swaynag"
+    else "i3-nagbar";
+
   workspaceBindings = builtins.listToAttrs (
     (map (i: {
       name = "${mod}+${toString i}";
@@ -69,7 +79,7 @@
     "${mod}+r" = "mode resize";
 
     "${mod}+Shift+c" = "reload";
-    "${mod}+Shift+e" = "exec \"swaynag -t warning -m 'leave, shutdown or reboot?' ${turnoff} ${reboot} ${exit}\"";
+    "${mod}+Shift+e" = "exec \"${nag} -t warning -m 'leave, shutdown or reboot?' ${turnoff} ${reboot} ${exit}\"";
 
     "XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
     "XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";

lib/spec.nix

@@ -13,7 +13,6 @@ in {
       ../modules/base.nix
       ../modules/colorscheme
       ../modules/conf
-      ../modules/devenvs
       ../modules/nixos
       ../modules/nupkgs
       ../modules/secrets