mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updates, nextcloud

Browse Source
This commit is contained in:
mjallen18
2024-07-18 13:33:01 -05:00
parent 57098db3c6
commit 42795b6e10
5 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
flake.lock generated
View File

@@ -11,11 +11,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1720452593, "lastModified": 1721134628,
"narHash": "sha256-lE6r0ty6o3tbwSg8HGSMc4RVhtryRP7OtcmgEAvSwUM=", "narHash": "sha256-hUYnfPwlDfrmAHNdzRBaXeEnxpfAKYyyfJo3AFie5u8=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "5cd32d60b3f8ce3b0552103bb8de0635c3c0d87d", "rev": "7eeff58148cf73cbe7d56120e244f354537f0e56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -215,11 +215,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719677234, "lastModified": 1720734513,
"narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -256,11 +256,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720470846, "lastModified": 1721135958,
"narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -293,11 +293,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719631702, "lastModified": 1720697445,
"narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", "narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "2f9668e19aff06550cd154c87c0af120735a56a4", "rev": "bba994424596df09228f5437bcf8ef7fde1fe56e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -381,11 +381,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1720469887, "lastModified": 1721270582,
"narHash": "sha256-BwPsGQ/EMqCreUc5j9Efj+wx13AjREtuHhbyHZygcE4=", "narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "fabc653517106127e2ed435fb52e7e8854354428", "rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -474,11 +474,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1720515935, "lastModified": 1720737798,
"narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a111ce6b537df12a39874aa9672caa87f8677eda", "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -490,11 +490,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720031269, "lastModified": 1720957393,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -522,11 +522,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1720386169, "lastModified": 1721226092,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "rev": "c716603a63aca44f39bef1986c13402167450e0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -538,11 +538,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1720418205, "lastModified": 1721138476,
"narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "655a58a72a6601292512670343087c2d75d859c1", "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
hosts/desktop/configuration.nix
View File

@@ -160,9 +160,13 @@ in
# Time config # Time config
time = { time = {
hardwareClockInLocalTime = true; hardwareClockInLocalTime = false;
}; };
virtualisation.libvirtd.enable = true;
programs.gamemode.enable = true;
# xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
# xdg.portal.extraPortals = mkIf plasma [ pkgs.xdg-desktop-portal-gtk ]; # xdg.portal.extraPortals = mkIf plasma [ pkgs.xdg-desktop-portal-gtk ];

14
hosts/desktop/home.nix
View File

@@ -23,7 +23,7 @@
shellAliases = { shellAliases = {
ll = "ls -alh"; ll = "ls -alh";
update = "sudo nixos-rebuild switch"; update = "sudo nixos-rebuild switch";
nas-update = "nixos-rebuild switch --use-remote-sudo --target-host admin@jallen-nas.local --build-host localhost --flake ~/nix-config/flake.nix#jallen-nas"; nas-update = "nixos-rebuild switch --use-remote-sudo --target-host admin@jallen-nas.local --build-host localhost --flake ~/nix-config#jallen-nas";
nas-ssh = "ssh admin@jallen-nas.local"; nas-ssh = "ssh admin@jallen-nas.local";
}; };
@@ -62,21 +62,23 @@
freerdp freerdp
gamescope_git gamescope_git
gamescope-wsi_git gamescope-wsi_git
gnome.gnome-tweaks # gnome-tweaks
gnomeExtensions.appindicator # gnomeExtensions.appindicator
gnomeExtensions.arcmenu # gnomeExtensions.arcmenu
gnomeExtensions.dash-to-panel # gnomeExtensions.dash-to-panel
gnomeExtensions.tiling-assistant # gnomeExtensions.tiling-assistant
goverlay goverlay
heroic heroic
lm_sensors lm_sensors
lutris lutris
mangohud mangohud
morph morph
nextcloud-client
nixfmt-rfc-style nixfmt-rfc-style
orca-slicer orca-slicer
papirus-icon-theme papirus-icon-theme
pop-gtk-theme pop-gtk-theme
protontricks
protonvpn-gui protonvpn-gui
protonvpn-gui protonvpn-gui
python3 python3

5
hosts/nas/configuration.nix
View File

@@ -142,6 +142,7 @@ in
share.hardware.nvidia = { share.hardware.nvidia = {
enable = true; enable = true;
enableBeta = false; enableBeta = false;
enableOpen = true;
nvidiaSettings = true; nvidiaSettings = true;
enableNvidiaDocker = true; enableNvidiaDocker = true;
}; };
@@ -353,7 +354,7 @@ in
fi fi
# otherwise authenticate with tailscale # otherwise authenticate with tailscale
${tailscale}/bin/tailscale up -authkey tskey-auth-kVqyntEixG11CNTRL-kKAYioBRVBHKa4rCqUmv9HVGMnvQiwBZh ${tailscale}/bin/tailscale up -authkey nodekey:e4557e761f8fa2cb51a189d32484092036d3954b61502b7e19688869a5107707
''; '';
}; };
@@ -457,7 +458,7 @@ in
pass pass
cockpit cockpit
packagekit packagekit
gnome.gnome-packagekit # gnome.gnome-packagekit
unstable.nix-inspect unstable.nix-inspect
unstable.gpt4all unstable.gpt4all
lm_sensors lm_sensors

4
modules/samba/default.nix
View File

@@ -37,6 +37,8 @@ in
securityType = "user"; securityType = "user";
openFirewall = true; openFirewall = true;
extraConfig = '' extraConfig = ''
create mode = 664
force directory mode = 2770
workgroup = WORKGROUP workgroup = WORKGROUP
server string = jallen-nas server string = jallen-nas
netbios name = jallen-nas netbios name = jallen-nas
@@ -48,6 +50,7 @@ in
hosts deny = 0.0.0.0/0 hosts deny = 0.0.0.0/0
guest account = nobody guest account = nobody
map to guest = bad user map to guest = bad user
usershare allow guests = yes
''; '';
shares = shares =
let let
@@ -59,6 +62,7 @@ in
private = if !share.public || share.enableTimeMachine then "yes" else "no"; private = if !share.public || share.enableTimeMachine then "yes" else "no";
browseable = if share.browseable then "yes" else "no"; browseable = if share.browseable then "yes" else "no";
writable = "yes"; writable = "yes";
"force group" = "jallen-nas";
"read only" = if share.readOnly then "yes" else "no"; "read only" = if share.readOnly then "yes" else "no";
"guest ok" = if share.guestOk then "yes" else "no"; "guest ok" = if share.guestOk then "yes" else "no";
"create mask" = share.createMask; "create mask" = share.createMask;