diff --git a/flake.lock b/flake.lock index ead20b0..1c6d92f 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1755275010, - "narHash": "sha256-lEApCoWUEWh0Ifc3k1JdVjpMtFFXeL2gG1qvBnoRc2I=", + "lastModified": 1755751773, + "narHash": "sha256-d1H34kko9J5fWrxCVgfa1TkIwdkGt/eDSVopAWenw24=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "7220b01d679e93ede8d7b25d6f392855b81dd475", + "rev": "3a0a38a1e7ac2c4b4150ea37a491fdffdc9c92e1", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755569926, - "narHash": "sha256-s7D28zPHlFWVZ7dDxm0L1o5+t423rMJUfgCMGUeyYSk=", + "lastModified": 1755755322, + "narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "c613ac14f5600033bf84ae75c315d5ce24a0229b", + "rev": "282b4c98de97da6667cb03de4f427371734bc39c", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1755587334, - "narHash": "sha256-aE2gP+mfgRqvKi6R/FkCHzCA5DwbzKKNyAcH67sPuNU=", + "lastModified": 1755752921, + "narHash": "sha256-HfCLZurzFgk5eX0hGmE6LwDrvX/1DF0JGJabywPc3nk=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "01250fb881e459e0bbd221a1207840bcb06dc0ec", + "rev": "f9cfcb07de78a378e0f81fd2876c94cf7242f9f7", "type": "github" }, "original": { @@ -148,11 +148,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1755587675, - "narHash": "sha256-YrEgHsM193suy797ikXRXIlbcm9S/XQW2GUbGlkpixk=", + "lastModified": 1755757723, + "narHash": "sha256-JOTKjMRNYIhc+D9CTQH4R76/d+IL3/rG1MaSeiXOJ88=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "be780465404f36023191f79d8a25cab152f7f51d", + "rev": "9c091755985b2da34afa6616c69bb1410d60dc6a", "type": "github" }, "original": { @@ -175,16 +175,16 @@ ] }, "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "owner": "NuschtOS", "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.8", + "ref": "v0.1.1", "repo": "ixx", "type": "github" } @@ -240,27 +240,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755756304, + "narHash": "sha256-9nv3PhRr+fVFRdG/caDW7HYcF/i+R29XRIBjGdXoNxg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "aa54caffb447fded192133f654411427f71ab069", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1754393734, - "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", + "lastModified": 1755577059, + "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", + "rev": "97eb7ee0da337d385ab015a23e15022c865be75c", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1755541228, - "narHash": "sha256-3PsCEAfZLk3shQNgEH67P6KvhV6bXziewl3HwJ/iaV4=", + "lastModified": 1755741137, + "narHash": "sha256-YnpE/fOL3H8cJZ9by/YmeNhIqOQdKuZRYA1L3+w6WsI=", "owner": "nix-community", "repo": "nixvim", - "rev": "e1e4bb83f1b1193c99971dfde6928e1f60ed4296", + "rev": "91a38e66240c338e683421a4ee3f525d329fc4ad", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1754301638, - "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", + "lastModified": 1755555503, + "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", "owner": "NuschtOS", "repo": "search", - "rev": "a60091045273484c040a91f5c229ba298f8ecc27", + "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b071d8c..9b6025f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Configuration for my macOS laptops and NixOS server"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/master"; flake-parts.url = "github:hercules-ci/flake-parts"; sops-nix = { url = "github:Mic92/sops-nix"; diff --git a/modules/home/default.nix b/modules/home/default.nix index 21f222a..f5fbc32 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -7,14 +7,15 @@ ./atuin.nix ./bash.nix ./bat.nix + ./direnv.nix ./eza.nix ./fish.nix ./fzf.nix ./git.nix - ./direnv.nix ./lazygit.nix ./mise.nix ./neovim + ./opencode.nix ./ripgrep.nix ./ssh.nix ./starship.nix diff --git a/modules/home/opencode.nix b/modules/home/opencode.nix new file mode 100644 index 0000000..d3bca3b --- /dev/null +++ b/modules/home/opencode.nix @@ -0,0 +1,13 @@ +{ + programs.opencode = { + enable = true; + settings = { + theme = "catppuccin"; + formatter = { + mix = { + disabled = true; + }; + }; + }; + }; +} diff --git a/modules/home/starship.nix b/modules/home/starship.nix index 40d8fdb..d46d6d3 100644 --- a/modules/home/starship.nix +++ b/modules/home/starship.nix @@ -7,7 +7,7 @@ command_timeout = 200; format = "[$directory$git_branch]($style)$character"; character = { - error_symbol = "[✗](bold #e64553)"; + error_symbol = "[✗ ](bold #e64553)"; success_symbol = "[❯](bold #40a02b)[❯](bold #df8e1d)[❯](bold #dc8a78)"; }; directory = { diff --git a/modules/packages.nix b/modules/packages.nix index 817573f..d55cbaf 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -3,8 +3,6 @@ with pkgs; [ (callPackage ./bin/open-project.nix {}) age alejandra - autoconf - automake delta docker docker-compose @@ -19,16 +17,9 @@ with pkgs; [ iosevka jq killall - ncurses - nix-ld - nodejs_24 nurl - opencode openssh - pnpm postgresql_17 - prettier - python312 sd sops sqlite