Compare commits

...

2 Commits

Author SHA1 Message Date
Nate Anderson
40b6544a78 Move to 25.05 2025-06-08 13:04:55 -06:00
Nate Anderson
77beeaf9f4 Fixed midi kernel param for circuit tracks, fixed chromium flashing in hyprland, update flake 2025-06-03 15:00:59 -06:00
7 changed files with 86 additions and 59 deletions
flake.lockflake.nix
nate-work
dotfiles/helix
modules
home-manager
hypr
nixos
scrappy/modules/apps/firefox

40
flake.lock generated
View File

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1745352209,
"narHash": "sha256-u3vJEzi6zxgG59KXjMR5koERsdKT5nd1OEKCpr6zgn8=",
"lastModified": 1748080874,
"narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
"owner": "catppuccin",
"repo": "nix",
"rev": "6268e50dbb0ac9375e110560395b5dc199e4dfb8",
"rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
"type": "github"
},
"original": {
@ -46,16 +46,16 @@
]
},
"locked": {
"lastModified": 1744743431,
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
"lastModified": 1748665073,
"narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
"rev": "282e1e029cb6ab4811114fc85110613d72771dea",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
@ -78,11 +78,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1745234285,
"narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
"lastModified": 1748929857,
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
"type": "github"
},
"original": {
@ -94,27 +94,27 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1745279238,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
"lastModified": 1749086602,
"narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3",
"rev": "4792576cb003c994bd7cc1edada3129def20b27d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1745234285,
"narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
"lastModified": 1748693115,
"narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
"rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"type": "github"
},
"original": {
@ -131,11 +131,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1745419524,
"narHash": "sha256-oDRzqjH44hOEvJAyA1A+pCp01+rkjEvW1+AXCCvEYNE=",
"lastModified": 1748982388,
"narHash": "sha256-LTeW3PfWqxEFLcqfcG/i+So4IB2HGI8IxZgn/cFamHc=",
"owner": "nix-community",
"repo": "NUR",
"rev": "a5724250ee4c962f1fbfe992061e296955277961",
"rev": "1c764f6eebc40f6db3a3b64a5fc5a192fc2a70e2",
"type": "github"
},
"original": {

View File

@ -2,10 +2,10 @@
description = "NixOS system flake.";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin.url = "github:catppuccin/nix";
@ -72,7 +72,7 @@
home-manager.users.nate = {
imports = [
./nate-work/modules/home-manager/home.nix
catppuccin.homeManagerModules.catppuccin
catppuccin.homeModules.catppuccin
];
};
home-manager.extraSpecialArgs = {

View File

@ -8,6 +8,7 @@ n = "move_char_left" # Maps the 'a' key to the move_char_left command
i = "move_visual_line_down"
e = "move_visual_line_up"
o = "move_char_right"
"S-tab" = "jump_backward"
I = "page_down"
E = "page_up"
@ -43,12 +44,14 @@ C-n = "select_next_sibling"
# Misc
"C-/" = "toggle_comments"
"@" = ":append-output git config get user.email"
[keys.normal."C-space"]
x = ":wbc!"
s = ":w!" # save file
[keys.normal.space]
x = ":write-buffer-close"
X = ":write-quit-all"
o = ":config-open"
c = ["vsplit", ":open llm-chat.md"]
h = "hover"
k = "select_references_to_symbol_under_cursor"
[keys.normal.g]
"/" = "goto_next_buffer"
@ -115,33 +118,18 @@ l = "no_op"
L = "no_op"
C-l = "no_op"
[keys.normal."space"]
h = "hover"
k = "select_references_to_symbol_under_cursor"
[editor]
bufferline = "always"
auto-save = true
line-number = "relative"
cursorline = true
cursorcolumn = true
color-modes = true
text-width = 120
auto-format = true
[editor.statusline]
left = ["mode", "spinner", "version-control"]
center = ["file-name"]
mode.normal = "Normal"
mode.insert = "Insert"
mode.select = "Select"
[editor.indent-guides]
render = true
[editor.lsp]
display-messages = true
display-inlay-hints = false
auto-save = true
bufferline = "always"
color-modes = true # color each mode differently in statusline
completion-timeout = 5
cursorcolumn = true
cursorline = true
indent-heuristic = "tree-sitter"
line-number = "relative"
rulers = [120]
text-width = 120
[editor.cursor-shape]
insert = "bar"
@ -151,6 +139,32 @@ select = "underline"
[editor.file-picker]
hidden = false
[editor.indent-guides]
render = true
[editor.inline-diagnostics]
cursor-line = "error"
other-lines = "error"
prefix-len = 5
max-diagnostics = 1
max-wrap = 30
[editor.lsp]
display-messages = true
display-inlay-hints = true
[editor.soft-wrap]
enable = true
max-wrap = 30
[editor.statusline]
left = ["mode", "file-modification-indicator", "spinner", "version-control"]
center = ["file-name"]
right = ["diagnostics", "selections", "register", "position", "file-encoding"]
mode.normal = "Normal"
mode.insert = "Insert"
mode.select = "Select"
[editor.whitespace.render]
space = "all"
tab = "all"

View File

@ -44,6 +44,7 @@
cursors.enable = false;
kvantum.enable = true;
zsh-syntax-highlighting.enable = true;
mako.enable = false;
};
@ -66,6 +67,7 @@
# Dev Tools
#
helix
vscodium-fhs
unstable.distrobox
unstable.docker_25
docker-compose
@ -136,7 +138,6 @@
#
# Photo / Video
#
davinci-resolve-studio
imv
mpv
ffmpeg
@ -252,7 +253,7 @@
zstyle :omz:plugins:ssh-agent lazy yes
'';
};
initExtra = ''
initContent = ''
eval "$(direnv hook zsh)"
# eval "$(ssh-agent)" >/dev/null
# export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent

View File

@ -189,15 +189,27 @@ in
# allow_dumb_copy = true;
};
misc = {
vfr = true;
# Revert to true when nvidia damage tracking works
vfr = 0;
force_default_wallpaper = 0;
disable_hyprland_logo = true;
};
render = {
explicit_sync = 1;
explicit_sync_kms = 1;
# Revert to ex_sync = 1 and remove sync_kms when nvidia is fixed
explicit_sync = 2;
explicit_sync_kms = 0;
direct_scanout = "no";
};
##
## delete when nvidia damage tracking works (debug & opengl)
##
debug = {
damage_tracking = 0;
};
opengl = {
nvidia_anti_flicker = 0;
# force_introspection = 2;
};
};
wayland.windowManager.hyprland.systemd.variables = ["--all"];

View File

@ -10,7 +10,7 @@
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelParams = [ "acpi_backlight=native" ];
boot.kernelParams = [ "acpi_backlight=native" "snd_seq_midi.output_buffer_size=131072" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];

View File

@ -20,7 +20,7 @@ in
id = 0;
name = "default";
isDefault = true;
extensions = with pkgs; [
extensions.packages = with pkgs; [
nur.repos.rycee.firefox-addons.darkreader
nur.repos.rycee.firefox-addons.keepassxc-browser
nur.repos.crazazy.firefox-addons.ublock-origin