From ab20bbd8c4f2d7961f5dc515839b976991d4ab7a Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 2 Jun 2026 20:21:32 +0200 Subject: [PATCH] update --- .gitignore | 1 - configuration.nix | 25 ++++- custom/hyprland.nix | 4 +- custom/mango.nix | 3 + custom/packages.nix | 20 ++-- custom/services.nix | 3 +- flake.lock | 261 ++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 12 +- 8 files changed, 302 insertions(+), 27 deletions(-) delete mode 100644 .gitignore create mode 100644 custom/mango.nix create mode 100644 flake.lock diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 301d47e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -flake.lock diff --git a/configuration.nix b/configuration.nix index cf27447..f1bd6fd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -20,6 +20,7 @@ # Optimization nix = { + gc = { automatic = true; dates = "weekly"; @@ -29,7 +30,17 @@ automatic = true; dates = [ "weekly" ]; }; - settings.experimental-features = [ "nix-command" "flakes"]; + settings = { + experimental-features = [ "nix-command" "flakes"]; + substituters = [ + "https://cache.nixos.org" + "https://attic.xuyh0120.win/lantian" # xddxdd's cache + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" + ]; + }; }; # Bootloader. @@ -45,7 +56,7 @@ "udev.log_level=3" "systemd.show_status=auto" ]; - kernelPackages = pkgs.linuxPackages_zen; + kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; #pkgs.linuxPackages_zen; plymouth = { enable = true; theme = "lone"; @@ -56,6 +67,10 @@ }) ]; }; + + + # Binary cache + # Enable "Silent boot" #consoleLogLevel = 3; @@ -72,7 +87,7 @@ hostName = "peceli"; firewall.enable = true; networkmanager.enable = true; - firewall.allowedTCPPorts = [ 9943 9944 22000 53317 ]; + firewall.allowedTCPPorts = [ 9943 9944 22000 53317 25565 ]; firewall.allowedUDPPorts = [ 9943 9944 53317 ]; }; @@ -94,12 +109,11 @@ #User config users = { defaultUserShell = pkgs.zsh; - groups.wireshark.gid = 500; users = { robin = { isNormalUser = true; description = "robin"; - extraGroups = [ "audio" "wireshark" "libvirtd" "networkmanager" "wheel" "docker"]; + extraGroups = [ "audio" "libvirtd" "networkmanager" "wheel" "docker" "gamemode"]; packages = with pkgs; [ flatpak ]; @@ -134,7 +148,6 @@ #Programs programs = { - wireshark.enable = true; virt-manager.enable = true; kdeconnect.enable = true; noisetorch.enable = true; diff --git a/custom/hyprland.nix b/custom/hyprland.nix index 1c12e42..b00f0bb 100644 --- a/custom/hyprland.nix +++ b/custom/hyprland.nix @@ -2,7 +2,7 @@ environment.systemPackages = (with pkgs; [ rofi hyprcursor - swww + awww hyprland hyprlock hyprsunset @@ -10,6 +10,6 @@ programs.hyprland = { enable = true; withUWSM = true; # recommended for most users - #xwayland.enable = true; + xwayland.enable = true; }; } diff --git a/custom/mango.nix b/custom/mango.nix new file mode 100644 index 0000000..717d0ec --- /dev/null +++ b/custom/mango.nix @@ -0,0 +1,3 @@ +{ config, pkgs, ... }:{ + programs.mangowc.enable = true; +} diff --git a/custom/packages.nix b/custom/packages.nix index d71944b..10e7971 100755 --- a/custom/packages.nix +++ b/custom/packages.nix @@ -15,7 +15,6 @@ zsh stow git - firefox kanata bat kdePackages.kdeconnect-kde @@ -50,7 +49,7 @@ noisetorch signal-desktop element-desktop - revolt-desktop + stoat-desktop localsend mpd ghostty @@ -88,15 +87,12 @@ home-manager iperf3 vesktop - lutris btop-rocm lm_sensors pipes cbonsai inkscape asciiquarium-transparent - wireshark - termshark monero-gui rmpc yt-dlp @@ -105,22 +101,16 @@ croc spotdl supertuxkart - testdisk - testdisk-qt htop ungoogled-chromium syncthing samba sssnake - droidcam - obs-studio-plugins.droidcam-obs - nitch tomb wine linux-wallpaperengine fusee-nano ppsspp - alvr lact librewolf nvtopPackages.amd @@ -131,5 +121,13 @@ spotify ryubing termdown + mumble + cinny-desktop + cargo + lua ]); + + nixpkgs.config.permittedInsecurePackages = [ + "electron-38.8.4" + ]; } diff --git a/custom/services.nix b/custom/services.nix index 17e8506..bb4d034 100755 --- a/custom/services.nix +++ b/custom/services.nix @@ -8,7 +8,8 @@ services = { enable = true; package = pkgs.openrgb-with-all-plugins; motherboard = "amd"; - startupProfile = "meow"; + startupProfile = "none"; + server.port = 6742; }; sunshine = { enable = true; diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..c352ddc --- /dev/null +++ b/flake.lock @@ -0,0 +1,261 @@ +{ + "nodes": { + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1779959490, + "narHash": "sha256-FS/SbuYuRt5biCp1ja0Se12V2q3Y3p+O+rAdFQvuJT4=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "1d38a1c83db0cddff4963516eb3f6838981cb6ae", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1779996637, + "narHash": "sha256-DcA59mHfCUfbr7EtH9YJUb3t62TcyXwC/I0QMyUs1bo=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "b87558b7c865628c48c1d6ff5c827b9df40e9281", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, + "catppuccin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1780394337, + "narHash": "sha256-qsiTng/LjFuxN5SNKIKhUWqFFbpvdpnYqRj2F7inK3k=", + "owner": "catppuccin", + "repo": "nix", + "rev": "9f015db982efc83ae1eb0074960e812ee386f3bb", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780408569, + "narHash": "sha256-s7Tv6FUQThRAvW8En8XVC6HMb0uiikzVccCcCo9u/Bg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f384af1bec6423a0d4ba1855917ab948f64e5808", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780099287, + "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nix-cachyos-kernel": { + "inputs": { + "cachyos-kernel": "cachyos-kernel", + "cachyos-kernel-patches": "cachyos-kernel-patches", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1780253365, + "narHash": "sha256-wcJ+6+Z+mfzBjClI0XsjOoGSW6o1RldVj6UETLzK+GQ=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "236462fb93cb56e26e6a6801ba5edb6dad66be0d", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "ref": "release", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1780246643, + "narHash": "sha256-JZXtt4Ax1FiEArbgzhLRQ7xrNZQdHIrty5XSwOoXrm8=", + "rev": "3109eaae18e09d0b8aef23dc2579e7d94b8d4b4e", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1008286.3109eaae18e0/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "25f538306313eae3927264466c70d7001dcea1df", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1780206209, + "narHash": "sha256-33WNQ5sssy+8+xhUz953aEnjR1Oh828j0DgLU1TfMqE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "45cf63e030188dd38532669b2450182bfc2d4653", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "catppuccin": "catppuccin", + "home-manager": "home-manager", + "nix-cachyos-kernel": "nix-cachyos-kernel", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable", + "zen-browser": "zen-browser" + } + }, + "zen-browser": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780372976, + "narHash": "sha256-7B90rWlpRZ6bZtRDCKZOqqfAjFFhiTDHXymWw2omhJ4=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "decef750607ebed4f8ccd9cd6169907367ab08b1", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 08815fc..4590c7d 100644 --- a/flake.nix +++ b/flake.nix @@ -14,13 +14,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; }; - outputs = { nixpkgs, nixpkgs-stable, home-manager, zen-browser, catppuccin, quickshell, ... }: + outputs = { nixpkgs, nixpkgs-stable, home-manager, zen-browser, catppuccin, nix-cachyos-kernel, ... }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -38,7 +35,10 @@ ({pkgs, ...}: { environment.systemPackages = [ zen-browser.packages.${system}.default - quickshell.packages.${system}.default + ]; + nixpkgs.overlays = [ + nix-cachyos-kernel.overlays.default + nix-cachyos-kernel.overlays.pinned ]; }) home-manager.nixosModules.home-manager