From 830b76bcb6ea3feb790aa2731425df693b5ef2c3 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sun, 2 Feb 2025 18:33:09 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A7=B9=20Refactor,=20moved=20monitorn?= =?UTF-8?q?ames=20to=20common.nix,=20removed=20waypaper=20reload?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- common.nix | 4 ++++ configuration.nix | 2 +- flake.nix | 3 ++- home-manager/development/git.nix | 1 + home-manager/hyprland/hypridle/default.nix | 1 + home-manager/hyprland/hyprpaper.nix | 8 +++++--- home-manager/hyprland/settings.nix | 8 +++----- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5edc07d..d2f11e1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ My NixOS configurations with dotfiles for my desktop | Shell | Fish | | Prompt | Starship | | Theme | Catppuccin | -| GPU | NVidia | +| GPU | Nvidia | | Panel | Hyprpanel | | Runner | Rofi | | Fetch | Fastfetch | diff --git a/common.nix b/common.nix index d22f032..3efff0d 100644 --- a/common.nix +++ b/common.nix @@ -20,6 +20,10 @@ rec { options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT }; + # Empty matches all + monitor1 = "DP-1"; + monitor2 = "DP-3"; + username = "martin"; # This value determines the NixOS release from which the default diff --git a/configuration.nix b/configuration.nix index 259c05d..cac4d50 100644 --- a/configuration.nix +++ b/configuration.nix @@ -53,7 +53,7 @@ in vdhcoapp fortune cowsay - inputs.zen-browser.packages."${system}".default # beta + inputs.zen-browser.packages.${system}.default # beta onlyoffice-desktopeditors ]; diff --git a/flake.nix b/flake.nix index f82a2d4..e5eca92 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ }: let system = "x86_64-linux"; + hostname = "nixos"; inherit (self) outputs; common = import ./common.nix; in @@ -46,7 +47,7 @@ # Adds the nix fmt command to format nix files formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem { system = system; specialArgs = { inherit outputs inputs; }; # Pass args to modules modules = [ diff --git a/home-manager/development/git.nix b/home-manager/development/git.nix index 943009f..4e87ed3 100644 --- a/home-manager/development/git.nix +++ b/home-manager/development/git.nix @@ -5,6 +5,7 @@ userEmail = "git@martials.no"; aliases = { + amend = "commit --amend"; cm = "commit"; s = "status"; }; diff --git a/home-manager/hyprland/hypridle/default.nix b/home-manager/hyprland/hypridle/default.nix index 111fea1..69768c3 100644 --- a/home-manager/hyprland/hypridle/default.nix +++ b/home-manager/hyprland/hypridle/default.nix @@ -34,4 +34,5 @@ in ]; }; }; + wayland.windowManager.hyprland.settings.exec-once = [ "hypridle" ]; } diff --git a/home-manager/hyprland/hyprpaper.nix b/home-manager/hyprland/hyprpaper.nix index 68f7ac5..5d32197 100644 --- a/home-manager/hyprland/hyprpaper.nix +++ b/home-manager/hyprland/hyprpaper.nix @@ -1,6 +1,8 @@ # Wallpapers { pkgs, ... }: - +let + common = import ../../common.nix; +in { home.packages = with pkgs; [ hyprpaper @@ -25,8 +27,8 @@ ]; wallpaper = [ - "DP-1,${monitor1}" - "DP-3,${monitor2}" + "${common.monitor1},${monitor1}" + "${common.monitor2},${monitor2}" ]; }; }; diff --git a/home-manager/hyprland/settings.nix b/home-manager/hyprland/settings.nix index 5b239b3..195c3df 100644 --- a/home-manager/hyprland/settings.nix +++ b/home-manager/hyprland/settings.nix @@ -1,23 +1,21 @@ { lib, ... }: let common = import ../../common.nix; - app = common.default; theme = import ../../theme.nix; + app = common.default; in { wayland.windowManager.hyprland.settings = { monitor = [ - "DP-1, 3440x1440@175, 0x0, 1" - "DP-3, 3840x2160@60, 3440x0, 1.5, transform, 1" + "${common.monitor1}, 3440x1440@175, 0x0, 1" + "${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1" ]; # Autostart exec-once = [ app.browser app.terminal - "hypridle" "systemctl --user start hyprpolkitagent" - "waypaper --restore" ]; env = [ From b50fce54a75d7f850430d76071a9005ce4dacfb2 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sun, 2 Feb 2025 19:05:07 +0100 Subject: [PATCH 2/3] Git sign by default, hostname from common.nix in flake.nix --- flake.nix | 3 +-- home-manager/development/git.nix | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index e5eca92..40de615 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,6 @@ }: let system = "x86_64-linux"; - hostname = "nixos"; inherit (self) outputs; common = import ./common.nix; in @@ -47,7 +46,7 @@ # Adds the nix fmt command to format nix files formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; - nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem { + nixosConfigurations.${common.hostname} = nixpkgs.lib.nixosSystem { system = system; specialArgs = { inherit outputs inputs; }; # Pass args to modules modules = [ diff --git a/home-manager/development/git.nix b/home-manager/development/git.nix index 4e87ed3..4632050 100644 --- a/home-manager/development/git.nix +++ b/home-manager/development/git.nix @@ -10,6 +10,11 @@ s = "status"; }; + signing = { + signByDefault = true; + key = "706F53DD087A91DE"; + }; + extraConfig = { push.autoSetupRemote = true; safe.directory = "/etc/nixos"; From 0b0d93cf41293e2523c3f8277335610ee678fe34 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sun, 9 Feb 2025 17:48:45 +0100 Subject: [PATCH 3/3] Zed tab icons, hyprsysteminfo, papers pdfReader, update flake.lock --- flake.lock | 280 +++++--------------------- home-manager/default-applications.nix | 2 + home-manager/development/zed.nix | 10 +- modules/gnome/default.nix | 1 + modules/hyprland/default.nix | 4 +- 5 files changed, 65 insertions(+), 232 deletions(-) diff --git a/flake.lock b/flake.lock index 7c682f9..2026036 100644 --- a/flake.lock +++ b/flake.lock @@ -46,20 +46,14 @@ }, "catppuccin": { "inputs": { - "catppuccin-v1_1": "catppuccin-v1_1", - "catppuccin-v1_2": "catppuccin-v1_2", - "home-manager": "home-manager", - "home-manager-stable": "home-manager-stable", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "nuscht-search": "nuscht-search" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1736957255, - "narHash": "sha256-qZZ/K5XheRMjCNYgle90QESuys0PIFJNPJJswMJ0GEA=", + "lastModified": 1739094937, + "narHash": "sha256-LemSQ5AZHwl4ZVlirdpAytDWgS96OZsct7Akx/REdGA=", "owner": "catppuccin", "repo": "nix", - "rev": "f06fcadf9a61b6581b392e72f230fa6783fe36e4", + "rev": "aee0cec463e62702751adaeb9f4fc00f2f72879b", "type": "github" }, "original": { @@ -68,34 +62,6 @@ "type": "github" } }, - "catppuccin-v1_1": { - "locked": { - "lastModified": 1734055249, - "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", - "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", - "revCount": 326, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" - } - }, - "catppuccin-v1_2": { - "locked": { - "lastModified": 1734734291, - "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", - "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", - "revCount": 344, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" - } - }, "devshell": { "inputs": { "nixpkgs": [ @@ -119,34 +85,18 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -155,11 +105,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -186,24 +136,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -217,11 +149,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -255,31 +187,9 @@ "home-manager": { "inputs": { "nixpkgs": [ - "catppuccin", "nixpkgs" ] }, - "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager-stable": { - "inputs": { - "nixpkgs": [ - "catppuccin", - "nixpkgs-stable" - ] - }, "locked": { "lastModified": 1736373539, "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", @@ -296,27 +206,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nixvim", @@ -324,11 +213,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -345,11 +234,11 @@ ] }, "locked": { - "lastModified": 1737011541, - "narHash": "sha256-YAT1VozLQ29V56EvEzJQswBOCLZDqn/gTU05mf+UFts=", + "lastModified": 1739002652, + "narHash": "sha256-W83O9ASWUFaDAFY7H9vvW/Gm9PN5Lkh0McYW3bA/6aU=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "88609f7e4c244326face34cb992a79053f2c7810", + "rev": "0d5f80ff5cd525b8f27adfb84cef67d90e3d7f10", "type": "github" }, "original": { @@ -359,34 +248,6 @@ } }, "ixx": { - "inputs": { - "flake-utils": [ - "catppuccin", - "nuscht-search", - "flake-utils" - ], - "nixpkgs": [ - "catppuccin", - "nuscht-search", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { "inputs": { "flake-utils": [ "nixvim", @@ -422,11 +283,11 @@ ] }, "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -451,29 +312,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -485,11 +330,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736916166, - "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "type": "github" }, "original": { @@ -521,7 +366,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs-unstable" @@ -530,11 +375,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736964246, - "narHash": "sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso=", + "lastModified": 1738966895, + "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", "owner": "nix-community", "repo": "nixvim", - "rev": "5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d", + "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", "type": "github" }, "original": { @@ -543,44 +388,21 @@ "type": "github" } }, - "nuscht-search": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "catppuccin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", - "owner": "NuschtOS", - "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx_2", + "flake-utils": "flake-utils", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -592,7 +414,7 @@ "root": { "inputs": { "catppuccin": "catppuccin", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "hyprpanel": "hyprpanel", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", @@ -603,17 +425,17 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_2" }, "locked": { - "lastModified": 1737000920, - "narHash": "sha256-o3dtkMm7M/CPCZ0G3MsK3Mv+KqcJEvP4wYR2iLrpPrs=", + "lastModified": 1739074574, + "narHash": "sha256-dLfT4/nIU3RzMHk7I5UigRehSWzq7wGkZxwuQdflO6s=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "cd004cdd2af21f7840a28566cd5e32ca71b73aa7", + "rev": "366191fe8e9375d280e9a6b0ed9823468b49f6e7", "type": "github" }, "original": { @@ -660,11 +482,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { @@ -678,11 +500,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1736997529, - "narHash": "sha256-eyZXz3aphVJ8mMZ5KivtnYS+5vhNxVjWGlBJM0DMqlE=", + "lastModified": 1739071251, + "narHash": "sha256-Kj4grI7YpHk2RIsy73Dwg7ikDn94MI7zKrWN0BXrvJI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "96be5663cc2ef52e8815c90f7abf3363be3950c2", + "rev": "410d6e9a8ba0edd163d0828a4cda1b1f267f2e1a", "type": "github" }, "original": { diff --git a/home-manager/default-applications.nix b/home-manager/default-applications.nix index 01de62a..d3f3e7f 100644 --- a/home-manager/default-applications.nix +++ b/home-manager/default-applications.nix @@ -6,6 +6,7 @@ let browser = "zen.desktop"; imageViewer = "org.gnome.Loupe.desktop"; + pdfReader = "org.gnome.Papers.desktop"; in { "text/html" = browser; @@ -17,6 +18,7 @@ "image/jpeg" = imageViewer; "image/png" = imageViewer; "image/gif" = imageViewer; + "application/pdf" = pdfReader; }; }; } diff --git a/home-manager/development/zed.nix b/home-manager/development/zed.nix index edc74bd..1d1503f 100644 --- a/home-manager/development/zed.nix +++ b/home-manager/development/zed.nix @@ -7,9 +7,10 @@ extensions = [ "html" "catppuccin" + "catppuccin-icons" "toml" "nix" - "git_firefly" + "git-firefly" ]; userSettings = let @@ -20,10 +21,15 @@ { autosave = "on_focus_change"; base_keymap = "JetBrains"; - ui_font_family = font; buffer_font_family = font; + icon-theme = "Catppuccin Mocha"; # TODO doesn't work? + ui_font_family = font; ui_font_size = fontSize; buffer_font_size = fontSize; + tabs = { + file_icons = true; + git_status = true; + }; theme = { mode = theme.mode; light = "Catppuccin Latte"; diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix index 57c5be3..0a39f32 100644 --- a/modules/gnome/default.nix +++ b/modules/gnome/default.nix @@ -15,6 +15,7 @@ gnome-calculator gnome-disk-utility gnome-clocks + papers # PDFReader ]; programs.dconf.enable = true; # Required for some gnome applications diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 64f7865..3a79323 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -6,7 +6,9 @@ xdg-desktop-portal-hyprland hyprpolkitagent # Auth deamon providing modals for password auth hyprshot # Screenshots - # unstable.hyprsysteminfo TODO requires flake update + unstable.hyprsysteminfo + unstable.hyprland-qtutils + unstable.hyprland-qt-support ]; programs = {