Skip to content

Commit 419a15e

Browse files
committed
Various fixes
1 parent fbf4d00 commit 419a15e

File tree

8 files changed

+17
-124
lines changed

8 files changed

+17
-124
lines changed

desktop/home/hyprland.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ in {
128128

129129
monitor = [
130130
# Monitor Name , Mode , Pos, Scale, <other params>
131-
"desc:GIGA-BYTE TECHNOLOGY CO. LTD. M27Q 24290B002448, highrr, 0x0, 1, vrr, 1"
132-
"desc:GIGA-BYTE TECHNOLOGY CO. LTD. M27Q 24290B002445, highrr, auto-right, 1, vrr, 1"
131+
"desc:GIGA-BYTE TECHNOLOGY CO. LTD. M27Q 24290B002445, highrr, 0x0, 1, vrr, 1"
132+
"desc:GIGA-BYTE TECHNOLOGY CO. LTD. M27Q 24290B002448, highrr, auto-right, 1, vrr, 1"
133133
"desc:BOE NE135A1M-NY1, highrr, auto, 1.67, vrr, 1"
134134
", preferred, auto, 1" # Rule for additional monitors
135135
];
@@ -147,6 +147,7 @@ in {
147147
{ class = "OrcaSlicer"; rules = ["suppressevent"]; }
148148
{ class = "org.pulseaudio.pavucontrol"; rules = ["float" "center"]; }
149149
{ title = "Ropuka's Idle Island"; rules = ["float" "persistentsize" "fullscreenstate 0 0"]; }
150+
{ title = "atuin-desktop"; rules = ["float"]; }
150151
];
151152

152153
# Layouts

desktop/hyprland.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
gvfs.enable = true;
2323
# Thumbnail support
2424
tumbler.enable = true;
25+
26+
gnome.gnome-keyring.enable = true;
2527
};
2628

2729
programs = {

home/.private

home/dev.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
home.packages = with pkgs; [
1313
nixpkgs-fmt # Used by the Nix IDE extension
1414
nil # Nix language server
15+
gnuplot
1516

1617
# Languages
1718
gcc

home/neovim.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# - Set up nvim-dap
55
# - Ctrl-backspace deletes the whole word
66
# - TreeSitter? just better directory listing show? (icons, etc.)
7-
# - Integrated terminal
87
# - Copilot by default? maybe with an alias?
98
# - Better git diff view when `:G d`
109
# - Some kind of multi-project support (windows? tabs?) and/or "open as project" default
@@ -15,6 +14,7 @@
1514
# - Fix right-click menu
1615
# - Use lazy loading
1716
# - v within floaterm uses the floaterm command instead
17+
# - conform-nvim for formatting
1818

1919
programs.nixvim = {
2020
enable = true;
@@ -96,7 +96,7 @@
9696

9797
settings = {
9898
# VS-Code like tab completion
99-
keymap.preset = "super-tab";
99+
# keymap.preset = "super-tab";
100100

101101
completion = {
102102
documentation.auto_show = true;
@@ -132,6 +132,8 @@
132132
treesitter = {
133133
enable = true;
134134
settings = {
135+
highlight.enable = true;
136+
indent.enable = true;
135137
parsers = {
136138
bash.enable = true;
137139
c.enable = true;
@@ -192,12 +194,15 @@
192194
settings.keymap_toggle = "<A-Esc>";
193195
};
194196

197+
neo-tree.enable = true;
198+
195199
web-devicons.enable = true; # Telescope dep
196200
};
197201

198202
keymaps = [
199203
{ key = "<C-Up>"; action = "<CMD>move -2<CR>"; }
200204
{ key = "<C-Down>"; action = "<CMD>move +1<CR>"; }
205+
{ key = "<leader>l"; action = "<CMD>Neotree toggle<CR>"; }
201206
];
202207

203208
extraPlugins = with pkgs.vimPlugins; [ vim-airline-themes ];

home/neovim.vim

Lines changed: 0 additions & 118 deletions
This file was deleted.

system/theme.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ in
1919
cursor = {
2020
package = inputs.rose-pine-hyprcursor.packages.${pkgs.system}.default;
2121
name = "BreezX-RosePine-Linux";
22-
size = 48;
22+
size = 64;
2323
};
2424

2525
fonts = {

system/vimrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set nocompatible " This must be first, because it changes other options as side effect
33

44
set autoindent
5+
" set cindent
56
set clipboard^=unnamed,unnamedplus
67
set colorcolumn=80 " Where to put the vertical line
78
set completeopt=menuone,noselect
@@ -30,6 +31,7 @@ set noswapfile " Disable the fucking .swp files
3031
set nowritebackup
3132
set nowrap
3233
set number " Show line numbers
34+
set preserveindent " Try to preserve the indent according to the rest of the file
3335
set ruler " Show where are you in the file
3436
set rnu " Relative line numbers
3537
set scrolloff=3 " 3 Lines around cursor when scrolling

0 commit comments

Comments
 (0)