aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock106
-rw-r--r--flake.nix5
-rw-r--r--home.nix2
-rw-r--r--hosts/olive/configuration.nix6
-rw-r--r--programs/htop.nix17
-rw-r--r--programs/tmux.nix26
-rw-r--r--theme/default.nix2
-rw-r--r--x/rxvt.nix6
8 files changed, 55 insertions, 115 deletions
diff --git a/flake.lock b/flake.lock
index d98000d..cb196f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,37 +44,6 @@
44 "type": "github" 44 "type": "github"
45 } 45 }
46 }, 46 },
47 "flake-compat": {
48 "flake": false,
49 "locked": {
50 "lastModified": 1650374568,
51 "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
52 "owner": "edolstra",
53 "repo": "flake-compat",
54 "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
55 "type": "github"
56 },
57 "original": {
58 "owner": "edolstra",
59 "repo": "flake-compat",
60 "type": "github"
61 }
62 },
63 "flake-utils": {
64 "locked": {
65 "lastModified": 1644229661,
66 "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
67 "owner": "numtide",
68 "repo": "flake-utils",
69 "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
70 "type": "github"
71 },
72 "original": {
73 "owner": "numtide",
74 "repo": "flake-utils",
75 "type": "github"
76 }
77 },
78 "gitignore": { 47 "gitignore": {
79 "inputs": { 48 "inputs": {
80 "nixpkgs": [ 49 "nixpkgs": [
@@ -138,57 +107,13 @@
138 "type": "github" 107 "type": "github"
139 } 108 }
140 }, 109 },
141 "neovim": {
142 "inputs": {
143 "flake-compat": "flake-compat",
144 "neovim-flake": "neovim-flake",
145 "nixpkgs": "nixpkgs"
146 },
147 "locked": {
148 "lastModified": 1660983413,
149 "narHash": "sha256-qy254SuW4aeKoCSDkHc94PvBbiWBwKE2rYCbg2YgByA=",
150 "owner": "nix-community",
151 "repo": "neovim-nightly-overlay",
152 "rev": "a8da96a656f22d5dfdd090a32293187159cb55ee",
153 "type": "github"
154 },
155 "original": {
156 "owner": "nix-community",
157 "repo": "neovim-nightly-overlay",
158 "type": "github"
159 }
160 },
161 "neovim-flake": {
162 "inputs": {
163 "flake-utils": "flake-utils",
164 "nixpkgs": [
165 "neovim",
166 "nixpkgs"
167 ]
168 },
169 "locked": {
170 "dir": "contrib",
171 "lastModified": 1660982695,
172 "narHash": "sha256-LJrwB5xU5+9ym8HY0eEA1QfUDb+UF9PWMy23WChGXdY=",
173 "owner": "neovim",
174 "repo": "neovim",
175 "rev": "1cc4706e94489498b12c4844c1b3a2e9aa5cc921",
176 "type": "github"
177 },
178 "original": {
179 "dir": "contrib",
180 "owner": "neovim",
181 "repo": "neovim",
182 "type": "github"
183 }
184 },
185 "nixos-hardware": { 110 "nixos-hardware": {
186 "locked": { 111 "locked": {
187 "lastModified": 1660407119, 112 "lastModified": 1662714967,
188 "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=", 113 "narHash": "sha256-IOTq5tAGGmBFj7tQbkcyLE261JUeTUucEE3p0WLZ4qM=",
189 "owner": "nixos", 114 "owner": "nixos",
190 "repo": "nixos-hardware", 115 "repo": "nixos-hardware",
191 "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1", 116 "rev": "1fec8fda86dac5701146c77d5f8a414b14ed1ff6",
192 "type": "github" 117 "type": "github"
193 }, 118 },
194 "original": { 119 "original": {
@@ -199,27 +124,11 @@
199 }, 124 },
200 "nixpkgs": { 125 "nixpkgs": {
201 "locked": { 126 "locked": {
202 "lastModified": 1660819943, 127 "lastModified": 1662099760,
203 "narHash": "sha256-TRZV/mlW1eYuojqDC3ueYWj7jsTKXJCtyMLNYX/Ybtw=", 128 "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=",
204 "owner": "nixos",
205 "repo": "nixpkgs",
206 "rev": "8ea014acc33da95ea56c902229957d8225005163",
207 "type": "github"
208 },
209 "original": {
210 "owner": "nixos",
211 "ref": "nixos-unstable",
212 "repo": "nixpkgs",
213 "type": "github"
214 }
215 },
216 "nixpkgs_2": {
217 "locked": {
218 "lastModified": 1660926553,
219 "narHash": "sha256-19Ib1b7Ny+yGhnxwnH1KhhB2hvALuNuqevA6XzqkQmo=",
220 "owner": "NixOS", 129 "owner": "NixOS",
221 "repo": "nixpkgs", 130 "repo": "nixpkgs",
222 "rev": "00e376e3f3c22d991052dfeaf154c42b09deeb29", 131 "rev": "67e45078141102f45eff1589a831aeaa3182b41e",
223 "type": "github" 132 "type": "github"
224 }, 133 },
225 "original": { 134 "original": {
@@ -254,9 +163,8 @@
254 "root": { 163 "root": {
255 "inputs": { 164 "inputs": {
256 "home-manager": "home-manager", 165 "home-manager": "home-manager",
257 "neovim": "neovim",
258 "nixos-hardware": "nixos-hardware", 166 "nixos-hardware": "nixos-hardware",
259 "nixpkgs": "nixpkgs_2", 167 "nixpkgs": "nixpkgs",
260 "prompt": "prompt", 168 "prompt": "prompt",
261 "statix": "statix" 169 "statix": "statix"
262 } 170 }
diff --git a/flake.nix b/flake.nix
index ce35ce8..8293654 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,8 +11,6 @@
11 inputs.nixpkgs.follows = "nixpkgs"; 11 inputs.nixpkgs.follows = "nixpkgs";
12 }; 12 };
13 13
14 neovim.url = "github:nix-community/neovim-nightly-overlay";
15
16 statix = { 14 statix = {
17 url = "git+https://git.peppe.rs/languages/statix"; 15 url = "git+https://git.peppe.rs/languages/statix";
18 inputs.nixpkgs.follows = "nixpkgs"; 16 inputs.nixpkgs.follows = "nixpkgs";
@@ -30,14 +28,12 @@
30 , nixpkgs 28 , nixpkgs
31 , nixos-hardware 29 , nixos-hardware
32 , home-manager 30 , home-manager
33 , neovim
34 , statix 31 , statix
35 , prompt 32 , prompt
36 , ... 33 , ...
37 } @ inputs: { 34 } @ inputs: {
38 35
39 overlays = { 36 overlays = {
40 nvim-nightly = neovim.overlay;
41 statix = statix.overlay; 37 statix = statix.overlay;
42 prompt = prompt.overlay; 38 prompt = prompt.overlay;
43 }; 39 };
@@ -46,6 +42,7 @@
46 olive = nixpkgs.lib.nixosSystem { 42 olive = nixpkgs.lib.nixosSystem {
47 system = "x86_64-linux"; 43 system = "x86_64-linux";
48 modules = [ 44 modules = [
45 ({ config = { nix.registry.nixpkgs.flake = nixpkgs; }; })
49 { 46 {
50 imports = [ ./hosts/olive/configuration.nix ]; 47 imports = [ ./hosts/olive/configuration.nix ];
51 _module.args.self = self; 48 _module.args.self = self;
diff --git a/home.nix b/home.nix
index adeaace..92d6c81 100644
--- a/home.nix
+++ b/home.nix
@@ -59,6 +59,8 @@
59 rtorrent 59 rtorrent
60 sxiv 60 sxiv
61 lftp 61 lftp
62 zoom-us
63 pavucontrol
62 64
63 # meta 65 # meta
64 nixpkgs-review 66 nixpkgs-review
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
index c4e7f17..3d5d47f 100644
--- a/hosts/olive/configuration.nix
+++ b/hosts/olive/configuration.nix
@@ -51,10 +51,12 @@
51 ../../patches/st/ligatures.diff 51 ../../patches/st/ligatures.diff
52 ]; 52 ];
53 }; 53 };
54
55 # for zoom-us
56 allowUnfree = true;
54 }; 57 };
55 58
56 nixpkgs.overlays = with self.overlays; [ 59 nixpkgs.overlays = with self.overlays; [
57 nvim-nightly
58 statix 60 statix
59 prompt 61 prompt
60 ]; 62 ];
@@ -89,7 +91,7 @@
89 pulseaudio = { 91 pulseaudio = {
90 enable = true; 92 enable = true;
91 package = pkgs.pulseaudioFull; 93 package = pkgs.pulseaudioFull;
92 extraConfig = "load-module module-switch-on-connect"; 94 extraConfig = "load-module module-bluetooth-policy auto_switch=2";
93 }; 95 };
94 bluetooth = { 96 bluetooth = {
95 enable = true; 97 enable = true;
diff --git a/programs/htop.nix b/programs/htop.nix
index a48b70c..fca3487 100644
--- a/programs/htop.nix
+++ b/programs/htop.nix
@@ -6,6 +6,21 @@
6{ 6{
7 programs.htop = { 7 programs.htop = {
8 enable = true; 8 enable = true;
9 settings.color_scheme = 1; # monochrome 9 settings = {
10 color_scheme = 1; # monochrome
11 show_program_path = 0;
12 fields = with config.lib.htop.fields; [
13 PID
14 M_SIZE
15 M_RESIDENT
16 M_SHARE
17 STATE
18 PERCENT_CPU
19 PERCENT_MEM
20 TIME
21 COMM
22 ];
23
24 };
10 }; 25 };
11} 26}
diff --git a/programs/tmux.nix b/programs/tmux.nix
index e5c5aa1..11efa39 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -3,6 +3,20 @@
3, ... 3, ...
4}: 4}:
5 5
6let
7 cmus-np = pkgs.writeScriptBin "cmus-np" ''
8 ${pkgs.cmus}/bin/cmus-remote -Q | awk '
9 /tag artist/ { $1=$2=""; artist = substr($0,3) }
10 /tag title/ { $1=$2=""; title = substr($0,3) }
11 END { printf "%s ยท %s\n", artist, title}
12 '
13 '';
14
15 cmus-status = pkgs.writeScriptBin "cmus-status" ''
16 ${pkgs.cmus}/bin/cmus-remote -Q | awk '/status/ { print $2 }'
17 '';
18
19in
6{ 20{
7 programs.tmux = { 21 programs.tmux = {
8 enable = true; 22 enable = true;
@@ -74,14 +88,16 @@
74 set -g status-style "bg=colour0" 88 set -g status-style "bg=colour0"
75 set -ag status-style "fg=colour7" 89 set -ag status-style "fg=colour7"
76 90
77 set -g status-right "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs " 91 set status-right-length 70
78 set -ag status-right "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y") " 92 set -g status-right "#[fg=colour15]#(${cmus-np}/bin/cmus-np) #[fg=colour8]#(${cmus-status}/bin/cmus-status) "
79 set -ag status-right "#[fg=colour7]#(bat -q)#[fg=colour12]" 93 set -ag status-right "#[fg=colour15]#(date +"%H%M") #[fg=colour8]hrs "
94 set -ag status-right "#[fg=colour15]#(date +"%d/%m")#[fg=colour8] #(date +"%Y")"
80 95
81 # status left 96 # status left
82 set -g status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') "
83 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')"
84 set status-left-length 50 97 set status-left-length 50
98 set -g status-left "#[fg=colour7]#(bat -q) "
99 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt cwd '#{pane_current_path}') "
100 set -ag status-left "#[fg=colour7]#(${pkgs.prompt}/bin/prompt vcs '#{pane_current_path}')"
85 ''; 101 '';
86 }; 102 };
87} 103}
diff --git a/theme/default.nix b/theme/default.nix
index b3af086..7c67057 100644
--- a/theme/default.nix
+++ b/theme/default.nix
@@ -3,4 +3,4 @@ let
3 night = import ./night.nix; 3 night = import ./night.nix;
4 gruvbox = import ./gruvbox.nix; 4 gruvbox = import ./gruvbox.nix;
5in 5in
6night 6day
diff --git a/x/rxvt.nix b/x/rxvt.nix
index 3498bd0..5744bd0 100644
--- a/x/rxvt.nix
+++ b/x/rxvt.nix
@@ -33,9 +33,9 @@ with theme;
33 "URxvt.font" = "xft:Nerd Input:size=11:style=Medium"; 33 "URxvt.font" = "xft:Nerd Input:size=11:style=Medium";
34 "URxvt.italicFont" = "xft:Nerd Input:size=11:style=Medium"; 34 "URxvt.italicFont" = "xft:Nerd Input:size=11:style=Medium";
35 "URxvt.boldFont" = "xft:Nerd Input:size=11:style=Medium"; 35 "URxvt.boldFont" = "xft:Nerd Input:size=11:style=Medium";
36 "*font" = "Nerd Input:size=11:style=Regular"; 36 "*font" = "Berkeley Mono:size=11:style=Regular";
37 "*italicFont" = "Nerd Input:size=11:style=Italic"; 37 "*italicFont" = "Berkeley Mono:size=11:style=Italic";
38 "*boldFont" = "Nerd Input:size=11:style=Bold"; 38 "*boldFont" = "Berkeley Mono:size=11:style=Bold";
39 39
40 "URxvt.lineSpace" = 0; 40 "URxvt.lineSpace" = 0;
41 "URxvt.letterSpace" = 0; 41 "URxvt.letterSpace" = 0;