diff --git a/flake.lock b/flake.lock index 766151f..cae47e5 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1709773529, - "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=", + "lastModified": 1710332572, + "narHash": "sha256-7JYT5Qya6QuM2szCrdVcNghoz7ar+ClzaqKJ4cfJaKQ=", "owner": "nix-community", "repo": "disko", - "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b", + "rev": "59e50d4ecbac78701c2f9950ff2b886ac66741ce", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1709784245, - "narHash": "sha256-t1sobS2zj7hD/dZj9aVPipYnskrk+Q7FqAViSqEMLQU=", + "lastModified": 1710334741, + "narHash": "sha256-NCh68CbUuXwmNh9ayCnq+XLpBMGmDcvrVjvM50X0BBA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "673c3faea3a5239f4efe545c4649c2b68501dbe1", + "rev": "a09a6f5c8feb15f4a7b9b3899566d98f1a06d83a", "type": "gitlab" }, "original": { @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1709714234, - "narHash": "sha256-fnuVQqdK48c66EC4mL8t7uLhwsY6JDyn7H5tjRpx9Sg=", + "lastModified": 1710345131, + "narHash": "sha256-hy7eXo6wUI4ug3hBoEB8y+0rWU5PUxEeEBiPQwZPMeQ=", "owner": "viperml", "repo": "nh", - "rev": "3f148b0c7f2d56be65dc55628f6b2e68ee10e231", + "rev": "4e13dc089f898e2b32149b1440f0b9412c2ff5b3", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", + "lastModified": 1709879831, + "narHash": "sha256-PZFXvKm929A3waipt2prRKYlNJvGQiBxWPDn/MIOKWo=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", + "rev": "2499f41a01f1154c5a3b967aabe37d94e6b6d18b", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1709410583, - "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", + "lastModified": 1710123225, + "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", + "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "type": "github" }, "original": { @@ -238,11 +238,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709677081, - "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=", + "lastModified": 1710283656, + "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64", + "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1709711091, - "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=", + "lastModified": 1710195194, + "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", "owner": "mic92", "repo": "sops-nix", - "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc", + "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", "type": "github" }, "original": { diff --git a/home-manager/_mixins/cli/fish.nix b/home-manager/_mixins/cli/fish.nix index be17788..c959625 100644 --- a/home-manager/_mixins/cli/fish.nix +++ b/home-manager/_mixins/cli/fish.nix @@ -3,7 +3,7 @@ let inherit (lib) mkIf; hasPackage = pname: lib.any (p: p ? pname && p.pname == pname) config.home.packages; hasRipgrep = hasPackage "ripgrep"; - hasExa = hasPackage "eza"; + hasEza = hasPackage "eza"; hasNeovim = config.programs.neovim.enable; hasEmacs = config.programs.emacs.enable; hasNeomutt = config.programs.neomutt.enable; @@ -30,11 +30,11 @@ in snr = "sudo nixos-rebuild --flake ."; snrs = "sudo nixos-rebuild --flake . switch"; hm = "home-manager --flake ."; - hms = "home-manager -b bkup --flake .gburd@$(hostmname) switch"; + hms = "home-manager -b bkup --flake .gburd@$(hostname) switch"; nh-ask = "nix run github:viperML/nh -- os switch --ask --nom ."; - ls = mkIf hasExa "eza"; - exa = mkIf hasExa "eza"; + ls = mkIf hasEza "eza"; + exa = mkIf hasEza "eza"; e = mkIf hasEmacs "emacsclient -t"; diff --git a/home-manager/_mixins/console/default.nix b/home-manager/_mixins/console/default.nix index cb8d1d1..ab9092f 100644 --- a/home-manager/_mixins/console/default.nix +++ b/home-manager/_mixins/console/default.nix @@ -77,7 +77,7 @@ enable = true; }; }; - exa = { + eza = { enable = true; enableAliases = true; icons = true; diff --git a/home-manager/_mixins/users/gburd/default.nix b/home-manager/_mixins/users/gburd/default.nix index 5524959..a9e788b 100644 --- a/home-manager/_mixins/users/gburd/default.nix +++ b/home-manager/_mixins/users/gburd/default.nix @@ -75,6 +75,98 @@ load_dotenv = true ''; + file.".config/Code/User/settings.json".text = '' + { + "editor.inlineSuggest.enabled": true, + "editor.fontFamily": "'FiraCode Nerd Font Mono', 'Droid Sans Mono', 'monospace', monospace", + "editor.fontLigatures": true, + } + ''; + + file.".config/Code/User/keybindings.json".text = '' + // Place your key bindings in this file to override the defaults + [ + // allow arrow keys to work in the find widget + { + "key": "right", + "command": "-emacs-mcx.isearchExit" + }, + { + "key": "left", + "command": "-emacs-mcx.isearchExit" + }, + { + "key": "up", + "command": "-emacs-mcx.isearchExit" + }, + { + "key": "down", + "command": "-emacs-mcx.isearchExit" + }, + // allow ctrl+f to find next in the find widget + { + "key": "ctrl+f", + "command": "-emacs-mcx.isearchExit", + "when": "editorFocus && findWidgetVisible" + }, + // allow other stuff to functional normally in the find widget + { + "key": "ctrl+b", + "command": "-emacs-mcx.isearchExit", + "when": "editorFocus && findWidgetVisible" + }, + { + "key": "ctrl+p", + "command": "-emacs-mcx.isearchExit", + "when": "editorFocus && findWidgetVisible" + }, + { + "key": "ctrl+n", + "command": "-emacs-mcx.isearchExit", + "when": "editorFocus && findWidgetVisible" + }, + { + "key": "ctrl+a", + "command": "-emacs-mcx.isearchExit", + "when": "editorFocus && findWidgetVisible" + }, + { + "key": "ctrl+e", + "command": "-emacs-mcx.isearchExit", + "when": "editorFocus && findWidgetVisible" + }, + { + "key": "enter", + "command": "-emacs-mcx.isearchExit" + }, + // allow curly quotes and ellipses characters on mac + { + "key": "alt+shift+[", + "command": "-emacs-mcx.backwardParagraph" + }, + { + "key": "alt+shift+]", + "command": "-emacs-mcx.forwardParagraph" + }, + { + "key": "alt+;", + "command": "-editor.action.blockComment", + "when": "editorTextFocus && !config.emacs-mcx.useMetaPrefixMacCmd && !editorReadonly" + }, + { + "key": "alt+;", + "command": "-emacs-mcx.executeCommands", + "when": "editorFocus && findWidgetVisible && !config.emacs-mcx.useMetaPrefixMacCmd" + }, + // stop backward kill word from adding to clipboard + { + "key": "alt+backspace", + "command": "-emacs-mcx.backwardKillWord", + "when": "editorTextFocus && !config.emacs-mcx.useMetaPrefixMacCmd && !editorReadonly" + } + ] + ''; + # file.".config/sublime-text-2/Local/License.sublime_license".text = # config.sops.secrets.sublime-licenses.text.path; @@ -117,7 +209,7 @@ libva-utils # Terminal VAAPI info lurk # Modern Unix `strace` mdp # Terminal Markdown presenter - moar # Modern Unix `less` + #moar # Modern Unix `less` mtr # Modern Unix `traceroute` netdiscover # Modern Unix `arp` nethogs # Modern Unix `iftop` diff --git a/nixos/_mixins/desktop/vscode.nix b/nixos/_mixins/desktop/vscode.nix index e9b1226..9aacff5 100644 --- a/nixos/_mixins/desktop/vscode.nix +++ b/nixos/_mixins/desktop/vscode.nix @@ -18,14 +18,17 @@ unstable.vscode-extensions.ms-azuretools.vscode-docker unstable.vscode-extensions.ms-python.python unstable.vscode-extensions.ms-python.vscode-pylance + unstable.vscode-extensions.ms-vscode.cmake-tools unstable.vscode-extensions.ms-vscode.cpptools - unstable.vscode-extensions.scalameta.metals - unstable.vscode-extensions.scala-lang.scala + unstable.vscode-extensions.ms-vscode.cpptools-extension-pack unstable.vscode-extensions.ms-vsliveshare.vsliveshare unstable.vscode-extensions.redhat.vscode-yaml unstable.vscode-extensions.ryu1kn.partial-diff + unstable.vscode-extensions.scala-lang.scala + unstable.vscode-extensions.scalameta.metals unstable.vscode-extensions.streetsidesoftware.code-spell-checker unstable.vscode-extensions.timonwong.shellcheck + unstable.vscode-extensions.tuttieee.emacs-mcx unstable.vscode-extensions.vscode-icons-team.vscode-icons unstable.vscode-extensions.yzhang.markdown-all-in-one ] ++ pkgs.unstable.vscode-utils.extensionsFromVscodeMarketplace [