diff --git a/common/wallpapers.nix b/common/wallpapers.nix index d00aef2..0ef33fe 100644 --- a/common/wallpapers.nix +++ b/common/wallpapers.nix @@ -7,10 +7,6 @@ rec { url = "https://w.wallhaven.cc/full/jx/wallhaven-jxlwpm.jpg"; sha256 = "sha256-QhkMeInFBk7nEvyvpo0Lg20PmdPBKk8jQLY6vsLfzy4="; }; - mapleleaves = { - url = "https://w.wallhaven.cc/full/8x/wallhaven-8xxqey.jpg"; - sha256 = "sha256-ohax2KzOmRt8JyUXO/7pDcy1EHXCdbfmzKzr9T3/hRk="; - }; kdb = { url = "https://git.kdb424.xyz/kdb424/wallpapers/raw/branch/main/wallhaven-7p3we9.png"; sha256 = "05acf2czadfnxswnqpgx9rsx71mqspmz5kafi3i1d2z191az6inf"; @@ -23,10 +19,6 @@ rec { url = "https://w.wallhaven.cc/full/z8/wallhaven-z87xmg.jpg"; sha256 = "sha256-NklTjeU/mrPCZVYNvxGMR8KrCM/bUVoEYN4FrDnlUO8="; }; - flowerstairs = { - url = "https://w.wallhaven.cc/full/5g/wallhaven-5gpv25.jpg"; - sha256 = "sha256-GOJA5JmW4KPw4UtFAru0JTBG7NUmc9PdmRFu8k9OwU0="; - }; current = italymountains; } diff --git a/flake.lock b/flake.lock index c0a9892..0c11ed9 100644 --- a/flake.lock +++ b/flake.lock @@ -130,6 +130,29 @@ "type": "github" } }, + "beautysh": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "poetry2nix": "poetry2nix", + "utils": "utils" + }, + "locked": { + "lastModified": 1680308980, + "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", + "owner": "lovesegfault", + "repo": "beautysh", + "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", + "type": "github" + }, + "original": { + "owner": "lovesegfault", + "repo": "beautysh", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -279,6 +302,24 @@ "inputs": { "systems": "systems_3" }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -565,11 +606,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { @@ -579,10 +620,62 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "beautysh": "beautysh", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": [ + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1700659845, + "narHash": "sha256-nU3fHWd/YKPtnJ+PVqtooVNlFtkSQIfrsq14wyufUXA=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "796e7391cec5134fd36951d275e7a0809e2107c8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "nixvim", + "beautysh", + "utils" + ], + "nixpkgs": [ + "nixvim", + "beautysh", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658665240, + "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -615,6 +708,7 @@ "nix-index-database": "nix-index-database", "nixos-apple-silicon": "nixos-apple-silicon", "nixpkgs": "nixpkgs_3", + "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix" } @@ -727,6 +821,36 @@ "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": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index bd85468..15749d3 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,10 @@ nixos-apple-silicon.inputs.nixpkgs.follows = "nixpkgs"; nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon"; + nixvim.url = "github:nix-community/nixvim"; + nixvim.inputs.nixpkgs.follows = "nixpkgs"; + nixvim.inputs.pre-commit-hooks.follows = "pre-commit-hooks"; + pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; @@ -37,11 +41,7 @@ outputs = { darwin, - flake-parts, - home-manager, - nix-github-actions, nixpkgs, - pre-commit-hooks, self, ... } @ inputs: let @@ -93,19 +93,12 @@ aarch64-darwin = { minimal-vm = self.nixosConfigurations.darwin-arm-minimal-vm.config.system.build.vm; homeconsole-vm = self.nixosConfigurations.darwin-arm-homeconsole-vm.config.system.build.vm; + default = self.darwinConfigurations.zeus.config.system.build.toplevel; }; x86_64-linux.live-image = self.nixosConfigurations.x86_64-live.config.system.build.isoImage; aarch64-linux.live-image = self.nixosConfigurations.x86_64-live.config.system.build.isoImage; }; - - githubActions = nix-github-actions.lib.mkGithubMatrix { - checks.x86_64-linux = { - nixbox = self.nixosConfigurations.nixbox.config.system.build.toplevel; - thinkpad = self.nixosConfigurations.thinkpad.config.system.build.toplevel; - pre-commit-check = self.checks.x86_64-linux.pre-commit-check; - }; - }; }; perSystem = { diff --git a/home/darwin/default.nix b/home/darwin/default.nix index 0d438d0..888535e 100644 --- a/home/darwin/default.nix +++ b/home/darwin/default.nix @@ -11,6 +11,9 @@ ./launchd.nix ]; + stylix.targets.gnome.enable = false; + stylix.targets.gtk.enable = false; + programs.ssh.includes = ["/Users/willem/.colima/ssh_config"]; home.file.".gnupg/gpg-agent.conf" = { diff --git a/home/packages.nix b/home/packages.nix index fec7e08..4919080 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -48,6 +48,7 @@ in { htop jq mu + nix-tree nix-zsh-completions nixfmt nixpkgs-fmt diff --git a/home/programs/emacs/default.nix b/home/programs/emacs/default.nix index 374246b..1a8d83c 100644 --- a/home/programs/emacs/default.nix +++ b/home/programs/emacs/default.nix @@ -9,7 +9,7 @@ enable = true; - package = pkgs.emacs29; + package = pkgs.emacs29-nox; extraPackages = epkgs: (with epkgs; let diff --git a/nixos/hosts/zeus.nix b/nixos/hosts/zeus.nix index 858c4da..3aea849 100644 --- a/nixos/hosts/zeus.nix +++ b/nixos/hosts/zeus.nix @@ -16,6 +16,9 @@ inputs.stylix.darwinModules.stylix ]; + # build of normal noto emoji fonts fails on darwin + stylix.fonts.emoji.package = pkgs.noto-fonts-emoji-blob-bin; + system.activationScripts.extraActivation.text = '' osascript -e 'tell application "System Events" to tell every desktop to set picture to "${config.stylix.image}"' '';