From c5f54de5466ac304ebc58a9b4ed76e61e63d57c5 Mon Sep 17 00:00:00 2001 From: liv Date: Sun, 27 Oct 2024 09:10:35 +0100 Subject: [PATCH 1/4] home: install more php packages --- home/features/devel/php.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/features/devel/php.nix b/home/features/devel/php.nix index 1df3c6a..2d3cb5d 100644 --- a/home/features/devel/php.nix +++ b/home/features/devel/php.nix @@ -1,5 +1,3 @@ -# install php from nixpkgs because mise wants to compile it from source, -# and that's a whole can of beans i'm not getting into { pkgs, ... }: { - home.packages = with pkgs; [ php83 ]; + home.packages = with pkgs; [ php83 php83Packages.composer phpactor ]; } From eeea27b4990dd836c86438561731fe56bcb95486 Mon Sep 17 00:00:00 2001 From: liv Date: Sun, 27 Oct 2024 09:10:43 +0100 Subject: [PATCH 2/4] home: more devel packages --- home/features/devel/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/features/devel/default.nix b/home/features/devel/default.nix index 594d4c7..be45b22 100644 --- a/home/features/devel/default.nix +++ b/home/features/devel/default.nix @@ -29,10 +29,16 @@ elixir-ls inotify-tools + # python + python3 + uv + basedpyright + # misc flyctl httpie beekeeper-studio exercism + neil ]; } From b8b0a75d133fe9047b48a679d60a011ef26d3535 Mon Sep 17 00:00:00 2001 From: liv Date: Sun, 27 Oct 2024 09:10:55 +0100 Subject: [PATCH 3/4] doom: reorganize modules --- doom_files/init.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doom_files/init.el b/doom_files/init.el index 1054821..92a2fac 100644 --- a/doom_files/init.el +++ b/doom_files/init.el @@ -123,7 +123,7 @@ ;;data ; config/data formats ;;(dart +flutter) ; paint ui and not much else ;;dhall - (elixir +lsp +tree-sitter) ; erlang done right + ;; (elixir +lsp +tree-sitter) ; erlang done right ;;elm ; care for a cup of TEA? emacs-lisp ; drown in parentheses ;;erlang ; an elegant language for a more civilized age @@ -153,11 +153,11 @@ (nix +lsp +tree-sitter) ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel org ; organize your plain life in plain text - ;;php ; perl's insecure younger brother + ;; (php +lsp +tree-sitter) ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;graphviz ; diagrams for confusing yourself even more ;;purescript ; javascript, but functional - ;;python ; beautiful is better than ugly + (python +lsp +pyright +tree-sitter) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever ;;racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 From 7f9dfd4338c2bd80e63d9b8feb9978fe48ebad6c Mon Sep 17 00:00:00 2001 From: liv Date: Sun, 27 Oct 2024 09:11:04 +0100 Subject: [PATCH 4/4] treewide: update flake inputs --- flake.lock | 42 +++++++++++++++++----------------- home/features/desktop/font.nix | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 758e40c..ca4dc70 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1729382845, - "narHash": "sha256-REiWck1zIOnZIgGmmOWfwvkQw1f4UrBsxxOSKVSAG4w=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a001f44cfc47164839eb61c6b1e7f4288813f7e8", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1729414726, - "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", + "lastModified": 1730011532, + "narHash": "sha256-srazPOwpu+hCB/Ny8r2Ixxq+nBREylIuBnRVJyW7vzc=", "owner": "nix-community", "repo": "home-manager", - "rev": "fe56302339bb28e3471632379d733547caec8103", + "rev": "05d9bee4a5155758aec3c3807c0e342b9f253522", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729394935, - "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729417461, - "narHash": "sha256-p0j/sUs7noqZw0W+SEuZXskzOfgOH7yY80ksIM0fCi4=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8f38d8a4754cf673c2609c4ed399630db87e678b", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1729380793, - "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", + "lastModified": 1729963473, + "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", "owner": "danth", "repo": "stylix", - "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", + "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b", "type": "github" }, "original": { diff --git a/home/features/desktop/font.nix b/home/features/desktop/font.nix index d748c3c..014a96f 100644 --- a/home/features/desktop/font.nix +++ b/home/features/desktop/font.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { - home.packages = with pkgs; [ recursive noto-fonts-cjk noto-fonts-emoji ]; + home.packages = with pkgs; [ recursive noto-fonts-cjk-sans noto-fonts-emoji ]; fontProfiles = { enable = true; monospace = {