aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock44
-rw-r--r--flake.nix14
-rw-r--r--home.nix3
-rw-r--r--hosts/myrtle/configuration.nix2
-rw-r--r--programs/neovim.nix3
-rw-r--r--scripts/default.nix17
-rw-r--r--services/dunst.nix2
7 files changed, 83 insertions, 2 deletions
diff --git a/flake.lock b/flake.lock
index 0f94912..b38c7fc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
1{ 1{
2 "nodes": { 2 "nodes": {
3 "better-text-objs": {
4 "inputs": {
5 "nixpkgs": [
6 "nixpkgs"
7 ]
8 },
9 "locked": {
10 "lastModified": 1674354525,
11 "narHash": "sha256-C0Fc7I2S1MGNGKgvGkMzzEyVF3WkRHlj8i+PF0o9tYI=",
12 "ref": "refs/heads/master",
13 "rev": "697b2c8f2415832bae7520a1d802e080363aa84b",
14 "revCount": 5,
15 "type": "git",
16 "url": "https://git.peppe.rs/vim/better-text-objs"
17 },
18 "original": {
19 "type": "git",
20 "url": "https://git.peppe.rs/vim/better-text-objs"
21 }
22 },
3 "fenix": { 23 "fenix": {
4 "inputs": { 24 "inputs": {
5 "nixpkgs": [ 25 "nixpkgs": [
@@ -98,10 +118,12 @@
98 }, 118 },
99 "root": { 119 "root": {
100 "inputs": { 120 "inputs": {
121 "better-text-objs": "better-text-objs",
101 "home-manager": "home-manager", 122 "home-manager": "home-manager",
102 "nixos-hardware": "nixos-hardware", 123 "nixos-hardware": "nixos-hardware",
103 "nixpkgs": "nixpkgs", 124 "nixpkgs": "nixpkgs",
104 "prompt": "prompt" 125 "prompt": "prompt",
126 "vim-colors-plain": "vim-colors-plain"
105 } 127 }
106 }, 128 },
107 "rust-analyzer-src": { 129 "rust-analyzer-src": {
@@ -135,6 +157,26 @@
135 "repo": "flake-utils", 157 "repo": "flake-utils",
136 "type": "github" 158 "type": "github"
137 } 159 }
160 },
161 "vim-colors-plain": {
162 "inputs": {
163 "nixpkgs": [
164 "nixpkgs"
165 ]
166 },
167 "locked": {
168 "lastModified": 1662030705,
169 "narHash": "sha256-eMPhWbybSTbf109A53Gmim6dGt7NwRwCfVbRXMIIEEo=",
170 "ref": "refs/heads/master",
171 "rev": "b381e6949ccd13b44fcab7b67e91dec2bb37deb2",
172 "revCount": 57,
173 "type": "git",
174 "url": "https://git.peppe.rs/vim/vim-colors-plain"
175 },
176 "original": {
177 "type": "git",
178 "url": "https://git.peppe.rs/vim/vim-colors-plain"
179 }
138 } 180 }
139 }, 181 },
140 "root": "root", 182 "root": "root",
diff --git a/flake.nix b/flake.nix
index 0d9692c..6a8b5d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,16 @@
21 inputs.nixpkgs.follows = "nixpkgs"; 21 inputs.nixpkgs.follows = "nixpkgs";
22 }; 22 };
23 23
24 better-text-objs = {
25 url = "git+https://git.peppe.rs/vim/better-text-objs";
26 inputs.nixpkgs.follows = "nixpkgs";
27 };
28
29 vim-colors-plain = {
30 url = "git+https://git.peppe.rs/vim/vim-colors-plain";
31 inputs.nixpkgs.follows = "nixpkgs";
32 };
33
24 }; 34 };
25 35
26 outputs = 36 outputs =
@@ -30,12 +40,16 @@
30 , home-manager 40 , home-manager
31 # , statix 41 # , statix
32 , prompt 42 , prompt
43 , better-text-objs
44 , vim-colors-plain
33 , ... 45 , ...
34 } @ inputs: { 46 } @ inputs: {
35 47
36 overlays = { 48 overlays = {
37 # statix = statix.overlay; 49 # statix = statix.overlay;
38 prompt = prompt.overlay; 50 prompt = prompt.overlay;
51 better-text-objs = better-text-objs.overlay;
52 vim-colors-plain = vim-colors-plain.overlay;
39 }; 53 };
40 54
41 nixosConfigurations = { 55 nixosConfigurations = {
diff --git a/home.nix b/home.nix
index 2cd58a5..6c5fa20 100644
--- a/home.nix
+++ b/home.nix
@@ -68,6 +68,9 @@
68 nixpkgs-fmt 68 nixpkgs-fmt
69 nix-prefetch-scripts 69 nix-prefetch-scripts
70 70
71 # work
72 slack
73 zoom-us
71 ] ++ (import ./scripts { inherit pkgs; }); 74 ] ++ (import ./scripts { inherit pkgs; });
72 75
73 xdg = { 76 xdg = {
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index 2f47776..3bd8c56 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -42,6 +42,8 @@
42 nixpkgs.overlays = with self.overlays; [ 42 nixpkgs.overlays = with self.overlays; [
43 # statix 43 # statix
44 prompt 44 prompt
45 better-text-objs
46 vim-colors-plain
45 ]; 47 ];
46 48
47 environment.systemPackages = with pkgs; [ 49 environment.systemPackages = with pkgs; [
diff --git a/programs/neovim.nix b/programs/neovim.nix
index e593e44..9585e37 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -51,6 +51,9 @@
51 emmet-vim 51 emmet-vim
52 vimwiki 52 vimwiki
53 fzf-vim 53 fzf-vim
54 ] ++ [
55 pkgs.better-text-objs
56 pkgs.vim-colors-plain
54 ]; 57 ];
55 }; 58 };
56} 59}
diff --git a/scripts/default.nix b/scripts/default.nix
index 20808e7..72d0235 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -60,6 +60,21 @@ let
60 fi 60 fi
61 ''; 61 '';
62 62
63 touchscreen = "ELAN9008:00 04F3:2ED6";
64 stylus = "ELAN9008:00 04F3:2ED6 Stylus Pen (0)";
65 portait-transform = builtins.toString [ 0 (-1) 1 1 0 0 0 0 1 ];
66 landscape-transform = builtins.toString [ 0 0 0 0 0 0 0 0 0 ];
67 portrait = pkgs.writeScriptBin "portrait" ''
68 ${pkgs.xorg.xrandr}/bin/xrandr -o left
69 ${pkgs.xorg.xinput}/bin/xinput set-prop "${touchscreen}" --type=float "Coordinate Transformation Matrix" ${portait-transform}
70 ${pkgs.xorg.xinput}/bin/xinput set-prop "${stylus}" --type=float "Coordinate Transformation Matrix" ${portait-transform}
71 '';
72 landscape = pkgs.writeScriptBin "landscape" ''
73 ${pkgs.xorg.xrandr}/bin/xrandr -o normal
74 ${pkgs.xorg.xinput}/bin/xinput set-prop "${touchscreen}" --type=float "Coordinate Transformation Matrix" ${landscape-transform}
75 ${pkgs.xorg.xinput}/bin/xinput set-prop "${stylus}" --type=float "Coordinate Transformation Matrix" ${landscape-transform}
76 '';
77
63in 78in
64[ 79[
65 webcam 80 webcam
@@ -69,4 +84,6 @@ in
69 uploader 84 uploader
70 battery 85 battery
71 tmux-fzf 86 tmux-fzf
87 portrait
88 landscape
72] 89]
diff --git a/services/dunst.nix b/services/dunst.nix
index b8bda7f..c340c3e 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -10,7 +10,7 @@ with theme;
10 enable = true; 10 enable = true;
11 settings = { 11 settings = {
12 global = { 12 global = {
13 font = "Nerd Input 12"; 13 font = "Nerd Input 10";
14 allow_markup = "no"; 14 allow_markup = "no";
15 format = ''%s\n%b''; 15 format = ''%s\n%b'';
16 sort = "yes"; 16 sort = "yes";