From f5e27c55a6465e4ef981c35e24b1a6a496ae626c Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Fri, 7 Mar 2025 16:04:44 -0800 Subject: [PATCH] meow meow 3 --- flake.lock | 98 ++++++++++++++++---------- flake.nix | 8 ++- glance.yml | 108 ++++++++++++++++++++++++++++ hosts/desktop/configuration.nix | 18 ++++- hosts/desktop/home.nix | 120 +++++++++++++++++++++++++++++++- 5 files changed, 306 insertions(+), 46 deletions(-) create mode 100644 glance.yml diff --git a/flake.lock b/flake.lock index 12a844d..2cedde3 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1739103745, - "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", + "lastModified": 1739298463, + "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", + "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", "type": "github" }, "original": { @@ -33,6 +33,27 @@ "type": "github" } }, + "chinese-fonts-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735891296, + "narHash": "sha256-xmyzX5JXC1JQNVNhI8AnbivcID2AJoCQXlSKxRxsMt0=", + "owner": "brsvh", + "repo": "chinese-fonts-overlay", + "rev": "748d91262ab205d069d5a40275f079ed70b71994", + "type": "github" + }, + "original": { + "owner": "brsvh", + "ref": "main", + "repo": "chinese-fonts-overlay", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -40,11 +61,11 @@ ] }, "locked": { - "lastModified": 1739548217, - "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=", + "lastModified": 1740452771, + "narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0", + "rev": "42be12b510253d750138ec90c66decc282298b44", "type": "github" }, "original": { @@ -292,11 +313,11 @@ ] }, "locked": { - "lastModified": 1739845242, - "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=", + "lastModified": 1740432748, + "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=", "owner": "nix-community", "repo": "home-manager", - "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b", + "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319", "type": "github" }, "original": { @@ -311,11 +332,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1739819125, - "narHash": "sha256-VLYFc7lXxHKrEff8orEF2M5iHIEyLtmyh3eU369aEao=", + "lastModified": 1740266555, + "narHash": "sha256-NReJCA379CGPRsIy5xifVz0xtBOJ+XrPaAhDKIGV9Ik=", "owner": "StevenBlack", "repo": "hosts", - "rev": "d8ff9479262d59b576abb041da47394a04f50e8d", + "rev": "8df476e3b53f862902119273eaa0a8474443969e", "type": "github" }, "original": { @@ -398,11 +419,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1739892000, - "narHash": "sha256-Dm/FHOSmOPX2yBiM0Ezd+SadhhHn2kaSNmoh12TgGis=", + "lastModified": 1740402690, + "narHash": "sha256-k5ZfubRCheWlaZlUAFO0gdVvEE3zZrELAH6HuY53I3c=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0137a5f6cdd24d5a10f813572791f1e641221a5b", + "rev": "73ae9790f994fe3f0194a5e225106c3dddb77d84", "type": "github" }, "original": { @@ -575,11 +596,11 @@ ] }, "locked": { - "lastModified": 1739048933, - "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", + "lastModified": 1739891528, + "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", + "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", "type": "github" }, "original": { @@ -674,11 +695,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1739338265, - "narHash": "sha256-C4hMwgMwtR0Dinm9F2OaYLHLsz5D6AZXVxYTElLhdMA=", + "lastModified": 1740418382, + "narHash": "sha256-kLncL2qxB29i6+ikkeIYfDkqtBjdhXvrEYyENbpSB7Q=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "b84a1495afa8a18a8f2c330a57664627c2f358d9", + "rev": "e2d08049d898a272f55c4e218544a04f0d314fad", "type": "github" }, "original": { @@ -696,11 +717,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739847682, - "narHash": "sha256-YvAKu47G5jOH715jw2dkfFxTj4Hdx4DnA7b6aDLrExQ=", + "lastModified": 1740442134, + "narHash": "sha256-ZYqFwKXT/gtyAZ7X5urLvElSovH0iot1+wlRby/Kg/g=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "cd7563ca23e71bc61a199a0a7ebabb861c3c821c", + "rev": "e8413501a60d226b2dccd2ab6cd43d0747c99a1a", "type": "github" }, "original": { @@ -712,8 +733,8 @@ "nixpkgs": { "locked": { "lastModified": 0, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", - "path": "/nix/store/j33wzkzndh41cyyy7i18bqm1srlv84cq-source", + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "path": "/nix/store/s1fbk6a410xn8vcaj54iqv22agyn0ria-source", "type": "path" }, "original": { @@ -723,11 +744,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -802,11 +823,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -891,6 +912,7 @@ }, "root": { "inputs": { + "chinese-fonts-overlay": "chinese-fonts-overlay", "darwin": "darwin", "home-manager": "home-manager", "hosts": "hosts", @@ -914,11 +936,11 @@ ] }, "locked": { - "lastModified": 1739845646, - "narHash": "sha256-UGQVBU/yDn6u0kAE4z1PYrOaaf3wl+gAAv5rui2TkFQ=", + "lastModified": 1740450604, + "narHash": "sha256-T/lqASXzCzp5lJISCUw+qwfRmImVUnhKgAhn8ymRClI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab2cd2b8b25ab3f65b8ce4aa701a6d69fbb0210f", + "rev": "5961ca311c85c31fc5f51925b4356899eed36221", "type": "github" }, "original": { @@ -1080,11 +1102,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1739880707, - "narHash": "sha256-Peo5tQ//7tLX7WtAc02wya5BFJ03eueZEkSU0D6BR8U=", + "lastModified": 1740443449, + "narHash": "sha256-n4q11hPTnlqU5a7Q1EKP1vVGMihYeEQTWsRYoLH1jb4=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "a14d3742ea2559b214bded7ce5dbdb09f0d58234", + "rev": "e94c04146987566e3228cbc1ccfe20bfee980a34", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index af0e37f..bc97cf6 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,11 @@ nix-options-search = { url = "github:madsbv/nix-options-search"; }; + + chinese-fonts-overlay = { + url = "github:brsvh/chinese-fonts-overlay/main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, @@ -70,13 +75,13 @@ overlays = [ inputs.zig.overlays.default inputs.rust-overlay.overlays.default + inputs.chinese-fonts-overlay.overlays.default ]; inherit (nixpkgs) lib; in { nixosConfigurations = { nixos = lib.nixosSystem { modules = [ - inputs.moonlight.homeModules.default {nixpkgs.overlays = overlays;} hosts.nixosModule { @@ -121,7 +126,6 @@ }; users.users.nmarks.home = "/Users/nmarks"; } - inputs.moonlight.homeModules.default ]; specialArgs = { inherit nh_darwin; diff --git a/glance.yml b/glance.yml new file mode 100644 index 0000000..92b4de1 --- /dev/null +++ b/glance.yml @@ -0,0 +1,108 @@ +pages: + - name: Home + # Optionally, if you only have a single page you can hide the desktop navigation for a cleaner look + # hide-desktop-navigation: true + columns: + - size: small + widgets: + - type: calendar + first-day-of-week: monday + + - type: rss + limit: 10 + collapse-after: 3 + cache: 12h + feeds: + - url: https://selfh.st/rss/ + title: selfh.st + limit: 4 + - url: https://ciechanow.ski/atom.xml + - url: https://www.joshwcomeau.com/rss.xml + title: Josh Comeau + - url: https://samwho.dev/rss.xml + - url: https://ishadeed.com/feed.xml + title: Ahmad Shadeed + + - type: twitch-channels + channels: + - theprimeagen + - j_blow + - piratesoftware + - cohhcarnage + - christitustech + - EJ_SA + + - size: full + widgets: + - type: group + widgets: + - type: hacker-news + - type: lobsters + + - type: videos + channels: + - UCXuqSBlHAE6Xw-yeJA0Tunw # Linus Tech Tips + - UCR-DXc1voovS8nhAvccRZhg # Jeff Geerling + - UCsBjURrPoezykLs9EqgamOA # Fireship + - UCBJycsmduvYEL83R_U4JriQ # Marques Brownlee + - UCHnyfMqiRRG1u-2MsSQLbXA # Veritasium + + - type: group + widgets: + - type: reddit + subreddit: technology + show-thumbnails: true + - type: reddit + subreddit: selfhosted + show-thumbnails: true + + - size: small + widgets: + - type: weather + location: London, United Kingdom + units: metric # alternatively "imperial" + hour-format: 12h # alternatively "24h" + # Optionally hide the location from being displayed in the widget + # hide-location: true + + - type: markets + # The link to go to when clicking on the symbol in the UI, + # {SYMBOL} will be substituded with the symbol for each market + symbol-link-template: https://www.tradingview.com/symbols/{SYMBOL}/news + markets: + - symbol: SPY + name: S&P 500 + - symbol: BTC-USD + name: Bitcoin + - symbol: NVDA + name: NVIDIA + - symbol: AAPL + name: Apple + - symbol: MSFT + name: Microsoft + + - type: releases + cache: 1d + # Without authentication the Github API allows for up to 60 requests per hour. You can create a + # read-only token from your Github account settings and use it here to increase the limit. + # token: ... + repositories: + - glanceapp/glance + - go-gitea/gitea + - immich-app/immich + - syncthing/syncthing + + # Add more pages here: + # - name: Your page name + # columns: + # - size: small + # widgets: + # # Add widgets here + + # - size: full + # widgets: + # # Add widgets here + + # - size: small + # widgets: + # # Add widgets here diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 98ca2cb..b6128b7 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -104,6 +104,7 @@ }; fonts.packages = with pkgs; [ + # alibaba-fonts nerd-fonts.fira-code nerd-fonts.iosevka ]; @@ -178,7 +179,7 @@ grub = { enable = true; device = "nodev"; - theme = pkgs.nixos-grub2-theme; + theme = pkgs.catppuccin-grub; useOSProber = true; efiSupport = true; }; @@ -211,6 +212,19 @@ LC_TIME = "en_US.UTF-8"; }; + i18n.inputMethod = { + type = "fcitx5"; + enable = true; + fcitx5.waylandFrontend = true; + fcitx5.addons = with pkgs; [ + # fcitx5-gtk + # kdePackages.fcitx5-qt + rime-data + fcitx5-rime + fcitx5-rose-pine + ]; + }; + # Enable the X11 windowing system. services.xserver.enable = true; services.xserver.displayManager.startx.enable = true; @@ -261,9 +275,7 @@ # openssh.authorizedKeys.keyFiles = ["~/.ssh/id_ed25519.pub"]; packages = with pkgs; [ firefox - kate vim - kitty lua-language-server texlive.combined.scheme-full steam-run diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index a9ebb14..17cb795 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -45,6 +45,7 @@ home.packages = with pkgs; [ + glance rust-bin.stable.latest.default just libxkbcommon @@ -58,8 +59,7 @@ python312Packages.jedi-language-server wofi bottles - spectacle - dolphin + kdePackages.dolphin path-of-building tor spotify @@ -89,7 +89,7 @@ file vesktop (discord.override { - withVencord = true; + withMoonlight = true; }) # itch : THIS IS BROKEN FOR SOME REASON, need to pin it?? qbittorrent @@ -218,6 +218,120 @@ }; }; + services.glance = { + enable = true; + settings = { + pages = [ + { + name = "Home"; + columns = [ + { + size = "small"; + widgets = [ + { + type = "calendar"; + first-day-of-week = "monday"; + } + { + type = "rss"; + limit = 10; + collapse-after = 3; + cache = "12h"; + feeds = [ + { + url = "https://selfh.st/rss/"; + title = "selfh.st"; + limit = 4; + } + {url = "https://ciechanow.ski/atom.xml";} + { + url = "https://www.joshwcomeau.com/rss.xml"; + title = "Josh Comeau"; + } + {url = "https://samwho.dev/rss.xml";} + { + url = "https://ishadeed.com/feed.xml"; + title = "Ahmad Shadeed"; + } + ]; + } + ]; + } + { + size = "full"; + widgets = [ + { + type = "group"; + widgets = [{type = "hacker-news";} {type = "lobsters";}]; + } + { + type = "videos"; + channels = ["UCXuqSBlHAE6Xw-yeJA0Tunw" "UCR-DXc1voovS8nhAvccRZhg" "UCsBjURrPoezykLs9EqgamOA" "UCBJycsmduvYEL83R_U4JriQ" "UCHnyfMqiRRG1u-2MsSQLbXA"]; + } + { + type = "group"; + widgets = [ + { + type = "reddit"; + subreddit = "technology"; + show-thumbnails = true; + } + { + type = "reddit"; + subreddit = "selfhosted"; + show-thumbnails = true; + } + ]; + } + ]; + } + { + size = "small"; + widgets = [ + { + type = "weather"; + location = "London, United Kingdom"; + units = "metric"; + hour-format = "12h"; + } + { + type = "markets"; + symbol-link-template = "https://www.tradingview.com/symbols/{SYMBOL}/news"; + markets = [ + { + symbol = "SPY"; + name = "S&P 500"; + } + { + symbol = "BTC-USD"; + name = "Bitcoin"; + } + { + symbol = "NVDA"; + name = "NVIDIA"; + } + { + symbol = "AAPL"; + name = "Apple"; + } + { + symbol = "MSFT"; + name = "Microsoft"; + } + ]; + } + { + type = "releases"; + cache = "1d"; + repositories = ["glanceapp/glance" "go-gitea/gitea" "immich-app/immich" "syncthing/syncthing"]; + } + ]; + } + ]; + } + ]; + }; + }; /* programs.zsh = { oh-my-zsh = {