Compare commits

..
17 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
Jeremy Janella efe9c8bfb1 env 2026-10-23 19:02:30 -04:00
Jeremy Janella 939949f75a ssh configs 2026-10-23 19:01:00 -04:00
Jeremy Janella a0daf842c9 fixed grim 2026-10-23 10:59:50 -04:00
Jeremy Janella 82bf6f2954 wm changes 2026-10-22 16:54:24 -04:00
Jeremy Janella f4b4f8a065 tldr 2026-10-21 15:44:06 -04:00
jjanella 35bd0282fb docker config 2026-10-20 01:33:45 -04:00
jjanella 55d8a42e8d Merge remote-tracking branch 'origin' 2026-10-19 02:27:18 -04:00
jjanella 4ea4302828 wallpaper 2026-10-19 02:26:53 -04:00
19 changed files with 253 additions and 108 deletions
+4
View File
@@ -42,6 +42,10 @@
]; ];
}; };
virtualisation.docker.daemon.settings = {
data-root = "/home/docker";
};
# systemd.services.heat-room = { # systemd.services.heat-room = {
# description = "Morning room heating"; # description = "Morning room heating";
# after = [ "graphical-session.target" ]; # after = [ "graphical-session.target" ];
+1 -1
View File
@@ -1 +1 @@
sudo nixos-rebuild build-vm --flake .#$(hostname) nixos-rebuild build-vm --flake .#$(hostname)
+30 -32
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;
};
@@ -111,26 +107,30 @@
"XDG_CURRENT_DESKTOP,Hyprland:GNOME" "XDG_CURRENT_DESKTOP,Hyprland:GNOME"
]; ];
cursor = {
inactive_timeout = 3;
};
misc = { misc = {
force_default_wallpaper = 0; force_default_wallpaper = 0;
background_color = "rgb(1e1e1e)"; background_color = "rgb(1e1e1e)";
}; };
general = { general = {
gaps_in = 4; gaps_in = 0;
gaps_out = 8; gaps_out = 0;
border_size = 2; border_size = 0;
"col.active_border" = "rgba(ffffff22)"; "col.active_border" = "rgba(ffffff22)";
"col.inactive_border" = "rgba(ffffff0a)"; "col.inactive_border" = "rgba(ffffff0a)";
}; };
decoration = { decoration = {
rounding = 12; rounding = 0;
shadow = { shadow = {
enabled = true; enabled = false;
range = 20; range = 20;
render_power = 3; render_power = 3;
color = "rgba(00000066)"; color = "rgba(FFFFFFFF)";
}; };
blur.enabled = false; blur.enabled = false;
}; };
@@ -187,9 +187,10 @@
"$mod SHIFT, 8, movetoworkspace, 8" "$mod SHIFT, 8, movetoworkspace, 8"
"$mod SHIFT, 9, movetoworkspace, 9" "$mod SHIFT, 9, movetoworkspace, 9"
", Print, exec, grimblast --freeze copy area" #", Print, exec, grimblast --freeze copy area"
"SHIFT, Print, exec, grimblast copy screen" #"SHIFT, Print, exec, grimblast copy screen"
"$mod, Print, exec, mkdir -p ~/Pictures/Screenshots && grimblast save screen ~/Pictures/Screenshots/$(date +%Y-%m-%d_%H-%M-%S).png" ", Print, exec, grimblast --freeze copysave area ~/screenshot.png"
"$mod, Print, exec, grimblast copysave screen ~/screenshot.png"
"$mod SHIFT, Escape, exec, systemctl suspend" "$mod SHIFT, Escape, exec, systemctl suspend"
]; ];
@@ -211,12 +212,6 @@
", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
]; ];
# monitor = [
# "DP-3, 2560x1440@170, 1440x700, 1"
# "HDMI-A-1, 2560x1440@144, 0x0, 1, transform, 1"
# ];
}; };
}; };
@@ -305,22 +300,11 @@
services.hyprpaper = { services.hyprpaper = {
enable = true; enable = true;
settings = { settings = {
preload = [ "/home/jeremy/nixos/wallpapers/sunset-marfa.png" ]; preload = [ "/home/jeremy/nixos/wallpaper.jpg" ];
wallpaper = [ ", /home/jeremy/nixos/wallpapers/sunset-marfa.png" ]; wallpaper = [ ", /home/jeremy/nixos/wallpaper.jpg" ];
}; };
}; };
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
@@ -398,6 +382,16 @@
thunderbird thunderbird
claude-code claude-code
gdb gdb
tldr
rust-analyzer
cargo
rustc
pyright
ruff
clang-tools
bash-language-server
shellcheck
shfmt
]; ];
}; };
@@ -431,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
]; ];
@@ -442,6 +437,8 @@
environment.sessionVariables = { environment.sessionVariables = {
SUDO_EDITOR = "nvim"; SUDO_EDITOR = "nvim";
EDITOR = "nvim";
VISUAL = "nvim";
}; };
hardware.bluetooth = { hardware.bluetooth = {
@@ -527,6 +524,7 @@
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [ programs.nix-ld.libraries = with pkgs; [
stdenv.cc.cc stdenv.cc.cc
stdenv.cc.cc.lib
zlib zlib
fuse3 fuse3
icu icu
Generated
+21 -4
View File
@@ -37,13 +37,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-2605": {
"locked": { "locked": {
"lastModified": 1787498568, "lastModified": 1793183032,
"narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", "narHash": "sha256-56mFMf8heLNfYhcgbrh4GpN5x+G9JOfTFXZC3n6w0qM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", "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 -2
View File
@@ -10,11 +10,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Optional: Unstable branch for things like Ollama or Hyprland
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 = [
@@ -26,6 +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-2605.legacyPackages.${prev.system}.neovim;
}) })
]; ];
} }
@@ -42,6 +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-2605.legacyPackages.${prev.system}.neovim;
}) })
]; ];
} }
@@ -58,6 +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-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
'';
}; };
} }
+36 -32
View File
@@ -1,39 +1,43 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then if not (vim.uv or vim.loop).fs_stat(lazypath) then
local lazyrepo = "https://github.com/folke/lazy.nvim.git" local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({ vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" }, { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
{ out, "WarningMsg" }, { out, "WarningMsg" },
{ "\nPress any key to exit..." }, { "\nPress any key to exit..." },
}, true, {}) }, true, {})
vim.fn.getchar() vim.fn.getchar()
os.exit(1) os.exit(1)
end end
end end
vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(lazypath)
require("lazy").setup({ require("lazy").setup({
spec = { spec = {
{ "LazyVim/LazyVim", import = "lazyvim.plugins" }, { "LazyVim/LazyVim", import = "lazyvim.plugins" },
{ import = "plugins" }, { import = "lazyvim.plugins.extras.lang.typst" },
}, { import = "lazyvim.plugins.extras.lang.rust" },
defaults = { { import = "lazyvim.plugins.extras.lang.python" },
lazy = false, { import = "lazyvim.plugins.extras.lang.clangd" },
version = false, { import = "plugins" },
}, },
install = { colorscheme = { "tokyonight", "habamax" } }, defaults = {
checker = { enabled = true }, lazy = false,
performance = { version = false,
rtp = { },
disabled_plugins = { install = { colorscheme = { "tokyonight", "habamax" } },
"gzip", checker = { enabled = true },
"tarPlugin", performance = {
"tohtml", rtp = {
"tutor", disabled_plugins = {
"zipPlugin", "gzip",
}, "tarPlugin",
}, "tohtml",
}, "tutor",
"zipPlugin",
},
},
},
}) })
+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" },
},
},
}
+13 -9
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
@@ -10,25 +10,27 @@
User rocky User rocky
ForwardX11 yes ForwardX11 yes
ForwardX11Trusted yes ForwardX11Trusted yes
IdentityFile ~/.ssh/id_ed25519.pub SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
Host scinet Host teach
HostName teach.scinet.utoronto.ca HostName teach.scinet.utoronto.ca
User lcl_uotcscd60s2180 User lcl_uotcscd60s2180
ForwardX11 yes SetEnv TERM=xterm-256color
ForwardX11Trusted yes IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_ed25519.pub
Host node Host node
Hostname janel.la Hostname janel.la
User jeremy User jeremy
ForwardX11Trusted yes ForwardX11Trusted yes
IdentityFile ~/.ssh/id_ed25519.pub SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
Host predator Host predator
Hostname 10.8.0.4 Hostname 10.8.0.4
User jeremy User jeremy
ForwardX11Trusted yes ForwardX11Trusted yes
SetEnv TERM=xterm-256color
ProxyJump node ProxyJump node
Host mathlab Host mathlab
@@ -36,14 +38,16 @@
User janellaj User janellaj
ForwardX11 yes ForwardX11 yes
ForwardX11Trusted yes ForwardX11Trusted yes
IdentityFile ~/.ssh/id_ed25519.pub SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
Host lab Host lab
Hostname it-ia3160-01.utsc-labs.utoronto.ca Hostname it-ia3160-01.utsc-labs.utoronto.ca
User janellaj User janellaj
ForwardX11 yes ForwardX11 yes
ForwardX11Trusted yes ForwardX11Trusted yes
IdentityFile ~/.ssh/id_ed25519.pub IdentityFile ~/.ssh/id_ed25519
SetEnv TERM=xterm-256color
ProxyJump mathlab ProxyJump mathlab
''; '';
+2
View File
@@ -36,6 +36,8 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
services.logind.lidSwitch = "suspend";
home-manager.users.jeremy.wayland.windowManager.hyprland.settings = { home-manager.users.jeremy.wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"eDP-1, 1920x1200@60, 0x0, 1" "eDP-1, 1920x1200@60, 0x0, 1"
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 190 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

+3 -3
View File
@@ -1,11 +1,11 @@
{ {
"layer": "top", "layer": "top",
"position": "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-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" ] "include": [ "~/.config/waybar/modules.jsonc" ]
} }
+3 -13
View File
@@ -9,13 +9,8 @@
"group/left-hidden" : { "group/left-hidden" : {
"orientation": "horizontal", "orientation": "horizontal",
"drawer": {
"transition-duration": 500,
"transition-left-to-right": false,
"click-to-reveal": true
},
"modules" : [ "modules" : [
"custom/arrow-right", "battery", "cpu", "load" "battery", "cpu", "load"
] ]
}, },
@@ -33,13 +28,8 @@
"group/right-hidden" : { "group/right-hidden" : {
"orientation": "horizontal", "orientation": "horizontal",
"drawer": {
"transition-duration": 500,
"transition-left-to-right": true,
"click-to-reveal": true
},
"modules" : [ "modules" : [
"custom/arrow-left", "memory", "temperature" "memory", "temperature"
] ]
}, },
@@ -69,7 +59,7 @@
"empty": "" "empty": ""
}, },
"num-tags": 5, "num-tags": 10,
"on-click": "activate", "on-click": "activate",
"overview-label": "" "overview-label": ""
}, },
+13 -12
View File
@@ -12,9 +12,10 @@
#waybar { #waybar {
font-weight: 700; font-weight: 700;
background: transparent; background: #000000;
font-size: 14px; font-size: 14px;
color: @fg; color: @fg;
min-height: 0;
} }
/* global paddings */ /* global paddings */
@@ -28,12 +29,12 @@
#load, #load,
#backlight, #backlight,
#pulseaudio { #pulseaudio {
padding: 1px 7px; padding: 0px 7px;
} }
#network, #network,
#tray { #tray {
padding: 1px 6px; padding: 0px 6px;
} }
#pulseaudio { #pulseaudio {
@@ -57,15 +58,15 @@
margin: 0 3px; margin: 0 3px;
} }
#right, #right,
#left, #left,
#right-hidden-top, #right-hidden-top,
#left-hidden-top, #left-hidden-top,
#clock { #clock {
padding: 2px 10px; padding: 0px 10px;
border-radius: 15px; border-radius: 0;
background: @module-bg; background: transparent;
border: 1px solid @border; border: none;
} }
#right-hidden-top, #right-hidden-top,
@@ -74,11 +75,11 @@
} }
#right, #left { #right, #left {
margin: 0 8px; margin: 0;
} }
#clock { #clock {
padding: 2px 18px; padding: 0px 18px;
} }
#custom-ctlcenter { #custom-ctlcenter {
@@ -153,7 +154,7 @@ tooltip {
} }
tooltip label { tooltip label {
padding: 3px 10px; padding: 0px 10px;
color: @fg; color: @fg;
font-weight: 700; font-weight: 700;
} }
@@ -172,7 +173,7 @@ menu {
} }
menu > * { menu > * {
padding: 3px 0px; padding: 0px 0px;
min-width: 5px; min-width: 5px;
border-radius: 6px; border-radius: 6px;
} }