aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock65
-rw-r--r--flake.nix11
-rw-r--r--font.nix2
-rw-r--r--home.nix1
-rw-r--r--hosts/myrtle/configuration.nix3
-rw-r--r--programs/init.vim1
-rw-r--r--programs/neovim.nix11
-rw-r--r--programs/tmux.nix2
-rw-r--r--services/default.nix1
9 files changed, 77 insertions, 20 deletions
diff --git a/flake.lock b/flake.lock
index 1ea6df4..6e39042 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,6 +40,27 @@
40 "type": "github" 40 "type": "github"
41 } 41 }
42 }, 42 },
43 "nix-github-actions": {
44 "inputs": {
45 "nixpkgs": [
46 "talon",
47 "nixpkgs"
48 ]
49 },
50 "locked": {
51 "lastModified": 1693660503,
52 "narHash": "sha256-B/g2V4v6gjirFmy+I5mwB2bCYc0l3j5scVfwgl6WOl8=",
53 "owner": "nix-community",
54 "repo": "nix-github-actions",
55 "rev": "bd5bdbb52350e145c526108f4ef192eb8e554fa0",
56 "type": "github"
57 },
58 "original": {
59 "owner": "nix-community",
60 "repo": "nix-github-actions",
61 "type": "github"
62 }
63 },
43 "nixos-hardware": { 64 "nixos-hardware": {
44 "locked": { 65 "locked": {
45 "lastModified": 1662714967, 66 "lastModified": 1662714967,
@@ -71,6 +92,22 @@
71 "type": "github" 92 "type": "github"
72 } 93 }
73 }, 94 },
95 "nixpkgs_2": {
96 "locked": {
97 "lastModified": 1698318101,
98 "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
99 "owner": "NixOS",
100 "repo": "nixpkgs",
101 "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
102 "type": "github"
103 },
104 "original": {
105 "owner": "NixOS",
106 "ref": "nixos-unstable",
107 "repo": "nixpkgs",
108 "type": "github"
109 }
110 },
74 "prompt": { 111 "prompt": {
75 "inputs": { 112 "inputs": {
76 "nixpkgs": [ 113 "nixpkgs": [
@@ -98,9 +135,29 @@
98 "nixos-hardware": "nixos-hardware", 135 "nixos-hardware": "nixos-hardware",
99 "nixpkgs": "nixpkgs", 136 "nixpkgs": "nixpkgs",
100 "prompt": "prompt", 137 "prompt": "prompt",
138 "talon": "talon",
101 "vim-colors-plain": "vim-colors-plain" 139 "vim-colors-plain": "vim-colors-plain"
102 } 140 }
103 }, 141 },
142 "talon": {
143 "inputs": {
144 "nix-github-actions": "nix-github-actions",
145 "nixpkgs": "nixpkgs_2"
146 },
147 "locked": {
148 "lastModified": 1701208467,
149 "narHash": "sha256-1xt+pieI5N1muLQ3NVuar9yl/YpkWX4/2+LPdhPC31Y=",
150 "owner": "nix-community",
151 "repo": "talon-nix",
152 "rev": "75a4a73b457ccbb44229dc9a5ec97c2ca46da065",
153 "type": "github"
154 },
155 "original": {
156 "owner": "nix-community",
157 "repo": "talon-nix",
158 "type": "github"
159 }
160 },
104 "vim-colors-plain": { 161 "vim-colors-plain": {
105 "inputs": { 162 "inputs": {
106 "nixpkgs": [ 163 "nixpkgs": [
@@ -108,11 +165,11 @@
108 ] 165 ]
109 }, 166 },
110 "locked": { 167 "locked": {
111 "lastModified": 1662030705, 168 "lastModified": 1702647482,
112 "narHash": "sha256-eMPhWbybSTbf109A53Gmim6dGt7NwRwCfVbRXMIIEEo=", 169 "narHash": "sha256-HLDqIfRjzb3YAdpjBW7iN2YCWWxSkTgu+MzKV5+H/WQ=",
113 "ref": "refs/heads/master", 170 "ref": "refs/heads/master",
114 "rev": "b381e6949ccd13b44fcab7b67e91dec2bb37deb2", 171 "rev": "bfa854ec04e0dab4c69911595d0653a34f626f1d",
115 "revCount": 57, 172 "revCount": 58,
116 "type": "git", 173 "type": "git",
117 "url": "https://git.peppe.rs/vim/vim-colors-plain" 174 "url": "https://git.peppe.rs/vim/vim-colors-plain"
118 }, 175 },
diff --git a/flake.nix b/flake.nix
index d659c3f..f57748d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,15 +10,8 @@
10 url = "github:nix-community/home-manager"; 10 url = "github:nix-community/home-manager";
11 inputs.nixpkgs.follows = "nixpkgs"; 11 inputs.nixpkgs.follows = "nixpkgs";
12 }; 12 };
13 # home-manager = {
14 # url = "path:/home/np/code/home-manager";
15 # inputs.nixpkgs.follows = "nixpkgs";
16 # };
17 13
18 # statix = { 14 talon.url = "github:nix-community/talon-nix";
19 # url = "git+https://git.peppe.rs/languages/statix";
20 # inputs.nixpkgs.follows = "nixpkgs";
21 # };
22 15
23 prompt = { 16 prompt = {
24 url = "git+https://git.peppe.rs/cli/prompt"; 17 url = "git+https://git.peppe.rs/cli/prompt";
@@ -46,6 +39,7 @@
46 , prompt 39 , prompt
47 , better-text-objs 40 , better-text-objs
48 , vim-colors-plain 41 , vim-colors-plain
42 , talon
49 , ... 43 , ...
50 } @ inputs: { 44 } @ inputs: {
51 45
@@ -54,6 +48,7 @@
54 prompt = prompt.overlay; 48 prompt = prompt.overlay;
55 better-text-objs = better-text-objs.overlay; 49 better-text-objs = better-text-objs.overlay;
56 vim-colors-plain = vim-colors-plain.overlay; 50 vim-colors-plain = vim-colors-plain.overlay;
51 talon = talon.overlays.default;
57 }; 52 };
58 53
59 nixosConfigurations = { 54 nixosConfigurations = {
diff --git a/font.nix b/font.nix
index 02425b1..74afcdd 100644
--- a/font.nix
+++ b/font.nix
@@ -1,3 +1,3 @@
1{ 1{
2 name = "CommitMono"; 2 name = "Nerd Input";
3} 3}
diff --git a/home.nix b/home.nix
index 7f73e46..6500216 100644
--- a/home.nix
+++ b/home.nix
@@ -88,6 +88,7 @@
88 # input 88 # input
89 xinput_calibrator 89 xinput_calibrator
90 libinput 90 libinput
91 talon
91 92
92 # meta 93 # meta
93 nixpkgs-review 94 nixpkgs-review
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index 09da894..069425f 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -53,6 +53,7 @@
53 prompt 53 prompt
54 better-text-objs 54 better-text-objs
55 vim-colors-plain 55 vim-colors-plain
56 talon
56 ]; 57 ];
57 58
58 environment = { 59 environment = {
@@ -123,7 +124,7 @@
123 }; 124 };
124 sensor.iio.enable = true; # enable screen autorotate 125 sensor.iio.enable = true; # enable screen autorotate
125 asus.battery = { 126 asus.battery = {
126 chargeUpto = 100; 127 chargeUpto = 80;
127 }; 128 };
128 }; 129 };
129 130
diff --git a/programs/init.vim b/programs/init.vim
index 8336db6..c62f419 100644
--- a/programs/init.vim
+++ b/programs/init.vim
@@ -176,4 +176,5 @@ lua << EOF
176require 'lsp' 176require 'lsp'
177require 'treesitter' 177require 'treesitter'
178require 'completions' 178require 'completions'
179require 'leap'
179EOF 180EOF
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 9585e37..0430868 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -13,7 +13,7 @@
13 withPython3 = true; 13 withPython3 = true;
14 extraPackages = with pkgs; [ 14 extraPackages = with pkgs; [
15 # gcc 15 # gcc
16 # python37Packages.yapf 16 python311Packages.yapf
17 # hlint 17 # hlint
18 # ocamlformat 18 # ocamlformat
19 ]; 19 ];
@@ -41,17 +41,16 @@
41 # syntax 41 # syntax
42 rust-vim 42 rust-vim
43 haskell-vim 43 haskell-vim
44 elm-vim
45 vim-nix 44 vim-nix
46 vimtex
47 45
48 # handy 46 # handy
49 vim-gitgutter
50 tabular 47 tabular
51 emmet-vim
52 vimwiki
53 fzf-vim 48 fzf-vim
49
50 # motion
51 leap-nvim
54 ] ++ [ 52 ] ++ [
53 # own
55 pkgs.better-text-objs 54 pkgs.better-text-objs
56 pkgs.vim-colors-plain 55 pkgs.vim-colors-plain
57 ]; 56 ];
diff --git a/programs/tmux.nix b/programs/tmux.nix
index f061997..43778dd 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -72,6 +72,7 @@ in
72 set escape-time 20 72 set escape-time 20
73 set -g mouse on 73 set -g mouse on
74 74
75
75 set -g base-index 1 76 set -g base-index 1
76 setw -g pane-base-index 1 77 setw -g pane-base-index 1
77 78
@@ -113,6 +114,7 @@ in
113 bind-key -T copy-mode-vi v send-keys -X begin-selection 114 bind-key -T copy-mode-vi v send-keys -X begin-selection
114 bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c " 115 bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c "
115 bind-key -T copy-mode-vi r send-keys -X rectangle-toggle 116 bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
117 bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "xclip -i -sel p -f | xclip -i -sel c "
116 bind P paste-buffer 118 bind P paste-buffer
117 119
118 set-window-option -g allow-rename off 120 set-window-option -g allow-rename off
diff --git a/services/default.nix b/services/default.nix
index b2a39bb..0a3977d 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -16,6 +16,7 @@
16 16
17 services = { 17 services = {
18 lorri.enable = true; 18 lorri.enable = true;
19 syncthing.enable = true;
19 gpg-agent = { 20 gpg-agent = {
20 enable = true; 21 enable = true;
21 defaultCacheTtl = 60 * 60 * 24 * 7; 22 defaultCacheTtl = 60 * 60 * 24 * 7;