diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..d56a237 --- /dev/null +++ b/.envrc @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +eval "$(devenv direnvrc)" +use devenv diff --git a/flake.lock b/flake.lock index 398f4a2..1e327a4 100644 --- a/flake.lock +++ b/flake.lock @@ -102,12 +102,12 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1771014593, - "narHash": "sha256-NrCFwn20ewJwy/SZoREs+XylerizPCYP54n9qkr31/E=", - "rev": "69b4ff80ae2bbdd1e3f02ccd76a5f2988b118ed2", - "revCount": 397, + "lastModified": 1771910357, + "narHash": "sha256-ns+2FDFS2BUbT1CshCF0hLYyYR2BiTOQqCMHDoGFXUo=", + "rev": "b0833008a670c5d1ad2d1afbd711c1bf101f5296", + "revCount": 405, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.16.0/019c58b5-64dc-77f9-b913-8738b7d338cc/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.16.3/019c8e19-e7a4-7fe4-ad79-b4b5feefd24a/source.tar.gz" }, "original": { "type": "tarball", @@ -117,37 +117,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-PUo0u1iNMB8eTlBNFMCW8/UAn1sGKGqsIYlXaDRhx00=", + "narHash": "sha256-NK3YCWCmz9WYQtXTg5/VYNo+KrV/7P5rBYqVhkzWEv8=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-jiIWiM88xkEpBQeohSxhl83fn2xoZY0nFkrW6CUAIAI=", + "narHash": "sha256-RtiD/ualuvKSZH04G5KpBd2D4tcr5pv//cU+CGnByKs=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-qF/NNdHwh3tAHrKIOz2FRq5Q8GcSMzJeEY/PFvGf5vo=", + "narHash": "sha256-XDzjUdfsnWtANfAzd8GpLkuch1+3rHDGD2uKN93Fw6M=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.3/x86_64-linux" } }, "disko": { @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1771324387, - "narHash": "sha256-d2Yc/7k1P8aCZqaSq9Aa/oEEncIm78DYHwpanqP+Axg=", + "lastModified": 1771881364, + "narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=", "owner": "nix-community", "repo": "disko", - "rev": "6ef4eafa8ecbd67a096a552876752397f616a08f", + "rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1771269455, - "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", + "lastModified": 1771851181, + "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", + "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", "type": "github" }, "original": { @@ -352,12 +352,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1771010067, - "narHash": "sha256-Itk88UC3CxjGjjAb20KI6KrM9tRoGEpbv996fXwAWGo=", - "rev": "5c670e37e884c43e1da0405075c9b9c83d316a6c", - "revCount": 24629, + "lastModified": 1771906938, + "narHash": "sha256-yMI4VhuahG1027I+x/xy0F5FUM7ntwB/hDouCmpwEb8=", + "rev": "628d55ca372a6d9eb071804b589aaa8a6974807d", + "revCount": 24688, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.16.0/019c589d-45e9-7337-9ff0-a8d78fecf63f/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.16.3/019c8e13-4542-7edc-9244-38a597d18258/source.tar.gz" }, "original": { "type": "tarball", @@ -366,11 +366,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771423359, - "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -427,12 +427,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770537093, - "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", - "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", - "revCount": 942631, + "lastModified": 1771177547, + "narHash": "sha256-trTtk3WTOHz7hSw89xIIvahkgoFJYQ0G43IlqprFoMA=", + "rev": "ac055f38c798b0d87695240c7b761b82fc7e5bc2", + "revCount": 946843, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.942631%2Brev-fef9403a3e4d31b0a23f0bacebbec52c248fbb51/019c4621-ce4f-799f-82f6-b3b29f099b09/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.946843%2Brev-ac055f38c798b0d87695240c7b761b82fc7e5bc2/019c6a25-fd20-733f-936e-6487e2957fe4/source.tar.gz" }, "original": { "type": "tarball", @@ -441,11 +441,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1771340206, - "narHash": "sha256-IanPDIuEft3uxOorgp5Sk1e5Vil2DYWL5FwN4zh4LF0=", + "lastModified": 1771979542, + "narHash": "sha256-0hqvh2D8tdwFG9pT9Ds1EysZYPTKpVJCunnXQ31MUZ8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c2629c3c2fadb47695e8e3deb37d7a416644bf3e", + "rev": "fe8e23f1d0e6ed4bdefd061e6834c4d61f2266be", "type": "github" }, "original": { @@ -535,11 +535,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771330061, - "narHash": "sha256-qBWXy3mSOEYjvZB/RZHT0joVPhNWU8GQZQljLzyMTq0=", + "lastModified": 1771787992, + "narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=", "owner": "danth", "repo": "stylix", - "rev": "fa45bf2d70517a8643a0edb44b02b8e6c0453d06", + "rev": "30054cca073b49b42a71289edec858f535b27fe9", "type": "github" }, "original": { @@ -684,11 +684,11 @@ ] }, "locked": { - "lastModified": 1771876204, - "narHash": "sha256-nTX+Qa3W+xsFxBl+lr4RsWvC4vgZocLt/qDeIvnf4+w=", + "lastModified": 1772005916, + "narHash": "sha256-aFYnT0gStcu1PVTh2Xzd0n8PIEKmqvTgrVkpv49qc6M=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2f951adfab1f5a090fe5ea4c5eaf11efca7f1039", + "rev": "044299e83752f78f9fc5d6a648f7f3dd84bb3b18", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 23e8868..22f6ff2 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ homeConfigurations = { "yoru@arcueid" = mkHome "x86_64-linux" ./hosts/home/home.nix; "xmorel@work-laptop" = mkHome "x86_64-linux" ./hosts/work/home.nix; - "xmorel@MacLaptop.local" = mkHome "aarch64-darwin" ./hosts/mac-laptop/home.nix; + # "xmorel@MacLaptop.local" = mkHome "aarch64-darwin" ./hosts/mac-laptop/home.nix; }; homeManagerModules.default = import ./modules/home-manager; nixosModules.default = import ./modules/nixos; diff --git a/hosts/work/home.nix b/hosts/work/home.nix index 0fba7f3..c782a37 100644 --- a/hosts/work/home.nix +++ b/hosts/work/home.nix @@ -37,7 +37,36 @@ }; home-manager.enable = true; rofi.enable = true; - noctalia-shell.enable = true; + noctalia-shell = { + # https://docs.noctalia.dev/getting-started/nixos/#config-ref + enable = true; + settings = { + settingsVersion = 0; + bar = { + widgets.left = [ + { id = "ControlCenter"; } + { id = "Launcher"; } + { id = "SystemMonitor"; } + { id = "MediaMini"; } + ]; + widgets.center = [ + { id = "Workspace"; } + { id = "ActiveWindow"; } + ]; + widgets.right = [ + { id = "Tray"; } + { id = "NotificationHistory"; } + { id = "Battery"; } + { id = "Volume"; } + { id = "Brightness"; } + { id = "Clock"; } + ]; + }; + location = { + name = "Plélan-le-Grand"; + }; + }; + }; quickshell.enable = true; alacritty.enable = true; kitty.enable = true; @@ -249,4 +278,5 @@ }; }; stylix.targets.firefox.profileNames = [ "default" ]; + stylix.targets.zen-browser.profileNames = [ "default" ]; } diff --git a/modules/home-manager/bundles/desktop-apps.nix b/modules/home-manager/bundles/desktop-apps.nix index 43f8694..8b1e7e9 100644 --- a/modules/home-manager/bundles/desktop-apps.nix +++ b/modules/home-manager/bundles/desktop-apps.nix @@ -18,12 +18,15 @@ pkgs.flameshot pkgs.lutris pkgs.ungoogled-chromium - pkgs.xfce.thunar - pkgs.xfce.thunar-archive-plugin - pkgs.xfce.thunar-volman + pkgs.thunar + pkgs.thunar-archive-plugin + pkgs.thunar-volman pkgs.vial pkgs.vlc ]; - programs.zen-browser.enable = true; + programs.zen-browser = { + enable = true; + suppressXdgMigrationWarning = true; + }; }; } diff --git a/modules/home-manager/bundles/shell.nix b/modules/home-manager/bundles/shell.nix index c5283af..775d396 100644 --- a/modules/home-manager/bundles/shell.nix +++ b/modules/home-manager/bundles/shell.nix @@ -78,7 +78,10 @@ jujutsu.enable = true; lazygit.enable = true; ripgrep.enable = true; - yazi.enable = true; + yazi = { + enable = true; + shellWrapperName = "y"; + }; }; }; } diff --git a/modules/home-manager/services/nix.nix b/modules/home-manager/services/nix.nix index bf95d77..6329459 100644 --- a/modules/home-manager/services/nix.nix +++ b/modules/home-manager/services/nix.nix @@ -15,7 +15,7 @@ home.packages = map lib.lowPrio [ pkgs.nh pkgs.nil - pkgs.nixfmt-rfc-style + pkgs.nixfmt ]; nix = { settings = {