Compare commits

...
9 Commits
Author SHA1 Message Date
Jeremy Janella d3ca83f83f color 2026-11-06 20:27:55 -05:00
jjanella 2b0decd620 just 2026-11-06 20:19:34 -05:00
jjanella f7cbec885b just 2026-11-06 18:28:10 -05:00
Jeremy Janella 492357022e updated x11 ssh config 2026-10-31 00:05:10 -04:00
jjanella fea98efeba c conf 2026-10-30 02:23:11 -04:00
Jeremy Janella 281175418d sshfs 2026-10-26 14:39:59 -04:00
Jeremy Janella 0e4944edad sshfs 2026-10-26 14:39:15 -04:00
Jeremy Janella f1b6a637aa nvim fix 2026-10-23 20:09:29 -04:00
Jeremy Janella 1f9dc369a6 nix update 2026-10-23 19:10:39 -04:00
13 changed files with 167 additions and 31 deletions
+1 -1
View File
@@ -1 +1 @@
sudo nixos-rebuild build-vm --flake .#$(hostname) nixos-rebuild build-vm --flake .#$(hostname)
+14 -18
View File
@@ -31,10 +31,6 @@
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
gamescopeSession.enable = true; gamescopeSession.enable = true;
}; };
programs.neovim = {
enable = true;
defaultEditor = true;
};
@@ -193,8 +189,8 @@
#", Print, exec, grimblast --freeze copy area" #", Print, exec, grimblast --freeze copy area"
#"SHIFT, Print, exec, grimblast copy screen" #"SHIFT, Print, exec, grimblast copy screen"
", Print, exec, mkdir -p ~/Pictures/Screenshots && grimblast --freeze copy area ~/Pictures/Screenshots/$(date +%Y-%m-%d_%H-%M-%S).png" ", Print, exec, grimblast --freeze copysave area ~/screenshot.png"
"$mod, Print, exec, mkdir -p ~/Pictures/Screenshots && grimblast save screen ~/Pictures/Screenshots/$(date +%Y-%m-%d_%H-%M-%S).png" "$mod, Print, exec, grimblast copysave screen ~/screenshot.png"
"$mod SHIFT, Escape, exec, systemctl suspend" "$mod SHIFT, Escape, exec, systemctl suspend"
]; ];
@@ -309,17 +305,6 @@
}; };
}; };
programs.neovim = { # Configure nvim
enable = true;
extraConfig = ''
set number relativenumber
set tabstop=2
set softtabstop=2
set shiftwidth=2
set expandtab
set cc=80
'';
};
programs.vscode = { # Configure vscodium programs.vscode = { # Configure vscodium
enable = true; enable = true;
package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.vscodium; # i just want the vscode-dark-2026 theme package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.vscodium; # i just want the vscode-dark-2026 theme
@@ -399,13 +384,21 @@
gdb gdb
tldr tldr
rust-analyzer rust-analyzer
cargo
rustc
pyright
ruff
clang-tools
bash-language-server
shellcheck
shfmt
]; ];
}; };
# Use https://search.nixos.org/ to find more packages (and options). # Use https://search.nixos.org/ to find more packages (and options).
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
firefox firefox
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.neovim neovim
wget wget
gnome-disk-utility gnome-disk-utility
dunst dunst
@@ -432,6 +425,7 @@
adwaita-icon-theme gnome-themes-extra adwaita-icon-theme gnome-themes-extra
networkmanagerapplet pavucontrol brightnessctl networkmanagerapplet pavucontrol brightnessctl
wl-clipboard grim slurp grimblast nautilus wl-clipboard grim slurp grimblast nautilus
just
]; ];
@@ -443,6 +437,8 @@
environment.sessionVariables = { environment.sessionVariables = {
SUDO_EDITOR = "nvim"; SUDO_EDITOR = "nvim";
EDITOR = "nvim";
VISUAL = "nvim";
}; };
hardware.bluetooth = { hardware.bluetooth = {
Generated
+21 -4
View File
@@ -37,13 +37,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-2605": {
"locked": { "locked": {
"lastModified": 1792502884, "lastModified": 1793183032,
"narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=", "narHash": "sha256-56mFMf8heLNfYhcgbrh4GpN5x+G9JOfTFXZC3n6w0qM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", "rev": "08d3a97586f6b6343b3b5e799980773629432610",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1793110635,
"narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -57,6 +73,7 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-2605": "nixpkgs-2605",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
+5 -4
View File
@@ -11,9 +11,10 @@
}; };
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-2605.url = "github:nixos/nixpkgs/nixos-26.05";
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs: { outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2605, home-manager, ... }@inputs: {
nixosConfigurations."alien" = nixpkgs.lib.nixosSystem { nixosConfigurations."alien" = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
@@ -25,7 +26,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama; ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama;
neovim = nixpkgs-unstable.legacyPackages.${prev.system}.neovim; neovim = nixpkgs-2605.legacyPackages.${prev.system}.neovim;
}) })
]; ];
} }
@@ -42,7 +43,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama; ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama;
neovim = nixpkgs-unstable.legacyPackages.${prev.system}.neovim; neovim = nixpkgs-2605.legacyPackages.${prev.system}.neovim;
}) })
]; ];
} }
@@ -59,7 +60,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama; ollama = nixpkgs-unstable.legacyPackages.${prev.system}.ollama;
neovim = nixpkgs-unstable.legacyPackages.${prev.system}.neovim; neovim = nixpkgs-2605.legacyPackages.${prev.system}.neovim;
}) })
]; ];
} }
+29
View File
@@ -0,0 +1,29 @@
default:
@just --list
upgrade *message:
just test
just commit {{message}}
just rebuild
rebuild:
sudo nixos-rebuild switch --flake .#$(hostname)
build-vm:
nixos-rebuild build-vm --flake .#$(hostname)
update:
nix flake update
gc:
sudo nix-collect-garbage -d
test:
sudo nixos-rebuild build --flake .#$(hostname)
commit *message:
git add -u .
git commit -m "{{message}}"
git pull --rebase
git push
+8
View File
@@ -26,5 +26,13 @@
xdg.configFile."nvim/lua/config/keymaps.lua".source = ./nvim/lua/config/keymaps.lua; xdg.configFile."nvim/lua/config/keymaps.lua".source = ./nvim/lua/config/keymaps.lua;
xdg.configFile."nvim/lua/config/autocmds.lua".source = ./nvim/lua/config/autocmds.lua; xdg.configFile."nvim/lua/config/autocmds.lua".source = ./nvim/lua/config/autocmds.lua;
xdg.configFile."nvim/lua/plugins/example.lua".source = ./nvim/lua/plugins/example.lua; xdg.configFile."nvim/lua/plugins/example.lua".source = ./nvim/lua/plugins/example.lua;
xdg.configFile."nvim/lua/plugins/bash.lua".source = ./nvim/lua/plugins/bash.lua;
xdg.configFile."nvim/lua/plugins/clangd.lua".source = ./nvim/lua/plugins/clangd.lua;
xdg.configFile."nvim/lua/plugins/img-clip.lua".source = ./nvim/lua/plugins/img-clip.lua;
xdg.configFile."nvim/lua/plugins/colorscheme.lua".source = ./nvim/lua/plugins/colorscheme.lua;
xdg.configFile."clangd/config.yaml".text = ''
CompileFlags:
Compiler: gcc
'';
}; };
} }
+2
View File
@@ -19,6 +19,8 @@ require("lazy").setup({
{ "LazyVim/LazyVim", import = "lazyvim.plugins" }, { "LazyVim/LazyVim", import = "lazyvim.plugins" },
{ import = "lazyvim.plugins.extras.lang.typst" }, { import = "lazyvim.plugins.extras.lang.typst" },
{ import = "lazyvim.plugins.extras.lang.rust" }, { import = "lazyvim.plugins.extras.lang.rust" },
{ import = "lazyvim.plugins.extras.lang.python" },
{ import = "lazyvim.plugins.extras.lang.clangd" },
{ import = "plugins" }, { import = "plugins" },
}, },
defaults = { defaults = {
+38
View File
@@ -0,0 +1,38 @@
return {
{
"nvim-treesitter/nvim-treesitter",
opts = function(_, opts)
if type(opts.ensure_installed) == "table" then
vim.list_extend(opts.ensure_installed, { "bash" })
end
end,
},
{
"neovim/nvim-lspconfig",
opts = {
servers = {
bashls = {
filetypes = { "sh", "bash", "zsh" },
},
},
},
},
{
"stevearc/conform.nvim",
opts = {
formatters_by_ft = {
sh = { "shfmt" },
bash = { "shfmt" },
},
},
},
{
"mfussenegger/nvim-lint",
opts = {
linters_by_ft = {
sh = { "shellcheck" },
bash = { "shellcheck" },
},
},
},
}
+21
View File
@@ -0,0 +1,21 @@
return {
{
"neovim/nvim-lspconfig",
opts = {
servers = {
clangd = {
cmd = {
"clangd",
"--background-index",
"--clang-tidy",
"--header-insertion=iwyu",
"--completion-style=detailed",
"--function-arg-placeholders",
"--fallback-style=llvm",
"--query-driver=/etc/profiles/per-user/*/bin/gcc,/etc/profiles/per-user/*/bin/g++,/run/current-system/sw/bin/gcc,/run/current-system/sw/bin/g++,/nix/store/*/bin/gcc,/nix/store/*/bin/g++",
},
},
},
},
},
}
+7
View File
@@ -0,0 +1,7 @@
return {
{ "Mofiqul/vscode.nvim" },
{
"LazyVim/LazyVim",
opts = { colorscheme = "vscode" },
},
}
+19
View File
@@ -0,0 +1,19 @@
return {
{
"HakonHarnes/img-clip.nvim",
event = "VeryLazy",
opts = {
default = {
embed_image_as_base64 = false,
prompt_for_file_name = false,
drag_and_drop = {
insert_mode = true,
},
use_absolute_path = true,
},
},
keys = {
{ "<leader>p", "<cmd>PasteImage<cr>", desc = "Paste image from system clipboard" },
},
},
}
-1
View File
@@ -1,2 +1 @@
nix flake update
sudo nixos-rebuild switch --flake .#$(hostname) sudo nixos-rebuild switch --flake .#$(hostname)
+2 -3
View File
@@ -2,7 +2,7 @@
{ {
imports = [ ./nvim.nix ]; imports = [ ./nvim.nix ];
environment.systemPackages = with pkgs; [ tree ]; environment.systemPackages = with pkgs; [ tree sshfs ];
programs.ssh.extraConfig = '' programs.ssh.extraConfig = ''
Host rocky Host rocky
@@ -16,8 +16,6 @@
Host teach Host teach
HostName teach.scinet.utoronto.ca HostName teach.scinet.utoronto.ca
User lcl_uotcscd60s2180 User lcl_uotcscd60s2180
ForwardX11 yes
ForwardX11Trusted yes
SetEnv TERM=xterm-256color SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519 IdentityFile ~/.ssh/id_ed25519
@@ -25,6 +23,7 @@
Hostname janel.la Hostname janel.la
User jeremy User jeremy
ForwardX11Trusted yes ForwardX11Trusted yes
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519 IdentityFile ~/.ssh/id_ed25519
Host predator Host predator