Compare commits

..

14 Commits

Author SHA1 Message Date
16980bf9f4 migrate to 25.11; remove teamspeak and jellyfin player due to webkit deprecation; 2025-11-28 00:42:44 +00:00
4fc8b0f4fa ignore container failures; lets try vesktop again; update resharper code 2025-11-26 17:29:22 +00:00
3a9d27adb8 move lsfg to gaming; add notes for 24.11 release; 2025-11-18 22:48:25 +00:00
079ba8a9d5 add oomd; swap back from tlp to power profiles; update resharper code; remove more mozilla bs 2025-11-17 16:01:31 +00:00
48c40f8124 update 2025-11-12 21:13:48 +00:00
c3171bd792 remove nftables (linux uses this by default now anyways i think?)
add busybox since its basically expected by some programs (comes with xz)
make virtualisation a proper module so i can flip between docker and podman (i will make podman work one day i swear)
add waydroid back in
electrum is busted for now
make resharper a bit more modular
add new firefox bs
2025-11-07 11:28:21 +00:00
a64a137724 Merge branch 'master' of https://git.worble.xyz/worble/nixos 2025-10-27 13:57:04 +00:00
d776ce0667 update ff profile 2025-10-27 13:56:41 +00:00
70a7c6d30a add nix path; remove openrgb due to build issues; use unstable teams cause mic issues; 2025-10-27 13:56:33 +00:00
f648311d04 flake update 2025-10-22 13:02:41 +01:00
8f5a18577f change to binary wrapper 2025-10-21 18:49:01 +01:00
4a49961bc0 omg i fixed vscode resharper i am a nix GOD 2025-10-21 18:23:20 +01:00
9f51eaf5fc finally embrace the sidebar revamp 2025-10-21 17:19:59 +01:00
bfc2435b43 add mkvtoolnix; remove kodi; move mangohud to gaming; playing with vscode resharper-code; 2025-10-21 11:33:52 +01:00
23 changed files with 329 additions and 223 deletions

View File

@@ -6,6 +6,7 @@
./location-time.nix ./location-time.nix
./networking.nix ./networking.nix
./nix-settings.nix ./nix-settings.nix
./oomd.nix
./pipewire.nix ./pipewire.nix
./programs.nix ./programs.nix
]; ];

View File

@@ -5,9 +5,6 @@
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking = { networking = {
nftables = {
enable = true;
};
networkmanager = { networkmanager = {
# Easiest to use and most distros use this by default. # Easiest to use and most distros use this by default.
enable = true; enable = true;

View File

@@ -1,4 +1,4 @@
{ ... }: { inputs, ... }:
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@@ -6,6 +6,8 @@
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
nix.gc.automatic = true; nix.gc.automatic = true;
nix.gc.options = "--delete-older-than 7d"; nix.gc.options = "--delete-older-than 7d";
# https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;

View File

@@ -0,0 +1,10 @@
{ ... }:
{
systemd.oomd = {
enable = true;
enableRootSlice = true;
enableSystemSlice = true;
enableUserSlices = true;
};
}

View File

@@ -19,8 +19,8 @@
rar rar
zstd zstd
xz
p7zip p7zip
busybox
libva-utils libva-utils
smartmontools smartmontools

View File

@@ -35,4 +35,9 @@
}; };
programs.cdemu.enable = true; # Remember to add users to the cdrom group for this to work programs.cdemu.enable = true; # Remember to add users to the cdrom group for this to work
environment.systemPackages = with pkgs;[
lsfg-vk
lsfg-vk-ui
];
} }

View File

@@ -0,0 +1,24 @@
{ pkgs, ... }:
{
# Install Japanese IME MOZC
i18n.inputMethod = {
enable = true;
type = "fcitx5";
# ibus = {
# engines = with pkgs.ibus-engines; [ mozc anthy ];
# panel = "${pkgs.kdePackages.plasma-desktop}/libexec/kimpanel-ibus-panel";
# };
fcitx5 = {
waylandFrontend = true;
addons = with pkgs; [
fcitx5-mozc
fcitx5-anthy
];
};
};
environment.systemPackages = [
pkgs.kdePackages.fcitx5-configtool
];
}

