diff --git a/flake.lock b/flake.lock index a14a9c9..04df969 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1739069463, - "narHash": "sha256-RuRJKPAc3VkLDguDi0yxOSw+G6D/SmQB9KvZyyiqiPg=", + "lastModified": 1739463725, + "narHash": "sha256-gTqrithnlXsx8Frhrcp5933v37CDJinZous1tzWZZzo=", "ref": "refs/heads/master", - "rev": "21cb6f14f954890604ca78071d9961ea3068f2f2", - "revCount": 105, + "rev": "51f5ac8104e9de1cfc02b3cff3c8f96220fdb34c", + "revCount": 106, "type": "git", "url": "https://gt.emenel.ca/emenel/audio.nix.git" }, @@ -69,11 +69,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739380704, - "narHash": "sha256-pIv4L+fvaaOHa1SsH2ePECvChmcr6T3AheFMtyn5rMI=", + "lastModified": 1739463649, + "narHash": "sha256-TrR9U9RHSWF8Fw3mOjR70PhxLCNiE6W71bpjXdgk7Uk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "88f3cba36d23f40c7e6b868d0b80555c55cdc3a5", + "rev": "9196c8d59c9110238c98c38cbb452ed49ef35ce3", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1739381933, - "narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", + "lastModified": 1739458725, + "narHash": "sha256-k9AeUzs3phaTgfljRslR4iNTX9svBNhxoIw4QLd/V70=", "owner": "nix-community", "repo": "home-manager", - "rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", + "rev": "22b418c13fb0be43f4bc5c185f323a3237028594", "type": "github" }, "original": { @@ -649,11 +649,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1739374250, - "narHash": "sha256-SPKk4RHN4PHh2bkskxjuP/aMYj1Zj6sPsgj645VXU2k=", + "lastModified": 1739455993, + "narHash": "sha256-eLoauPdmvcvTtBQQESw6aKDkItZ9HVJNkpzr7GAgxj0=", "owner": "kmonad", "repo": "kmonad", - "rev": "219bd6337424c39c5b1456c842e72d3990bb8e0f", + "rev": "8e71ac9e1275673c610a8d15a43e6cf19b6fc666", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739386504, - "narHash": "sha256-7Wwdmd9+cC1eXQdXovgsp/LBTz2wr3fkCif3rElfmTE=", + "lastModified": 1739436814, + "narHash": "sha256-axkBabPrOWdGXWNM3ZyFrFlmn2WWaea10ca4nBqABXM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e5e527356e68649e3aa31024685e385c2ff0b4eb", + "rev": "2597ff0d56048e6e33e5bea90cbbdad697a1338f", "type": "github" }, "original": { @@ -745,11 +745,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739382992, - "narHash": "sha256-OlNPwptEELe6z75CYtbWI/6LZfwlhufDgZHRjDYFfkU=", + "lastModified": 1739432365, + "narHash": "sha256-uQm3OhhgUQHA5eV+0v/qAFmFHly8yHg2P+BVVy/3DcY=", "owner": "YaLTeR", "repo": "niri", - "rev": "ef80bcc83414d2e9a1cd14cc62ee021968e67128", + "rev": "4c98b874862c2e6df7f71bdf36df0ba527690fbb", "type": "github" }, "original": { @@ -814,11 +814,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1739310483, - "narHash": "sha256-0N4+nJFUmzxt4RV00dEEd9KRoViQ1CtA3C35aA1d/m4=", + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "09edf243b90b3443a1ea1cf73643f2490b96a99c", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", "type": "github" }, "original": { @@ -912,11 +912,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -960,11 +960,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -1373,11 +1373,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1739385581, - "narHash": "sha256-XD8hIAPiBFZgIzQP4ejeabjDCXbwO3S0kaLdoLLiEjs=", + "lastModified": 1739455114, + "narHash": "sha256-NpU7+G5vh+dj58SaIhkXTD37V/uQn6bqItF0Jt/xg1c=", "owner": "wez", "repo": "wezterm", - "rev": "11505b7083cc098203f899b023f31fe41abff0bd", + "rev": "1e527797424b3aea0d326792033ef9c4f283a6e8", "type": "github" }, "original": { @@ -1429,11 +1429,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1739362407, - "narHash": "sha256-Er6yltdlJw15tRAcxRJxNtPxCUlykq+v7Zz2LmjEwM4=", + "lastModified": 1739444537, + "narHash": "sha256-mdp5DsogMoWINRvsw5A0bqik0gWhFg15FfJMWpxtR1Q=", "owner": "sxyazi", "repo": "yazi", - "rev": "f506849fb5192d6a82c9ed663bbc2fdfe983205a", + "rev": "077faacc9a84bb5a06c5a8185a71405b0cb3dc8a", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 2721956..c1a3803 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -82,45 +82,43 @@ password=${config.sops.placeholder.filez} }; }; - fileSystems."/mnt/filez/media" = { - device = "//100.70.114.113/Media"; - fsType = "smb3"; - options = let - automount_opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,uid=1000"; - in [ - "${automount_opts},credentials=/etc/nixos/smb-secrets" - ]; - }; + fileSystems = + let + automount_opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,uid=1000,credentials=/etc/nixos/smb-secrets"; + in { - fileSystems."/mnt/filez/music-production" = { - device = "//100.70.114.113/Music Production"; - fsType = "smb3"; - options = let - automount_opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,uid=1000"; - in [ - "${automount_opts},credentials=/etc/nixos/smb-secrets" - ]; - }; + "/mnt/filez/media" = { + device = "//100.70.114.113/Media"; + fsType = "smb3"; + options = [ + "${automount_opts}" + ]; + }; - fileSystems."/mnt/filez/storage" = { - device = "//100.70.114.113/Storage"; - fsType = "smb3"; - options = let - automount_opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,uid=1000"; - in [ - "${automount_opts},credentials=/etc/nixos/smb-secrets" - ]; - }; + "/mnt/filez/music-production" = { + device = "//100.70.114.113/Music Production"; + fsType = "smb3"; + options = [ + "${automount_opts}" + ]; + }; - fileSystems."/mnt/filez/photos" = { - device = "//100.70.114.113/Photo Storage"; - fsType = "smb3"; - options = let - automount_opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,uid=1000"; - in [ - "${automount_opts},credentials=/etc/nixos/smb-secrets" - ]; - }; + "/mnt/filez/storage" = { + device = "//100.70.114.113/Storage"; + fsType = "smb3"; + options = [ + "${automount_opts}" + ]; + }; + + "/mnt/filez/photos" = { + device = "//100.70.114.113/Photo Storage"; + fsType = "smb3"; + options = [ + "${automount_opts}" + ]; + }; + }; # fileSystems."/mnt/beets-import" = { # device = "//100.103.170.132/media"; diff --git a/overlays/ulauncher.nix b/overlays-inactive/ulauncher.nix similarity index 100% rename from overlays/ulauncher.nix rename to overlays-inactive/ulauncher.nix diff --git a/overlays/wineWow.nix b/overlays-inactive/wineWow.nix similarity index 100% rename from overlays/wineWow.nix rename to overlays-inactive/wineWow.nix