From 42795b6e106e6e41726f4a3a4b6e7c2f969f39a2 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Thu, 18 Jul 2024 13:33:01 -0500 Subject: [PATCH] updates, nextcloud --- flake.lock | 54 ++++++++++++++++----------------- hosts/desktop/configuration.nix | 6 +++- hosts/desktop/home.nix | 14 +++++---- hosts/nas/configuration.nix | 5 +-- modules/samba/default.nix | 4 +++ 5 files changed, 47 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index e9d31f4..cd87f26 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1720452593, - "narHash": "sha256-lE6r0ty6o3tbwSg8HGSMc4RVhtryRP7OtcmgEAvSwUM=", + "lastModified": 1721134628, + "narHash": "sha256-hUYnfPwlDfrmAHNdzRBaXeEnxpfAKYyyfJo3AFie5u8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5cd32d60b3f8ce3b0552103bb8de0635c3c0d87d", + "rev": "7eeff58148cf73cbe7d56120e244f354537f0e56", "type": "github" }, "original": { @@ -215,11 +215,11 @@ ] }, "locked": { - "lastModified": 1719677234, - "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", + "lastModified": 1720734513, + "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", + "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1720470846, - "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1719631702, - "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", + "lastModified": 1720697445, + "narHash": "sha256-IvFFc57vljkR1eP4VeNMuXJTS/POClq+ytFAadigSY0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", + "rev": "bba994424596df09228f5437bcf8ef7fde1fe56e", "type": "github" }, "original": { @@ -381,11 +381,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1720469887, - "narHash": "sha256-BwPsGQ/EMqCreUc5j9Efj+wx13AjREtuHhbyHZygcE4=", + "lastModified": 1721270582, + "narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "fabc653517106127e2ed435fb52e7e8854354428", + "rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720515935, - "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", + "lastModified": 1720737798, + "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", + "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "type": "github" }, "original": { @@ -490,11 +490,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -522,11 +522,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1721226092, + "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "c716603a63aca44f39bef1986c13402167450e0a", "type": "github" }, "original": { @@ -538,11 +538,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1721138476, + "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206", "type": "github" }, "original": { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index c8d705b..8d54cfe 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -160,9 +160,13 @@ in # Time config time = { - hardwareClockInLocalTime = true; + hardwareClockInLocalTime = false; }; + virtualisation.libvirtd.enable = true; + + programs.gamemode.enable = true; + # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; # xdg.portal.extraPortals = mkIf plasma [ pkgs.xdg-desktop-portal-gtk ]; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index c37da2c..1216706 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -23,7 +23,7 @@ shellAliases = { ll = "ls -alh"; 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"; }; @@ -62,21 +62,23 @@ freerdp gamescope_git gamescope-wsi_git - gnome.gnome-tweaks - gnomeExtensions.appindicator - gnomeExtensions.arcmenu - gnomeExtensions.dash-to-panel - gnomeExtensions.tiling-assistant + # gnome-tweaks + # gnomeExtensions.appindicator + # gnomeExtensions.arcmenu + # gnomeExtensions.dash-to-panel + # gnomeExtensions.tiling-assistant goverlay heroic lm_sensors lutris mangohud morph + nextcloud-client nixfmt-rfc-style orca-slicer papirus-icon-theme pop-gtk-theme + protontricks protonvpn-gui protonvpn-gui python3 diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix index a188db9..aa70147 100755 --- a/hosts/nas/configuration.nix +++ b/hosts/nas/configuration.nix @@ -142,6 +142,7 @@ in share.hardware.nvidia = { enable = true; enableBeta = false; + enableOpen = true; nvidiaSettings = true; enableNvidiaDocker = true; }; @@ -353,7 +354,7 @@ in fi # 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 cockpit packagekit - gnome.gnome-packagekit + # gnome.gnome-packagekit unstable.nix-inspect unstable.gpt4all lm_sensors diff --git a/modules/samba/default.nix b/modules/samba/default.nix index 0576aec..777ca2f 100644 --- a/modules/samba/default.nix +++ b/modules/samba/default.nix @@ -37,6 +37,8 @@ in securityType = "user"; openFirewall = true; extraConfig = '' + create mode = 664 + force directory mode = 2770 workgroup = WORKGROUP server string = jallen-nas netbios name = jallen-nas @@ -48,6 +50,7 @@ in hosts deny = 0.0.0.0/0 guest account = nobody map to guest = bad user + usershare allow guests = yes ''; shares = let @@ -59,6 +62,7 @@ in private = if !share.public || share.enableTimeMachine then "yes" else "no"; browseable = if share.browseable then "yes" else "no"; writable = "yes"; + "force group" = "jallen-nas"; "read only" = if share.readOnly then "yes" else "no"; "guest ok" = if share.guestOk then "yes" else "no"; "create mask" = share.createMask;