From 85ec6f4c7cd4a643766cd0d3c8998b249a1bb4b7 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 19 Jun 2024 22:02:53 +0200 Subject: [PATCH] xps 19 --- flake.lock | 91 +++++++++++++++++++++--------- home-modules/firefox.nix | 5 +- home-modules/hyprland.nix | 19 ++++--- home-modules/programming/gleam.nix | 6 ++ home.nix | 5 +- 5 files changed, 86 insertions(+), 40 deletions(-) create mode 100644 home-modules/programming/gleam.nix diff --git a/flake.lock b/flake.lock index 0c76f4d..d0ca59f 100755 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1717931498, - "narHash": "sha256-8j6h9gZmAngPXLFRRtd8ySRb0I43f0rRW0puU8IBwKA=", + "lastModified": 1718337800, + "narHash": "sha256-Azz2lg6WsfT4SDMTA3DtJ6hS7kox3e0buSrV4J+zMAQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3b7b7d83b3561269c2d8f20b5d4d4496bb36b2e6", + "rev": "aaf15fa3ed60109af8aad4cbb19c1fe28b4476ad", "type": "gitlab" }, "original": { @@ -202,17 +202,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1717960589, - "narHash": "sha256-0fPh9sFwzWbvDTTY6omTrYk2r9nBz7e4AzGH6HlRLCo=", + "lastModified": 1718365532, + "narHash": "sha256-2wd1ytcpvnBlhTxP1O/G4PJSY3fKuTxQLDxp+kFP4Sg=", "ref": "refs/heads/main", - "rev": "121c6ac3eae1601a1498e52a9be7030ebfed242c", - "revCount": 4788, + "rev": "a9d53a2252f7ec084e2487d18777e2df01c8c351", + "revCount": 4825, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -228,6 +229,11 @@ "hyprland": [ "hyprland" ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], "systems": [ "hyprland-plugins", "hyprland", @@ -235,11 +241,11 @@ ] }, "locked": { - "lastModified": 1717837954, - "narHash": "sha256-chdXRv+JoiLQ9xwwq4q14X14em94VQaxk+tzkxRnQ5c=", + "lastModified": 1718111105, + "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "8571aa9badf7db9c4911018a5611c038cc776256", + "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", "type": "github" }, "original": { @@ -277,6 +283,10 @@ }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -287,11 +297,11 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -300,6 +310,31 @@ "type": "github" } }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881334, + "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -352,11 +387,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -400,11 +435,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717786204, - "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -431,11 +466,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1717696253, - "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", + "lastModified": 1718208800, + "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", + "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "type": "github" }, "original": { @@ -520,11 +555,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717902109, - "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=", + "lastModified": 1718137936, + "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f0922ad001829b400f0160ba85b47d252fa3d925", + "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", "type": "github" }, "original": { @@ -580,11 +615,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1717918856, + "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "72907822c19afc0983c69d59d299204381623725", "type": "github" }, "original": { diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index 4749372..5947149 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -1,7 +1,8 @@ -{pkgs, secrets, user, inputs, ...}: { +{pkgs, pkgs-unstable, secrets, user, inputs, ...}: { programs.firefox = { enable = true; - package = pkgs.firefox; + package = pkgs-unstable.firefox; + # package = pkgs.firefox; profiles.${user} = { # extensions = with inputs.firefox-addons; [ # ublock-origin diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index d35ded3..a443832 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -49,22 +49,25 @@ let in lib.mkIf (user != "tv") { - home.packages = [ + home.packages = with pkgs; [ # hyprland itself is a system package - pkgs.hyprland-protocols + hyprland-protocols - pkgs-unstable.hyprlock - pkgs-unstable.hypridle + hyprlock + hypridle - pkgs.grim - pkgs.slurp + grim + slurp - ]; + ] ++ (with pkgs-unstable; [ + + ]); wayland.windowManager.hyprland = { enable = true; # package = pkgs-unstable.hyprland; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; + package = pkgs.hyprland; + # package = inputs.hyprland.packages.${pkgs.system}.hyprland; xwayland.enable = true; systemd.enable = true; plugins = [ diff --git a/home-modules/programming/gleam.nix b/home-modules/programming/gleam.nix new file mode 100644 index 0000000..841a4b6 --- /dev/null +++ b/home-modules/programming/gleam.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + gleam + ]; +} diff --git a/home.nix b/home.nix index ca66919..38f24eb 100755 --- a/home.nix +++ b/home.nix @@ -49,6 +49,7 @@ ./home-modules/programming/python.nix ./home-modules/programming/node.nix + ./home-modules/programming/gleam.nix ./home-modules/color-pallete.nix ]; @@ -60,7 +61,6 @@ permittedInsecurePackages = allowed.inecure-packages; }; home.packages = with pkgs; [ - firefox chromium zathura @@ -88,8 +88,9 @@ gsettings-desktop-schemas wl-clipboard xclip + xournal ] ++ (with pkgs-unstable; [ - # firefox + firefox ]) ++ (if host != "NxACE" then (with pkgs; [ signal-desktop obsidian