diff --git a/flake.lock b/flake.lock index 1dcf6d4..e61a39b 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1704310048, - "narHash": "sha256-eAxFGlZllel+viidYQsocPckbLp7xQD9jg3+vW5wx9I=", + "lastModified": 1704384167, + "narHash": "sha256-3Bst0uAjpUMKwIoHsSDWBM+A1hz1orxd2jQVOaypvow=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4c479a9ab1b44668c5c0001f6cc447edf31603ef", + "rev": "99fefb12ae9cd2464591df3652709f513a20a89e", "type": "gitlab" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1704311514, - "narHash": "sha256-j6JsfCv31bW7LzV06q2L/27QZ4k1Zq7lEq2AR9R150A=", + "lastModified": 1704498488, + "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcbc70a7ee064f2b65dc1fac1717ca2a9813bbe6", + "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", "type": "github" }, "original": { @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1704019383, - "narHash": "sha256-leDLJYnOm+UsgvoJkkI2zOFw9W4yhzpumpcD49zLa5U=", + "lastModified": 1704567627, + "narHash": "sha256-wltHbrR4fOTtWVSOBoFGdeyl/MKOLIdrP1FFp+z5KTU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7a8bf968a94622d86df4fee3f4579ac2ec83d0ad", + "rev": "c0d94db920222ae00b19d8c5198a2a8c889bb8ca", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1703361984, - "narHash": "sha256-3pZJY6h2OsmLi9iA6vHLYrlOcv3OK4ZCX9ljw66Q5xc=", + "lastModified": 1704378678, + "narHash": "sha256-cKyRey93E9ikisnzDB/DcPC8zu1iiK5miDQ5WoGg1ek=", "owner": "nix-community", "repo": "kde2nix", - "rev": "cc627fe32d9283205592574208ae4fcdf93d3414", + "rev": "b123e781c912109c41c34d7778b970c9d8e403b7", "type": "github" }, "original": { @@ -288,11 +288,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1704266875, - "narHash": "sha256-luA5SGmeIRZlgLfSLUuR3eacS63q2bJ0Yywqak5lj3E=", + "lastModified": 1704632650, + "narHash": "sha256-83J/nd/NoLqo3vj0S0Ppqe8L+ijIFiGL6HNDfCCUD/Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8e34f33464d77bea2d5cf7dc1066647b1ad2b324", + "rev": "c478b3d56969006e015e55aaece4931f3600c1b2", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702319469, - "narHash": "sha256-vxXgbGOmGLr5JUbFZUM/TVYYn/quMTqfFJrx5EXyhbk=", + "lastModified": 1704367582, + "narHash": "sha256-mAm6fl0VtONvT03ia/MzXKHAxNMWLYZMTV7VpXRBiho=", "owner": "K900", "repo": "nixpkgs", - "rev": "80878a189a3a7dd9c7253370e2771596936b8a74", + "rev": "e06ffa09d0041a8864bf4304674953a7cf3acaf4", "type": "github" }, "original": { @@ -320,11 +320,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -353,11 +353,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { @@ -370,11 +370,11 @@ "openrgb": { "flake": false, "locked": { - "lastModified": 1704295142, - "narHash": "sha256-FiaSbPQ007utdtrlP6f6WHZPXQfRBpcRjVfxvuo9C3Q=", + "lastModified": 1704594148, + "narHash": "sha256-X20yST/U5ueqpRTmgAh7eNlPGLH4pKNWIBvcM5eX+OI=", "owner": "CalcProgrammer1", "repo": "OpenRGB", - "rev": "c54a268e1991e206f0db9fa7da695e90e6480a7e", + "rev": "477fabd38103be77a0c6035f0cdbba00ae6a8dc8", "type": "gitlab" }, "original": { @@ -398,11 +398,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702290759, - "narHash": "sha256-DUPtcei6GJlrC05Y3cqwLLSst+sp07334aAZw4Uk118=", + "lastModified": 1703939133, + "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f99ed8523fc3aef67a7c838ca31f4b94ef902837", + "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1704314598, - "narHash": "sha256-R1IPxMk7GnhkitkSjCqxFmIknsfAL6TCvmLZfOwxvaA=", + "lastModified": 1704617036, + "narHash": "sha256-T/VwsO1h7j6eylQCVvUCpwnCZ2NypqXVcE9H2Cw20FU=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "57a589367f719d59748a0546e1bdc8b86e832d1f", + "rev": "43dd929214cfa84471460f6cf8547c7a3993831c", "type": "github" }, "original": { diff --git a/systems/kami/hardware.nix b/systems/kami/hardware.nix index 092e7f4..7c9be42 100644 --- a/systems/kami/hardware.nix +++ b/systems/kami/hardware.nix @@ -26,16 +26,6 @@ zramSwap.enable = true; fileSystems = { - # "/" = { - # device = "/dev/disk/by-uuid/99a47ace-7e69-4520-b914-d4fe5b31dc79"; - # fsType = "btrfs"; - # options = [ "subvol=@" "compress=zstd:8" ]; - #}; - # "/" = { - # device = "none"; - # fsType = "tmpfs"; - # options = [ "size=4G" "mode=755" ]; # mode=755 so only root can write to those files - # }; "/" = { device = "/dev/nvme0n1p2"; fsType = "bcachefs"; @@ -55,28 +45,14 @@ }; "/media/backup" = { device = "u384346@u384346.your-storagebox.de:/"; - fsType = "fuse.sshfs"; - noCheck = true; + fsType = "sshfs"; options = [ - "IdentityFile=/home/jopejoe1/.ssh/github" - "ServerAliveCountMax=3" - "ServerAliveInterval=15" "_netdev" "allow_other" - "default_permissions" - "exec" - "gid=100" - "idmap=user" - "noatime" - "noauto" - "reconnect" - "transform_symlinks" - "uid=1000" - "users" - "x-systemd.after=network-online.target" "x-systemd.automount" - "x-systemd.mount-timeout=10s" - "x-systemd.requires=network-online.target" + "IdentityFile=/home/jopejoe1/.ssh/github" + "ServerAliveInterval=15" + "reconnect" ]; }; #"/media/zfs" = {