From 629840f7e66f1c05442c754dac036fd9d7f5f1dc Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Fri, 4 Apr 2025 16:53:42 +0100 Subject: [PATCH] wip --- flakes/rust-dev/flake.lock | 96 -------------------------------- flakes/rust-dev/flake.nix | 35 ------------ home/arrakis/default.nix | 7 --- home/arrakis/monitors.nix | 2 +- home/common/programs/aider.nix | 16 ++++++ home/common/programs/default.nix | 2 + home/common/programs/elixir.nix | 6 ++ 7 files changed, 25 insertions(+), 139 deletions(-) delete mode 100644 flakes/rust-dev/flake.lock delete mode 100644 flakes/rust-dev/flake.nix create mode 100644 home/common/programs/aider.nix create mode 100644 home/common/programs/elixir.nix diff --git a/flakes/rust-dev/flake.lock b/flakes/rust-dev/flake.lock deleted file mode 100644 index 961ca47..0000000 --- a/flakes/rust-dev/flake.lock +++ /dev/null @@ -1,96 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1736320768, - "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs", - "rust": "rust", - "utils": "utils" - } - }, - "rust": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1738463259, - "narHash": "sha256-+5QJpiRpkh1ALvKcMEpPyGwkPZfaynsYF4SFdNW5UfQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "e2bb8c205a069514535f083742c7da8dfb6e02b9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flakes/rust-dev/flake.nix b/flakes/rust-dev/flake.nix deleted file mode 100644 index f24aafb..0000000 --- a/flakes/rust-dev/flake.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - utils.url = "github:numtide/flake-utils"; - rust.url = "github:oxalica/rust-overlay"; - }; - outputs = - { - self, - nixpkgs, - utils, - rust, - }: - utils.lib.eachDefaultSystem ( - system: - - let - overlays = [ (import rust) ]; - pkgs = import nixpkgs { - inherit system overlays; - }; - buildInputs = with pkgs; [ - pkg-config - bacon - openssl - ]; - in - with pkgs; - { - devShells.default = mkShell { - inherit buildInputs; - }; - } - ); -} diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index f8999ee..1b06194 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -34,13 +34,6 @@ ]; windowrulev2 = [ - # ethui-dev - # "workspace 2 silent, class:ethui" - # "float, class:ethui" - # "size 800 800, class:ethui" - # "move 100%-800 100%-800, class:ethui" - # "noinitialfocus, class:ethui" - "noinitialfocus, class:bevy-.*" "float, class:bevy-.*" "size 800 600, class:bevy-.*" diff --git a/home/arrakis/monitors.nix b/home/arrakis/monitors.nix index 36c4805..52c5209 100644 --- a/home/arrakis/monitors.nix +++ b/home/arrakis/monitors.nix @@ -14,7 +14,7 @@ in wayland.windowManager.hyprland.settings = { monitor = [ "eDP-1, preferred, 0x0, 1, bitdepth, 8" - "DP-3, preferred, -320x-1440, 1" + "DP-3, preferred, 0x-2160, 1.2" # "DP-3, 1920x1200, 0x0, 1, mirror, eDP-1" ]; }; diff --git a/home/common/programs/aider.nix b/home/common/programs/aider.nix new file mode 100644 index 0000000..8eedc71 --- /dev/null +++ b/home/common/programs/aider.nix @@ -0,0 +1,16 @@ +{ + lib, + config, + pkgs, + ... +}: +{ + home.packages = with pkgs; [ + aider-chat + ]; + + home.file.".aider.conf.yml".text = '' + code-theme: one-dark + auto-commits: false + ''; +} diff --git a/home/common/programs/default.nix b/home/common/programs/default.nix index f11b6cc..7069053 100644 --- a/home/common/programs/default.nix +++ b/home/common/programs/default.nix @@ -4,10 +4,12 @@ ./zsh.nix ./neovim ./rust.nix + ./elixir.nix ./nodejs.nix ./git ./solidity.nix ./dev.nix + ./aider.nix ]; programs = { diff --git a/home/common/programs/elixir.nix b/home/common/programs/elixir.nix new file mode 100644 index 0000000..5428e50 --- /dev/null +++ b/home/common/programs/elixir.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + elixir_1_18 + ]; +}