diff --git a/flake.lock b/flake.lock index 6a7c5ed..7456d7c 100644 --- a/flake.lock +++ b/flake.lock @@ -57,12 +57,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1680946745, - "narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "946da791763db1c306b86a8bd3828bf5814a1247", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -81,11 +84,11 @@ ] }, "locked": { - "lastModified": 1680667162, - "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", + "lastModified": 1681250798, + "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", + "rev": "28698126bd825aff21cae9ffd15cf83e169051b0", "type": "github" }, "original": { @@ -119,11 +122,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1680976434, - "narHash": "sha256-sI9grpCpS1ni2ZvbYTG259hzwPXDSNQio+ol4CJKKRc=", + "lastModified": 1681219712, + "narHash": "sha256-rt0O9aVZhE1J6u+v19/blAqzl8VxyNLgOymfuHj1rkI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b32af6ebfb5ea3ffc16cbf07a6cdbaa6c486ba58", + "rev": "c2f29be9baccd14ced62105f0fc07e34e6f4fd29", "type": "github" }, "original": { @@ -140,11 +143,11 @@ ] }, "locked": { - "lastModified": 1671839510, - "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", + "lastModified": 1681065697, + "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", + "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "type": "github" }, "original": { @@ -158,11 +161,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1680695861, - "narHash": "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=", + "lastModified": 1681080114, + "narHash": "sha256-rAKfgQJQRsw4QMOXdxfHIh/d5LPY6HHKBX1KtaPs2No=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "9182de9ffc8c76fbf24d16dec0ea7a9430597a06", + "rev": "4bcedde1dc1a06107ec32c93a937de30f40aa1fc", "type": "github" }, "original": { @@ -264,11 +267,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1680865339, - "narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=", + "lastModified": 1681091990, + "narHash": "sha256-ifIzhksUBZKp5WgCuoVhDY32qaEplXp7khzrB6zkaFc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0040164e473509b4aee6aedb3b923e400d6df10b", + "rev": "ea96b4af6148114421fda90df33cf236ff5ecf1d", "type": "github" }, "original": { @@ -348,11 +351,11 @@ ] }, "locked": { - "lastModified": 1680404136, - "narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=", + "lastModified": 1681209176, + "narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b93eb910f768f9788737bfed596a598557e5625d", + "rev": "00d5fd73756d424de5263b92235563bc06f2c6e1", "type": "github" }, "original": { @@ -361,13 +364,28 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1680758185, - "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", + "lastModified": 1681126633, + "narHash": "sha256-evQ3Ct/yJDSHej16Hiq+JfxRjgm9FXu/2LBxsyorGdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", + "rev": "db24d86dd8a4769c50d6b7295e81aa280cd93f35", "type": "github" }, "original": { @@ -407,11 +425,11 @@ ] }, "locked": { - "lastModified": 1673116118, - "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", + "lastModified": 1681127512, + "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", + "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", "type": "github" }, "original": { diff --git a/home-manager-modules/hyprland/default.nix b/home-manager-modules/hyprland/default.nix index 6a0ac87..51154d5 100644 --- a/home-manager-modules/hyprland/default.nix +++ b/home-manager-modules/hyprland/default.nix @@ -21,6 +21,7 @@ with lib; xdg.configFile."hypr/hyprland.conf".text = '' exec-once = waybar & hyprpaper exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY + exec-once = nm-applet --indicator # Monitors monitor = eDP-1, preferred, auto, auto @@ -71,7 +72,7 @@ with lib; # Gestures gestures { workspace_swipe = true - workspace_swipe_fingers = 3 + workspace_swipe_fingers = 4 } @@ -161,7 +162,9 @@ with lib; wallpaper = ,${../../machines/macintosh/wallpaper.jpg} ''; - home.packages = with pkgs; [ qt6.qtwayland libsForQt5.qt5.qtwayland hyprpaper ]; + + + home.packages = with pkgs; [ qt6.qtwayland libsForQt5.qt5.qtwayland hyprpaper swaylock ]; }; } diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix index 4c52a9a..6f8505f 100644 --- a/machines/macintosh/default.nix +++ b/machines/macintosh/default.nix @@ -82,8 +82,29 @@ # for a WiFi printer services.avahi.openFirewall = true; + services.davfs2 = { + enable = true; + }; + + security.pam.services.swaylock = { }; + + services.autofs = { + enable = true; + debug = true; + autoMaster = + let + mapConf = pkgs.writeText "auto" '' + nuage -fstype=davfs,uid=1000,file_mode=600,dir_mode=700,conf=/home/julien/.davfs2/davfs2.conf,rw :https\://nuage.malka.family/remote.php/webdav/ + ''; + in + '' + /home/julien/clouds file:${mapConf} + ''; + }; + system.stateVersion = "23.05"; # Did you read the comment? } + diff --git a/users/julien.nix b/users/julien.nix index 71955fb..a80c6b1 100644 --- a/users/julien.nix +++ b/users/julien.nix @@ -5,7 +5,7 @@ users.users.julien = { isNormalUser = true; home = "/home/julien"; - extraGroups = [ "wheel" config.users.groups.keys.name "filerun" "networkmanager" ]; + extraGroups = [ "wheel" config.users.groups.keys.name "filerun" "networkmanager" "davfs2" ]; shell = pkgs.fish; passwordFile = config.sops.secrets.user-julien-password.path; };