diff --git a/flake.lock b/flake.lock index dfb5f39..6de6782 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1742670145, - "narHash": "sha256-xQ2F9f+ICAGBp/nNv3ddD2U4ZvzuLOci0u/5lyMXPvk=", + "lastModified": 1740679976, + "narHash": "sha256-6U/zvgtcGJqpOTKsIgf+mRO7/djwV07ImU/t0nZBix8=", "owner": "nix-community", "repo": "home-manager", - "rev": "63e77d09a133ac641a0c204e7cfb0c97e133706d", + "rev": "343646e092696d94b6f22b6875ae685756fd4cf0", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 2c3b6a9..47c5087 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -48,16 +48,16 @@ boot.kernelModules = [ "kvm-amd" "nct6775" ]; # Direct patching for enabling for async reprojection (for SteamVR) on AMD - #boot.kernelPatches = [ - # { - # name = "amdgpu-ignore-ctx-privileges"; - # patch = pkgs.fetchpatch { - # name = "cap_sys_nice_begone.patch"; - # url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; - # hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; - # }; - # } - #]; + boot.kernelPatches = [ + { + name = "amdgpu-ignore-ctx-privileges"; + patch = pkgs.fetchpatch { + name = "cap_sys_nice_begone.patch"; + url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; + hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; + }; + } + ]; services.fwupd.enable = true; services.hardware.openrgb.enable = true; # Add flakes @@ -176,24 +176,7 @@ # For xdebug...verify actual necessity # Have had to use this, but I think it can be disabled still - perhaps w/xdebug binding setting...don't know. - #networking.firewall.allowedTCPPorts = [ 9003 ]; - - networking.firewall = { - allowedTCPPorts = [ 9003 ]; - allowedUDPPorts = [ 51820 ]; - # if packets are still dropped, they will show up in dmesg - logReversePathDrops = true; - checkReversePath = "loose"; - # wireguard trips rpfilter up - #extraCommands = '' - # ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN - # ip46tables -t mangle -I nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN - #''; - #extraStopCommands = '' - # ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN || true - # ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true - #''; - }; + networking.firewall.allowedTCPPorts = [ 9003 ]; # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -260,12 +243,11 @@ # why did these two disappear??? usbutils # provide lsusb, etc. pciutils # provide lspci, etc. - #rustdesk # the rustdesk remote desktop client + rustdesk # the rustdesk remote desktop client vorta # borg backup UI ncdu # nncurses tool for examining disk usage psmisc # process tools like killall corectrl # provide hardware clock controls for AMDGPU - gimp # GIMP image manipulation proggy ]; programs.zsh.enable = true; programs.git = { @@ -277,9 +259,9 @@ # enable = true; # openFirewall = true; # This is set true by default #}; - #nixpkgs.config.permittedInsecurePackages = [ - # "electron-27.3.11" - #]; + nixpkgs.config.permittedInsecurePackages = [ + "electron-27.3.11" + ]; fonts.packages = with pkgs; [ anonymousPro corefonts diff --git a/hosts/default/main-user.nix b/hosts/default/main-user.nix index 30a3491..354774d 100644 --- a/hosts/default/main-user.nix +++ b/hosts/default/main-user.nix @@ -2,10 +2,6 @@ let cfg = config.main-user; - # Create a customized version of logseq -# logseq-patch = pkgs.logseq.override { -# electron_27 = pkgs.electron_34; -# }; in { options.main-user = { @@ -32,7 +28,7 @@ in keepassxc # passwords! macchina # like *fetch - display basics z-lua # jump around directories (be careful with same-named ones!) - # logseq-patch # REQUIRES TEMPORARY INSECURE ELECTRON + logseq # REQUIRES TEMPORARY INSECURE ELECTRON signal-desktop # messaging ddev # local docker dev awesome vscodium # vs code editor, but free