diff options
-rw-r--r-- | hosts/myrtle/configuration.nix | 28 | ||||
-rw-r--r-- | programs/chromium.nix | 5 | ||||
-rw-r--r-- | programs/tmux.nix | 10 | ||||
-rw-r--r-- | scripts/default.nix | 3 |
4 files changed, 22 insertions, 24 deletions
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix index f0bcb81..e3b51de 100644 --- a/hosts/myrtle/configuration.nix +++ b/hosts/myrtle/configuration.nix | |||
@@ -97,7 +97,6 @@ | |||
97 | pulseaudio = { | 97 | pulseaudio = { |
98 | enable = true; | 98 | enable = true; |
99 | package = pkgs.pulseaudioFull; | 99 | package = pkgs.pulseaudioFull; |
100 | # extraConfig = "load-module module-bluetooth-policy auto_switch=2"; | ||
101 | }; | 100 | }; |
102 | bluetooth = { | 101 | bluetooth = { |
103 | enable = true; | 102 | enable = true; |
@@ -110,11 +109,12 @@ | |||
110 | nvidiaBusId = "PCI:1:0:0"; | 109 | nvidiaBusId = "PCI:1:0:0"; |
111 | }; | 110 | }; |
112 | package = config.boot.kernelPackages.nvidiaPackages.latest; | 111 | package = config.boot.kernelPackages.nvidiaPackages.latest; |
113 | # powerManagement = { | 112 | powerManagement = { |
114 | # enable = true; | 113 | enable = true; |
115 | # finegrained = true; | 114 | finegrained = true; |
116 | # }; | 115 | }; |
117 | }; | 116 | }; |
117 | sensor.iio.enable = true; # enable screen autorotate | ||
118 | }; | 118 | }; |
119 | 119 | ||
120 | powerManagement = { | 120 | powerManagement = { |
@@ -122,6 +122,11 @@ | |||
122 | powertop.enable = true; | 122 | powertop.enable = true; |
123 | }; | 123 | }; |
124 | 124 | ||
125 | console = { | ||
126 | font = "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; | ||
127 | keyMap = "us"; | ||
128 | }; | ||
129 | |||
125 | services = { | 130 | services = { |
126 | xserver = { | 131 | xserver = { |
127 | enable = true; | 132 | enable = true; |
@@ -135,15 +140,6 @@ | |||
135 | Option "AllowIndirectGLXProtocol" "off" | 140 | Option "AllowIndirectGLXProtocol" "off" |
136 | Option "TripleBuffer" "on" | 141 | Option "TripleBuffer" "on" |
137 | ''; | 142 | ''; |
138 | # serverLayoutSection = lib.mkAfter '' | ||
139 | # Screen 0 "Screen-nvidia[0]" | ||
140 | # ''; | ||
141 | # config = lib.mkAfter '' | ||
142 | # Section "Screen" | ||
143 | # Identifier "Screen-nvidia[0]" | ||
144 | # Device "Device-nvidia[0]" | ||
145 | # EndSection | ||
146 | # ''; | ||
147 | }; | 143 | }; |
148 | 144 | ||
149 | openssh = { | 145 | openssh = { |
@@ -156,7 +152,8 @@ | |||
156 | enable = true; | 152 | enable = true; |
157 | enableUserService = true; | 153 | enableUserService = true; |
158 | }; | 154 | }; |
159 | supergfxd.enable = true; | 155 | |
156 | supergfxd.enable = false; | ||
160 | 157 | ||
161 | logind.extraConfig = '' | 158 | logind.extraConfig = '' |
162 | HandlePowerKey=suspend | 159 | HandlePowerKey=suspend |
@@ -168,6 +165,7 @@ | |||
168 | notifyCapacity = 20; | 165 | notifyCapacity = 20; |
169 | suspendCapacity = 5; | 166 | suspendCapacity = 5; |
170 | }; | 167 | }; |
168 | |||
171 | touchegg.enable = true; | 169 | touchegg.enable = true; |
172 | }; | 170 | }; |
173 | 171 | ||
diff --git a/programs/chromium.nix b/programs/chromium.nix index 975e721..dcd48f4 100644 --- a/programs/chromium.nix +++ b/programs/chromium.nix | |||
@@ -9,10 +9,11 @@ | |||
9 | extensions = [ | 9 | extensions = [ |
10 | "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere | 10 | "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere |
11 | "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin | 11 | "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin |
12 | "aapbdbdomjkkjkaonfhkkikfgjllcleb" # translate | ||
13 | "aghfnjkcakhmadgdomlmlhhaocbkloab" # just black | 12 | "aghfnjkcakhmadgdomlmlhhaocbkloab" # just black |
14 | "pobhoodpcipjmedfenaigbeloiidbflp" # minimal twitter | ||
15 | "ennpfpdlaclocpomkiablnmbppdnlhoh" # rust search extension | 13 | "ennpfpdlaclocpomkiablnmbppdnlhoh" # rust search extension |
16 | ]; | 14 | ]; |
15 | commandLineArgs = [ | ||
16 | "--force-dark-mode" | ||
17 | ]; | ||
17 | }; | 18 | }; |
18 | } | 19 | } |
diff --git a/programs/tmux.nix b/programs/tmux.nix index 2e73f3e..b66f79e 100644 --- a/programs/tmux.nix +++ b/programs/tmux.nix | |||
@@ -59,18 +59,14 @@ in | |||
59 | { | 59 | { |
60 | programs.tmux = { | 60 | programs.tmux = { |
61 | enable = true; | 61 | enable = true; |
62 | plugins = [ thumbs resurrect ]; | 62 | plugins = [ thumbs ]; |
63 | prefix = "C-t"; | 63 | prefix = "C-t"; |
64 | keyMode = "vi"; | 64 | keyMode = "vi"; |
65 | terminal = "xterm-256color-italic"; | 65 | terminal = "xterm-256color-italic"; |
66 | extraConfig = '' | 66 | extraConfig = '' |
67 | unbind-key C-b | ||
68 | bind-key C-t send-prefix | ||
69 | |||
70 | bind r source-file ~/.config/tmux/tmux.conf | 67 | bind r source-file ~/.config/tmux/tmux.conf |
71 | 68 | ||
72 | set escape-time 20 | 69 | set escape-time 20 |
73 | |||
74 | set -g mouse on | 70 | set -g mouse on |
75 | 71 | ||
76 | set -g base-index 1 | 72 | set -g base-index 1 |
@@ -79,7 +75,6 @@ in | |||
79 | # session jumper | 75 | # session jumper |
80 | bind-key -n C-j run-shell "tmux-fzf" | 76 | bind-key -n C-j run-shell "tmux-fzf" |
81 | 77 | ||
82 | |||
83 | # pane binds | 78 | # pane binds |
84 | unbind-key E | 79 | unbind-key E |
85 | bind-key h select-pane -L | 80 | bind-key h select-pane -L |
@@ -148,6 +143,9 @@ in | |||
148 | 143 | ||
149 | # popup styles | 144 | # popup styles |
150 | set -g popup-border-style "fg=colour8" | 145 | set -g popup-border-style "fg=colour8" |
146 | |||
147 | # load all sessions | ||
148 | source-file ~/.config/tmux/sessions/all | ||
151 | ''; | 149 | ''; |
152 | }; | 150 | }; |
153 | } | 151 | } |
diff --git a/scripts/default.nix b/scripts/default.nix index f134556..616be1c 100644 --- a/scripts/default.nix +++ b/scripts/default.nix | |||
@@ -37,7 +37,7 @@ let | |||
37 | battery = import ./battery.nix pkgs; | 37 | battery = import ./battery.nix pkgs; |
38 | 38 | ||
39 | # run-on-gpu script | 39 | # run-on-gpu script |
40 | battery = import ./nvidia-offload.nix pkgs; | 40 | nvidia-offload = import ./nvidia-offload.nix pkgs; |
41 | 41 | ||
42 | # fzf script to switch between tmux sessions | 42 | # fzf script to switch between tmux sessions |
43 | tmux-fzf = pkgs.writeScriptBin "tmux-fzf" '' | 43 | tmux-fzf = pkgs.writeScriptBin "tmux-fzf" '' |
@@ -78,4 +78,5 @@ in | |||
78 | tmux-fzf | 78 | tmux-fzf |
79 | portrait | 79 | portrait |
80 | landscape | 80 | landscape |
81 | nvidia-offload | ||
81 | ] | 82 | ] |