From 93c7a5c2fc0ef5e12b9bed0625370d9cff9a007e Mon Sep 17 00:00:00 2001 From: Redyf Date: Sun, 30 Jun 2024 21:57:51 -0300 Subject: [PATCH 1/4] feat: add new hyprland animations --- home/redyf/desktop/hyprland/default.nix | 40 +++++++++++++++++-------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/home/redyf/desktop/hyprland/default.nix b/home/redyf/desktop/hyprland/default.nix index 00d180e8..770f8bf9 100644 --- a/home/redyf/desktop/hyprland/default.nix +++ b/home/redyf/desktop/hyprland/default.nix @@ -149,26 +149,41 @@ in { animations = { enabled = true; + # bezier = [ + # "pace,0.46, 1, 0.29, 0.99" + # "overshot,0.13,0.99,0.29,1.1" + # "md3_decel, 0.05, 0.7, 0.1, 1" + # ]; + # animation = [ + # "windowsIn,1,6,md3_decel,slide" + # "windowsOut,1,6,md3_decel,slide" + # "windowsMove,1,6,md3_decel,slide" + # "fade,1,10,md3_decel" + # "workspaces,1,9,md3_decel,slide" + # "workspaces, 1, 6, default" + # "specialWorkspace,1,8,md3_decel,slide" + # "border,1,10,md3_decel" + # ]; bezier = [ - "pace,0.46, 1, 0.29, 0.99" - "overshot,0.13,0.99,0.29,1.1" - "md3_decel, 0.05, 0.7, 0.1, 1" + "1, 0.23, 1, 0.32, 1" ]; + animation = [ - "windowsIn,1,6,md3_decel,slide" - "windowsOut,1,6,md3_decel,slide" - "windowsMove,1,6,md3_decel,slide" - "fade,1,10,md3_decel" - "workspaces,1,9,md3_decel,slide" - "workspaces, 1, 6, default" - "specialWorkspace,1,8,md3_decel,slide" - "border,1,10,md3_decel" + "windows, 1, 5, 1" + "windowsIn, 1, 5, 1, slide" + "windowsOut, 1, 5, 1, slide" + "border, 1, 5, default" + "borderangle, 1, 5, default" + "fade, 1, 5, default" + "workspaces, 1, 5, 1, slidefade 30%" ]; }; misc = { vfr = true; # misc:no_vfr -> misc:vfr. bool, heavily recommended to leave at default on. Saves on CPU usage. vrr = false; # misc:vrr -> Adaptive sync of your monitor. 0 (off), 1 (on), 2 (fullscreen only). Default 0 to avoid white flashes on select hardware. + disable_hyprland_logo = true; + # disable_splash_rendering = true; }; dwindle = { @@ -186,7 +201,7 @@ in { mfact = 0.5; orientation = "right"; special_scale_factor = 0.8; - new_status = "master"; + new_status = "slave"; no_gaps_when_only = false; }; @@ -202,6 +217,7 @@ in { "autostart" "easyeffects --gapplication-service" # Starts easyeffects in the background "importGsettings" + "spotify" ]; bind = [ From 4ef0fc5ecdee6ac92ee2aa8689f0e36b561dd52c Mon Sep 17 00:00:00 2001 From: Redyf Date: Sun, 30 Jun 2024 21:58:12 -0300 Subject: [PATCH 2/4] chore: rename deprecated variables --- hosts/redyf/configuration.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix index 1a47d9b5..c3704ee0 100644 --- a/hosts/redyf/configuration.nix +++ b/hosts/redyf/configuration.nix @@ -53,9 +53,9 @@ in { modesetting.enable = true; package = config.boot.kernelPackages.nvidiaPackages.stable; }; - opengl = { + graphics = { enable = true; - driSupport32Bit = true; + enable32Bit = true; extraPackages = with pkgs; [nvidia-vaapi-driver]; }; }; @@ -158,8 +158,10 @@ in { base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; fonts = { monospace = { - package = with pkgs; nerdfonts.override {fonts = ["IBMPlexMono"];}; - name = "BlexMono Nerd Font Bold"; + # package = with pkgs; nerdfonts.override {fonts = ["FiraCode"];}; + # name = "FiraCode Nerd Font Mono Med"; + package = with pkgs; inputs.font-flake.packages.${system}.sf-mono; + name = "Liga SFMono Nerd Font"; }; sansSerif = { package = pkgs.dejavu_fonts; @@ -178,7 +180,7 @@ in { }; opacity = { applications = 1.0; - terminal = 1.0; + terminal = 0.95; desktop = 1.0; popups = 1.0; }; From f3490adcbaeefac862eada73d07a5a176a791ce4 Mon Sep 17 00:00:00 2001 From: Redyf Date: Sun, 30 Jun 2024 21:58:35 -0300 Subject: [PATCH 3/4] chore: update flake inputs --- flake.lock | 703 ++++++----------------------------------------------- flake.nix | 14 +- 2 files changed, 77 insertions(+), 640 deletions(-) diff --git a/flake.lock b/flake.lock index 446616a7..d22ada23 100644 --- a/flake.lock +++ b/flake.lock @@ -1,35 +1,15 @@ { "nodes": { - "Neve": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixvim": "nixvim" - }, - "locked": { - "lastModified": 1718287254, - "narHash": "sha256-YLq+gEzQ1YBS8zkw6vAdQCStNhBMXXOLnGZiZzWLtPY=", - "owner": "redyf", - "repo": "Neve", - "rev": "e7954f9b15555f6c961383ff0647560c17f2aec7", - "type": "github" - }, - "original": { - "owner": "redyf", - "repo": "Neve", - "type": "github" - } - }, "ags": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1715703984, - "narHash": "sha256-0BZkMui6aCqswMCouvp0G90tAxDOxVnxTvG6TDZsDaI=", + "lastModified": 1718921313, + "narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=", "owner": "Aylur", "repo": "ags", - "rev": "11150225e62462bcd431d1e55185e810190a730a", + "rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d", "type": "github" }, "original": { @@ -152,39 +132,16 @@ "type": "github" } }, - "devshell": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "Neve", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", - "owner": "numtide", - "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1718588625, - "narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", + "lastModified": 1719733833, + "narHash": "sha256-6h2EqZU9bL9rHlXE+2LCBgnDImejzbS+4dYsNDDFlkY=", "owner": "nix-community", "repo": "disko", - "rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", + "rev": "d185770ea261fb5cf81aa5ad1791b93a7834d12c", "type": "github" }, "original": { @@ -194,36 +151,6 @@ } }, "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -239,28 +166,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "Neve", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -279,53 +184,17 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "font-flake": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719113152, - "narHash": "sha256-JZ6Dk/+U0k7bFAF8oJOq4APN+k3aAjWlPg600vfCq1Y=", + "lastModified": 1719764655, + "narHash": "sha256-zF7YgsrZnlXRt26X6MVFlKCQwyJt/GUYCNk8fZS+YDM=", "owner": "redyf", "repo": "font-flake", - "rev": "63aa8e06266d1081d475b224a6ed4a53511ff118", + "rev": "84767d8db241a07e5a44155dad04a6beadaf4072", "type": "github" }, "original": { @@ -350,58 +219,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "Neve", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "Neve", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "Neve", - "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" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -420,39 +237,17 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "Neve", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1718744742, - "narHash": "sha256-kOG10gJ3zLZNiom9NXJM4/mA4/lsmR3rp74YVw+iros=", + "lastModified": 1719677234, + "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "owner": "nix-community", "repo": "home-manager", - "rev": "0dd1c1495af6e6424695670343236f0053bf4947", + "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "type": "github" }, "original": { @@ -462,7 +257,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_2": { "inputs": { "nixpkgs": [ "stylix", @@ -499,40 +294,11 @@ ] }, "locked": { - "lastModified": 1718368322, - "narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprcursor_2": { - "inputs": { - "hyprlang": [ - "waybar-hyprland", - "hyprlang" - ], - "nixpkgs": [ - "waybar-hyprland", - "nixpkgs" - ], - "systems": [ - "waybar-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1718368322, - "narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -547,16 +313,16 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_6", - "systems": "systems_4", + "nixpkgs": "nixpkgs_4", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1718740381, - "narHash": "sha256-nRKxZfzSiG8EUmUmgsvPbEDR1GAPpVHZFbF7RJMzJTM=", + "lastModified": 1719786368, + "narHash": "sha256-fpVk3CajFQ4hcTuoU9njw/btPrAV92f8+WawVy8XvcE=", "ref": "refs/heads/main", - "rev": "e0e3c4c6ae15af88ac5fd5ab959adfe45a2e1dca", - "revCount": 4861, + "rev": "d7ea1b7785f31e9fd6477490309721a19a835592", + "revCount": 4900, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -581,38 +347,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "waybar-hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "waybar-hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -650,35 +389,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "waybar-hyprland", - "hyprutils" - ], - "nixpkgs": [ - "waybar-hyprland", - "nixpkgs" - ], - "systems": [ - "waybar-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1717881852, - "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "ec6938c66253429192274d612912649a0cfe4d28", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -691,36 +401,11 @@ ] }, "locked": { - "lastModified": 1718271409, - "narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "waybar-hyprland", - "nixpkgs" - ], - "systems": [ - "waybar-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1718271409, - "narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { @@ -741,36 +426,11 @@ ] }, "locked": { - "lastModified": 1718119275, - "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "waybar-hyprland", - "nixpkgs" - ], - "systems": [ - "waybar-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1718119275, - "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { @@ -781,66 +441,30 @@ }, "matugen": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_5", + "systems": "systems_3" }, "locked": { - "lastModified": 1711657889, - "narHash": "sha256-4VX7Rt+ftEH8nwg59eT7TsvHYUf8/euUmwh/JLc4rLc=", + "lastModified": 1719698631, + "narHash": "sha256-gErDkUAIiofxVLfXojthXRwG42rOR50P1Ym4DcqWoA8=", "owner": "InioX", "repo": "matugen", - "rev": "566277529dadc2b149a8bd8b9859ea791ecdef26", + "rev": "7ea9a7506de06cab146241e7ef60812a791d19a1", "type": "github" }, "original": { "owner": "InioX", - "ref": "v2.2.0", "repo": "matugen", "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "Neve", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1718149104, - "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", + "lastModified": 1718714799, + "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_10": { - "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "type": "github" }, "original": { @@ -852,43 +476,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1718276985, - "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", + "lastModified": 1719379843, + "narHash": "sha256-u+D+IOAMMl70+CJ9NKB+RMrASjInuIWMHzjLWQjPZ6c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", + "rev": "b3f3c1b13fb08f3828442ee86630362e81136bbc", "type": "github" }, "original": { @@ -898,7 +490,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1719109599, "narHash": "sha256-SQDtUnsB0q36dRZBCQNbErEMz3xFtdOThVJoVbMkB7s=", @@ -913,13 +505,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -929,13 +521,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { - "lastModified": 1691186842, - "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -945,13 +537,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { - "lastModified": 1718530797, - "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "type": "github" }, "original": { @@ -961,7 +553,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -977,59 +569,16 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager", - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1718282813, - "narHash": "sha256-Rlf+UmAZ8nr5dBEqIiubLcxT8x/LSmS3ID+HNwyq+D4=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "01aa3d469e0cb0430e16fde6c5c3176f453bfba8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nur": { - "locked": { - "lastModified": 1718755722, - "narHash": "sha256-BhHQGfL5CJ5Bm1jPVXStTETkN7CpYDkkvNEimQdXGGE=", - "owner": "nix-community", - "repo": "NUR", - "rev": "5c630785d3d86f5cfb1f015ae8792a44e137aa34", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "root": { "inputs": { - "Neve": "Neve", "ags": "ags", "disko": "disko", "font-flake": "font-flake", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "hyprland": "hyprland", "matugen": "matugen", - "nixpkgs": "nixpkgs_8", - "nur": "nur", - "stylix": "stylix", - "waybar-hyprland": "waybar-hyprland" + "nixpkgs": "nixpkgs_6", + "stylix": "stylix" } }, "stylix": { @@ -1041,17 +590,17 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_9" + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1718634635, - "narHash": "sha256-REUyeY+gD/QuTwAhuJycheej0FWFGPTosI+jiG5TsQk=", + "lastModified": 1719525570, + "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", "owner": "danth", "repo": "stylix", - "rev": "f13c946181730f98e1a5cd09714100490207b250", + "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", "type": "github" }, "original": { @@ -1076,36 +625,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1120,7 +639,7 @@ "type": "github" } }, - "systems_5": { + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1135,52 +654,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "Neve", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718139168, - "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "waybar-hyprland": { - "inputs": { - "hyprcursor": "hyprcursor_2", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_10", - "systems": "systems_5", - "xdph": "xdph_2" - }, - "locked": { - "lastModified": 1718740381, - "narHash": "sha256-zlK0jB/LXXxxckDw0HvM9JZpZMp6noJ0CpxCBcaoYe8=", - "owner": "hyprwm", - "repo": "hyprland", - "rev": "e0e3c4c6ae15af88ac5fd5ab959adfe45a2e1dca", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -1198,41 +671,11 @@ ] }, "locked": { - "lastModified": 1718272114, - "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, - "xdph_2": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "hyprlang": [ - "waybar-hyprland", - "hyprlang" - ], - "nixpkgs": [ - "waybar-hyprland", - "nixpkgs" - ], - "systems": [ - "waybar-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1718272114, - "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 87a6f453..657bd853 100644 --- a/flake.nix +++ b/flake.nix @@ -9,20 +9,14 @@ }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - waybar-hyprland.url = "github:hyprwm/hyprland"; - nur.url = "github:nix-community/NUR"; - Neve.url = "github:redyf/Neve"; disko.url = "github:nix-community/disko"; stylix.url = "github:danth/stylix"; ags.url = "github:Aylur/ags"; - matugen.url = "github:InioX/matugen?ref=v2.2.0"; + matugen.url = "github:InioX/matugen"; font-flake.url = "github:redyf/font-flake"; - - # SFMono w/ patches - # sf-mono-liga-src = { - # url = "github:shaunsingh/SFMono-Nerd-Font-Ligaturized"; - # flake = false; - # }; + # waybar-hyprland.url = "github:hyprwm/hyprland"; + # Neve.url = "github:redyf/Neve"; + # nur.url = "github:nix-community/NUR"; # git+ssh://git@git.example.com/User/repo.git if you're using private repos # berkeley = { From 9f03cca61bd89205d5a524301b7f9e4743abaf11 Mon Sep 17 00:00:00 2001 From: Redyf Date: Wed, 3 Jul 2024 21:46:12 -0300 Subject: [PATCH 4/4] feat: add new section + shoutout for NobbZ I got this section from NobbZ! His nix-config is awesome, go check his github :) --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 0a0861ab..2a3ad5ef 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,12 @@ iwctl --passphrase [passphrase] station [device] connect [SSID] ## Installation +> [!CAUTION] +> This hosts system and home configurations are public for your own learning and +> research. They are not meant to be used with any hardware other than mine. +> Trying to build and deploy them to other systems without appropriate changes +> can render your machines unbootable and damage data. + I'll guide you through the Installation, but first make sure to download the Minimal ISO image available at [NixOS](https://nixos.org/download#nixos-iso) and make a bootable drive with it. I suggest using [Rufus](https://rufus.ie/en/) for the task as it's a great software, and an ethernet cable to make things easier. We shall begin! @@ -164,6 +170,7 @@ Credits for the installation section goes to [Stephenstechtalks](https://github. - [Siduck76](https://github.com/siduck76/nvchad/) - [Sioodmy](https://github.com/sioodmy/dotfiles) - [ZerotoNix](https://zero-to-nix.com) +- [NobbZ](https://github.com/NobbZ)