fix: i3 config

xgroleau · Oct 22, 2024 · 5c55ed8 · 5c55ed8
1 parent 8b0a577
commit 5c55ed8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/home/modules/desktop/i3/default.nix b/home/modules/desktop/i3/default.nix
@@ -197,17 +197,30 @@ in
               }
             ];
 
-            # Keybindings using the requested format
             keybindings = lib.mkOptionDefault {
-              "${mod}+h" = "exec $focus_on; focus left";
-              "${mod}+j" = "exec $focus_on; focus down";
-              "${mod}+k" = "exec $focus_on; focus up";
-              "${mod}+l" = "exec $focus_on; focus right";
+              # Window management
 
-              "${mod}+Shift+h" = "exec $focus_on; move left";
-              "${mod}+Shift+j" = "exec $focus_on; move down";
-              "${mod}+Shift+k" = "exec $focus_on; move up";
-              "${mod}+Shift+l" = "exec $focus_on; move right";
+              # move focused container to workspace
+              "${mod}+Shift+1" = "move container to workspace number 1; workspace number 1";
+              "${mod}+Shift+2" = "move container to workspace number 2; workspace number 2";
+              "${mod}+Shift+3" = "move container to workspace number 3; workspace number 3";
+              "${mod}+Shift+4" = "move container to workspace number 4; workspace number 4";
+              "${mod}+Shift+5" = "move container to workspace number 5; workspace number 5";
+              "${mod}+Shift+6" = "move container to workspace number 6; workspace number 6";
+              "${mod}+Shift+7" = "move container to workspace number 7; workspace number 7";
+              "${mod}+Shift+8" = "move container to workspace number 8; workspace number 8";
+              "${mod}+Shift+9" = "move container to workspace number 9; workspace number 9";
+              "${mod}+Shift+0" = "move container to workspace number 10; workspace number 10";
+
+              "${mod}+h" = "focus left";
+              "${mod}+j" = "focus down";
+              "${mod}+k" = "focus up";
+              "${mod}+l" = "focus right";
+
+              "${mod}+Shift+h" = "move left";
+              "${mod}+Shift+j" = "move down";
+              "${mod}+Shift+k" = "move up";
+              "${mod}+Shift+l" = "move right";
 
               "${mod}+Return" = "exec alacritty";
               "${mod}+space" = "exec --no-startup-id rofi -show drun -modi drun";
@@ -288,7 +301,7 @@ in
           extraConfig = ''
             exec_always --no-startup-id autorandr -c
             exec_always --no-startup-id systemctl --user restart polybar
-            exec_always --no-startup-id flashfocus
+            exec_always --no-startup-id flashfocus --time 100
           '';
         };
     };

diff --git a/home/modules/editors/emacs/config/init.el b/home/modules/editors/emacs/config/init.el
@@ -4,8 +4,8 @@
 ;; in. Remember to run 'doom sync' after modifying it!
 
 ;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
-;;      documentation. There you'll find a "Module Index" link where you'll find
-;;      a comprehensive list of Doom's modules and what flags they support.
+;;      documentation. There you'll find a link to Doom's Module Index where all
+;;      of our modules are listed, including what flags they support.
 
 ;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
 ;;      'C-c c k' for non-vim users) to view its documentation. This works on
@@ -69,6 +69,7 @@
        :emacs
        (dired +ranger +icons)             ; making dired pretty [functional]
        electric          ; smarter, keyword-based electric-indent
+       ;;eww               ; the internet is gross 
        ;;(ibuffer +icons)         ; interactive buffer management
        undo              ; persistent, smarter undo for your inevitable mistakes
        vc                ; version-control and Emacs, sitting in a tree
@@ -101,14 +102,13 @@
        ;;pass              ; password manager for nerds
        pdf               ; pdf enhancements, usefull for Latex
        ;;prodigy           ; FIXME managing external services & code builders
-       ;;taskrunner        ; taskrunner for all your projects
        ;;terraform         ; infrastructure as code
        ;;tmux              ; an API for interacting with tmux
        tree-sitter
        ;;upload            ; map local to remote projects via ssh/ftp
 
        :os
-       (:if IS-MAC macos)  ; improve compatibility with macOS
+       (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
        tty               ; improve the terminal Emacs experience
 
        :lang
@@ -145,7 +145,7 @@
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        (latex +lsp +cdlatex)             ; writing papers in Emacs has never been so fun
-       ;;lean
+       ;;lean              ; for folks with too much to prove 
        ;;ledger            ; an accounting system in Emacs
        lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
@@ -155,6 +155,7 @@
        org               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother
        plantuml          ; diagrams for confusing people more
+       ;;graphviz          ; diagrams for confusing yourself even more 
        ;;purescript        ; javascript, but functional
        (python +lsp +pyright +poetry) ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
@@ -176,7 +177,7 @@
        zig               ; C, but simpler
 
        :email
-       ;;(mu4e +gmail)
+       ;;(mu4e +org +gmail)
        ;;notmuch
        ;;(wanderlust +gmail)
 
@@ -186,7 +187,6 @@
        everywhere        ; *leave* Emacs!? You must be joking
        ;;irc               ; how neckbeards socialize
        ;;(rss +org)        ; emacs as an RSS reader
-       ;;twitter           ; twitter client https://twitter.com/vnought
 
        :config
        ;;literate

diff --git a/hosts/azura/default.nix b/hosts/azura/default.nix
@@ -55,6 +55,8 @@
         alsa.support32Bit = true;
         pulse.enable = true;
       };
+
+      zerotierone.enable = true;
     };
     security.rtkit.enable = true;