emenel/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moving old overlays to inactive dir, refactor new filesystem section

Browse source
This commit is contained in:
Matt Nish-Lapidus 2025-02-13 11:27:00 -05:00
parent 09f234a90d
commit ca06918f79
4 changed files with 68 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

68
flake.lock generated
View file

@ -31,11 +31,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739069463, "lastModified": 1739463725,
"narHash": "sha256-RuRJKPAc3VkLDguDi0yxOSw+G6D/SmQB9KvZyyiqiPg=", "narHash": "sha256-gTqrithnlXsx8Frhrcp5933v37CDJinZous1tzWZZzo=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "21cb6f14f954890604ca78071d9961ea3068f2f2", "rev": "51f5ac8104e9de1cfc02b3cff3c8f96220fdb34c",
"revCount": 105, "revCount": 106,
"type": "git", "type": "git",
"url": "https://gt.emenel.ca/emenel/audio.nix.git" "url": "https://gt.emenel.ca/emenel/audio.nix.git"
}, },
@ -69,11 +69,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1739380704, "lastModified": 1739463649,
"narHash": "sha256-pIv4L+fvaaOHa1SsH2ePECvChmcr6T3AheFMtyn5rMI=", "narHash": "sha256-TrR9U9RHSWF8Fw3mOjR70PhxLCNiE6W71bpjXdgk7Uk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "88f3cba36d23f40c7e6b868d0b80555c55cdc3a5", "rev": "9196c8d59c9110238c98c38cbb452ed49ef35ce3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739381933, "lastModified": 1739458725,
"narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=", "narHash": "sha256-k9AeUzs3phaTgfljRslR4iNTX9svBNhxoIw4QLd/V70=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "15b59d4191b993ebdfcb1f61b834fced217882ba", "rev": "22b418c13fb0be43f4bc5c185f323a3237028594",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +649,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1739374250, "lastModified": 1739455993,
"narHash": "sha256-SPKk4RHN4PHh2bkskxjuP/aMYj1Zj6sPsgj645VXU2k=", "narHash": "sha256-eLoauPdmvcvTtBQQESw6aKDkItZ9HVJNkpzr7GAgxj0=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "219bd6337424c39c5b1456c842e72d3990bb8e0f", "rev": "8e71ac9e1275673c610a8d15a43e6cf19b6fc666",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -712,11 +712,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1739386504, "lastModified": 1739436814,
"narHash": "sha256-7Wwdmd9+cC1eXQdXovgsp/LBTz2wr3fkCif3rElfmTE=", "narHash": "sha256-axkBabPrOWdGXWNM3ZyFrFlmn2WWaea10ca4nBqABXM=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "e5e527356e68649e3aa31024685e385c2ff0b4eb", "rev": "2597ff0d56048e6e33e5bea90cbbdad697a1338f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,11 +745,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739382992, "lastModified": 1739432365,
"narHash": "sha256-OlNPwptEELe6z75CYtbWI/6LZfwlhufDgZHRjDYFfkU=", "narHash": "sha256-uQm3OhhgUQHA5eV+0v/qAFmFHly8yHg2P+BVVy/3DcY=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "ef80bcc83414d2e9a1cd14cc62ee021968e67128", "rev": "4c98b874862c2e6df7f71bdf36df0ba527690fbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -814,11 +814,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1739310483, "lastModified": 1739444422,
"narHash": "sha256-0N4+nJFUmzxt4RV00dEEd9KRoViQ1CtA3C35aA1d/m4=", "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "09edf243b90b3443a1ea1cf73643f2490b96a99c", "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -912,11 +912,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1739206421, "lastModified": 1739357830,
"narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44534bc021b85c8d78e465021e21f33b856e2540", "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -960,11 +960,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1739206421, "lastModified": 1739357830,
"narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44534bc021b85c8d78e465021e21f33b856e2540", "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1373,11 +1373,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1739385581, "lastModified": 1739455114,
"narHash": "sha256-XD8hIAPiBFZgIzQP4ejeabjDCXbwO3S0kaLdoLLiEjs=", "narHash": "sha256-NpU7+G5vh+dj58SaIhkXTD37V/uQn6bqItF0Jt/xg1c=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "11505b7083cc098203f899b023f31fe41abff0bd", "rev": "1e527797424b3aea0d326792033ef9c4f283a6e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1429,11 +1429,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1739362407, "lastModified": 1739444537,
"narHash": "sha256-Er6yltdlJw15tRAcxRJxNtPxCUlykq+v7Zz2LmjEwM4=", "narHash": "sha256-mdp5DsogMoWINRvsw5A0bqik0gWhFg15FfJMWpxtR1Q=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "f506849fb5192d6a82c9ed663bbc2fdfe983205a", "rev": "077faacc9a84bb5a06c5a8185a71405b0cb3dc8a",
"type": "github" "type": "github"
}, },
"original": { "original": {

70
hosts/eddie/configuration.nix
View file

@ -82,45 +82,43 @@ password=${config.sops.placeholder.filez}
}; };
}; };
fileSystems."/mnt/filez/media" = { fileSystems =
device = "//100.70.114.113/Media"; let
fsType = "smb3"; 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";
options = let in {
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."/mnt/filez/music-production" = { "/mnt/filez/media" = {
device = "//100.70.114.113/Music Production"; device = "//100.70.114.113/Media";
fsType = "smb3"; fsType = "smb3";
options = let options = [
automount_opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,uid=1000"; "${automount_opts}"
in [ ];
"${automount_opts},credentials=/etc/nixos/smb-secrets" };
];
};
fileSystems."/mnt/filez/storage" = { "/mnt/filez/music-production" = {
device = "//100.70.114.113/Storage"; device = "//100.70.114.113/Music Production";
fsType = "smb3"; fsType = "smb3";
options = let options = [
automount_opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,uid=1000"; "${automount_opts}"
in [ ];
"${automount_opts},credentials=/etc/nixos/smb-secrets" };
];
};
fileSystems."/mnt/filez/photos" = { "/mnt/filez/storage" = {
device = "//100.70.114.113/Photo Storage"; device = "//100.70.114.113/Storage";
fsType = "smb3"; fsType = "smb3";
options = let options = [
automount_opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,uid=1000"; "${automount_opts}"
in [ ];
"${automount_opts},credentials=/etc/nixos/smb-secrets" };
];
}; "/mnt/filez/photos" = {
device = "//100.70.114.113/Photo Storage";
fsType = "smb3";
options = [
"${automount_opts}"
];
};
};
# fileSystems."/mnt/beets-import" = { # fileSystems."/mnt/beets-import" = {
# device = "//100.103.170.132/media"; # device = "//100.103.170.132/media";

0
overlays/ulauncher.nix → overlays-inactive/ulauncher.nix
View file

0
overlays/wineWow.nix → overlays-inactive/wineWow.nix
View file