View File

@@ -1,20 +1,20 @@
{ ... }: { ... }:
{ {
services.power-profiles-daemon.enable = false; services.power-profiles-daemon.enable = true;
services.tlp = { # services.tlp = {
enable = true; # enable = true;
settings = { # settings = {
RESTORE_DEVICE_STATE_ON_STARTUP = 1; # RESTORE_DEVICE_STATE_ON_STARTUP = 1;
USB_AUTOSUSPEND = 0; # USB_AUTOSUSPEND = 0;
PLATFORM_PROFILE_ON_AC = "performance"; # PLATFORM_PROFILE_ON_AC = "performance";
PLATFORM_PROFILE_ON_BAT = "low-power"; # PLATFORM_PROFILE_ON_BAT = "low-power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; # CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power"; # CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
CPU_BOOST_ON_AC = 1; # CPU_BOOST_ON_AC = 1;
CPU_BOOST_ON_BAT = 0; # CPU_BOOST_ON_BAT = 0;
}; # };
}; # };
# Enable touchpad support (enabled by default in most desktopManagers). # Enable touchpad support (enabled by default in most desktopManagers).
services.libinput.enable = true; services.libinput.enable = true;

View File

@@ -1,6 +1,13 @@
{ pkgs, ... }: { pkgs, lib, config, ... }:
with lib;
{ {
options.virtualisation.containerManagement = mkOption {
type = types.enum [ "docker" "podman" ];
default = "docker";
};
config = {
virtualisation = { virtualisation = {
containers = { containers = {
# Enable common container config files in /etc/containers # Enable common container config files in /etc/containers
@@ -10,30 +17,37 @@
enable = true; enable = true;
qemu = { qemu = {
vhostUserPackages = [ pkgs.virtiofsd ]; vhostUserPackages = [ pkgs.virtiofsd ];
ovmf.enable = true;
}; };
}; };
# podman = { # remember to add the necessary users to the podman group
# enable = true; podman = {
# dockerSocket.enable = true; enable = if (config.virtualisation.containerManagement == "podman") then true else false;
# dockerCompat = true; dockerSocket.enable = true;
# defaultNetwork.settings.dns_enabled = true; dockerCompat = true;
# }; defaultNetwork.settings.dns_enabled = true;
};
# remember to add the necessary users to the docker group # remember to add the necessary users to the docker group
docker = { docker = {
enable = true; enable = if (config.virtualisation.containerManagement == "docker") then true else false;
storageDriver = "btrfs"; storageDriver = "btrfs";
}; };
# waydroid = { waydroid = {
# enable = true; enable = true;
# }; package = pkgs.waydroid-nftables;
};
}; };
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
# environment.systemPackages = with pkgs;[
# docker-compose environment.systemPackages = with pkgs;[
# # podman-compose waydroid-helper
# podman-tui ] ++ optionals (config.virtualisation.containerManagement == "podman") [
# podman-desktop docker-compose
# ]; # podman-compose
podman-tui
podman-desktop
] ++ optionals (config.virtualisation.containerManagement == "docker") [
lazydocker
];
};
} }

View File

