diff --git a/flake.lock b/flake.lock index 7612a46..eab5ec0 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1715872464, - "narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=", + "lastModified": 1713406758, + "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", "owner": "nix-community", "repo": "disko", - "rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1", + "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716109578, - "narHash": "sha256-6b6PG2h4p5KOGc/bFaet14kvrHaZ5kkI2fZRgdfiJX4=", + "lastModified": 1713517520, + "narHash": "sha256-t59lpRo7EulX9J0/bc5/8cUEo7hl6z9YOYukzg54cyU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "999b048552f496803b01c445834a9ef70410a5cb", + "rev": "a8692d4e570e93061d2bbe10af4a1590afe82e15", "type": "github" }, "original": { @@ -153,6 +153,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -202,11 +220,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1713527814, + "narHash": "sha256-0NJLgMKvv+HluzeHei/m8vDhX3xovNLkMw/idwIJ218=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "0184c8180f5cbb8e3a54a239b874fe849d3073cb", "type": "github" }, "original": { @@ -287,11 +305,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "lastModified": 1713297878, + "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", "type": "github" }, "original": { @@ -335,11 +353,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1715948915, - "narHash": "sha256-dxMrggEogQuJQr6f02VAFtsSNtjEPkgxczeiyW7WOQc=", + "lastModified": 1713344939, + "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bacb8503d3a51d9e9b52e52a1ba45e2c380ad07d", + "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", "type": "github" }, "original": { @@ -431,6 +449,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -438,11 +457,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1715870890, - "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { @@ -472,11 +491,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1714720456, - "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", + "lastModified": 1713012165, + "narHash": "sha256-z/soXKDnz+w4Nw0LkRaM73YqolhSmIYy6cpg1F2ps8I=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", + "rev": "9f6635a0351c190179dc6904545f950108a23dd8", "type": "gitlab" }, "original": { @@ -531,6 +550,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1659877975, @@ -548,7 +582,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1709126324, diff --git a/home/alex/programs/emacs/doom/init.el b/home/alex/programs/emacs/doom/init.el index 9ddb266..6163748 100644 --- a/home/alex/programs/emacs/doom/init.el +++ b/home/alex/programs/emacs/doom/init.el @@ -20,7 +20,7 @@ ;;layout ; auie,ctsrnm is the superior home row :completion - ;; company ; the ultimate code completion backend + company ; the ultimate code completion backend ;;helm ; the *other* search engine for love and life ;;ido ; the other *other* search engine... ;;ivy ; a search engine for love and life @@ -157,11 +157,11 @@ ;;php ; perl's insecure younger brother plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional - (python +lsp +tree-sitter +pyenv) ; beautiful is better than ugly + python ; beautiful is better than ugly qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 - (rest +jq) ; Emacs as a REST client + rest ; Emacs as a REST client ;;rst ; ReST in peace ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} (rust +lsp +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() @@ -174,7 +174,7 @@ ;;terra ; Earth and Moon in alignment for performance. (web +lsp +tree-sitter) ; the tubes (yaml +lsp +tree-sitter) ; JSON, but readable - (zig +lsp +tree-sitter) ; C, but simpler + ;;zig ; C, but simpler :email ;; (mu4e +org +gmail) @@ -192,3 +192,7 @@ :config ;;literate (default +bindings +smartparens)) + +(setq native-comp-deferred-compilation nil) +(after! (doom-packages straight) + (setq straight--native-comp-available t)) diff --git a/modules/nix-config.nix b/modules/nix-config.nix index 13ffe16..716d4e7 100644 --- a/modules/nix-config.nix +++ b/modules/nix-config.nix @@ -1,13 +1,8 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: { nix = { - package = pkgs.nixVersions.latest; + package = pkgs.nixUnstable; gc = { automatic = true; dates = "weekly"; @@ -16,10 +11,7 @@ settings = { auto-optimise-store = true; - experimental-features = [ - "nix-command" - "flakes" - ]; + experimental-features = [ "nix-command" "flakes" "repl-flake" ]; warn-dirty = false; # avoid unwanted garbage collection when using direnv diff --git a/modules/wm/x.nix b/modules/wm/x.nix index d186430..cb669fb 100644 --- a/modules/wm/x.nix +++ b/modules/wm/x.nix @@ -1,16 +1,9 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: { # Enable the X11 windowing system. services = { - dbus = { - enable = true; - }; + dbus = { enable = true; }; xserver = { enable = true; @@ -29,14 +22,15 @@ desktopManager.xfce.enable = true; desktopManager.gnome.enable = true; - }; - # Enable touchpad support (enabled default in most desktopManager). - libinput = { - enable = true; - touchpad.disableWhileTyping = true; - touchpad.tapping = false; - mouse.naturalScrolling = config.services.libinput.touchpad.naturalScrolling; + # Enable touchpad support (enabled default in most desktopManager). + libinput = { + enable = true; + touchpad.disableWhileTyping = true; + touchpad.tapping = false; + mouse.naturalScrolling = + config.services.xserver.libinput.touchpad.naturalScrolling; + }; }; }; }