summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock30
-rw-r--r--home/desktops/hyprland/binds.nix93
-rw-r--r--home/desktops/hyprland/wallpaper.nix6
-rw-r--r--home/neovim/init.lua17
-rw-r--r--system/desktop.nix3
5 files changed, 72 insertions, 77 deletions
diff --git a/flake.lock b/flake.lock
index da9240a..c67053a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -210,11 +210,11 @@
]
},
"locked": {
- "lastModified": 1767104570,
- "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
+ "lastModified": 1767619743,
+ "narHash": "sha256-N0kK1JqxIjFl7hPAfhkW6C9AO7feYJUWLPyqJO2VuQQ=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
+ "rev": "a65c04965c841eb01ba401f5162f12bc8d52014f",
"type": "github"
},
"original": {
@@ -607,11 +607,11 @@
]
},
"locked": {
- "lastModified": 1767208067,
- "narHash": "sha256-3FBQZeSwHLNcBbw3iwflg7ealdQ1j8FxIwog6WwxQJE=",
+ "lastModified": 1767570455,
+ "narHash": "sha256-Yw2sx8d41ef79QWvdYP4i4fGNflTlE2zKXSah+AiKIQ=",
"owner": "cynicsketch",
"repo": "nix-mineral",
- "rev": "b0b38893cdb32e92b8c3fae15d1516d5aab0113f",
+ "rev": "22ea24a2b82729c118c2235f068d12151aaf5387",
"type": "github"
},
"original": {
@@ -659,11 +659,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1766902085,
- "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
+ "lastModified": 1767379071,
+ "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
+ "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github"
},
"original": {
@@ -879,11 +879,11 @@
]
},
"locked": {
- "lastModified": 1766894905,
- "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=",
+ "lastModified": 1767499857,
+ "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7",
+ "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
"type": "github"
},
"original": {
@@ -1042,11 +1042,11 @@
]
},
"locked": {
- "lastModified": 1767208624,
- "narHash": "sha256-1+cgt2gincCk3lbRXD+I045CXiOQu+tm3lY8bhxIqqI=",
+ "lastModified": 1767568852,
+ "narHash": "sha256-6s8hL3YX9zAq2T7qvcwwzaEVwc9MEYbW+C2LcAAQfbk=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
- "rev": "9a2a7110171962710038c4da50aaff9e77f33e51",
+ "rev": "350c729b261e6f5529460140a5f0943dd4c5e156",
"type": "github"
},
"original": {
diff --git a/home/desktops/hyprland/binds.nix b/home/desktops/hyprland/binds.nix
index df4ecc0..3266938 100644
--- a/home/desktops/hyprland/binds.nix
+++ b/home/desktops/hyprland/binds.nix
@@ -1,66 +1,67 @@
-{config, ...}: {
+{config, ...}: let
+ mod = "SUPER";
+in {
wayland.windowManager.hyprland.settings = {
# Keybinds
- "$mod" = "SUPER";
bind = [
# Launch programs
- "$mod, W, exec, ${config.default.browser}"
- "$mod, D, exec, ${config.default.appLauncher}"
- "$mod, L, exec, ${config.default.lockScreen}"
- "$mod, Return, exec, ${config.default.terminal}"
+ "${mod}, W, exec, ${config.default.browser}"
+ "${mod}, D, exec, ${config.default.appLauncher}"
+ "${mod}, L, exec, ${config.default.lockScreen}"
+ "${mod}, Return, exec, ${config.default.terminal}"
", Print, exec, grimblast copy area"
# Misc
- "$mod SHIFT, L, exit"
- #"$mod, tab, hyprexpo:expo, toggle"
+ "${mod} SHIFT, L, exit"
+ #"${mod}, tab, hyprexpo:expo, toggle"
# Window operations
- "$mod SHIFT, Q, killactive"
- "$mod SHIFT, SPACE, togglefloating"
- "$mod, F, fullscreen"
- "$mod, J, togglesplit"
+ "${mod} SHIFT, Q, killactive"
+ "${mod} SHIFT, SPACE, togglefloating"
+ "${mod}, F, fullscreen"
+ "${mod}, J, togglesplit"
# Move focus with mod + arrow keys
- "$mod, left, movefocus, l"
- "$mod, right, movefocus, r"
- "$mod, up, movefocus, u"
- "$mod, down, movefocus, d"
+ "${mod}, left, movefocus, l"
+ "${mod}, right, movefocus, r"
+ "${mod}, up, movefocus, u"
+ "${mod}, down, movefocus, d"
# Move window across workspace with mod + arrow keys
- "$mod SHIFT, left, hy3:movewindow, l"
- "$mod SHIFT, right, hy3:movewindow, r"
- "$mod SHIFT, up, hy3:movewindow, u"
- "$mod SHIFT, down, hy3:movewindow, d"
+ "${mod} SHIFT, left, hy3:movewindow, l"
+ "${mod} SHIFT, right, hy3:movewindow, r"
+ "${mod} SHIFT, up, hy3:movewindow, u"
+ "${mod} SHIFT, down, hy3:movewindow, d"
# Switch workspaces with mod + [0-9]
- "$mod, 1, workspace, 1"
- "$mod, 2, workspace, 2"
- "$mod, 3, workspace, 3"
- "$mod, 4, workspace, 4"
- "$mod, 5, workspace, 5"
- "$mod, 6, workspace, 6"
- "$mod, 7, workspace, 7"
- "$mod, 8, workspace, 8"
- "$mod, 9, workspace, 9"
+ "${mod}, 1, workspace, 1"
+ "${mod}, 2, workspace, 2"
+ "${mod}, 3, workspace, 3"
+ "${mod}, 4, workspace, 4"
+ "${mod}, 5, workspace, 5"
+ "${mod}, 6, workspace, 6"
+ "${mod}, 7, workspace, 7"
+ "${mod}, 8, workspace, 8"
+ "${mod}, 9, workspace, 9"
# Move active window to a workspace with mod + SHIFT + [0-9]
- "$mod SHIFT, 1, movetoworkspacesilent, 1"
- "$mod SHIFT, 2, movetoworkspacesilent, 2"
- "$mod SHIFT, 3, movetoworkspacesilent, 3"
- "$mod SHIFT, 4, movetoworkspacesilent, 4"
- "$mod SHIFT, 5, movetoworkspacesilent, 5"
- "$mod SHIFT, 6, movetoworkspacesilent, 6"
- "$mod SHIFT, 7, movetoworkspacesilent, 7"
- "$mod SHIFT, 8, movetoworkspacesilent, 8"
- "$mod SHIFT, 9, movetoworkspacesilent, 9"
- "$mod SHIFT, 0, movetoworkspacesilent, 10"
+ "${mod} SHIFT, 1, movetoworkspacesilent, 1"
+ "${mod} SHIFT, 2, movetoworkspacesilent, 2"
+ "${mod} SHIFT, 3, movetoworkspacesilent, 3"
+ "${mod} SHIFT, 4, movetoworkspacesilent, 4"
+ "${mod} SHIFT, 5, movetoworkspacesilent, 5"
+ "${mod} SHIFT, 6, movetoworkspacesilent, 6"
+ "${mod} SHIFT, 7, movetoworkspacesilent, 7"
+ "${mod} SHIFT, 8, movetoworkspacesilent, 8"
+ "${mod} SHIFT, 9, movetoworkspacesilent, 9"
+ "${mod} SHIFT, 0, movetoworkspacesilent, 10"
# Move to tab
@@ -75,14 +76,14 @@
"LALT, 9, hy3:focustab, index, 09"
"LALT, 0, hy3:focustab, index, 10"
- "$mod SHIFT, B, hy3:makegroup, h"
- "$mod SHIFT, V, hy3:makegroup, v"
- "$mod SHIFT, C, hy3:changegroup, toggletab"
+ "${mod} SHIFT, B, hy3:makegroup, h"
+ "${mod} SHIFT, V, hy3:makegroup, v"
+ "${mod} SHIFT, C, hy3:changegroup, toggletab"
# Scroll through existing workspaces with mod + scroll
- "$mod, mouse_down, workspace, e+1"
- "$mod, mouse_up, workspace, e-1"
+ "${mod}, mouse_down, workspace, e+1"
+ "${mod}, mouse_up, workspace, e-1"
];
bindn = [
@@ -96,8 +97,8 @@
bindm = [
# Move/resize windows with mod + LMB/RMB and dragging
- "$mod, mouse:272, movewindow"
- "$mod, mouse:273, resizewindow"
+ "${mod}, mouse:272, movewindow"
+ "${mod}, mouse:273, resizewindow"
];
binde = [
diff --git a/home/desktops/hyprland/wallpaper.nix b/home/desktops/hyprland/wallpaper.nix
index e8fc861..0a404f5 100644
--- a/home/desktops/hyprland/wallpaper.nix
+++ b/home/desktops/hyprland/wallpaper.nix
@@ -3,8 +3,10 @@
enable = config.desktops.hyprland.enable;
settings = {
- preload = config.theme.wallpaper;
- wallpaper = ",${config.theme.wallpaper}";
+ wallpaper = {
+ monitor = "";
+ path = config.theme.wallpaper;
+ };
splash = false;
};
};
diff --git a/home/neovim/init.lua b/home/neovim/init.lua
index a97feb4..e66e523 100644
--- a/home/neovim/init.lua
+++ b/home/neovim/init.lua
@@ -291,19 +291,10 @@ require('nvim-surround').setup {}
--[[ SYNTAX HIGHLIGHTING ]]--
-require('nvim-treesitter.configs').setup {
- highlight = {
- enable = true,
- disable = function(lang, buf)
- local max_filesize = config.highlight.max_size * 1024
- local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
- if ok and stats and stats.size > max_filesize then
- return true
- end
- end,
- additional_vim_regex_highlighting = true,
- },
-}
+vim.api.nvim_create_autocmd('FileType', {
+ pattern = { '<filetype>' },
+ callback = function() vim.treesitter.start() end,
+})
require('illuminate').configure {
providers = {
diff --git a/system/desktop.nix b/system/desktop.nix
index 525bd50..9c87d85 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -47,7 +47,8 @@ in {
enable = true;
drivers = with pkgs; [
brlaser
- cnijfilter2
+ # FIXME: failes to compile
+ # cnijfilter2
gutenprint
];
};
generated by cgit v1.2.3-freya (git 2.51.1) at 2026-01-09 01:50:18 +0000