@@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11?shallow=1";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.stdenv.hostPlatform.system}".[package name]
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05?shallow=1"; url = "github:nix-community/home-manager/release-25.11?shallow=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -19,6 +19,7 @@
url = "github:numtide/system-manager?shallow=1"; url = "github:numtide/system-manager?shallow=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-system-graphics = { nix-system-graphics = {
url = "github:soupglasses/nix-system-graphics?shallow=1"; url = "github:soupglasses/nix-system-graphics?shallow=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758287904, "lastModified": 1760701190,
"narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -20,24 +20,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -66,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760241904, "lastModified": 1760846226,
"narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa", "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -81,15 +63,14 @@
}, },
"nix-vscode-extensions": { "nix-vscode-extensions": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1760406799, "lastModified": 1761098495,
"narHash": "sha256-vK61Z2DhBMp3Y+FcqRqf1ZYkmcePXOQGJ0NGBzN7ys8=", "narHash": "sha256-aE2Vp0Q/Ra95sHk/YgQI6z9PvqPttgcIVUk3uSOWj9g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "979e203b85cb5f15228c7fe3dfaf1964d6e50b9d", "rev": "bd4690e402591e99a091dcd49663d3d6c9bf0ada",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -100,11 +81,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1760106635, "lastModified": 1760958188,
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -132,11 +113,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1760284886, "lastModified": 1760878510,
"narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -148,11 +129,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1760139962, "lastModified": 1760862643,
"narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -172,21 +153,6 @@
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11?shallow=1";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.stdenv.hostPlatform.system}".[package name]
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05?shallow=1"; url = "github:nix-community/home-manager/release-25.11?shallow=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@@ -17,6 +17,7 @@
../../configuration/modules/virtualisation.nix ../../configuration/modules/virtualisation.nix
../../configuration/modules/gaming.nix ../../configuration/modules/gaming.nix
../../configuration/modules/kde.nix ../../configuration/modules/kde.nix
../../configuration/modules/i18n.nix
]; ];
networking.hostName = "tuxedo"; # Define your hostname. networking.hostName = "tuxedo"; # Define your hostname.
@@ -32,7 +33,9 @@
"ntsync" "ntsync"
]; ];
services.hardware.openrgb.enable = true; # services.hardware.openrgb.enable = true;
virtualisation.containerManagement = "docker";
fileSystems."/mnt/HDD2" = { fileSystems."/mnt/HDD2" = {
fsType = "ext4"; fsType = "ext4";
@@ -64,9 +67,6 @@
environment.systemPackages = with pkgs;[ environment.systemPackages = with pkgs;[
distrobox distrobox
gpu-screen-recorder-gtk gpu-screen-recorder-gtk
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk-ui
]; ];
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
@@ -80,6 +80,7 @@
"podman" "podman"
"cdrom" "cdrom"
"wireshark" "wireshark"
"kvm" # for android studio
]; # Enable sudo for the user. ]; # Enable sudo for the user.
linger = true; linger = true;
}; };

View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758287904, "lastModified": 1764110879,
"narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "narHash": "sha256-xanUzIb0tf3kJ+PoOFmXEXV1jM3PjkDT/TQ5DYeNYRc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "rev": "aecba248f9a7d68c5d1ed15de2d1c8a4c994a3c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -20,24 +20,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -45,16 +27,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758463745, "lastModified": 1764177491,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "narHash": "sha256-dhX2abFWxeXab3Aad4Pg1xGtn9W84/qetNXfmYUwktw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "rev": "2217780c39169a9c77915200137550c2ef0fa974",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -66,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760241904, "lastModified": 1763870992,
"narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa", "rev": "d7423982c7a26586aa237d130b14c8b302c7a367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -81,15 +63,14 @@
}, },
"nix-vscode-extensions": { "nix-vscode-extensions": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1760493393, "lastModified": 1764208554,
"narHash": "sha256-a8PFspkUKhbnXqoy1XD66PLvHeP0dMkaEFOiSo0OV1U=", "narHash": "sha256-9cHI5OyIcTuaWYrgq3ng7W0q+wgX8II2fkqCHNot5jY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "c7cfda7d93fecc526a75cfbd2ca3133d048472e0", "rev": "8cd52edf9dea91d1610c50b494dc20636b61b862",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -116,11 +97,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1760284886, "lastModified": 1763966396,
"narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -132,16 +113,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1760423683, "lastModified": 1764020296,
"narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2", "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -155,21 +136,6 @@
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05?shallow=1"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11?shallow=1";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".[package name] nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable?shallow=1"; # use by inputs.nixpkgs-unstable.legacyPackages."${pkgs.stdenv.hostPlatform.system}".[package name]
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05?shallow=1"; url = "github:nix-community/home-manager/release-25.11?shallow=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, inputs, ... }:
{ {
imports = [ imports = [
@@ -34,15 +34,18 @@
teamspeak6-client teamspeak6-client
# media # media
jellyfin-media-player # TODO: disabled due to qt5-web-engine vulnerable https://github.com/NixOS/nixpkgs/pull/435067
# jellyfin-media-player
haruna haruna
# misc # misc
electrum # TODO: uncomment when ecdsa is updated
syncthing # https://github.com/NixOS/nixpkgs/pull/456881
# electrum
dbeaver-bin dbeaver-bin
ruffle ruffle
popsicle popsicle
mkvtoolnix
# for headset tune # for headset tune
headsetcontrol headsetcontrol
@@ -70,16 +73,12 @@
}; };
}; };
mangohud = { topgrade = {
enable = true;
settings = { settings = {
preset = 1; misc = {
ignore_failures = [ "containers" ];
}; };
}; };
kodi = {
enable = true;
package = pkgs.kodi.withPackages (exts: [ exts.pvr-iptvsimple ]);
}; };
}; };

