diff --git a/features/desktopish/redshift.nix b/features/desktopish/redshift.nix index 28d4826..b3a76fc 100644 --- a/features/desktopish/redshift.nix +++ b/features/desktopish/redshift.nix @@ -1,5 +1,4 @@ - -{ config, pkgs, ...}: +{ config, pkgs, ... }: # Based on https://nixos.wiki/wiki/Redshift { diff --git a/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix b/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix index 2b4d4ab..9852e43 100644 --- a/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix +++ b/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix @@ -1,2 +1,2 @@ # DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file +import (import ./thunk.nix) diff --git a/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix b/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix index bbf2dc1..b402034 100644 --- a/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix +++ b/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix @@ -1,9 +1,14 @@ # DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; +let + fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then + builtins.fetchTarball + { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else + (import { }).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file +in +fetch json diff --git a/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix b/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix index 2b4d4ab..9852e43 100644 --- a/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix +++ b/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix @@ -1,2 +1,2 @@ # DO NOT HAND-EDIT THIS FILE -import (import ./thunk.nix) \ No newline at end of file +import (import ./thunk.nix) diff --git a/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix b/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix index bbf2dc1..b402034 100644 --- a/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix +++ b/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix @@ -1,9 +1,14 @@ # DO NOT HAND-EDIT THIS FILE -let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: - if !fetchSubmodules && !private then builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; - } else (import {}).fetchFromGitHub { - inherit owner repo rev sha256 fetchSubmodules private; - }; +let + fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then + builtins.fetchTarball + { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else + (import { }).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; json = builtins.fromJSON (builtins.readFile ./github.json); -in fetch json \ No newline at end of file +in +fetch json diff --git a/home/email.nix b/home/email.nix index ceec7db..bfe591e 100644 --- a/home/email.nix +++ b/home/email.nix @@ -1,5 +1,5 @@ { pkgs, ... }: -let +let realName = "Sridhar Ratnakumar"; # IMAP/SMTP settings for standard email servers servers = { @@ -29,10 +29,11 @@ let }; }; }; -in { +in +{ programs.himalaya = { enable = true; - settings = {}; + settings = { }; }; accounts.email.accounts = { proton = servers.protonmail // { @@ -41,7 +42,7 @@ in { himalaya.enable = true; address = "srid@srid.ca"; userName = "hey@srid.ca"; - passwordCommand = "cat /Users/srid/.protonmail.password"; # Temporary password from ProtonMail Bridge, so I don't care + passwordCommand = "cat /Users/srid/.protonmail.password"; # Temporary password from ProtonMail Bridge, so I don't care }; icloud = servers.icloud // { inherit realName; diff --git a/home/neovim.lua b/home/neovim.lua index f01e468..0e8bafe 100644 --- a/home/neovim.lua +++ b/home/neovim.lua @@ -1,15 +1,15 @@ -- ------- -- Library --- ------- + - - ------- -function map(mode, shortcut, command) - vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true }) +function map (mode, shortcut, command) +vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true }) end function nmap(shortcut, command) - map('n', shortcut, command) +map('n', shortcut, command) end function imap(shortcut, command) - map('i', shortcut, command) +map('i', shortcut, command) end -- ------ @@ -32,3 +32,4 @@ vim.opt.tabstop = 2 vim.opt.shiftwidth = 2 vim.opt.expandtab = true + diff --git a/home/neovim.nix b/home/neovim.nix index 38850ca..83dafa6 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -1,7 +1,8 @@ { pkgs, inputs, system, ... }: -let - nvim = inputs.neovim-nightly-overlay.packages.${system}.neovim; -in { +let + nvim = inputs.neovim-nightly-overlay.packages.${system}.neovim; +in +{ programs.neovim = { enable = true; package = nvim; @@ -56,7 +57,7 @@ in { }) # Doom-emacs like experience - { + { plugin = vim-which-key; type = "lua"; # TODO: How to port this to Lua? @@ -68,12 +69,12 @@ in { nnoremap :WhichKey '' nnoremap :WhichKey ',' ]]) - ''; + ''; } # TODO: Don't know how to configure this correctly # nvim-whichkey-setup-lua - { + { plugin = telescope-nvim; type = "lua"; config = '' @@ -81,16 +82,16 @@ in { nmap("fg", ":Telescope live_grep") nmap("fb", ":Telescope buffers") nmap("fh", ":Telescope help_tags") - ''; + ''; } - { + { plugin = telescope-zoxide; type = "lua"; config = '' nmap("fz", ":Telescope zoxide list") - ''; + ''; } - { + { plugin = telescope-file-browser-nvim; type = "lua"; config = '' @@ -115,7 +116,7 @@ in { -- you need to call load_extension, somewhere after setup function: require("telescope").load_extension "file_browser" nmap("fb", ":Telescope file_browser") - ''; + ''; } { @@ -127,7 +128,7 @@ in { theme = 'tokyonight' } } - ''; + ''; } # Buffer tabs @@ -138,7 +139,7 @@ in { require("bufferline").setup{ } nmap("b", ":BufferLineCycleNext") nmap("B", ":BufferLineCyclePrev") - ''; + ''; } # Developing plugins in Haskell @@ -146,7 +147,7 @@ in { # Language support vim-nix - { + { plugin = haskell-vim; type = "lua"; config = '' @@ -158,7 +159,7 @@ in { let g:haskell_enable_typeroles = 1 " to enable highlighting of type roles let g:haskell_enable_static_pointers = 1 " to enable highlighting of `static` ]]) - ''; + ''; } vim-markdown ];