fmt

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

home/modules/zsh.nix

@@ -10,7 +10,7 @@
     };
     enableAutosuggestions = true;
     enableCompletion = true;
-    enableSyntaxHighlighting = true;
+    syntaxHighlighting.enable = true;
     prezto = {
       enable = true;
       prompt.theme = "pure";

home/natto/config/emacs/config.org

@@ -1,5 +1,5 @@
-# #+TITLE: My Emacs Configuration
+#+TITLE: My Emacs Configuration
-# #+AUTHOR: Amneesh Singh
+#+AUTHOR: Amneesh Singh
 #+PROPERTY: header-args:emacs-lisp :tangle yes
 
 * Settings
@@ -23,6 +23,9 @@
 (setq ring-bell-function 'ignore
       gc-cons-threshold most-positive-fixnum
       initial-major-mode 'fundamental-mode)
+(unless (display-graphic-p)
+        (require 'evil-terminal-cursor-changer)
+        (evil-terminal-cursor-changer-activate))
 #+end_src
 
 ** Setting some variables
@@ -132,6 +135,8 @@ Add selectrum-prescient
 To undo and redo easily like vi
 #+begin_src emacs-lisp
 (use-package undo-tree
+  :init
+  (setq undo-tree-history-directory-alist '(("." . "~/.emacs.d/undo")))
   :config
   (global-undo-tree-mode 1))
 #+end_src
@@ -199,8 +204,7 @@ For autocomplete
   :after lsp-mode
   :config
   (add-to-list 'company-backends 'company-dabbrev)
-  (setq company-backends (cons 'company-files (remove 'company-files company-backends)))
+  (setq company-backends (append '(company-files) (remove 'company-files company-backends)))
-  (add-to-list 'company-backends 'company-emoji)
   (company-mode 1))
 #+end_src
 
@@ -210,11 +214,6 @@ For autocomplete
   :hook (company-mode . company-quickhelp-mode))
 #+end_src
 
-*** Extra company packages
-#+begin_src emacs-lisp
-(use-package company-emoji)
-#+end_src
-
 ** Treesitter
 #+begin_src emacs-lisp
 (use-package tree-sitter-langs :defer t)

home/natto/config/hypr/hyprland.conf

@@ -35,13 +35,15 @@ general {
 
 decoration {
     rounding = 1
-    blur = yes
-    blur_size = 5
-    blur_passes = 1
-    blur_new_optimizations = on
-    blur_xray = yes
-    drop_shadow = yes
     inactive_opacity = 0.8
+    drop_shadow = true
+
+    blur {
+        enabled = true
+        size = 5
+        new_optimizations = true
+        xray = true
+    }
 }
 
 animations {

home/natto/git.nix

@@ -10,7 +10,7 @@
   };
 
   age.secrets.gitconfig = {
-    file = ./secrets/.gitconfig.age;
+    file = ./secrets/gitconfig.age;
     path = "${config.home.homeDirectory}/.gitconfig";
   };
 }

home/natto/gtk.nix

@@ -3,7 +3,7 @@
   gtk = {
     enable = true;
     theme = {
-      name = "Catppuccin-Mocha-Standard-Teal-dark";
+      name = "Catppuccin-Mocha-Standard-Teal-Dark";
       package = pkgs.catppuccin-gtk.override {
         accents = [ "teal" ];
         variant = "mocha";

home/natto/pkgs.nix

@@ -50,13 +50,14 @@
     gnome.zenity
 
     # Wine and games and stuff
+    lutris
     wineWowPackages.stable
     steam
     lutris
     winetricks
     flake.packages.${pkgs.system}.tlauncher
     mangohud
-    inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
+    #   inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
 
     # Programming and dev stuff
     (texlive.combine {
@@ -86,7 +87,6 @@
     ghc
     nodejs
     rust-bin.nightly.latest.default
-    clang-tools
     openjdk
 
     # Misc

home/natto/wayland.nix

@@ -9,9 +9,7 @@
         enable = true;
         xwayland = {
           enable = true;
-          hidpi = true;
         };
-        nvidiaPatches = true;
         extraConfig = (builtins.readFile ./config/hypr/hyprland.conf)
           + (with config.home.pointerCursor; ''
           exec-once=hyprctl setcursor ${name} ${toString size}

home/natto/zsh.nix

@@ -9,7 +9,7 @@ in
   '';
 
   age.secrets.zshenv_secret = {
-    file = ./secrets/.zshenv_secret;
+    file = ./secrets/zshenv_secret;
     path = secretPath;
     mode = "660";
   };

hosts/marisa/networking.nix

@@ -6,13 +6,13 @@
       allowedTCPPorts = [
         22 # ssh
         80 # http
-      #  5454
+        #  5454
         5001 #gitea
         4646 #nomad
-      #  8500 #vault nomad consul
+        #  8500 #vault nomad consul
         8000 #simpler-filehost
-      #  6666 #concourse
+        #  6666 #concourse
-      #  202 #gitea-ssh
+        #  202 #gitea-ssh
       ];
       allowedUDPPorts = [ 17840 ];
       trustedInterfaces = [ "docker0" ];

hosts/marisa/services/default.nix

@@ -17,7 +17,7 @@
   services = {
     openssh = {
       enable = true;
-      ports = [22 22001];
+      ports = [ 22 22001 ];
     };
     postgresql = {
       enable = true;

hosts/modules/wayland.nix

@@ -6,5 +6,6 @@
     extraPortals = [
       inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
     ];
+    config.common.default = "*";
   };
 }

hosts/modules/xorg.nix

@@ -27,15 +27,8 @@
           enable = true;
         };
       };
-      extraLayouts = {
+      xkb.layout = "us";
-        colemak = {
+      xkb.variant = "colemak_dh"; # trying to ditch DHz now
-          description = "Colemak Layouts";
-          languages = [ "eng" ];
-          symbolsFile = ./colemak;
-        };
-      };
-      layout = "us";
-      xkbVariant = "colemak_dh"; # trying to ditch DHz now
       autoRepeatDelay = 320;
       autoRepeatInterval = 30;
     };

lib/default.nix

@@ -1,17 +1,13 @@
 { inputs, self, ... }:
 {
-  imports = [
+  config._module.args.globalArgs = {
-    {
+    _module.args = {
-      config._module.args.globalArgs = {
+      inherit inputs self;
-        _module.args = {
+      flake = self;
-          inherit inputs self;
+      lib' = {
-          flake = self;
+        colors = import ./colors.nix;
-          lib' = {
+        network = import ./network.nix;
-            colors = import ./colors.nix;
-            network = import ./network.nix;
-          };
-        };
       };
-    }
+    };
-  ];
+  };
 }