diff --git a/flake.lock b/flake.lock index 6ca3868..88365bc 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1727805723, - "narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1730229744, + "narHash": "sha256-2W//PmgocN9lplDJ7WoiP9EcrfUxqvtxplCAqlwvquY=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "d70658494391994c7b32e8fe5610dae76737e4df", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -175,11 +175,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1727852635, - "narHash": "sha256-eY0Y5ZDMo5IS+K42kMwAMCLsYHoAgPW3R4UxeGfzP0U=", + "lastModified": 1730823220, + "narHash": "sha256-qQAYFkeoqvMpGj2lwBuAKQpN1mSF5tXRfgGwbQsnO6Y=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "377cf41246ee443c86c4ae48f66f5100038fe158", + "rev": "d64f5c5f3f16383773638dc48e717c17301e30ce", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1727825968, - "narHash": "sha256-7DbbGIAbJesqYEkZh2FaEo5wycZ/cRbvZP6k01Z5+ZM=", + "lastModified": 1730762793, + "narHash": "sha256-1dSHnG7rCtubItTt4Zayj7Z3oZY3b/TQDUcQbdS6ZH4=", "owner": "neovim", "repo": "neovim", - "rev": "2168d772b864fd05109fb4299e409d4bdc1df39d", + "rev": "f5b84c1a44069af70a3f0c3330e7cc25b224ad93", "type": "github" }, "original": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1727707210, - "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", + "lastModified": 1730878299, + "narHash": "sha256-0VIz/3PKaylSIoRdOE07kkT1tMXgqaybXrfIS2Xz+so=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", + "rev": "98e7dba87238e4fa4eac609dc44f07dab40661c4", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1730886862, + "narHash": "sha256-wCZtRGM1NGxq6VG4+TMzfsa4cuG2VJVtowtYuWW5W3g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "90642a0deae927fa911d49d4f7c5616257105141", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727747005, - "narHash": "sha256-2PBox0LkPhxirg1asEIpvfFARjq5KLw0EHPCy4unjPs=", + "lastModified": 1730643484, + "narHash": "sha256-FZN70acnL7V0gfmtLTdsi4J1o51bfaBYDTi3E7b7z3U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9682b2197dabc185fcca802ac1ac21136e48fcc2", + "rev": "4ae2e647537bcdbb82265469442713d066675275", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1d715f8..e96a817 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,6 @@ darwinConfigurations = { macbook = nix-darwin.lib.darwinSystem { - system = "aarch64-darwin"; specialArgs = { inherit inputs; }; modules = [ ./hosts/macbook/configuration.nix diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix index 31f0fe9..c11befc 100644 --- a/hosts/macbook/configuration.nix +++ b/hosts/macbook/configuration.nix @@ -8,7 +8,7 @@ nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.config.allowUnfree = true; - nixpkgs.config.allowBroken = true; + nixpkgs.config.allowBroken = false; networking.hostName = "macbook"; diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 53416b1..89c02f6 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -13,6 +13,7 @@ ../../modules/home-manager/email ../../modules/home-manager/zk ../../modules/home-manager/password-store + ../../modules/home-manager/taskwarrior ]; home.username = "mthomson"; home.homeDirectory = "/Users/mthomson"; @@ -28,9 +29,6 @@ enableZshIntegration = true; # see note on other shells below nix-direnv.enable = true; }; - spotify-player = { - enable = true; - }; java = { enable = true; }; @@ -55,14 +53,11 @@ wireguard-tools kompose inetutils - taskwarrior3 - taskwarrior-tui devenv - _1password + _1password-cli calcurse glow gcc - keepassxc luajit qemu ]; diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix index 3f06c50..a4a12da 100644 --- a/hosts/thinkpad/home.nix +++ b/hosts/thinkpad/home.nix @@ -37,7 +37,7 @@ pavucontrol pasystray networkmanagerapplet - _1password + _1password-cli upower acpi ]; diff --git a/modules/home-manager/keepassxc/default.nix b/modules/home-manager/keepassxc/default.nix deleted file mode 100644 index 6eedfde..0000000 --- a/modules/home-manager/keepassxc/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, config, ... }: - -{ - home.packages = with pkgs; [ - keepassxc - ]; - - # home.sessionPath = [ "${pkgs.keepassxc}/Applications/KeePassXC.app/Contents/MacOS/" ]; -} diff --git a/modules/home-manager/neovim/nvim/lua/plugins/mini.lua b/modules/home-manager/neovim/nvim/lua/plugins/mini.lua index 8350897..c3a629b 100644 --- a/modules/home-manager/neovim/nvim/lua/plugins/mini.lua +++ b/modules/home-manager/neovim/nvim/lua/plugins/mini.lua @@ -41,7 +41,7 @@ return { -- Collection of various small independent plugins/modules require('mini.jump').setup() - require('mini.jump2d').setup() + -- require('mini.jump2d').setup() local files = require('mini.files') files.setup() diff --git a/modules/home-manager/neovim/nvim/lua/plugins/render-markdown.lua b/modules/home-manager/neovim/nvim/lua/plugins/render-markdown.lua new file mode 100644 index 0000000..51761b4 --- /dev/null +++ b/modules/home-manager/neovim/nvim/lua/plugins/render-markdown.lua @@ -0,0 +1,9 @@ +return { + 'MeanderingProgrammer/render-markdown.nvim', + dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins + -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons + ---@module 'render-markdown' + ---@type render.md.UserConfig + opts = {}, +} diff --git a/modules/home-manager/neovim/nvim/lua/plugins/wiki.lua b/modules/home-manager/neovim/nvim/lua/plugins/wiki.lua new file mode 100644 index 0000000..bdca0c7 --- /dev/null +++ b/modules/home-manager/neovim/nvim/lua/plugins/wiki.lua @@ -0,0 +1,6 @@ +return { + 'lervag/wiki.vim', + config = function() + vim.g.wiki_root = '~/wiki' + end +} diff --git a/modules/home-manager/taskwarrior/default.nix b/modules/home-manager/taskwarrior/default.nix index 80740db..4e59871 100644 --- a/modules/home-manager/taskwarrior/default.nix +++ b/modules/home-manager/taskwarrior/default.nix @@ -4,6 +4,7 @@ programs = { taskwarrior = { enable = true; + package = pkgs.taskwarrior3; }; }; }