diff --git a/common/home-manager/emacs/default.nix b/common/home-manager/emacs/default.nix index ed67530..d369303 100644 --- a/common/home-manager/emacs/default.nix +++ b/common/home-manager/emacs/default.nix @@ -96,6 +96,8 @@ in { (set-frame-parameter (selected-frame) 'alpha '(85 . 85)) (add-to-list 'default-frame-alist '(alpha . (85 . 85))) + + (xterm-mouse-mode) ''; usePackageVerbose = true; @@ -181,7 +183,7 @@ in { ''; }; - go-mode = { enable = true; }; + go-mode.enable = true; lsp-mode = { enable = true; @@ -267,7 +269,7 @@ in { config = '' (ivy-mode 1) (setq ivy-use-virtual-buffers t - ivy-hight 20 + ivy-hight 25 ivy-count-format "(%d/%d) " ivy-initial-inputs-alist nil) ''; @@ -420,6 +422,10 @@ in { weechat.enable = true; systemd.enable = true; terraform-mode.enable = true; + + gemini-mode.enable = true; + highlight-indent-guides.enable = true; + "0x0".enable = true; }; }; }; diff --git a/common/users/cadey/spacemacs/spacemacs b/common/users/cadey/spacemacs/spacemacs index 0f5c22c..26c0007 100644 --- a/common/users/cadey/spacemacs/spacemacs +++ b/common/users/cadey/spacemacs/spacemacs @@ -53,7 +53,6 @@ values." sql html systemd - nim org rust shell @@ -64,7 +63,6 @@ values." kubernetes lsp typescript - elixir elm windows-scripts perl5 diff --git a/flake.lock b/flake.lock index e355944..cc35805 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1648475189, - "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", + "lastModified": 1652079807, + "narHash": "sha256-aCs1EwO9K2yJ1DcT4+4g7BMlJBWP7Xjs4k5i8ueR8PU=", "owner": "serokell", "repo": "deploy-rs", - "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", + "rev": "690f698b18345d894784752b5fa93b9b8f3cc29f", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1651259218, - "narHash": "sha256-Op4KH8XyqYKrD7DyuAF3dnq9oOOcE9n2LULxSs2FgQ4=", + "lastModified": 1652072170, + "narHash": "sha256-7aWTXT+tM6yNYwq6HYzNmnFvkosygMMFy0QPiLgBt6M=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "82abb862fec2c3f48d8f3690d22f27fc25f48478", + "rev": "ff6f93f4d156d7e9b48bb9cc986d119775e7df1f", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1651262513, - "narHash": "sha256-5iW1fevaAD0Rbtbgb4I++7fyaND3oarGs3mAjyadE0Y=", + "lastModified": 1651886851, + "narHash": "sha256-kbXOJSf1uho0/7P54nZkJdJY3oAelIjyc6tfiRhaXJI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8b51be7149a0735e87b232d21ae4f852619eac7", + "rev": "882bd8118bdbff3a6e53e5ced393932b351ce2f6", "type": "github" }, "original": { @@ -265,11 +265,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1651114127, - "narHash": "sha256-/lLC0wkMZkAdA5e1W76SnJzbhfOGDvync3VRHJMtAKk=", + "lastModified": 1652059086, + "narHash": "sha256-CjHSbr6LSFkN4YBdTB6+8ZQmSqhsbiXqAeQ9hQJ/gBI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6766fb6503ae1ebebc2a9704c162b2aef351f921", + "rev": "934e076a441e318897aa17540f6cf7caadc69028", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1651007983, - "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=", + "lastModified": 1651726670, + "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936", + "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", "type": "github" }, "original": { @@ -338,21 +338,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1650161686, - "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "portable-svc": { "inputs": { "nixpkgs": "nixpkgs_6" @@ -372,25 +357,6 @@ "url": "https://tulpa.dev/cadey/portable-svc.git" } }, - "portable-svc_2": { - "inputs": { - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1650586426, - "narHash": "sha256-n/Q2IzITm8s5sej3l3D0rxJcd7vx4P7KF4hOkN9pOOg=", - "ref": "main", - "rev": "eb4b2c4754e5cd4a976a2941c27194526e8781de", - "revCount": 6, - "type": "git", - "url": "https://tulpa.dev/cadey/portable-svc.git" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://tulpa.dev/cadey/portable-svc.git" - } - }, "printerfacts": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index 872bbaf..ddafd05 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,7 @@ , rhea, waifud, emacs-overlay, wsl, x, ... }: let pkgs = nixpkgs.legacyPackages."x86_64-linux"; + mkSystem = extraModules: nixpkgs.lib.nixosSystem rec { system = "x86_64-linux";