aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock62
-rw-r--r--flake.nix6
-rw-r--r--home.nix2
-rw-r--r--programs/bash.nix5
-rw-r--r--programs/default.nix1
-rw-r--r--programs/feh.nix2
-rw-r--r--programs/rofi.nix5
-rw-r--r--programs/tmux.nix2
-rw-r--r--services/dunst.nix4
9 files changed, 26 insertions, 63 deletions
diff --git a/flake.lock b/flake.lock
index 95b0fe7..9104578 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,28 +20,6 @@
20 "url": "https://git.peppe.rs/vim/better-text-objs" 20 "url": "https://git.peppe.rs/vim/better-text-objs"
21 } 21 }
22 }, 22 },
23 "fenix": {
24 "inputs": {
25 "nixpkgs": [
26 "prompt",
27 "nixpkgs"
28 ],
29 "rust-analyzer-src": "rust-analyzer-src"
30 },
31 "locked": {
32 "lastModified": 1642141613,
33 "narHash": "sha256-WFS7T5oOLD8anu/77iz7EPz7zQsJZtP5qVa5485k3dI=",
34 "owner": "nix-community",
35 "repo": "fenix",
36 "rev": "d75ffc9f1d3b60bb597e48ae01f486a6de27d30e",
37 "type": "github"
38 },
39 "original": {
40 "owner": "nix-community",
41 "repo": "fenix",
42 "type": "github"
43 }
44 },
45 "home-manager": { 23 "home-manager": {
46 "inputs": { 24 "inputs": {
47 "nixpkgs": [ 25 "nixpkgs": [
@@ -49,11 +27,11 @@
49 ] 27 ]
50 }, 28 },
51 "locked": { 29 "locked": {
52 "lastModified": 1681852391, 30 "lastModified": 1694643239,
53 "narHash": "sha256-0wGjrFTmYyjS9jE6MdgjcOEKvWjFkKcRpOtSXso99JI=", 31 "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
54 "owner": "nix-community", 32 "owner": "nix-community",
55 "repo": "home-manager", 33 "repo": "home-manager",
56 "rev": "aa03c8a429902dbaf15b3395f8cefc5a4b83f7f7", 34 "rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
57 "type": "github" 35 "type": "github"
58 }, 36 },
59 "original": { 37 "original": {
@@ -79,33 +57,32 @@
79 }, 57 },
80 "nixpkgs": { 58 "nixpkgs": {
81 "locked": { 59 "locked": {
82 "lastModified": 1688868408, 60 "lastModified": 1694062546,
83 "narHash": "sha256-RR9N5XTAxSBhK8MCvLq9uxfdkd7etC//seVXldy0k48=", 61 "narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=",
84 "owner": "NixOS", 62 "owner": "NixOS",
85 "repo": "nixpkgs", 63 "repo": "nixpkgs",
86 "rev": "510d721ce097150ae3b80f84b04b13b039186571", 64 "rev": "b200e0df08f80c32974a6108ce431d8a8a5e6547",
87 "type": "github" 65 "type": "github"
88 }, 66 },
89 "original": { 67 "original": {
90 "owner": "NixOS", 68 "owner": "NixOS",
91 "ref": "nixos-23.05", 69 "ref": "nixpkgs-unstable",
92 "repo": "nixpkgs", 70 "repo": "nixpkgs",
93 "type": "github" 71 "type": "github"
94 } 72 }
95 }, 73 },
96 "prompt": { 74 "prompt": {
97 "inputs": { 75 "inputs": {
98 "fenix": "fenix",
99 "nixpkgs": [ 76 "nixpkgs": [
100 "nixpkgs" 77 "nixpkgs"
101 ] 78 ]
102 }, 79 },
103 "locked": { 80 "locked": {
104 "lastModified": 1662898783, 81 "lastModified": 1694244899,
105 "narHash": "sha256-wh/sty5Gs7vwDcuNpxekI/7lzg7LEyQIQVAX0dMJTE8=", 82 "narHash": "sha256-+Nv7HVG/s2Jers3+XiBqYzg+X+MpDY+j5Rucyfgoib0=",
106 "ref": "refs/heads/master", 83 "ref": "refs/heads/master",
107 "rev": "306640f502ef24e31590eef910b78ccd85ce8f6e", 84 "rev": "39c3e7baf034bdbecc29f5f441d8dde634833b52",
108 "revCount": 5, 85 "revCount": 6,
109 "type": "git", 86 "type": "git",
110 "url": "https://git.peppe.rs/cli/prompt" 87 "url": "https://git.peppe.rs/cli/prompt"
111 }, 88 },
@@ -124,23 +101,6 @@
124 "vim-colors-plain": "vim-colors-plain" 101 "vim-colors-plain": "vim-colors-plain"
125 } 102 }
126 }, 103 },
127 "rust-analyzer-src": {
128 "flake": false,
129 "locked": {
130 "lastModified": 1642101527,
131 "narHash": "sha256-C4zcaWULWlrirpEt/pA85CCMBt+7SWZweMaMJ7EvrXw=",
132 "owner": "rust-analyzer",
133 "repo": "rust-analyzer",
134 "rev": "b4c31481a554d0132003228ba319bd9476fe85ae",
135 "type": "github"
136 },
137 "original": {
138 "owner": "rust-analyzer",
139 "ref": "nightly",
140 "repo": "rust-analyzer",
141 "type": "github"
142 }
143 },
144 "vim-colors-plain": { 104 "vim-colors-plain": {
145 "inputs": { 105 "inputs": {
146 "nixpkgs": [ 106 "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index d1f39f6..3782459 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
2 description = "nerdypepper's nixos config"; 2 description = "nerdypepper's nixos config";
3 3
4 inputs = { 4 inputs = {
5 nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; 5 nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
6 6
7 nixos-hardware.url = "github:nixos/nixos-hardware"; 7 nixos-hardware.url = "github:nixos/nixos-hardware";
8 8
@@ -10,6 +10,10 @@
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 # };
13 17
14 # statix = { 18 # statix = {
15 # url = "git+https://git.peppe.rs/languages/statix"; 19 # url = "git+https://git.peppe.rs/languages/statix";
diff --git a/home.nix b/home.nix
index 7a51f63..838a4c3 100644
--- a/home.nix
+++ b/home.nix
@@ -39,7 +39,6 @@
39 nodePackages.bash-language-server 39 nodePackages.bash-language-server
40 w3m 40 w3m
41 noto-fonts-emoji 41 noto-fonts-emoji
42 ripgrep-all
43 urlview 42 urlview
44 fd 43 fd
45 du-dust 44 du-dust
@@ -51,6 +50,7 @@
51 signal-desktop 50 signal-desktop
52 killall 51 killall
53 httpie 52 httpie
53 thunderbird
54 54
55 # sync 55 # sync
56 rtorrent 56 rtorrent
diff --git a/programs/bash.nix b/programs/bash.nix
index 2a3cb97..bff2eb9 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -14,6 +14,7 @@
14 14
15 shellAliases = { 15 shellAliases = {
16 "..." = "cd -- ../.."; 16 "..." = "cd -- ../..";
17 "...." = "cd -- ../../..";
17 grep = "grep --color=auto"; 18 grep = "grep --color=auto";
18 l = "ls -CF"; 19 l = "ls -CF";
19 la = "ls -A"; 20 la = "ls -A";
@@ -24,7 +25,6 @@
24 tmux = "tmux -u"; 25 tmux = "tmux -u";
25 tree = "tree -C"; 26 tree = "tree -C";
26 tb = "nc termbin.com 9999"; 27 tb = "nc termbin.com 9999";
27 n = "j";
28 28
29 # git aliases 29 # git aliases
30 gb = "git branch -v"; 30 gb = "git branch -v";
@@ -71,8 +71,6 @@
71 }; 71 };
72 72
73 initExtra = '' 73 initExtra = ''
74 [ -f $HOME/.github ] && . $HOME/.github
75 eval "$(direnv hook bash)"
76 export PATH=$PATH:"$HOME/scripts" 74 export PATH=$PATH:"$HOME/scripts"
77 export PROMPT_COMMAND="tmux refresh-client -S"; 75 export PROMPT_COMMAND="tmux refresh-client -S";
78 export PS1="\n\001\e[0;36m\002λ\001\e[0m\002 "; 76 export PS1="\n\001\e[0;36m\002λ\001\e[0m\002 ";
@@ -116,7 +114,6 @@
116 function __rm() { 114 function __rm() {
117 git worktree remove "$1" 115 git worktree remove "$1"
118 } 116 }
119
120 ''; 117 '';
121 118
122 }; 119 };
diff --git a/programs/default.nix b/programs/default.nix
index e28838b..70ded22 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -18,6 +18,7 @@
18 ./readline.nix 18 ./readline.nix
19 ./tmux.nix 19 ./tmux.nix
20 ./zathura.nix 20 ./zathura.nix
21 ./rofi.nix
21 ]; 22 ];
22 23
23 programs = { 24 programs = {
diff --git a/programs/feh.nix b/programs/feh.nix
index 2e15fe4..29374ca 100644
--- a/programs/feh.nix
+++ b/programs/feh.nix
@@ -5,7 +5,7 @@
5 5
6{ 6{
7 programs.feh = { 7 programs.feh = {
8 enable = true; 8 enable = false;
9 buttons = { 9 buttons = {
10 zoom_in = "C-5"; 10 zoom_in = "C-5";
11 zoom_out = "C-4"; 11 zoom_out = "C-4";
diff --git a/programs/rofi.nix b/programs/rofi.nix
index 12c0d7b..bdf5898 100644
--- a/programs/rofi.nix
+++ b/programs/rofi.nix
@@ -29,8 +29,7 @@ let
29 selected-normal-foreground = mkLiteral theme.base0C; 29 selected-normal-foreground = mkLiteral theme.base0C;
30 urgent-foreground = mkLiteral theme.base05; 30 urgent-foreground = mkLiteral theme.base05;
31 31
32 border = mkLiteral "4px solid"; 32 border-color = mkLiteral theme.base00;
33 border-color = mkLiteral theme.base01;
34 }; 33 };
35 34
36 inputbar.children = [ "entry" ]; 35 inputbar.children = [ "entry" ];
@@ -46,6 +45,8 @@ let
46 padding = 40; 45 padding = 40;
47 width = 800; 46 width = 800;
48 height = 600; 47 height = 600;
48 border = mkLiteral "3px solid";
49 border-color = mkLiteral theme.base01;
49 }; 50 };
50 }; 51 };
51in 52in
diff --git a/programs/tmux.nix b/programs/tmux.nix
index 292d751..f061997 100644
--- a/programs/tmux.nix
+++ b/programs/tmux.nix
@@ -76,7 +76,7 @@ in
76 setw -g pane-base-index 1 76 setw -g pane-base-index 1
77 77
78 # session jumper 78 # session jumper
79 bind-key -n C-n run-shell "tmux-fzf" 79 bind-key -n C-h run-shell "tmux-fzf"
80 80
81 # pane binds 81 # pane binds
82 unbind-key E 82 unbind-key E
diff --git a/services/dunst.nix b/services/dunst.nix
index 485cb1a..0d05889 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -22,7 +22,7 @@ with theme;
22 ignore_newline = "no"; 22 ignore_newline = "no";
23 geometry = "300x8-20+20"; 23 geometry = "300x8-20+20";
24 shrink = "yes"; 24 shrink = "yes";
25 frame_width = 4; 25 frame_width = 1;
26 transparency = "0"; 26 transparency = "0";
27 idle_threshold = "120"; 27 idle_threshold = "120";
28 monitor = "0"; 28 monitor = "0";
@@ -53,7 +53,7 @@ with theme;
53 urgency_low = { 53 urgency_low = {
54 background = base00; 54 background = base00;
55 foreground = base05; 55 foreground = base05;
56 frame_color = base00; 56 frame_color = base01;
57 timeout = 2; 57 timeout = 2;
58 }; 58 };
59 59