diff options
-rw-r--r-- | flake.lock | 31 | ||||
-rw-r--r-- | flake.nix | 2 | ||||
-rw-r--r-- | home.nix | 3 | ||||
-rw-r--r-- | hosts/myrtle/configuration.nix | 7 | ||||
-rw-r--r-- | hosts/myrtle/hardware-configuration.nix | 2 |
5 files changed, 11 insertions, 34 deletions
@@ -46,20 +46,18 @@ | |||
46 | "inputs": { | 46 | "inputs": { |
47 | "nixpkgs": [ | 47 | "nixpkgs": [ |
48 | "nixpkgs" | 48 | "nixpkgs" |
49 | ], | 49 | ] |
50 | "utils": "utils" | ||
51 | }, | 50 | }, |
52 | "locked": { | 51 | "locked": { |
53 | "lastModified": 1672244468, | 52 | "lastModified": 1681852391, |
54 | "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", | 53 | "narHash": "sha256-0wGjrFTmYyjS9jE6MdgjcOEKvWjFkKcRpOtSXso99JI=", |
55 | "owner": "nix-community", | 54 | "owner": "nix-community", |
56 | "repo": "home-manager", | 55 | "repo": "home-manager", |
57 | "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", | 56 | "rev": "aa03c8a429902dbaf15b3395f8cefc5a4b83f7f7", |
58 | "type": "github" | 57 | "type": "github" |
59 | }, | 58 | }, |
60 | "original": { | 59 | "original": { |
61 | "owner": "nix-community", | 60 | "owner": "nix-community", |
62 | "ref": "release-22.11", | ||
63 | "repo": "home-manager", | 61 | "repo": "home-manager", |
64 | "type": "github" | 62 | "type": "github" |
65 | } | 63 | } |
@@ -81,11 +79,11 @@ | |||
81 | }, | 79 | }, |
82 | "nixpkgs": { | 80 | "nixpkgs": { |
83 | "locked": { | 81 | "locked": { |
84 | "lastModified": 1674236650, | 82 | "lastModified": 1681753173, |
85 | "narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=", | 83 | "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=", |
86 | "owner": "NixOS", | 84 | "owner": "NixOS", |
87 | "repo": "nixpkgs", | 85 | "repo": "nixpkgs", |
88 | "rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5", | 86 | "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125", |
89 | "type": "github" | 87 | "type": "github" |
90 | }, | 88 | }, |
91 | "original": { | 89 | "original": { |
@@ -143,21 +141,6 @@ | |||
143 | "type": "github" | 141 | "type": "github" |
144 | } | 142 | } |
145 | }, | 143 | }, |
146 | "utils": { | ||
147 | "locked": { | ||
148 | "lastModified": 1667395993, | ||
149 | "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", | ||
150 | "owner": "numtide", | ||
151 | "repo": "flake-utils", | ||
152 | "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", | ||
153 | "type": "github" | ||
154 | }, | ||
155 | "original": { | ||
156 | "owner": "numtide", | ||
157 | "repo": "flake-utils", | ||
158 | "type": "github" | ||
159 | } | ||
160 | }, | ||
161 | "vim-colors-plain": { | 144 | "vim-colors-plain": { |
162 | "inputs": { | 145 | "inputs": { |
163 | "nixpkgs": [ | 146 | "nixpkgs": [ |
@@ -7,7 +7,7 @@ | |||
7 | nixos-hardware.url = "github:nixos/nixos-hardware"; | 7 | nixos-hardware.url = "github:nixos/nixos-hardware"; |
8 | 8 | ||
9 | home-manager = { | 9 | home-manager = { |
10 | url = "github:nix-community/home-manager/release-22.11"; | 10 | url = "github:nix-community/home-manager"; |
11 | inputs.nixpkgs.follows = "nixpkgs"; | 11 | inputs.nixpkgs.follows = "nixpkgs"; |
12 | }; | 12 | }; |
13 | 13 | ||
@@ -47,6 +47,7 @@ | |||
47 | libnotify | 47 | libnotify |
48 | inotify-tools | 48 | inotify-tools |
49 | pavucontrol | 49 | pavucontrol |
50 | bc | ||
50 | signal-desktop | 51 | signal-desktop |
51 | 52 | ||
52 | # sync | 53 | # sync |
@@ -59,7 +60,7 @@ | |||
59 | krita | 60 | krita |
60 | sxiv | 61 | sxiv |
61 | imagemagick | 62 | imagemagick |
62 | ffmpeg | 63 | ffmpeg-full |
63 | mpv | 64 | mpv |
64 | slop | 65 | slop |
65 | maim | 66 | maim |
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix index 4212556..fa6b0d7 100644 --- a/hosts/myrtle/configuration.nix +++ b/hosts/myrtle/configuration.nix | |||
@@ -168,13 +168,6 @@ | |||
168 | suspendCapacity = 5; | 168 | suspendCapacity = 5; |
169 | }; | 169 | }; |
170 | 170 | ||
171 | touchegg.enable = true; | ||
172 | |||
173 | signald = { | ||
174 | enable = true; | ||
175 | group = "signald"; | ||
176 | }; | ||
177 | |||
178 | auto-cpufreq.enable = true; | 171 | auto-cpufreq.enable = true; |
179 | 172 | ||
180 | }; | 173 | }; |
diff --git a/hosts/myrtle/hardware-configuration.nix b/hosts/myrtle/hardware-configuration.nix index 099052a..74872ed 100644 --- a/hosts/myrtle/hardware-configuration.nix +++ b/hosts/myrtle/hardware-configuration.nix | |||
@@ -39,5 +39,5 @@ | |||
39 | powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; | 39 | powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; |
40 | hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | 40 | hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; |
41 | # high-resolution display | 41 | # high-resolution display |
42 | hardware.video.hidpi.enable = lib.mkDefault true; | 42 | # hardware.video.hidpi.enable = lib.mkDefault true; |
43 | } | 43 | } |