From 9f06dd6c2ce2a7d026b2933dc8d366154a3e32a4 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Thu, 20 Mar 2025 13:33:50 -0400 Subject: [PATCH] some updates --- common/gui/hyprland.nix | 5 +- common/gui/thunar.nix | 5 +- common/gui/xdg.nix | 9 +- common/nixos/packages.nix | 2 +- common/nixos/users.nix | 4 +- flake.lock | 738 +++++++++++++--------- flake.nix | 3 +- home-manager/modules/common-gui.nix | 3 + home-manager/modules/common.nix | 1 + home-manager/modules/eza.nix | 9 +- home-manager/modules/fzf.nix | 31 + home-manager/modules/git.nix | 18 +- home-manager/modules/hyprland/default.nix | 4 +- home-manager/modules/hyprspace.nix | 6 - home-manager/modules/kitty.nix | 16 + home-manager/modules/lazygit.nix | 24 +- home-manager/modules/starship.nix | 47 +- home-manager/modules/thunar.nix | 48 ++ home-manager/modules/tmux/tmux.nix | 2 +- home-manager/modules/xdg.nix | 13 + home-manager/modules/zen.nix | 10 + home-manager/modules/zsh.nix | 24 +- 22 files changed, 675 insertions(+), 347 deletions(-) create mode 100644 home-manager/modules/fzf.nix create mode 100644 home-manager/modules/thunar.nix create mode 100644 home-manager/modules/xdg.nix create mode 100644 home-manager/modules/zen.nix diff --git a/common/gui/hyprland.nix b/common/gui/hyprland.nix index 294f7ea..d8242e5 100644 --- a/common/gui/hyprland.nix +++ b/common/gui/hyprland.nix @@ -10,7 +10,7 @@ ./pipewire.nix ./wayland.nix ./displayManager.nix - ./xdg.nix + # ./xdg.nix ]; # Security @@ -76,9 +76,12 @@ environment.systemPackages = with pkgs; [ libva-utils gsettings-desktop-schemas + xdg-utils + hyprland-qtutils ]; environment.sessionVariables = { XDG_CURRENT_DESKTOP = "Hyprland"; XDG_SESSION_DESKTOP = "Hyprland"; + XDG_SESSION_TYPE = "wayland"; }; } diff --git a/common/gui/thunar.nix b/common/gui/thunar.nix index ec88797..45c8ed2 100644 --- a/common/gui/thunar.nix +++ b/common/gui/thunar.nix @@ -3,7 +3,8 @@ config, lib, ... -}: { +}: +{ options = { thunar.enable = lib.mkEnableOption "Enables thunar and its plugins"; }; @@ -11,6 +12,8 @@ programs.thunar = { enable = true; plugins = with pkgs.xfce; [ + xfconf + tumbler thunar-archive-plugin thunar-volman ]; diff --git a/common/gui/xdg.nix b/common/gui/xdg.nix index 394b78d..b48af6c 100644 --- a/common/gui/xdg.nix +++ b/common/gui/xdg.nix @@ -3,14 +3,20 @@ lib, pkgs, ... -}: { +}: +{ # XDG Portals xdg = { autostart.enable = true; portal = { enable = true; + wlr.enable = true; + xdgOpenUsePortal = true; extraPortals = [ + pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-gtk + pkgs.libsForQt5.xdg-desktop-portal-kde + pkgs.lxqt.xdg-desktop-portal-lxqt ]; }; }; @@ -18,6 +24,7 @@ xdg-utils xdg-desktop-portal xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland ]; environment.sessionVariables = { diff --git a/common/nixos/packages.nix b/common/nixos/packages.nix index 2073739..5fa894b 100644 --- a/common/nixos/packages.nix +++ b/common/nixos/packages.nix @@ -28,7 +28,7 @@ nh nix-output-monitor nvd - inputs.superfile.packages.${system}.default + # inputs.superfile.packages.${system}.default ]; environment.sessionVariables = { FLAKE = "/home/${user}/repos/nixos-config"; diff --git a/common/nixos/users.nix b/common/nixos/users.nix index 5244d8e..b9d8fba 100644 --- a/common/nixos/users.nix +++ b/common/nixos/users.nix @@ -20,8 +20,8 @@ "audio" "wireshark" ]; - # shell = pkgs.zsh; - shell = pkgs.nushell; + shell = pkgs.zsh; + # shell = pkgs.nushell; uid = 1000; }; } diff --git a/flake.lock b/flake.lock index abe220d..00b77f0 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1739103745, - "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "type": "github" }, "original": { @@ -98,11 +98,11 @@ ] }, "locked": { - "lastModified": 1729527199, - "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", + "lastModified": 1739103745, + "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", + "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1739444039, - "narHash": "sha256-J7PLowc4pCdEkXEWtm72bC6gNNlT7sgNAq5YMZmvvkg=", + "lastModified": 1742320965, + "narHash": "sha256-jGAhz2VD/TR8RQS5cUU2Jh8T0yyP50bw75dmHByLZpE=", "owner": "cachix", "repo": "devenv", - "rev": "1235cd13f47df6ad19c8a183c6eabc1facb7c399", + "rev": "6bde92766ddd3ee1630029a03d36baddd51934e2", "type": "github" }, "original": { @@ -274,35 +274,14 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1736899990, - "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -390,7 +369,6 @@ } }, "flake-compat_6": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -451,11 +429,33 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -466,7 +466,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -505,7 +505,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1740849354, + "narHash": "sha256-oy33+t09FraucSZ2rZ6qnD1Y1c8azKKmQuCvF2ytUko=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "4a709a8ce9f8c08fa7ddb86761fe488ff7858a07", "type": "github" }, "original": { @@ -563,49 +563,23 @@ } }, "git-hooks_2": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_4", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_3": { "inputs": { "flake-compat": [ "stylix", "flake-compat" ], - "gitignore": "gitignore_6", + "gitignore": "gitignore_5", "nixpkgs": [ "stylix", "nixpkgs" ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -682,28 +656,6 @@ } }, "gitignore_4": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_5": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -724,7 +676,7 @@ "type": "github" } }, - "gitignore_6": { + "gitignore_5": { "inputs": { "nixpkgs": [ "stylix", @@ -795,11 +747,11 @@ ] }, "locked": { - "lastModified": 1739658904, - "narHash": "sha256-2o/JuD6qD0CtPNVvdPNL3bEDFITaSfSLceajHcIzmw4=", + "lastModified": 1742326330, + "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", "owner": "nix-community", "repo": "home-manager", - "rev": "45c07fcf7d28b5fb3ee189c260dee0a2e4d14317", + "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", "type": "github" }, "original": { @@ -810,27 +762,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "stylix", @@ -838,11 +769,11 @@ ] }, "locked": { - "lastModified": 1737630279, - "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", + "lastModified": 1741635347, + "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", "owner": "nix-community", "repo": "home-manager", - "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", + "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", "type": "github" }, "original": { @@ -867,11 +798,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -899,11 +830,11 @@ ] }, "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -941,6 +872,38 @@ "type": "github" } }, + "hyprgraphics_2": { + "inputs": { + "hyprutils": [ + "hyprspace", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprspace", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprspace", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -957,11 +920,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1739665242, - "narHash": "sha256-eKIMpBXaGrB/V/afS4pjropo50FgLE1t1W2aMI4/mhA=", + "lastModified": 1742402960, + "narHash": "sha256-skKoZd9SEXnxNlddPSuPS3J4cUUZ+Pt5ZnAMvimQXoQ=", "ref": "refs/heads/main", - "rev": "897ee276dc0a8a6b11a8102b225a9e969faac0bf", - "revCount": 5823, + "rev": "a25a214523dbb8fa25862a3f1570665cdb3db6e2", + "revCount": 5909, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1011,11 +974,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -1082,6 +1045,41 @@ "type": "github" } }, + "hyprland-qt-support_3": { + "inputs": { + "hyprlang": [ + "hyprspace", + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprspace", + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprspace", + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", @@ -1118,11 +1116,53 @@ "type": "github" } }, + "hyprland-qtutils_2": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support_3", + "hyprlang": [ + "hyprspace", + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprspace", + "hyprland", + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "hyprspace", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprspace", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprland_2": { "inputs": { "aquamarine": "aquamarine_2", "hyprcursor": "hyprcursor_2", + "hyprgraphics": "hyprgraphics_2", "hyprland-protocols": "hyprland-protocols_2", + "hyprland-qtutils": "hyprland-qtutils_2", "hyprlang": "hyprlang_3", "hyprutils": "hyprutils_4", "hyprwayland-scanner": "hyprwayland-scanner_2", @@ -1135,11 +1175,11 @@ "xdph": "xdph_2" }, "locked": { - "lastModified": 1729989895, - "narHash": "sha256-IFctdjt+v7zRDe24Y8+BdVDaKy0pmn60FWDzpYg4CT0=", + "lastModified": 1739815352, + "narHash": "sha256-JqMiCMkkOOq5380y7S/xgBG9yd2C7/KjDbXqu4vLe2A=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a3d3b4fd64a51a8c1663b450bd2a408f1f0fa9b3", + "rev": "d01f9943e1d401b09fc53be3c161279ab4f2c5ba", "type": "github" }, "original": { @@ -1164,11 +1204,11 @@ ] }, "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -1224,11 +1264,11 @@ ] }, "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -1243,11 +1283,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1739606511, - "narHash": "sha256-ywkv5Pm6p4Taavp3yX9SjoLVf/mIHS3fRXSHjXqaJHQ=", + "lastModified": 1742402033, + "narHash": "sha256-aaBdTUJIAo9LBPpjNX96AoAi0H+O/oW8o+7SCVBAzXI=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "c309a73d2d9821c90864447058b627c02bd82165", + "rev": "3a5ad2a1db420f0238895f2cb1ff64acd0d2cc54", "type": "github" }, "original": { @@ -1283,11 +1323,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1739004667, - "narHash": "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw=", + "lastModified": 1741933157, + "narHash": "sha256-HEWIQ1SgUTnc964oDsi68rQQug57BqbdUYqZvr3Ep0A=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "ac55bbdb6cee760af9315899b5b187a40ce43e46", + "rev": "c3cf91bdb6a912f9d2c2779deebdf23385fd659a", "type": "github" }, "original": { @@ -1308,11 +1348,11 @@ ] }, "locked": { - "lastModified": 1739048933, - "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "type": "github" }, "original": { @@ -1389,11 +1429,11 @@ ] }, "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", + "lastModified": 1739048933, + "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", + "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", "type": "github" }, "original": { @@ -1414,11 +1454,11 @@ ] }, "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -1441,11 +1481,11 @@ ] }, "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -1517,11 +1557,11 @@ ] }, "locked": { - "lastModified": 1734114420, - "narHash": "sha256-n52PUzub5jZWc8nI/sR7UICOheU8rNA+YZ73YaHeCBg=", + "lastModified": 1741798497, + "narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=", "owner": "domenkozar", "repo": "nix", - "rev": "bde6a1a0d1f2af86caa4d20d23eca019f3d57eee", + "rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd", "type": "github" }, "original": { @@ -1531,27 +1571,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -1559,11 +1578,11 @@ ] }, "locked": { - "lastModified": 1739675689, - "narHash": "sha256-zSmU6RvIdwbwGObnjXb+jTmF4q9e7D4BCs2926VegR8=", + "lastModified": 1742174123, + "narHash": "sha256-pDNzMoR6m1ZSJToZQ6XDTLVSdzIzmFl1b8Pc3f7iV6Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "52ef1072d57cfd0b4d2c375d646e7420ae2f5901", + "rev": "2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c", "type": "github" }, "original": { @@ -1572,6 +1591,27 @@ "type": "github" } }, + "nixcord": { + "inputs": { + "flake-compat": "flake-compat_4", + "nixpkgs": "nixpkgs_8", + "systems": "systems_4", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1742251239, + "narHash": "sha256-QH61lUWvO7jkZAzsgBJtyjmX5/UozZcSZQxOl10jVk4=", + "owner": "kaylorben", + "repo": "nixcord", + "rev": "d7f44d000158fa46af9fae1819d8221d1ccb4ca2", + "type": "github" + }, + "original": { + "owner": "kaylorben", + "repo": "nixcord", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1737469691, @@ -1588,29 +1628,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -1622,11 +1646,27 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1742272065, + "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", + "rev": "3549532663732bfd89993204d40543e9edaec4f2", "type": "github" }, "original": { @@ -1636,7 +1676,23 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { + "locked": { + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1715534503, "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", @@ -1652,6 +1708,22 @@ "type": "github" } }, + "nixpkgs_14": { + "locked": { + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1733212471, @@ -1686,11 +1758,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -1734,11 +1806,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -1750,27 +1822,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1742169275, + "narHash": "sha256-nkH2Edu9rClcsQp2PYBe8E6fp8LDPi2uDBQ6wyMdeXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", + "rev": "5d9b5431f967007b3952c057fc92af49a4c5f3b2", "type": "github" }, "original": { @@ -1780,24 +1836,34 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1735554305, + "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks_2", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_9", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_11", + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1739632145, - "narHash": "sha256-maNBjf9whO303r4+8ekfAZOrf3sHnw6DLiSph5xnXJw=", + "lastModified": 1742396414, + "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8c55873998948bf14a2b6cf30f9ad5ecdf79818", + "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", "type": "github" }, "original": { @@ -1806,6 +1872,29 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1741693509, + "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", @@ -1816,11 +1905,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", "type": "github" }, "original": { @@ -1839,11 +1928,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -1860,15 +1949,14 @@ "hyprspace", "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -1880,17 +1968,17 @@ "pre-commit-hooks_3": { "inputs": { "flake-compat": "flake-compat_5", - "gitignore": "gitignore_5", + "gitignore": "gitignore_4", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1742300892, + "narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "ea26a82dda75bee6783baca6894040c8e6599728", "type": "github" }, "original": { @@ -1909,25 +1997,27 @@ "hyprpolkitagent": "hyprpolkitagent", "hyprspace": "hyprspace", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_8", + "nixcord": "nixcord", + "nixpkgs": "nixpkgs_10", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks_3", "sops-nix": "sops-nix", "stylix": "stylix", - "superfile": "superfile" + "superfile": "superfile", + "zen-browser": "zen-browser" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": { @@ -1945,13 +2035,14 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_2", - "git-hooks": "git-hooks_3", + "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", + "nur": "nur", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1959,11 +2050,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1739375014, - "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", + "lastModified": 1742406729, + "narHash": "sha256-k03W8/GTJlCTtf5UaC4PIKSwTVQ3d3farweYvpkb53M=", "owner": "danth", "repo": "stylix", - "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", + "rev": "ccb411c5db16341455d82d955fef4db9985741a6", "type": "github" }, "original": { @@ -1977,14 +2068,14 @@ "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_3", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1739530074, - "narHash": "sha256-/6JIAIsqiWg0853YDU/Ncc51+pcHAfkZu2nW3J8uo3w=", + "lastModified": 1742229245, + "narHash": "sha256-Mno0aoVkURC3mSfsEVbPxNS0c8PAObYvdHBq4yUPxq4=", "owner": "MHNightCat", "repo": "superfile", - "rev": "231c9dcef20d917dff5426e2c30a0490db019d72", + "rev": "1f0ab010c8e4c6f7d472a9a9c18e0747e3ccd654", "type": "github" }, "original": { @@ -2048,9 +2139,8 @@ "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "id": "systems", + "type": "indirect" } }, "systems_5": { @@ -2083,6 +2173,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -2120,11 +2225,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1737565458, - "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", "owner": "tinted-theming", "repo": "schemes", - "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", "type": "github" }, "original": { @@ -2136,11 +2241,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1735737224, - "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { @@ -2166,18 +2271,37 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ - "nixvim", + "stylix", + "nur", "nixpkgs" ] }, "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { @@ -2214,11 +2338,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -2261,11 +2385,11 @@ ] }, "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { @@ -2273,6 +2397,24 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_14" + }, + "locked": { + "lastModified": 1742375121, + "narHash": "sha256-wIRU5K0TdEKr7RMNNIjtYYebcO4isaoYLctaftdurQs=", + "ref": "refs/heads/main", + "rev": "bb095cab6c476742d60602eac636057e32073f2e", + "revCount": 80, + "type": "git", + "url": "https://git.sr.ht/~canasta/zen-browser-flake/" + }, + "original": { + "type": "git", + "url": "https://git.sr.ht/~canasta/zen-browser-flake/" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 033f6bf..85caa5f 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,8 @@ # Don't follow nixpkgs or cache will miss # inputs.nixpkgs.follows = "nixpkgs"; }; - + zen-browser.url = "git+https://git.sr.ht/~canasta/zen-browser-flake/"; + nixcord.url = "github:kaylorben/nixcord"; devenv = { url = "github:cachix/devenv/main"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/modules/common-gui.nix b/home-manager/modules/common-gui.nix index 3acb0b8..30827d7 100644 --- a/home-manager/modules/common-gui.nix +++ b/home-manager/modules/common-gui.nix @@ -6,6 +6,9 @@ ./kitty.nix ./ghostty.nix ./obs.nix + ./thunar.nix + ./zen.nix + ./xdg.nix ]; fonts.fontconfig.enable = true; diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index af9b40e..a66094b 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -18,6 +18,7 @@ ./tmux/tmux.nix ./zoxide.nix ./zsh.nix + ./fzf.nix ./nushell/default.nix ]; nixpkgs.config.allowUnfree = true; diff --git a/home-manager/modules/eza.nix b/home-manager/modules/eza.nix index cb3f83e..302ae90 100644 --- a/home-manager/modules/eza.nix +++ b/home-manager/modules/eza.nix @@ -1,9 +1,16 @@ # A modern replacement for 'ls'. -{...}: { +{ ... }: +{ programs.eza = { enable = true; enableZshIntegration = true; git = true; icons = "auto"; + extraOptions = [ + "--group-directories-first" + "--no-quotes" + "--git-ignore" + "--icons=always" + ]; }; } diff --git a/home-manager/modules/fzf.nix b/home-manager/modules/fzf.nix new file mode 100644 index 0000000..9e35d00 --- /dev/null +++ b/home-manager/modules/fzf.nix @@ -0,0 +1,31 @@ +# Fzf is a general-purpose command-line fuzzy finder. +{ config, lib, ... }: +let + accent = "#" + config.lib.stylix.colors.base0D; + foreground = "#" + config.lib.stylix.colors.base05; + muted = "#" + config.lib.stylix.colors.base03; +in +{ + programs.fzf = { + enable = true; + enableZshIntegration = true; + colors = lib.mkForce { + "fg+" = accent; + "bg+" = "-1"; + "fg" = foreground; + "bg" = "-1"; + "prompt" = muted; + "pointer" = accent; + }; + defaultOptions = [ + "--margin=1" + "--layout=reverse" + "--border=rounded" + "--info='hidden'" + "--header=''" + "--prompt='/ '" + "-i" + "--no-bold" + ]; + }; +} diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index 6f95ae6..ad089d1 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -4,11 +4,13 @@ pkgs, user, ... -}: { +}: +{ programs.git = { enable = true; userName = "gwg313"; userEmail = "gwg313@pm.me"; + extraConfig = { user = { signingkey = "60FF63B4826B7400"; @@ -55,13 +57,23 @@ pull = { rebase = false; }; + + color.ui = "1"; }; ignores = [ "__pycache__" ".direnv" - # Node "npm-debug.log" + ".cache/" + ".DS_Store" + ".idea/" "*.swp" + "*.elc" + "auto-save-list" + ".direnv/" + "node_modules" + "result" + "result-*" ]; }; @@ -69,6 +81,8 @@ shellAliases = { trackme = "git branch --set-upstream-to=origin/$(git symbolic-ref --short HEAD)"; rebasemain = "git pull origin main --rebase"; + hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all''; + llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative''; }; }; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index b0c2ef4..ef4ad52 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -20,7 +20,7 @@ in ./animations.nix ./bindings.nix ./polkitagent.nix - # ./hyprspace.nix + ./hyprspace.nix ]; home.packages = with pkgs; [ @@ -100,7 +100,7 @@ in gaps_in = gaps-in; gaps_out = gaps-out; border_size = border-size; - border_part_of_window = true; + # border_part_of_window = true; # layout = "master"; layout = "dwindle"; }; diff --git a/home-manager/modules/hyprspace.nix b/home-manager/modules/hyprspace.nix index 99841c9..7ea8bfb 100644 --- a/home-manager/modules/hyprspace.nix +++ b/home-manager/modules/hyprspace.nix @@ -1,6 +1,5 @@ { inputs, pkgs, ... }: { - wayland.windowManager.hyprland = { plugins = [ inputs.hyprspace.packages.${pkgs.system}.Hyprspace ]; settings = { @@ -9,11 +8,6 @@ autoDrag = false; }; }; - - bind = [ - "$mod,S, overview:toggle" # Overview - - ]; }; }; } diff --git a/home-manager/modules/kitty.nix b/home-manager/modules/kitty.nix index ae33337..ef85e02 100644 --- a/home-manager/modules/kitty.nix +++ b/home-manager/modules/kitty.nix @@ -7,6 +7,22 @@ { programs.kitty = { enable = true; + settings = { + scrollback_lines = 10000; + initial_window_width = 1200; + initial_window_height = 600; + update_check_interval = 0; + enable_audio_bell = false; + confirm_os_window_close = "0"; + remember_window_size = "no"; + disable_ligatures = "never"; + url_style = "curly"; + cursor_shape = "Underline"; + cursor_underline_thickness = 3; + cursor_trail = 3; + cursor_trail_decay = "0.1 0.4"; + window_padding_width = 10; + }; font = { # name = lib.mkForce "Comic Code"; size = lib.mkForce 16; diff --git a/home-manager/modules/lazygit.nix b/home-manager/modules/lazygit.nix index dc1116f..d004335 100644 --- a/home-manager/modules/lazygit.nix +++ b/home-manager/modules/lazygit.nix @@ -1,10 +1,28 @@ -# A terminal-based Git interface. -{ ... }: +{ config, lib, ... }: +let + accent = "#${config.lib.stylix.colors.base0D}"; + muted = "#${config.lib.stylix.colors.base03}"; +in { programs.lazygit = { enable = true; - settings = { + settings = lib.mkForce { + git.overrideGpg = true; + gui = { + theme = { + activeBorderColor = [ + accent + "bold" + ]; + inactiveBorderColor = [ muted ]; + }; + showListFooter = false; + showRandomTip = false; + showCommandLog = false; + showBottomLine = false; + nerdFontsVersion = "3"; + }; }; }; } diff --git a/home-manager/modules/starship.nix b/home-manager/modules/starship.nix index 4056407..9ea90d9 100644 --- a/home-manager/modules/starship.nix +++ b/home-manager/modules/starship.nix @@ -1,18 +1,51 @@ # A customizable prompt for shells. -{ ... }: +{ config, lib, ... }: +let + accent = "#${config.lib.stylix.colors.base0D}"; + background-alt = "#${config.lib.stylix.colors.base01}"; +in { programs.starship = { enable = true; enableZshIntegration = true; - enableNushellIntegration = true; settings = { add_newline = true; - character = { - success_symbol = "➜"; - error_symbol = "➜"; + format = lib.concatStrings [ + "$hostname" + "$directory" + "$git_branch" + "$git_state" + "$git_status" + "$character" + ]; + directory = { + style = accent; }; - aws = { - disabled = true; + + character = { + success_symbol = "[❯](${accent})"; + error_symbol = "[❯](red)"; + vimcmd_symbol = "[❮](cyan)"; + }; + + git_branch = { + symbol = "[](${background-alt}) "; + style = "fg:${accent} bg:${background-alt}"; + format = "on [$symbol$branch]($style)[](${background-alt}) "; + }; + + git_status = { + format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218)($ahead_behind$stashed)]($style)"; + style = "cyan"; + conflicted = ""; + renamed = ""; + deleted = ""; + stashed = "≡"; + }; + + git_state = { + format = "([$state( $progress_current/$progress_total)]($style)) "; + style = "bright-black"; }; }; }; diff --git a/home-manager/modules/thunar.nix b/home-manager/modules/thunar.nix new file mode 100644 index 0000000..c1a415f --- /dev/null +++ b/home-manager/modules/thunar.nix @@ -0,0 +1,48 @@ +# Thunar is a file explorer +{ pkgs, ... }: +{ + # ctrl + m to toggle the menubar + home.packages = with pkgs.xfce; [ + thunar + xfconf + tumbler + thunar-archive-plugin + thunar-volman + ]; + + home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = '' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ''; +} diff --git a/home-manager/modules/tmux/tmux.nix b/home-manager/modules/tmux/tmux.nix index c6d41fc..01bd3dd 100644 --- a/home-manager/modules/tmux/tmux.nix +++ b/home-manager/modules/tmux/tmux.nix @@ -171,7 +171,7 @@ exec