View File

@@ -51,10 +51,14 @@ with lib;
enableFishIntegration = true; enableFishIntegration = true;
}; };
delta = {
enable = true;
enableGitIntegration = true;
};
git = { git = {
enable = true; enable = true;
delta.enable = true; settings = {
extraConfig = {
credential = { credential = {
helper = [ "cache --timeout 21600" "${pkgs.git-credential-manager}/bin/git-credential-manager" "${pkgs.git-credential-oauth}/bin/git-credential-oauth" ]; helper = [ "cache --timeout 21600" "${pkgs.git-credential-manager}/bin/git-credential-manager" "${pkgs.git-credential-oauth}/bin/git-credential-oauth" ];
credentialStore = "secretservice"; credentialStore = "secretservice";
@@ -174,6 +178,24 @@ with lib;
settings = mkMerge [{ settings = mkMerge [{
misc = { misc = {
assume_yes = true; assume_yes = true;
disable = [
"android_studio"
"jetbrains_aqua"
"jetbrains_clion"
"jetbrains_datagrip"
"jetbrains_dataspell"
"jetbrains_gateway"
"jetbrains_goland"
"jetbrains_idea"
"jetbrains_mps"
"jetbrains_phpstorm"
"jetbrains_pycharm"
"jetbrains_rider"
"jetbrains_rubymine"
"jetbrains_rustrover"
"jetbrains_toolbox"
"jetbrains_webstorm"
];
}; };
} }
(mkIf (nixUpdateLocation != null) { (mkIf (nixUpdateLocation != null) {

View File

@@ -1,4 +1,4 @@
{ pkgs, inputs, lib, ... }: { pkgs, lib, ... }:
{ {
imports = [ imports = [
@@ -9,14 +9,17 @@
home.packages = with pkgs;[ home.packages = with pkgs;[
# general # general
thunderbird thunderbird
keepassxc
qbittorrent qbittorrent
libreoffice-qt libreoffice-qt
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop # 25.11 Can move to stable when https://github.com/NixOS/nixpkgs/pull/460058 gets backported
joplin-desktop
# comms # comms
teamspeak_client # TODO: disabled due to qt5-web-engine vulnerable https://github.com/NixOS/nixpkgs/pull/435067
# teamspeak3
teamspeak6-client
discord discord
vesktop
# media # media
strawberry strawberry
@@ -32,6 +35,12 @@
}; };
}; };
xdg.configFile."capacitor/sysconfig.json".text = lib.generators.toJSON { } {
machine = "00000000-0000-0000-0000-000000000000";
signup = false;
telemetry = false;
};
home.sessionVariables = { home.sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
}; };
@@ -49,5 +58,11 @@
enable = true; enable = true;
package = pkgs.brave; package = pkgs.brave;
}; };
keepassxc = {
enable = true;
# add in 25.12?
# autostart = true;
};
}; };
} }

View File

@@ -0,0 +1,36 @@
# { pkgs, ... }:
# let
# androidEnv = pkgs.androidenv.override { licenseAccepted = true; };
# androidComp = (
# androidEnv.composeAndroidPackages {
# toolsVersion = null;
# includeEmulator = true;
# includeNDK = true;
# platformVersions = [
# "latest"
# "25"
# ];
# includeSystemImages = true;
# systemImageTypes = [
# "default"
# ];
# abiVersions = [
# "x86_64"
# "armeabi-v7a"
# "arm64-v8a"
# ];
# }
# );
# android-studio = (pkgs.android-studio.withSdk androidComp.androidsdk);
# in
# {
# home.sessionVariables = {
# ANDROID_HOME = "${androidComp.androidsdk}/libexec/android-sdk";
# ANDROID_SDK_ROOT = "${androidComp.androidsdk}/libexec/android-sdk";
# ANDROID_NDK_ROOT = "${androidComp.androidsdk}/libexec/android-sdk/ndk-bundle";
# };
# home.packages = [
# pkgs.android-studio
# ];
# }

View File

@@ -2,6 +2,7 @@
{ {
imports = [ imports = [
# ./android.nix
./dotnet.nix ./dotnet.nix
./games.nix ./games.nix
./helix.nix ./helix.nix

View File

@@ -3,6 +3,26 @@
let let
openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx; openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace; vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace;
resharper-code-version = "0.0.15";
resharper-code = (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "resharper-code";
version = resharper-code-version;
publisher = "jetbrains";
};
vsix = builtins.fetchurl {
name = "jetbrains.resharper-code.zip";
url = "https://download.jetbrains.com/product?code=VSCRS&latest&distribution=linuxX64&type=eap&version=${resharper-code-version}";
sha256 = "sha256:eef138c4fdd035031577f4c483c2155c4dd5ce91cfd1b9a2489c138aeb6cb99e";
};
}).overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.makeBinaryWrapper ];
postFixup = ''
wrapProgram $out/share/vscode/extensions/jetbrains.resharper-code/resharper/linux-x64/JetBrains.VsCode.Backend \
--prefix LD_LIBRARY_PATH : ${pkgs.dotnet-sdk.icu}/lib
'';
});
in in
{ {
home.packages = with pkgs;[ home.packages = with pkgs;[
@@ -17,7 +37,9 @@ in
profiles.default = { profiles.default = {
enableUpdateCheck = false; enableUpdateCheck = false;
enableExtensionUpdateCheck = false; enableExtensionUpdateCheck = false;
extensions = (with openvsx;[ extensions = [
resharper-code # Requires DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
] ++ (with openvsx;[
biomejs.biome biomejs.biome
mkhl.direnv mkhl.direnv
dracula-theme.theme-dracula dracula-theme.theme-dracula
@@ -34,7 +56,6 @@ in
ms-python.python ms-python.python
ms-python.debugpy ms-python.debugpy
charliermarsh.ruff charliermarsh.ruff
# jetbrains.resharper-code won't work with nix lmao
]) ++ (with vscode-marketplace;[ ]) ++ (with vscode-marketplace;[
bradlc.vscode-tailwindcss bradlc.vscode-tailwindcss
]); ]);

View File

@@ -49,8 +49,8 @@
"sidebar.position_start" = false; "sidebar.position_start" = false;
# new sidebar # new sidebar
"sidebar.revamp" = if tablet then true else false; "sidebar.revamp" = true;
"sidebar.verticalTabs" = if tablet then true else false; "sidebar.verticalTabs" = true;
"browser.tabs.hoverPreview.enabled" = false; "browser.tabs.hoverPreview.enabled" = false;
"browser.tabs.hoverPreview.showThumbnails" = false; "browser.tabs.hoverPreview.showThumbnails" = false;
"browser.tabs.groups.hoverPreview.enabled" = false; "browser.tabs.groups.hoverPreview.enabled" = false;
@@ -61,8 +61,12 @@
# browser links should be new tab # browser links should be new tab
"browser.link.open_newwindow.restriction" = 0; "browser.link.open_newwindow.restriction" = 0;
# allow custom search enginers # allow custom search engines
"browser.urlbar.update2.engineAliasRefresh" = true; "browser.urlbar.update2.engineAliasRefresh" = true;
# do not retrieve suggestions as you type https://blog.mozilla.org/en/firefox/better-search-suggestions/
"browser.urlbar.quicksuggest.online.enabled" = false;
# do not trim http
"browser.urlbar.trimURLs" = false;
# force enable hardware accel # force enable hardware accel
"media.hardware-video-decoding.force-enabled" = true; "media.hardware-video-decoding.force-enabled" = true;
@@ -88,13 +92,13 @@
# restore tabs on startup # restore tabs on startup
"browser.startup.page" = 3; "browser.startup.page" = 3;
# do not trim http
"browser.urlbar.trimURLs" = false;
# open in new tabs # open in new tabs
"browser.tabs.loadBookmarksInTabs" = true; "browser.tabs.loadBookmarksInTabs" = true;
"browser.search.openintab" = true;
"browser.urlbar.openintab" = true; # AI
"browser.ml.chat.page" = false;
# AI tab groups
"browser.tabs.groups.smart.userEnabled" = false;
/* Arkenfox Begin */ /* Arkenfox Begin */
@@ -173,16 +177,19 @@
"browser.contentblocking.category" = "strict"; "browser.contentblocking.category" = "strict";
}; };
userChrome = '' userChrome = ''
/* Hide tab bar in FF Quantum */ /* Remove old sidebar header */
@-moz-document url(chrome://browser/content/browser.xul), url(chrome://browser/content/browser.xhtml) { #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header {
#TabsToolbar { display: none;
visibility: collapse !important;
margin-bottom: 21px !important;
} }
#sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header { /* Remove sidebar revamp header */
visibility: collapse !important; #sidebar-panel-header {
display: none;
} }
/* Allow complete collapse of sidebar revamp */
#sidebar-main:not([sidebar-launcher-expanded]) {
width: 0;
} }
''; '';
} }

View File

@@ -1,7 +1,7 @@
{ pkgs, inputs, ... }: { pkgs, inputs, ... }:
let let
pkgs_unstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}"; pkgs_unstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.stdenv.hostPlatform.system}";
# https://simpler-website.pages.dev/html/2021/1/wine-environment-variables/#wineesync # https://simpler-website.pages.dev/html/2021/1/wine-environment-variables/#wineesync
wine-wrapped = (pkgs.writeShellApplication { wine-wrapped = (pkgs.writeShellApplication {
@@ -26,32 +26,35 @@ let
umu-run "$@" umu-run "$@"
''; '';
}); });
# proton with ja_JP
umu-ja = (pkgs.writeShellApplication {
name = "umu-ja";
runtimeInputs = [ umu-wrapped ];
text = "LANG=ja_JP.utf8 umu-run \"$@\"";
});
# wine with ja_JP
wine-ja = (pkgs.writeShellApplication {
name = "wine-ja";
runtimeInputs = [ wine-wrapped ];
text = "LANG=ja_JP.utf8 wine \"$@\"";
});
in in
{ {
home.packages = with pkgs;[ home.packages = with pkgs;[
# Wine / Proton # Wine / Proton
umu-wrapped umu-wrapped
umu-ja
wine-wrapped wine-wrapped
wine-ja
pkgs_unstable.winetricks pkgs_unstable.winetricks
# proton with ja_JP
(pkgs.writeShellApplication {
name = "umu-ja";
runtimeInputs = [ umu-wrapped ];
text = "LANG=ja_JP.utf8 umu-run \"$@\"";
})
# wine with ja_JP
(pkgs.writeShellApplication {
name = "wine-ja";
runtimeInputs = [ wine-wrapped ];
text = "LANG=ja_JP.utf8 wine \"$@\"";
})
bottles bottles
(heroic.override { (heroic.override {
extraPkgs = pkgs: [ extraPkgs = pkgs: [
pkgs.umu-launcher
pkgs.gamescope pkgs.gamescope
pkgs.mangohud
]; ];
}) })
@@ -65,4 +68,19 @@ in
# Cheat engine # Cheat engine
scanmem scanmem
]; ];
programs = {
mangohud = {
enable = true;
enableSessionWide = true;
settings = {
preset = 1;
};
settingsPerApplication = {
mpv = {
no_display = true;
};
};
};
};
} }