From 9b97c9ac845890718da70b29e7086e314cb437cc Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Wed, 22 Mar 2023 16:20:30 -0400 Subject: [PATCH] update lockfile, fix darwin --- flake.lock | 42 +++++++++---------- flake.nix | 2 + modules/common/applications/kitty.nix | 7 +++- modules/common/default.nix | 9 +--- .../Spoons/Launcher.spoon/init.lua | 1 + modules/nixos/graphical/rofi.nix | 4 ++ 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 50effed..4d929fa 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1678841558, - "narHash": "sha256-rYysvBEPl6swrKivgRq2JWCmfgOAiuMS0TLFOEm9PS8=", + "lastModified": 1679446046, + "narHash": "sha256-CBjVE3Sj7Ls1pffxGavqPXRkaLYy1+O88NzBwNdgNcY=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "4bf99d168a281e6db4da91af2d25922f3790a873", + "rev": "1531f1477881e76c67b123a55f3d44ed7f83a4ba", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678916824, - "narHash": "sha256-YPQAQ0x0wLvbQ/vaEj8o+0hRfbBNR0teTJ6QsG0yzw4=", + "lastModified": 1679067095, + "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", "owner": "nix-community", "repo": "home-manager", - "rev": "c8cb60b8a15c90b2bbc416c182532620602edb48", + "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1678819893, - "narHash": "sha256-lfA6WGdxPsPkBK5Y19ltr5Sn7v7MlT+jpZ4nUgco0Xs=", + "lastModified": 1679262748, + "narHash": "sha256-DQCrrAFrkxijC6haUzOC5ZoFqpcv/tg2WxnyW3np1Cc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7067edc68c035e21780259ed2d26e1f164addaa2", + "rev": "60c1d71f2ba4c80178ec84523c2ca0801522e0a6", "type": "github" }, "original": { @@ -334,11 +334,11 @@ "null-ls-nvim-src": { "flake": false, "locked": { - "lastModified": 1678896738, - "narHash": "sha256-Ah8Wy1C3Cd75vw/8IRrYNZgSYXTgTxZwpABMb2LzW8Q=", + "lastModified": 1679325581, + "narHash": "sha256-ixhy8qgP2GEPqrMdI+GsHzeHxESwhRw6cjf5hcpwP1w=", "owner": "jose-elias-alvarez", "repo": "null-ls.nvim", - "rev": "2fcc10637b325e656d45a760901e1e05170e36c9", + "rev": "13dd1fc13063681ca7e039436c88f6eca7e3e937", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "nur": { "locked": { - "lastModified": 1678915555, - "narHash": "sha256-U4BDXptYZH2j59syOxuAbkpioKxqW+bC3LbJK+Tofw8=", + "lastModified": 1679482366, + "narHash": "sha256-88K2ABCsdsVwq6Go/uEn/fds1fUeeeoixOALjrrUI0Q=", "owner": "nix-community", "repo": "nur", - "rev": "40cbb3e28ea69c29375f6e0d01988caf50244f1f", + "rev": "e9088dc6f9f289fbff984744ad04dccbd5c1f8ac", "type": "github" }, "original": { @@ -365,11 +365,11 @@ "nvim-lspconfig-src": { "flake": false, "locked": { - "lastModified": 1678883048, - "narHash": "sha256-D/KLRg2yenxBX+24njWg2c494hI3uKIcZGhQbk+jg1c=", + "lastModified": 1679319980, + "narHash": "sha256-UQ/Zng1/9rXRnQeAjemA21qfCltmZRq9QekQ0vGYlX8=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "63f4c0082f007d2356df4bc335f55e6d414da89c", + "rev": "0f94c5fded29c0024254259f3d8a0284bfb507ea", "type": "github" }, "original": { @@ -397,11 +397,11 @@ "nvim-treesitter-src": { "flake": false, "locked": { - "lastModified": 1678916699, - "narHash": "sha256-I1uXrvDGHDwv9k1shITQvIGGNCiB7TBeDHRC1cWWd7s=", + "lastModified": 1679482116, + "narHash": "sha256-SofmIKv/zGsocOBEbmzOraTE0GuLDjrJB2gZhKCz8ok=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "fa0644667ea7ee7a72efdb69c471de4953a11019", + "rev": "dbdbd71b41a3627e0f2784eff746ad4366e2a21c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0280f2d..812aa8d 100644 --- a/flake.nix +++ b/flake.nix @@ -201,6 +201,8 @@ buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ]; }; + test = pkgs.mkShell { buildInputs = with pkgs; [ age ]; }; + # Used for cloud and systems development and administration devops = pkgs.mkShell { buildInputs = with pkgs; [ diff --git a/modules/common/applications/kitty.nix b/modules/common/applications/kitty.nix index 95e67df..6e22e04 100644 --- a/modules/common/applications/kitty.nix +++ b/modules/common/applications/kitty.nix @@ -12,8 +12,11 @@ config = lib.mkIf (config.gui.enable && config.kitty.enable) { # Set the Rofi-Systemd terminal for viewing logs - environment.sessionVariables.ROFI_SYSTEMD_TERM = - lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty"; + # Using optionalAttrs because only available in NixOS + environment = { } // lib.attrsets.optionalAttrs + (builtins.hasAttr "sessionVariables" config.environment) { + sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty"; + }; home-manager.users.${config.user} = { diff --git a/modules/common/default.nix b/modules/common/default.nix index fedb3ed..95bb732 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -44,11 +44,6 @@ default = true; }; }; - - # colorscheme = lib.mkOption { - # type = types.attrs; - # description = "Base16 color scheme"; - # }; homePath = lib.mkOption { type = lib.types.path; description = "Path of user's home directory."; @@ -57,7 +52,6 @@ else "/home/${config.user}"); }; - dotfilesPath = lib.mkOption { type = lib.types.path; description = "Path of dotfiles repository."; @@ -95,7 +89,8 @@ ]; # Scans and hard links identical files in the store - auto-optimise-store = true; + # Not working with macOS: https://github.com/NixOS/nix/issues/7273 + auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true; }; diff --git a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua index 57eb477..9c50a1d 100644 --- a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua +++ b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua @@ -90,6 +90,7 @@ function obj:init() self:switch("System Preferences.app") end) self.launcher:bind("", "R", function() + hs.console.clearConsole() hs.reload() end) self.launcher:bind("", "S", function() diff --git a/modules/nixos/graphical/rofi.nix b/modules/nixos/graphical/rofi.nix index a8e09aa..3b4ec9d 100644 --- a/modules/nixos/graphical/rofi.nix +++ b/modules/nixos/graphical/rofi.nix @@ -4,6 +4,10 @@ config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) { + # Set the Rofi-Systemd terminal for viewing logs + environment.sessionVariables.ROFI_SYSTEMD_TERM = + lib.mkIf config.kitty.enable "${pkgs.kitty}/bin/kitty"; + home-manager.users.${config.user} = { home.packages = with pkgs;