diff --git a/client-configuration.nix b/client-configuration.nix index 65ce6ff..108efbd 100644 --- a/client-configuration.nix +++ b/client-configuration.nix @@ -398,13 +398,14 @@ claude-code gdb tldr + rust-analyzer ]; }; # Use https://search.nixos.org/ to find more packages (and options). environment.systemPackages = with pkgs; [ firefox - neovim + inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.neovim wget gnome-disk-utility dunst diff --git a/flake.lock b/flake.lock index 80268c7..0b9147f 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1787498568, - "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", + "lastModified": 1792502884, + "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", + "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d96e409..363aa84 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Optional: Unstable branch for things like Ollama or Hyprland nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; }; @@ -26,6 +25,7 @@ nixpkgs.overlays = [ (final: prev: { ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama; + neovim = nixpkgs-unstable.legacyPackages.${prev.system}.neovim; }) ]; } @@ -42,6 +42,7 @@ nixpkgs.overlays = [ (final: prev: { ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama; + neovim = nixpkgs-unstable.legacyPackages.${prev.system}.neovim; }) ]; } @@ -58,6 +59,7 @@ nixpkgs.overlays = [ (final: prev: { ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama; + neovim = nixpkgs-unstable.legacyPackages.${prev.system}.neovim; }) ]; } diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index 29ce2ac..f19fa03 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -1,39 +1,41 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, - { "\nPress any key to exit..." }, - }, true, {}) - vim.fn.getchar() - os.exit(1) - end + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end end vim.opt.rtp:prepend(lazypath) require("lazy").setup({ - spec = { - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - { import = "plugins" }, - }, - defaults = { - lazy = false, - version = false, - }, - install = { colorscheme = { "tokyonight", "habamax" } }, - checker = { enabled = true }, - performance = { - rtp = { - disabled_plugins = { - "gzip", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, + spec = { + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + { import = "lazyvim.plugins.extras.lang.typst" }, + { import = "lazyvim.plugins.extras.lang.rust" }, + { import = "plugins" }, + }, + defaults = { + lazy = false, + version = false, + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { enabled = true }, + performance = { + rtp = { + disabled_plugins = { + "gzip", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, }) diff --git a/rebuild.sh b/rebuild.sh index d77bb95..29ad04c 100644 --- a/rebuild.sh +++ b/rebuild.sh @@ -1 +1,2 @@ +nix flake update sudo nixos-rebuild switch --flake .#$(hostname) diff --git a/shared-configuration.nix b/shared-configuration.nix index 7b11360..ccb69ae 100644 --- a/shared-configuration.nix +++ b/shared-configuration.nix @@ -12,11 +12,12 @@ ForwardX11Trusted yes IdentityFile ~/.ssh/id_ed25519 - Host scinet + Host teach HostName teach.scinet.utoronto.ca User lcl_uotcscd60s2180 ForwardX11 yes ForwardX11Trusted yes + SetEnv TERM=xterm-256color IdentityFile ~/.ssh/id_ed25519 Host node diff --git a/waybar/config.jsonc b/waybar/config.jsonc index b2fe487..6b29141 100755 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -1,11 +1,11 @@ { "layer": "top", "position": "top", - "margin": "5 0", + "margin": "0 0", - "modules-left" : ["group/left-hidden-top", "group/left"], + "modules-left" : ["group/left"], "modules-center" : ["clock"], - "modules-right" : [ "group/right", "group/right-hidden-top"], + "modules-right" : [ "group/right", "group/left-hidden-top", "group/right-hidden-top"], "include": [ "~/.config/waybar/modules.jsonc" ] } diff --git a/waybar/modules.hyprland.jsonc b/waybar/modules.hyprland.jsonc index af52ea9..525dc5b 100644 --- a/waybar/modules.hyprland.jsonc +++ b/waybar/modules.hyprland.jsonc @@ -9,13 +9,8 @@ "group/left-hidden" : { "orientation": "horizontal", - "drawer": { - "transition-duration": 500, - "transition-left-to-right": false, - "click-to-reveal": true - }, "modules" : [ - "custom/arrow-right", "battery", "cpu", "load" + "battery", "cpu", "load" ] }, @@ -33,13 +28,8 @@ "group/right-hidden" : { "orientation": "horizontal", - "drawer": { - "transition-duration": 500, - "transition-left-to-right": true, - "click-to-reveal": true - }, "modules" : [ - "custom/arrow-left", "memory", "temperature" + "memory", "temperature" ] }, diff --git a/waybar/style.css b/waybar/style.css index 31acba0..5caa15b 100755 --- a/waybar/style.css +++ b/waybar/style.css @@ -12,9 +12,10 @@ #waybar { font-weight: 700; - background: transparent; + background: #000000; font-size: 14px; color: @fg; + min-height: 0; } /* global paddings */ @@ -57,15 +58,15 @@ margin: 0 3px; } -#right, +#right, #left, #right-hidden-top, #left-hidden-top, #clock { padding: 0px 10px; - border-radius: 15px; - background: @module-bg; - border: 1px solid @border; + border-radius: 0; + background: transparent; + border: none; } #right-hidden-top, @@ -74,7 +75,7 @@ } #right, #left { - margin: 0 8px; + margin: 0; } #clock {