diff --git a/dots/hyprland.nix b/dots/hyprland.nix index 6af71ca..f9a3ea8 100755 --- a/dots/hyprland.nix +++ b/dots/hyprland.nix @@ -408,13 +408,13 @@ in windowrule = [ # Ignore maximize requests from apps. You'll probably like this. - "suppressevent maximize, class:.*" + "match:class .*, suppress_event maximize" # Fix some dragging issues with XWayland - "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" + "match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0, no_focus on" - "workspace special:magic silent, class:thunderbird" - "workspace special:magic silent, class:emacs, title:work" + "match:class thunderbird, workspace special:magic silent" + "match:class emacs, match:title work, workspace special:magic silent" ]; }; }; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 8f78ce9..e100595 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -72,6 +72,29 @@ }) ]; + fileSystems."/server" = lib.mkIf (systemName == "pc") { # or remove the mkIf if you want it on both + device = "//192.168.1.8/mrfluffy"; # adjust the share name if it’s not the home share + fsType = "cifs"; + options = let + # Separate credentials from the Nix store (very important for security) + credFile = "/etc/nixos/smb-credentials-mrfluffy"; + in [ + # Basic recommended options + "credentials=${credFile}" + "gid=users" # make files belong to the "users" group (or your preferred group) + "uid=1000" # replace with your user’s UID, or use "uid=${config.users.users.yourname.uid}" + "file_mode=0664" + "dir_mode=0775" + "nofail" # ← this makes the mount OPTIONAL (boot continues if unreachable) + "noauto" # don’t mount automatically at boot (optional, combine with x-systemd.automount) + "x-systemd.automount" # creates a systemd automount unit → mounts on first access + "x-systemd.mount-timeout=15" # don’t wait forever + "vers=3.0" # force SMB3 if the server supports it (recommended) + # "iocharset=utf8" # usually not needed with modern servers + # "cache=loose" # improves performance for some workloads + ]; + }; + swapDevices = [ ] ++ (lib.optionals (systemName == "pc") [ diff --git a/home/homePkgs.nix b/home/homePkgs.nix index 44bc862..ca8a3c4 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -238,7 +238,9 @@ in dualsensectl gamemode goverlay - heroic + (pkgs.heroic.override { + extraPkgs = pkgs: [ pkgs.gamescope ]; # pulls in the real package + }) prismlauncher protonup-qt wineWowPackages.stable diff --git a/home/work.nix b/home/work.nix index d9ddfb7..0243b1c 100755 --- a/home/work.nix +++ b/home/work.nix @@ -69,6 +69,12 @@ in ############################ brave + ############################ + # work stuff + ############################ + #awscli2 + + # swaynotificationcenter # inputs.ladybird.packages."${pkgs.system}".ladybird diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 583a5a1..15e4f13 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -214,5 +214,9 @@ in git zotero + + # --- File System Stuff --- + cifs-utils + ]; }