diff --git a/flake.lock b/flake.lock index ca7e6050..57ca4f16 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1725377834, - "narHash": "sha256-tqoAO8oT6zEUDXte98cvA1saU9+1dLJQe3pMKLXv8ps=", + "lastModified": 1726524467, + "narHash": "sha256-xkPPPvfHhHK7BNX5ZrQ9N6AIEixCmFzRZHduDf0zv30=", "owner": "nix-community", "repo": "disko", - "rev": "e55f9a8678adc02024a4877c2a403e3f6daf24fe", + "rev": "22ee467a54a3ab7fa9d637ccad5330c6c087e9dc", "type": "github" }, "original": { @@ -124,11 +124,11 @@ ] }, "locked": { - "lastModified": 1725234343, - "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -157,24 +157,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -231,32 +213,11 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1726440980, + "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.05", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager-master": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726036828, - "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "8a1671642826633586d12ac3158e463c7a50a112", + "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "type": "github" }, "original": { @@ -308,11 +269,11 @@ ] }, "locked": { - "lastModified": 1726032244, - "narHash": "sha256-3VvRGPkpBJobQrFD3slQzMAwZlo4/UwxT8933U5tRVM=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "f4f18f3d7229845e1c9d517457b7a0b90a38b728", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -321,27 +282,6 @@ "type": "github" } }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1724561770, - "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -349,11 +289,11 @@ ] }, "locked": { - "lastModified": 1725765290, - "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", + "lastModified": 1726449931, + "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "642275444c5a9defce57219c944b3179bf2adaa9", + "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", "type": "github" }, "original": { @@ -404,11 +344,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725885300, - "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "lastModified": 1726489388, + "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "type": "github" }, "original": { @@ -420,27 +360,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725826545, - "narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-master": { - "locked": { - "lastModified": 1726042813, - "narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", + "lastModified": 1726543036, + "narHash": "sha256-0Kt/XdQ0caFhbop6YZeVWEjVmzVeGiCkHB+cUGx0gDo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "159be5db480d1df880a0135ca0bfed84c2f88353", + "rev": "a2cad4db0b6d352c0bc484f82e48c445f8092778", "type": "github" }, "original": { @@ -450,54 +374,6 @@ "type": "github" } }, - "nixpkgs-rpi4": { - "locked": { - "lastModified": 1695289343, - "narHash": "sha256-IJNCku6+oZmb/xAHxu3U+gsewIlVrRB3689bGLjeO8w=", - "owner": "elohmeier", - "repo": "nixpkgs", - "rev": "2bd04c7d2efbd5c7ce1d626baaa6303eb578dc27", - "type": "github" - }, - "original": { - "owner": "elohmeier", - "repo": "nixpkgs", - "rev": "2bd04c7d2efbd5c7ce1d626baaa6303eb578dc27", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": [ @@ -515,19 +391,25 @@ "home-manager": [ "home-manager" ], - "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch", + "nix-darwin": [ + "nix-darwin" + ], + "nixpkgs": [ + "nixpkgs" + ], + "nuschtosSearch": [ + "nuschtosSearch" + ], "treefmt-nix": [ "treefmt-nix" ] }, "locked": { - "lastModified": 1726000537, - "narHash": "sha256-Y1dEuf2wZkg2rhE8sf73x9K0zknUald4Ia6zXnGEfjg=", + "lastModified": 1726502324, + "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=", "owner": "nix-community", "repo": "nixvim", - "rev": "fc7e9b29271a03459191955f78d4128451b7cd81", + "rev": "2e3083e42509c399b224239f6d7fa17976b18536", "type": "github" }, "original": { @@ -538,18 +420,19 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1724584782, - "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "lastModified": 1726487258, + "narHash": "sha256-Xc6ZorKUI+XxYHuV6QkFoem//yVNReD9feviXztN90A=", "owner": "NuschtOS", "repo": "search", - "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "rev": "6ada92d0d1f0b671464920d817a228810a181971", "type": "github" }, "original": { @@ -592,11 +475,11 @@ ] }, "locked": { - "lastModified": 1723460387, - "narHash": "sha256-mpLILmzXlcn3RZV1gIBNaYjKAeCNEqIjP0Cfcwjg2IY=", + "lastModified": 1726545737, + "narHash": "sha256-MCmcUh2TQD8aWatyOzPQpz0KmRPPdrOT00zDOnJTZiU=", "owner": "elohmeier", "repo": "nvim-config", - "rev": "743bf4b8b8ef08c1f1f25e1088c7f669d32f33b9", + "rev": "f5dceb8141e1452c0ae0097d994b593dc5c475c8", "type": "github" }, "original": { @@ -645,7 +528,6 @@ "git-hooks": "git-hooks", "gitignore": "gitignore", "home-manager": "home-manager", - "home-manager-master": "home-manager-master", "lanzaboote": "lanzaboote", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", @@ -653,13 +535,11 @@ "nixcfg": "nixcfg", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-master": "nixpkgs-master", - "nixpkgs-rpi4": "nixpkgs-rpi4", - "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", + "nuschtosSearch": "nuschtosSearch", "nvim-config": "nvim-config", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "treefmt-nix": "treefmt-nix" } }, @@ -703,21 +583,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 79b1475a..bf36d839 100644 --- a/flake.nix +++ b/flake.nix @@ -40,10 +40,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - home-manager-master = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -83,22 +79,24 @@ nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixpkgs-rpi4.url = "github:elohmeier/nixpkgs/2bd04c7d2efbd5c7ce1d626baaa6303eb578dc27"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-master.url = "github:NixOS/nixpkgs/master"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/master"; nixvim = { url = "github:nix-community/nixvim"; inputs.devshell.follows = "devshell"; inputs.flake-compat.follows = "flake-compat"; inputs.flake-parts.follows = "flake-parts"; inputs.git-hooks.follows = "git-hooks"; - - # intentionally use the tested nixpkgs version from nixvim - # inputs.nixpkgs.follows = "nixpkgs-unstable"; - + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nix-darwin.follows = "nix-darwin"; inputs.treefmt-nix.follows = "treefmt-nix"; inputs.home-manager.follows = "home-manager"; + inputs.nuschtosSearch.follows = "nuschtosSearch"; + }; + nuschtosSearch = { + url = "github:NuschtOS/search"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; }; pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 5c52766a..4404ea80 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -9,7 +9,6 @@ let system: modules: let pkgs = withSystem system ({ pkgs, ... }: pkgs); - pkgsUnstable = withSystem system ({ pkgsUnstable, ... }: pkgsUnstable); in inputs.nix-darwin.lib.darwinSystem { inherit system; @@ -20,7 +19,6 @@ let { _module.args = { pkgs = lib.mkForce pkgs; - pkgsUnstable = lib.mkForce pkgsUnstable; }; } ] ++ modules; @@ -31,30 +29,28 @@ in flake.darwinConfigurations = { mb4 = darwinSystemFor "aarch64-darwin" [ - # inputs.home-manager.darwinModule ( - { pkgs, pkgsUnstable, ... }: + { pkgs, ... }: { - # home-manager.useGlobalPkgs = true; - # home-manager.extraSpecialArgs.pkgsUnstable = pkgsUnstable; - # - # # username must match the one specified in ./orbstack-defaults/orbstack.nix - # home-manager.users.enno = { nixosConfig, pkgs, ... }: { - # home.stateVersion = nixosConfig.system.stateVersion; - # imports = [ - # ]; - # }; + services.nix-daemon.enable = true; - # do not manage nix-daemon/nix.conf - nix.useDaemon = true; + nix = { + package = pkgs.nixVersions.nix_2_24; - # services.nix-daemon.enable = true; - # nix.settings.trusted-users = [ - # "root" - # "enno" - # ]; - # nix.settings.experimental-features = "nix-command flakes"; - # nix.settings.extra-nix-path = "nixpkgs=flake:nixpkgs"; + daemonIOLowPriority = true; + channel.enable = false; + + # defaults from DeterminateSystems/nix-installer + settings = { + always-allow-substitutes = true; + extra-trusted-substituters = "https://cache.flakehub.com"; + extra-trusted-public-keys = "cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM= cache.flakehub.com-4:Asi8qIv291s0aYLyH6IOnr5Kf6+OF14WVjkE6t3xMio= cache.flakehub.com-5:zB96CRlL7tiPtzA9/WKyPkp3A2vqxqgdgyTVNGShPDU= cache.flakehub.com-6:W4EGFwAGgBj3he7c5fNh9NkOXw0PUVaxygCVKeuvaqU= cache.flakehub.com-7:mvxJ2DZVHn/kRxlIaxYNMuDG1OvMckZu32um1TadOR8= cache.flakehub.com-8:moO+OVS0mnTjBTcOUh2kYLQEd59ExzyoW1QgQ8XAARQ= cache.flakehub.com-9:wChaSeTI6TeCuV/Sg2513ZIM9i0qJaYsF+lZCXg0J6o= cache.flakehub.com-10:2GqeNlIp6AKp4EF2MVbE1kBOp9iBSyo0UPR9KoR0o1Y="; + bash-prompt-prefix = "(nix:$name)\040"; + experimental-features = "nix-command flakes"; + extra-nix-path = "nixpkgs=flake:nixpkgs"; + upgrade-nix-store-path-url = "https://install.determinate.systems/nix-upgrade/stable/universal"; + }; + }; programs.gnupg.agent.enable = true; @@ -65,6 +61,7 @@ in upgrade = true; }; brews = [ + "aichat" "btop" "qemu" "tesseract" @@ -76,9 +73,10 @@ in # "libimobiledevice" ]; casks = [ + "activitywatch" + "betterdisplay" "burp-suite" "cleanshot" - # "coolterm" "cursor" "db-browser-for-sqlite" "dbeaver-enterprise" @@ -110,12 +108,13 @@ in "soundsource" "spotify" "stats" + "sublime-text" "transmission" "utm" "visual-studio-code" "vnc-viewer" - "sublime-text" # "amethyst" + # "coolterm" # "losslesscut" # "postman" # "texshop" diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix index 43a27194..f54005ba 100644 --- a/modules/flake/overlays.nix +++ b/modules/flake/overlays.nix @@ -52,7 +52,7 @@ makeFlags = old.makeFlags ++ [ "O_GITSTATUS=1" ]; # fix for darwin, nnn assumes homebrew gsed - patchPhase = '' + patchPhase = final.lib.optionalString final.stdenv.isDarwin '' substituteInPlace src/nnn.c --replace '#define SED "gsed"' '#define SED "${final.gnused}/bin/sed"' ''; })).override diff --git a/modules/home/default.nix b/modules/home/default.nix index 8d0adf38..b38f21f6 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -22,8 +22,8 @@ }; flake.homeConfigurations = { - macos-enno = inputs.home-manager-master.lib.homeManagerConfiguration { - pkgs = import inputs.nixpkgs-unstable { + macos-enno = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = import inputs.nixpkgs { system = "aarch64-darwin"; overlays = [ self.overlays.default @@ -32,25 +32,6 @@ config.allowUnfree = true; }; - extraSpecialArgs = { - pkgsMaster = import inputs.nixpkgs-master { - system = "aarch64-darwin"; - overlays = [ - self.overlays.default - inputs.nvim-config.overlays.default - ]; - config.allowUnfree = true; - }; - pkgsUnstable = import inputs.nixpkgs-unstable { - system = "aarch64-darwin"; - overlays = [ - self.overlays.default - inputs.nvim-config.overlays.default - ]; - config.allowUnfree = true; - }; - }; - modules = [ # self.homeModules.paperless inputs.nix-index-database.hmModules.nix-index diff --git a/modules/home/fish.nix b/modules/home/fish.nix index 83bfdec6..cd0891ba 100644 --- a/modules/home/fish.nix +++ b/modules/home/fish.nix @@ -2,7 +2,6 @@ p@{ config, lib, pkgs, - pkgsUnstable, ... }: @@ -81,10 +80,10 @@ in let # cache vivid output in the store ls_colors_dark = pkgs.runCommandNoCC "ls_colors_dark" { } '' - ${pkgsUnstable.vivid}/bin/vivid generate tokyonight-night > $out + ${pkgs.vivid}/bin/vivid generate tokyonight-night > $out ''; ls_colors_light = pkgs.runCommandNoCC "ls_colors_light" { } '' - ${pkgsUnstable.vivid}/bin/vivid generate ayu > $out + ${pkgs.vivid}/bin/vivid generate ayu > $out ''; # generate tide config into a file containing key-value pairs diff --git a/modules/home/lazygit.nix b/modules/home/lazygit.nix index 2138d7fd..e7e58057 100644 --- a/modules/home/lazygit.nix +++ b/modules/home/lazygit.nix @@ -141,7 +141,7 @@ _: { ]; git = { commit = { - signOff = true; + # signOff = true; }; paging = { colorArg = "always"; diff --git a/modules/home/macos-enno.nix b/modules/home/macos-enno.nix index e810f2ec..6a72d875 100644 --- a/modules/home/macos-enno.nix +++ b/modules/home/macos-enno.nix @@ -17,6 +17,27 @@ stateVersion = "21.11"; }; + home.packages = with pkgs; [ + bat + gh + jless + libfaketime + ptsd-nnn + ripgrep + ]; + + home.file.".aider.conf.yml".source = + let + settings = { + check-update = false; + dirty-commits = false; + lint-cmd = "[python: ruff check]"; + suggest-shell-commands = false; + }; + yamlFormat = pkgs.formats.yaml { }; + in + yamlFormat.generate "aider-config" settings; + programs.nix-index-database.comma.enable = true; services.syncthing.enable = true; diff --git a/modules/home/neovim.nix b/modules/home/neovim.nix index 0a58cc7a..b189edb6 100644 --- a/modules/home/neovim.nix +++ b/modules/home/neovim.nix @@ -1,7 +1,7 @@ -{ pkgsUnstable, ... }: +{ pkgs, ... }: { - home.packages = [ pkgsUnstable.nixvim-full ]; + home.packages = [ pkgs.nixvim-full ]; home.sessionVariables.EDITOR = "nvim"; }