noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-12 22:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

update lockfile, fix darwin

Browse Source
This commit is contained in:
Noah Masur 2023-03-22 16:20:30 -04:00
parent bda59eeb4a
commit 9b97c9ac84
6 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
flake.lock
View File

@ -94,11 +94,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1678841558, "lastModified": 1679446046,
"narHash": "sha256-rYysvBEPl6swrKivgRq2JWCmfgOAiuMS0TLFOEm9PS8=", "narHash": "sha256-CBjVE3Sj7Ls1pffxGavqPXRkaLYy1+O88NzBwNdgNcY=",
"owner": "bandithedoge", "owner": "bandithedoge",
"repo": "nixpkgs-firefox-darwin", "repo": "nixpkgs-firefox-darwin",
"rev": "4bf99d168a281e6db4da91af2d25922f3790a873", "rev": "1531f1477881e76c67b123a55f3d44ed7f83a4ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +176,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1678916824, "lastModified": 1679067095,
"narHash": "sha256-YPQAQ0x0wLvbQ/vaEj8o+0hRfbBNR0teTJ6QsG0yzw4=", "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c8cb60b8a15c90b2bbc416c182532620602edb48", "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,11 +301,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1678819893, "lastModified": 1679262748,
"narHash": "sha256-lfA6WGdxPsPkBK5Y19ltr5Sn7v7MlT+jpZ4nUgco0Xs=", "narHash": "sha256-DQCrrAFrkxijC6haUzOC5ZoFqpcv/tg2WxnyW3np1Cc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7067edc68c035e21780259ed2d26e1f164addaa2", "rev": "60c1d71f2ba4c80178ec84523c2ca0801522e0a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
"null-ls-nvim-src": { "null-ls-nvim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1678896738, "lastModified": 1679325581,
"narHash": "sha256-Ah8Wy1C3Cd75vw/8IRrYNZgSYXTgTxZwpABMb2LzW8Q=", "narHash": "sha256-ixhy8qgP2GEPqrMdI+GsHzeHxESwhRw6cjf5hcpwP1w=",
"owner": "jose-elias-alvarez", "owner": "jose-elias-alvarez",
"repo": "null-ls.nvim", "repo": "null-ls.nvim",
"rev": "2fcc10637b325e656d45a760901e1e05170e36c9", "rev": "13dd1fc13063681ca7e039436c88f6eca7e3e937",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -349,11 +349,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1678915555, "lastModified": 1679482366,
"narHash": "sha256-U4BDXptYZH2j59syOxuAbkpioKxqW+bC3LbJK+Tofw8=", "narHash": "sha256-88K2ABCsdsVwq6Go/uEn/fds1fUeeeoixOALjrrUI0Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "40cbb3e28ea69c29375f6e0d01988caf50244f1f", "rev": "e9088dc6f9f289fbff984744ad04dccbd5c1f8ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +365,11 @@
"nvim-lspconfig-src": { "nvim-lspconfig-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1678883048, "lastModified": 1679319980,
"narHash": "sha256-D/KLRg2yenxBX+24njWg2c494hI3uKIcZGhQbk+jg1c=", "narHash": "sha256-UQ/Zng1/9rXRnQeAjemA21qfCltmZRq9QekQ0vGYlX8=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "63f4c0082f007d2356df4bc335f55e6d414da89c", "rev": "0f94c5fded29c0024254259f3d8a0284bfb507ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +397,11 @@
"nvim-treesitter-src": { "nvim-treesitter-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1678916699, "lastModified": 1679482116,
"narHash": "sha256-I1uXrvDGHDwv9k1shITQvIGGNCiB7TBeDHRC1cWWd7s=", "narHash": "sha256-SofmIKv/zGsocOBEbmzOraTE0GuLDjrJB2gZhKCz8ok=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"rev": "fa0644667ea7ee7a72efdb69c471de4953a11019", "rev": "dbdbd71b41a3627e0f2784eff746ad4366e2a21c",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -201,6 +201,8 @@
buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ]; buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
}; };
test = pkgs.mkShell { buildInputs = with pkgs; [ age ]; };
# Used for cloud and systems development and administration # Used for cloud and systems development and administration
devops = pkgs.mkShell { devops = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [

7
modules/common/applications/kitty.nix
View File

@ -12,8 +12,11 @@
config = lib.mkIf (config.gui.enable && config.kitty.enable) { config = lib.mkIf (config.gui.enable && config.kitty.enable) {
# Set the Rofi-Systemd terminal for viewing logs # Set the Rofi-Systemd terminal for viewing logs
environment.sessionVariables.ROFI_SYSTEMD_TERM = # Using optionalAttrs because only available in NixOS
lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty"; environment = { } // lib.attrsets.optionalAttrs
(builtins.hasAttr "sessionVariables" config.environment) {
sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
};
home-manager.users.${config.user} = { home-manager.users.${config.user} = {

9
modules/common/default.nix
View File

@ -44,11 +44,6 @@
default = true; default = true;
}; };
}; };
# colorscheme = lib.mkOption {
# type = types.attrs;
# description = "Base16 color scheme";
# };
homePath = lib.mkOption { homePath = lib.mkOption {
type = lib.types.path; type = lib.types.path;
description = "Path of user's home directory."; description = "Path of user's home directory.";
@ -57,7 +52,6 @@
else else
"/home/${config.user}"); "/home/${config.user}");
}; };
dotfilesPath = lib.mkOption { dotfilesPath = lib.mkOption {
type = lib.types.path; type = lib.types.path;
description = "Path of dotfiles repository."; description = "Path of dotfiles repository.";
@ -95,7 +89,8 @@
]; ];
# Scans and hard links identical files in the store # 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;
}; };

1
modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua
View File

@ -90,6 +90,7 @@ function obj:init()
self:switch("System Preferences.app") self:switch("System Preferences.app")
end) end)
self.launcher:bind("", "R", function() self.launcher:bind("", "R", function()
hs.console.clearConsole()
hs.reload() hs.reload()
end) end)
self.launcher:bind("", "S", function() self.launcher:bind("", "S", function()

4
modules/nixos/graphical/rofi.nix
View File

@ -4,6 +4,10 @@
config = lib.mkIf (pkgs.stdenv.isLinux && config.services.xserver.enable) { 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-manager.users.${config.user} = {
home.packages = with pkgs; home.packages = with pkgs;