some config tweaks and mount points for all filez shares
This commit is contained in:
parent
def10c3649
commit
b9f9db4a92
7 changed files with 143 additions and 93 deletions
66
flake.lock
generated
66
flake.lock
generated
|
|
@ -69,11 +69,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739294132,
|
||||
"narHash": "sha256-TG0f3kbydzLERVmcRTzeWdo6oKOGOTPUZDfVrKvSjdc=",
|
||||
"lastModified": 1739380704,
|
||||
"narHash": "sha256-pIv4L+fvaaOHa1SsH2ePECvChmcr6T3AheFMtyn5rMI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "096d802c6545f32eb718483ef66ae8013abf9a36",
|
||||
"rev": "88f3cba36d23f40c7e6b868d0b80555c55cdc3a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -323,11 +323,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739314552,
|
||||
"narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=",
|
||||
"lastModified": 1739381933,
|
||||
"narHash": "sha256-4gvobxITgcrNGfwsVG5a46QzQCX89btIYw23p0ilbcc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd",
|
||||
"rev": "15b59d4191b993ebdfcb1f61b834fced217882ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -612,11 +612,11 @@
|
|||
"uv2nix": "uv2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738874392,
|
||||
"narHash": "sha256-/oKOtwENrb/4Goqx1kz9i5C6kYGnuhC71NKgkGQ8kgw=",
|
||||
"lastModified": 1739346879,
|
||||
"narHash": "sha256-Sq2mCT0LVrH6aVGkSZRVdUXnhT1FqiiYEEn7vpY/T7o=",
|
||||
"owner": "isd-project",
|
||||
"repo": "isd",
|
||||
"rev": "d210d28160feaed4b696d1016f9162d3dd84a70a",
|
||||
"rev": "a820650e5a6210cbaa8dc48a5043fcce507014b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -649,11 +649,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "nix",
|
||||
"lastModified": 1739312917,
|
||||
"narHash": "sha256-4dSE1VrIl6Id8thFK1mXnkt3Y55WStAfjd4z4QV/JIo=",
|
||||
"lastModified": 1739374250,
|
||||
"narHash": "sha256-SPKk4RHN4PHh2bkskxjuP/aMYj1Zj6sPsgj645VXU2k=",
|
||||
"owner": "kmonad",
|
||||
"repo": "kmonad",
|
||||
"rev": "0ffbbbe8780cdd1bdd5206e15c699a49c9c8f3a5",
|
||||
"rev": "219bd6337424c39c5b1456c842e72d3990bb8e0f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -712,11 +712,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739296148,
|
||||
"narHash": "sha256-q00GM94Rr4Sgh/phpJucXonWkL9C9zX/8pFXstZKJcY=",
|
||||
"lastModified": 1739386504,
|
||||
"narHash": "sha256-7Wwdmd9+cC1eXQdXovgsp/LBTz2wr3fkCif3rElfmTE=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "dc9e2366279f9c4f8586963e0aab3c0a4ebd9133",
|
||||
"rev": "e5e527356e68649e3aa31024685e385c2ff0b4eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -745,11 +745,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1739287457,
|
||||
"narHash": "sha256-0xpNX8oVKJSKglhfrxQxMhA5UWOu2OAUwNvxNuDmOI8=",
|
||||
"lastModified": 1739382992,
|
||||
"narHash": "sha256-OlNPwptEELe6z75CYtbWI/6LZfwlhufDgZHRjDYFfkU=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "213eafa2032897e7ce3132f179a135a65d327d9b",
|
||||
"rev": "ef80bcc83414d2e9a1cd14cc62ee021968e67128",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -912,11 +912,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1739055578,
|
||||
"narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
|
||||
"lastModified": 1739206421,
|
||||
"narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
|
||||
"rev": "44534bc021b85c8d78e465021e21f33b856e2540",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -992,11 +992,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1739020877,
|
||||
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
|
||||
"lastModified": 1739214665,
|
||||
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
|
||||
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1040,11 +1040,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1739020877,
|
||||
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
|
||||
"lastModified": 1739214665,
|
||||
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
|
||||
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1373,11 +1373,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "nix",
|
||||
"lastModified": 1739305237,
|
||||
"narHash": "sha256-b7pId/qWGNgnWbJTYvwGqrMfZL/MomTouSuuaYSh7Wg=",
|
||||
"lastModified": 1739385581,
|
||||
"narHash": "sha256-XD8hIAPiBFZgIzQP4ejeabjDCXbwO3S0kaLdoLLiEjs=",
|
||||
"owner": "wez",
|
||||
"repo": "wezterm",
|
||||
"rev": "2471433d1f327b1c19dd31fac68e95d7e7fd4f4f",
|
||||
"rev": "11505b7083cc098203f899b023f31fe41abff0bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1429,11 +1429,11 @@
|
|||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739275518,
|
||||
"narHash": "sha256-jcNiDYYDeQzVS5TIayo5mf3aMq1p8rOIcJgF1e3oCW8=",
|
||||
"lastModified": 1739362407,
|
||||
"narHash": "sha256-Er6yltdlJw15tRAcxRJxNtPxCUlykq+v7Zz2LmjEwM4=",
|
||||
"owner": "sxyazi",
|
||||
"repo": "yazi",
|
||||
"rev": "a4dde6a8484c06b25013433433374186bbb81971",
|
||||
"rev": "f506849fb5192d6a82c9ed663bbc2fdfe983205a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
alsa-utils
|
||||
alsa-oss
|
||||
dbus
|
||||
|
||||
cifs-utils
|
||||
sops
|
||||
|
||||
ispell
|
||||
|
|
@ -137,6 +137,18 @@
|
|||
XCURSOR_SIZE = 32;
|
||||
XCURSOR_THEME = "Bibata-Modern-Classic";
|
||||
};
|
||||
|
||||
# mounts = {
|
||||
# home-emenel-filez-media = {
|
||||
# Unit = {
|
||||
# Description = "Filez:Media (NAS)";
|
||||
# };
|
||||
# Mount = {
|
||||
# What = "/mnt/filez/media";
|
||||
# Where = "/home/emenel/filez/media";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
# moving files!
|
||||
|
|
|
|||
|
|
@ -62,29 +62,74 @@
|
|||
};
|
||||
};
|
||||
|
||||
# sops = {
|
||||
# age.keyFile = "/home/emenel/.config/sops/age/keys.txt"; # must have no password!
|
||||
# defaultSopsFile = ./secrets.yaml;
|
||||
# secrets = {
|
||||
# filez = {};
|
||||
# };
|
||||
# templates."smb-secrets".content = ''
|
||||
# username=admin
|
||||
# password=${config.sops.placeholder.filez}
|
||||
# '';
|
||||
# };
|
||||
sops = {
|
||||
age.keyFile = "/home/emenel/.config/sops/age/keys.txt"; # must have no password!
|
||||
defaultSopsFile = ./secrets.yaml;
|
||||
secrets = {
|
||||
filez = {};
|
||||
};
|
||||
templates."smb-secrets".content = ''
|
||||
username=admin
|
||||
password=${config.sops.placeholder.filez}
|
||||
# '';
|
||||
};
|
||||
|
||||
|
||||
# environment.etc = {
|
||||
# "nixos/smb-secrets".source = config.sops.templates."smb-secrets".path;
|
||||
# };
|
||||
environment.etc = {
|
||||
"nixos/smb-secrets" = {
|
||||
source = config.sops.templates."smb-secrets".path;
|
||||
group = "users";
|
||||
};
|
||||
};
|
||||
|
||||
# fileSystems."/mnt/media" = {
|
||||
# device = "//100.70.114.113";
|
||||
# fsType = "cifs";
|
||||
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."/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"
|
||||
];
|
||||
};
|
||||
|
||||
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"
|
||||
];
|
||||
};
|
||||
|
||||
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"
|
||||
];
|
||||
};
|
||||
|
||||
# fileSystems."/mnt/beets-import" = {
|
||||
# device = "//100.103.170.132/media";
|
||||
# fsType = "smb3";
|
||||
# options = let
|
||||
# automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
|
||||
# in ["${automount_opts},credentials=/etc/nixos/smb-secrets"];
|
||||
# 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}"
|
||||
# ];
|
||||
# };
|
||||
|
||||
|
||||
|
|
@ -197,18 +242,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
# specialisation = {
|
||||
# gpupower.configuration = {
|
||||
# system.nixos.tags = [ "gpupower" ];
|
||||
# hardware.nvidia = {
|
||||
# prime.offload.enable = lib.mkForce false;
|
||||
# prime.offload.enableOffloadCmd = lib.mkForce false;
|
||||
# prime.sync.enable = lib.mkForce true;
|
||||
# powerManagement.finegrained = lib.mkForce false;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
musnix = {
|
||||
enable = true;
|
||||
alsaSeq.enable = true;
|
||||
|
|
|
|||
|
|
@ -131,10 +131,10 @@ in {
|
|||
window-rules = [
|
||||
# global window rule for shared config
|
||||
{ geometry-corner-radius = {
|
||||
top-left = 8.0;
|
||||
top-right = 8.0;
|
||||
bottom-left = 8.0;
|
||||
bottom-right = 8.0;
|
||||
top-left = pkgs.rice.corner-radius;
|
||||
top-right = pkgs.rice.corner-radius;
|
||||
bottom-left = pkgs.rice.corner-radius;
|
||||
bottom-right = pkgs.rice.corner-radius;
|
||||
};
|
||||
clip-to-geometry = true; }
|
||||
|
||||
|
|
@ -181,10 +181,10 @@ in {
|
|||
}
|
||||
];
|
||||
|
||||
switch-events = with config.lib.niri.actions; {
|
||||
lid-close.action = spawn "niri msg output eDP-1 off && shikanectl switch desk-clam";
|
||||
lid-open.action = spawn "niri msg output eDP-1 on";
|
||||
};
|
||||
# switch-events = with config.lib.niri.actions; {
|
||||
# lid-close.action = spawn "niri msg output eDP-1 off && shikanectl switch desk-clam";
|
||||
# lid-open.action = spawn "niri msg output eDP-1 on";
|
||||
# };
|
||||
|
||||
binds = with config.lib.niri.actions; let
|
||||
wez = spawn "wezterm" "--config-file" "/home/emenel/.config/wezterm/launcher.lua" "start" "--always-new-process";
|
||||
|
|
@ -224,6 +224,8 @@ in {
|
|||
action = spawn "swayosd-client" "--input-volume" "mute-toggle";
|
||||
};
|
||||
|
||||
|
||||
# TODO write shell script that sets swayosd and light -O to store new value for recall
|
||||
"XF86MonBrightnessUp" = {
|
||||
allow-when-locked=true;
|
||||
action = spawn "swayosd-client" "--brightness" "raise";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
{ pkgs, ... }:
|
||||
with pkgs.lib.nix-rice;
|
||||
let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
|
||||
in {
|
||||
services.swaync = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -10,10 +11,12 @@
|
|||
control-center-layer = "top";
|
||||
layer-shell = true;
|
||||
cssPriority = "application";
|
||||
control-center-margin-top = 0;
|
||||
control-center-margin-bottom = 0;
|
||||
control-center-margin-right = 0;
|
||||
control-center-margin-left = 0;
|
||||
control-center-height = 600;
|
||||
fit-to-screen = false;
|
||||
# control-center-margin-top = 0;
|
||||
# control-center-margin-bottom = 0;
|
||||
# control-center-margin-right = 0;
|
||||
# control-center-margin-left = 0;
|
||||
notification-2fa-action = true;
|
||||
notification-inline-replies = false;
|
||||
notification-icon-size = 64;
|
||||
|
|
@ -49,27 +52,25 @@
|
|||
};
|
||||
style =
|
||||
''
|
||||
.control-center {
|
||||
background: #111111;
|
||||
border-radius: 6px;
|
||||
padding: 6px;
|
||||
border: 2px solid #34548a;
|
||||
}
|
||||
.control-center {
|
||||
background: ${strPalette.normal.background};
|
||||
border-radius: ${toString pkgs.rice.corner-radius}px;
|
||||
padding: 6px;
|
||||
margin: 6px 12px;
|
||||
border: 2px solid ${strPalette.normal.cyan};
|
||||
color: ${strPalette.normal.white};
|
||||
}
|
||||
|
||||
.notification-row {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.notification-row:focus,
|
||||
.notification-row:hover {
|
||||
background: @noti-bg-focus;
|
||||
}
|
||||
|
||||
.notification {
|
||||
border-radius: 6px;
|
||||
border-radius: ${toString pkgs.rice.corner-radius}px;
|
||||
margin: 6px 12px;
|
||||
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), 0 1px 3px 1px rgba(0, 0, 0, 0.7),
|
||||
0 2px 6px 2px rgba(0, 0, 0, 0.3);
|
||||
padding: 0;
|
||||
padding: 6px;
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ window#waybar {
|
|||
}
|
||||
|
||||
#clock{
|
||||
padding-left: 5px;
|
||||
color: ${strPalette.normal.magenta};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -70,5 +70,6 @@ in {
|
|||
package = super.pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Classic";
|
||||
};
|
||||
corner-radius = 8.0;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue