authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-03-07 16:04:44-08:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-03-07 16:04:44-08:00
logf5e27c55a6465e4ef981c35e24b1a6a496ae626c
treefb1c525bb146d7781c5706a97f086b2f5539c0e8
parentc03bdd6ea1374c0b7046807d3ec76bc7bc82e39b

meow meow 3

5 files changed, 306 insertions(+), 46 deletions(-)

flake.lock+60-38
......@@ -20,11 +20,11 @@
2020 ]
2121 },
2222 "locked": {
23 "lastModified": 1739103745,
24 "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=",
23 "lastModified": 1739298463,
24 "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=",
2525 "owner": "hyprwm",
2626 "repo": "aquamarine",
27 "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd",
27 "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16",
2828 "type": "github"
2929 },
3030 "original": {
......@@ -33,6 +33,27 @@
3333 "type": "github"
3434 }
3535 },
36 "chinese-fonts-overlay": {
37 "inputs": {
38 "nixpkgs": [
39 "nixpkgs"
40 ]
41 },
42 "locked": {
43 "lastModified": 1735891296,
44 "narHash": "sha256-xmyzX5JXC1JQNVNhI8AnbivcID2AJoCQXlSKxRxsMt0=",
45 "owner": "brsvh",
46 "repo": "chinese-fonts-overlay",
47 "rev": "748d91262ab205d069d5a40275f079ed70b71994",
48 "type": "github"
49 },
50 "original": {
51 "owner": "brsvh",
52 "ref": "main",
53 "repo": "chinese-fonts-overlay",
54 "type": "github"
55 }
56 },
3657 "darwin": {
3758 "inputs": {
3859 "nixpkgs": [
......@@ -40,11 +61,11 @@
4061 ]
4162 },
4263 "locked": {
43 "lastModified": 1739548217,
44 "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=",
64 "lastModified": 1740452771,
65 "narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=",
4566 "owner": "lnl7",
4667 "repo": "nix-darwin",
47 "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0",
68 "rev": "42be12b510253d750138ec90c66decc282298b44",
4869 "type": "github"
4970 },
5071 "original": {
......@@ -292,11 +313,11 @@
292313 ]
293314 },
294315 "locked": {
295 "lastModified": 1739845242,
296 "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=",
316 "lastModified": 1740432748,
317 "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=",
297318 "owner": "nix-community",
298319 "repo": "home-manager",
299 "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b",
320 "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319",
300321 "type": "github"
301322 },
302323 "original": {
......@@ -311,11 +332,11 @@
311332 "nixpkgs": "nixpkgs"
312333 },
313334 "locked": {
314 "lastModified": 1739819125,
315 "narHash": "sha256-VLYFc7lXxHKrEff8orEF2M5iHIEyLtmyh3eU369aEao=",
335 "lastModified": 1740266555,
336 "narHash": "sha256-NReJCA379CGPRsIy5xifVz0xtBOJ+XrPaAhDKIGV9Ik=",
316337 "owner": "StevenBlack",
317338 "repo": "hosts",
318 "rev": "d8ff9479262d59b576abb041da47394a04f50e8d",
339 "rev": "8df476e3b53f862902119273eaa0a8474443969e",
319340 "type": "github"
320341 },
321342 "original": {
......@@ -398,11 +419,11 @@
398419 "xdph": "xdph"
399420 },
400421 "locked": {
401 "lastModified": 1739892000,
402 "narHash": "sha256-Dm/FHOSmOPX2yBiM0Ezd+SadhhHn2kaSNmoh12TgGis=",
422 "lastModified": 1740402690,
423 "narHash": "sha256-k5ZfubRCheWlaZlUAFO0gdVvEE3zZrELAH6HuY53I3c=",
403424 "owner": "hyprwm",
404425 "repo": "Hyprland",
405 "rev": "0137a5f6cdd24d5a10f813572791f1e641221a5b",
426 "rev": "73ae9790f994fe3f0194a5e225106c3dddb77d84",
406427 "type": "github"
407428 },
408429 "original": {
......@@ -575,11 +596,11 @@
575596 ]
576597 },
577598 "locked": {
578 "lastModified": 1739048933,
579 "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=",
599 "lastModified": 1739891528,
600 "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=",
580601 "owner": "hyprwm",
581602 "repo": "hyprutils",
582 "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499",
603 "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba",
583604 "type": "github"
584605 },
585606 "original": {
......@@ -674,11 +695,11 @@
674695 "nixpkgs": "nixpkgs_4"
675696 },
676697 "locked": {
677 "lastModified": 1739338265,
678 "narHash": "sha256-C4hMwgMwtR0Dinm9F2OaYLHLsz5D6AZXVxYTElLhdMA=",
698 "lastModified": 1740418382,
699 "narHash": "sha256-kLncL2qxB29i6+ikkeIYfDkqtBjdhXvrEYyENbpSB7Q=",
679700 "owner": "madsbv",
680701 "repo": "nix-options-search",
681 "rev": "b84a1495afa8a18a8f2c330a57664627c2f358d9",
702 "rev": "e2d08049d898a272f55c4e218544a04f0d314fad",
682703 "type": "github"
683704 },
684705 "original": {
......@@ -696,11 +717,11 @@
696717 "nixpkgs-stable": "nixpkgs-stable"
697718 },
698719 "locked": {
699 "lastModified": 1739847682,
700 "narHash": "sha256-YvAKu47G5jOH715jw2dkfFxTj4Hdx4DnA7b6aDLrExQ=",
720 "lastModified": 1740442134,
721 "narHash": "sha256-ZYqFwKXT/gtyAZ7X5urLvElSovH0iot1+wlRby/Kg/g=",
701722 "owner": "lilyinstarlight",
702723 "repo": "nixos-cosmic",
703 "rev": "cd7563ca23e71bc61a199a0a7ebabb861c3c821c",
724 "rev": "e8413501a60d226b2dccd2ab6cd43d0747c99a1a",
704725 "type": "github"
705726 },
706727 "original": {
......@@ -712,8 +733,8 @@
712733 "nixpkgs": {
713734 "locked": {
714735 "lastModified": 0,
715 "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
716 "path": "/nix/store/j33wzkzndh41cyyy7i18bqm1srlv84cq-source",
736 "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
737 "path": "/nix/store/s1fbk6a410xn8vcaj54iqv22agyn0ria-source",
717738 "type": "path"
718739 },
719740 "original": {
......@@ -723,11 +744,11 @@
723744 },
724745 "nixpkgs-stable": {
725746 "locked": {
726 "lastModified": 1739624908,
727 "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
747 "lastModified": 1740339700,
748 "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
728749 "owner": "NixOS",
729750 "repo": "nixpkgs",
730 "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
751 "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
731752 "type": "github"
732753 },
733754 "original": {
......@@ -802,11 +823,11 @@
802823 },
803824 "nixpkgs_5": {
804825 "locked": {
805 "lastModified": 1739736696,
806 "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
826 "lastModified": 1740367490,
827 "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
807828 "owner": "NixOS",
808829 "repo": "nixpkgs",
809 "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
830 "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
810831 "type": "github"
811832 },
812833 "original": {
......@@ -891,6 +912,7 @@
891912 },
892913 "root": {
893914 "inputs": {
915 "chinese-fonts-overlay": "chinese-fonts-overlay",
894916 "darwin": "darwin",
895917 "home-manager": "home-manager",
896918 "hosts": "hosts",
......@@ -914,11 +936,11 @@
914936 ]
915937 },
916938 "locked": {
917 "lastModified": 1739845646,
918 "narHash": "sha256-UGQVBU/yDn6u0kAE4z1PYrOaaf3wl+gAAv5rui2TkFQ=",
939 "lastModified": 1740450604,
940 "narHash": "sha256-T/lqASXzCzp5lJISCUw+qwfRmImVUnhKgAhn8ymRClI=",
919941 "owner": "oxalica",
920942 "repo": "rust-overlay",
921 "rev": "ab2cd2b8b25ab3f65b8ce4aa701a6d69fbb0210f",
943 "rev": "5961ca311c85c31fc5f51925b4356899eed36221",
922944 "type": "github"
923945 },
924946 "original": {
......@@ -1080,11 +1102,11 @@
10801102 "nixpkgs": "nixpkgs_6"
10811103 },
10821104 "locked": {
1083 "lastModified": 1739880707,
1084 "narHash": "sha256-Peo5tQ//7tLX7WtAc02wya5BFJ03eueZEkSU0D6BR8U=",
1105 "lastModified": 1740443449,
1106 "narHash": "sha256-n4q11hPTnlqU5a7Q1EKP1vVGMihYeEQTWsRYoLH1jb4=",
10851107 "owner": "mitchellh",
10861108 "repo": "zig-overlay",
1087 "rev": "a14d3742ea2559b214bded7ce5dbdb09f0d58234",
1109 "rev": "e94c04146987566e3228cbc1ccfe20bfee980a34",
10881110 "type": "github"
10891111 },
10901112 "original": {
flake.nix+6-2
......@@ -51,6 +51,11 @@
5151 nix-options-search = {
5252 url = "github:madsbv/nix-options-search";
5353 };
54
55 chinese-fonts-overlay = {
56 url = "github:brsvh/chinese-fonts-overlay/main";
57 inputs.nixpkgs.follows = "nixpkgs";
58 };
5459 };
5560 outputs = {
5661 self,
......@@ -70,13 +75,13 @@
7075 overlays = [
7176 inputs.zig.overlays.default
7277 inputs.rust-overlay.overlays.default
78 inputs.chinese-fonts-overlay.overlays.default
7379 ];
7480 inherit (nixpkgs) lib;
7581 in {
7682 nixosConfigurations = {
7783 nixos = lib.nixosSystem {
7884 modules = [
79 inputs.moonlight.homeModules.default
8085 {nixpkgs.overlays = overlays;}
8186 hosts.nixosModule
8287 {
......@@ -121,7 +126,6 @@
121126 };
122127 users.users.nmarks.home = "/Users/nmarks";
123128 }
124 inputs.moonlight.homeModules.default
125129 ];
126130 specialArgs = {
127131 inherit nh_darwin;
glance.yml created+108
......@@ -0,0 +1,108 @@
1pages:
2 - name: Home
3 # Optionally, if you only have a single page you can hide the desktop navigation for a cleaner look
4 # hide-desktop-navigation: true
5 columns:
6 - size: small
7 widgets:
8 - type: calendar
9 first-day-of-week: monday
10
11 - type: rss
12 limit: 10
13 collapse-after: 3
14 cache: 12h
15 feeds:
16 - url: https://selfh.st/rss/
17 title: selfh.st
18 limit: 4
19 - url: https://ciechanow.ski/atom.xml
20 - url: https://www.joshwcomeau.com/rss.xml
21 title: Josh Comeau
22 - url: https://samwho.dev/rss.xml
23 - url: https://ishadeed.com/feed.xml
24 title: Ahmad Shadeed
25
26 - type: twitch-channels
27 channels:
28 - theprimeagen
29 - j_blow
30 - piratesoftware
31 - cohhcarnage
32 - christitustech
33 - EJ_SA
34
35 - size: full
36 widgets:
37 - type: group
38 widgets:
39 - type: hacker-news
40 - type: lobsters
41
42 - type: videos
43 channels:
44 - UCXuqSBlHAE6Xw-yeJA0Tunw # Linus Tech Tips
45 - UCR-DXc1voovS8nhAvccRZhg # Jeff Geerling
46 - UCsBjURrPoezykLs9EqgamOA # Fireship
47 - UCBJycsmduvYEL83R_U4JriQ # Marques Brownlee
48 - UCHnyfMqiRRG1u-2MsSQLbXA # Veritasium
49
50 - type: group
51 widgets:
52 - type: reddit
53 subreddit: technology
54 show-thumbnails: true
55 - type: reddit
56 subreddit: selfhosted
57 show-thumbnails: true
58
59 - size: small
60 widgets:
61 - type: weather
62 location: London, United Kingdom
63 units: metric # alternatively "imperial"
64 hour-format: 12h # alternatively "24h"
65 # Optionally hide the location from being displayed in the widget
66 # hide-location: true
67
68 - type: markets
69 # The link to go to when clicking on the symbol in the UI,
70 # {SYMBOL} will be substituded with the symbol for each market
71 symbol-link-template: https://www.tradingview.com/symbols/{SYMBOL}/news
72 markets:
73 - symbol: SPY
74 name: S&P 500
75 - symbol: BTC-USD
76 name: Bitcoin
77 - symbol: NVDA
78 name: NVIDIA
79 - symbol: AAPL
80 name: Apple
81 - symbol: MSFT
82 name: Microsoft
83
84 - type: releases
85 cache: 1d
86 # Without authentication the Github API allows for up to 60 requests per hour. You can create a
87 # read-only token from your Github account settings and use it here to increase the limit.
88 # token: ...
89 repositories:
90 - glanceapp/glance
91 - go-gitea/gitea
92 - immich-app/immich
93 - syncthing/syncthing
94
95 # Add more pages here:
96 # - name: Your page name
97 # columns:
98 # - size: small
99 # widgets:
100 # # Add widgets here
101
102 # - size: full
103 # widgets:
104 # # Add widgets here
105
106 # - size: small
107 # widgets:
108 # # Add widgets here
hosts/desktop/configuration.nix+15-3
......@@ -104,6 +104,7 @@
104104 };
105105
106106 fonts.packages = with pkgs; [
107 # alibaba-fonts
107108 nerd-fonts.fira-code
108109 nerd-fonts.iosevka
109110 ];
......@@ -178,7 +179,7 @@
178179 grub = {
179180 enable = true;
180181 device = "nodev";
181 theme = pkgs.nixos-grub2-theme;
182 theme = pkgs.catppuccin-grub;
182183 useOSProber = true;
183184 efiSupport = true;
184185 };
......@@ -211,6 +212,19 @@
211212 LC_TIME = "en_US.UTF-8";
212213 };
213214
215 i18n.inputMethod = {
216 type = "fcitx5";
217 enable = true;
218 fcitx5.waylandFrontend = true;
219 fcitx5.addons = with pkgs; [
220 # fcitx5-gtk
221 # kdePackages.fcitx5-qt
222 rime-data
223 fcitx5-rime
224 fcitx5-rose-pine
225 ];
226 };
227
214228 # Enable the X11 windowing system.
215229 services.xserver.enable = true;
216230 services.xserver.displayManager.startx.enable = true;
......@@ -261,9 +275,7 @@
261275 # openssh.authorizedKeys.keyFiles = ["~/.ssh/id_ed25519.pub"];
262276 packages = with pkgs; [
263277 firefox
264 kate
265278 vim
266 kitty
267279 lua-language-server
268280 texlive.combined.scheme-full
269281 steam-run
hosts/desktop/home.nix+117-3
......@@ -45,6 +45,7 @@
4545
4646 home.packages = with pkgs;
4747 [
48 glance
4849 rust-bin.stable.latest.default
4950 just
5051 libxkbcommon
......@@ -58,8 +59,7 @@
5859 python312Packages.jedi-language-server
5960 wofi
6061 bottles
61 spectacle
62 dolphin
62 kdePackages.dolphin
6363 path-of-building
6464 tor
6565 spotify
......@@ -89,7 +89,7 @@
8989 file
9090 vesktop
9191 (discord.override {
92 withVencord = true;
92 withMoonlight = true;
9393 })
9494 # itch : THIS IS BROKEN FOR SOME REASON, need to pin it??
9595 qbittorrent
......@@ -218,6 +218,120 @@
218218 };
219219 };
220220
221 services.glance = {
222 enable = true;
223 settings = {
224 pages = [
225 {
226 name = "Home";
227 columns = [
228 {
229 size = "small";
230 widgets = [
231 {
232 type = "calendar";
233 first-day-of-week = "monday";
234 }
235 {
236 type = "rss";
237 limit = 10;
238 collapse-after = 3;
239 cache = "12h";
240 feeds = [
241 {
242 url = "https://selfh.st/rss/";
243 title = "selfh.st";
244 limit = 4;
245 }
246 {url = "https://ciechanow.ski/atom.xml";}
247 {
248 url = "https://www.joshwcomeau.com/rss.xml";
249 title = "Josh Comeau";
250 }
251 {url = "https://samwho.dev/rss.xml";}
252 {
253 url = "https://ishadeed.com/feed.xml";
254 title = "Ahmad Shadeed";
255 }
256 ];
257 }
258 ];
259 }
260 {
261 size = "full";
262 widgets = [
263 {
264 type = "group";
265 widgets = [{type = "hacker-news";} {type = "lobsters";}];
266 }
267 {
268 type = "videos";
269 channels = ["UCXuqSBlHAE6Xw-yeJA0Tunw" "UCR-DXc1voovS8nhAvccRZhg" "UCsBjURrPoezykLs9EqgamOA" "UCBJycsmduvYEL83R_U4JriQ" "UCHnyfMqiRRG1u-2MsSQLbXA"];
270 }
271 {
272 type = "group";
273 widgets = [
274 {
275 type = "reddit";
276 subreddit = "technology";
277 show-thumbnails = true;
278 }
279 {
280 type = "reddit";
281 subreddit = "selfhosted";
282 show-thumbnails = true;
283 }
284 ];
285 }
286 ];
287 }
288 {
289 size = "small";
290 widgets = [
291 {
292 type = "weather";
293 location = "London, United Kingdom";
294 units = "metric";
295 hour-format = "12h";
296 }
297 {
298 type = "markets";
299 symbol-link-template = "https://www.tradingview.com/symbols/{SYMBOL}/news";
300 markets = [
301 {
302 symbol = "SPY";
303 name = "S&P 500";
304 }
305 {
306 symbol = "BTC-USD";
307 name = "Bitcoin";
308 }
309 {
310 symbol = "NVDA";
311 name = "NVIDIA";
312 }
313 {
314 symbol = "AAPL";
315 name = "Apple";
316 }
317 {
318 symbol = "MSFT";
319 name = "Microsoft";
320 }
321 ];
322 }
323 {
324 type = "releases";
325 cache = "1d";
326 repositories = ["glanceapp/glance" "go-gitea/gitea" "immich-app/immich" "syncthing/syncthing"];
327 }
328 ];
329 }
330 ];
331 }
332 ];
333 };
334 };
221335 /*
222336 programs.zsh = {
223337 oh-my-zsh = {