Compare commits

..

No commits in common. "a06273419c22ce9b571ea25dc15b7cd83a1e9e3c" and "0ffd971823ef70fa5d17a148e45b231d27a48cfc" have entirely different histories.

3 changed files with 22 additions and 44 deletions

12
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742670145, "lastModified": 1740679976,
"narHash": "sha256-xQ2F9f+ICAGBp/nNv3ddD2U4ZvzuLOci0u/5lyMXPvk=", "narHash": "sha256-6U/zvgtcGJqpOTKsIgf+mRO7/djwV07ImU/t0nZBix8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "63e77d09a133ac641a0c204e7cfb0c97e133706d", "rev": "343646e092696d94b6f22b6875ae685756fd4cf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742422364, "lastModified": 1740560979,
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -48,16 +48,16 @@
boot.kernelModules = [ "kvm-amd" "nct6775" ]; boot.kernelModules = [ "kvm-amd" "nct6775" ];
# Direct patching for enabling for async reprojection (for SteamVR) on AMD # Direct patching for enabling for async reprojection (for SteamVR) on AMD
#boot.kernelPatches = [ boot.kernelPatches = [
# { {
# name = "amdgpu-ignore-ctx-privileges"; name = "amdgpu-ignore-ctx-privileges";
# patch = pkgs.fetchpatch { patch = pkgs.fetchpatch {
# name = "cap_sys_nice_begone.patch"; name = "cap_sys_nice_begone.patch";
# url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch";
# hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo=";
# }; };
# } }
#]; ];
services.fwupd.enable = true; services.fwupd.enable = true;
services.hardware.openrgb.enable = true; services.hardware.openrgb.enable = true;
# Add flakes # Add flakes
@ -176,24 +176,7 @@
# For xdebug...verify actual necessity # 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. # 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 ];
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
#'';
};
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -260,12 +243,11 @@
# why did these two disappear??? # why did these two disappear???
usbutils # provide lsusb, etc. usbutils # provide lsusb, etc.
pciutils # provide lspci, etc. pciutils # provide lspci, etc.
#rustdesk # the rustdesk remote desktop client rustdesk # the rustdesk remote desktop client
vorta # borg backup UI vorta # borg backup UI
ncdu # nncurses tool for examining disk usage ncdu # nncurses tool for examining disk usage
psmisc # process tools like killall psmisc # process tools like killall
corectrl # provide hardware clock controls for AMDGPU corectrl # provide hardware clock controls for AMDGPU
gimp # GIMP image manipulation proggy
]; ];
programs.zsh.enable = true; programs.zsh.enable = true;
programs.git = { programs.git = {
@ -277,9 +259,9 @@
# enable = true; # enable = true;
# openFirewall = true; # This is set true by default # openFirewall = true; # This is set true by default
#}; #};
#nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
# "electron-27.3.11" "electron-27.3.11"
#]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
anonymousPro anonymousPro
corefonts corefonts

View file

@ -2,10 +2,6 @@
let let
cfg = config.main-user; cfg = config.main-user;
# Create a customized version of logseq
# logseq-patch = pkgs.logseq.override {
# electron_27 = pkgs.electron_34;
# };
in in
{ {
options.main-user = { options.main-user = {
@ -32,7 +28,7 @@ in
keepassxc # passwords! keepassxc # passwords!
macchina # like *fetch - display basics macchina # like *fetch - display basics
z-lua # jump around directories (be careful with same-named ones!) 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 signal-desktop # messaging
ddev # local docker dev awesome ddev # local docker dev awesome
vscodium # vs code editor, but free vscodium # vs code editor, but free