From 60fe2f1b3ea489c84dec2972feda3eb43e4681a0 Mon Sep 17 00:00:00 2001 From: rainy Date: Fri, 16 May 2025 16:58:50 -0700 Subject: [PATCH] stuff :3 --- .gitignore | 1 + configuration.nix | 53 ++++++++++++++++++++++++++--- flake.lock | 77 ++++++++++++++++++++++++++++++++++++------ flake.nix | 1 + home.nix | 33 +++++++++++++++++- modules/fastfetch.nix | 48 ++++++++++++++++++++++++++ modules/networking.nix | 9 +++++ 7 files changed, 206 insertions(+), 16 deletions(-) create mode 100644 modules/fastfetch.nix create mode 100644 modules/networking.nix diff --git a/.gitignore b/.gitignore index b0456b3..e57e025 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ result build/ node_modules/ .vscode/ +secrets.conf diff --git a/configuration.nix b/configuration.nix index 2444b0f..b481f9c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,13 +8,30 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./modules/networking.nix # ]; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_6_6; + boot.kernelPackages = pkgs.linuxPackages_latest; + # boot.kernelParams = [ + # "iommu=pt" + # "vfio-pci.ids='1002:747e,1002:ab30'" + # "pcie_aspm=off" + #]; + #boot.kernelModules = [ + # "kvm-amd" + #]; + + # boot.initrd.preDeviceCommands = '' + # DEVS="0000:03:00.0 0000:03:00.1" + # for DEV in $DEVS; do + # echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override + # done + # modprobe -i vfio-pci + # ''; #home-manager.useGlobalPkgs = true; #home-manager.useUserPackages = true; @@ -23,15 +40,15 @@ #home-manager.users.rainy = import ./home.nix; networking.hostName = "rainix"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Enable networking - networking.networkmanager.enable = true; - networking.networkmanager.wifi.powersave = false; + #networking.networkmanager.enable = true; + #networking.networkmanager.wifi.powersave = false; # Set your time zone. time.timeZone = "America/Los_Angeles"; @@ -72,6 +89,26 @@ options = "--delete-older-than 7d"; }; + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + glibc + zlib + openssl + libffi + util-linux + bzip2 + sqlite + ncurses + readline + gdbm + libnsl + libtirpc + libxcrypt + gcc + util-linux + freetype + ]; + # cosmic services.desktopManager.cosmic.enable = true; @@ -84,6 +121,7 @@ ignoreShellProgramCheck = true; packages = with pkgs; [ pavucontrol + #inputs.zen-browser.packages."${system}".specific #kitty #krita #steam @@ -110,6 +148,10 @@ #virt virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = [ "rainy" ]; + virtualisation.podman = { + enable = true; + dockerCompat = true; + }; #programs.fish.enable = true; # Allow unfree packages @@ -124,6 +166,7 @@ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget # pipewire-pulse + distrobox ]; # Some programs need SUID wrappers, can be configured further or are @@ -143,7 +186,7 @@ # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. - # networking.firewall.enable = false; + networking.firewall.enable = false; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/flake.lock b/flake.lock index 9179759..f5bf2ee 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,32 @@ ] }, "locked": { - "lastModified": 1745977079, - "narHash": "sha256-eEOmrgpenIs+JwuCdqgEYly6sdz8vbCQVgvo8dk3DZM=", + "lastModified": 1747340209, + "narHash": "sha256-tUiXrwlJoG3dzJ+fSwv1S3VPU5ODSPZJHoBmlu4t344=", "owner": "nix-community", "repo": "home-manager", - "rev": "84d262115e10ad321ef01cd85903d0f5c3ec113f", + "rev": "098e365dd83311cc8236f83ea6be42abb49a6c76", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", "type": "github" }, "original": { @@ -27,11 +48,11 @@ ] }, "locked": { - "lastModified": 1745725746, - "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", + "lastModified": 1746934494, + "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "187524713d0d9b2d2c6f688b81835114d4c2a7c6", + "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", "type": "github" }, "original": { @@ -42,11 +63,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -60,7 +97,27 @@ "inputs": { "home-manager": "home-manager", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "zen-browser": "zen-browser" + } + }, + "zen-browser": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1747278581, + "narHash": "sha256-2TzDRpuU3Ae5yEvt8HiNbgK/c6JogUqQGvTQq7Hj+iA=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "8358d144bccc142fffff1743d1b2dd15e24f7f3a", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 8cca1df..cf34310 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nix-index-database.url = "github:nix-community/nix-index-database"; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/home.nix b/home.nix index 19c228e..98df4b8 100644 --- a/home.nix +++ b/home.nix @@ -5,6 +5,8 @@ ./modules/kitty.nix ./modules/fish.nix ./modules/git.nix + ./modules/fastfetch.nix + #inputs.zen-browser.homeModules.beta #./modules/wlsunset.nix ]; home.username = "rainy"; @@ -12,6 +14,14 @@ programs.home-manager.enable = true; programs.nix-index.enable = true; + + # programs.zen-browser = { + # enable = true; + # policies = { + # DisableAppUpdate = true; + # DisableTelemetry = true; + # }; + # }; home.packages = [ pkgs.krita @@ -25,7 +35,7 @@ pkgs.gamemode pkgs.mangohud pkgs.gamescope - pkgs.fastfetch + #pkgs.fastfetch pkgs.upscayl pkgs.heroic pkgs.termusic @@ -37,6 +47,27 @@ pkgs.seafile-client pkgs.ollama-rocm pkgs.btop + pkgs.signal-desktop + pkgs.bottles + pkgs.dconf + pkgs.zathura + pkgs.revolt-desktop + pkgs.code-cursor + pkgs.lutris-unwrapped + pkgs.wineWowPackages.full + pkgs.protontricks + pkgs.p7zip + pkgs.zenity + pkgs.wget + pkgs.xfce.thunar + pkgs.jq + pkgs.python312Full + pkgs.python312Packages.vdf + pkgs.pciutils + pkgs.nvtopPackages.amd + pkgs.insomnia + #pkgs.meteo + #pkgs.busybox #pkgs.wlsunset #pkgs.redshift #pkgs.youtube-dl diff --git a/modules/fastfetch.nix b/modules/fastfetch.nix new file mode 100644 index 0000000..fb29937 --- /dev/null +++ b/modules/fastfetch.nix @@ -0,0 +1,48 @@ +{ + programs.fastfetch = { + enable = true; + settings = { + logo = { + source = "/home/rainy/.config/nc.png"; + padding = { + right = 1; + }; + type = "kitty"; + width = 28; + height = 14; + }; + display = { + size = { + binaryPrefix = "si"; + }; + color = "blue"; + separator = "  "; + }; + modules = [ + { + type = "datetime"; + key = "Date"; + format = "{1}-{3}-{11}"; + } + { + type = "datetime"; + key = "Time"; + format = "{14}:{17}:{20}"; + } + "kernel" + "os" + "packages" + "de" + "wm" + "cpu" + "gpu" + "memory" + "disk" + "shell" + "break" + "player" + "media" + ]; + }; + }; +} diff --git a/modules/networking.nix b/modules/networking.nix new file mode 100644 index 0000000..be9e0db --- /dev/null +++ b/modules/networking.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +#{ +# networking.wireless = { +# secretsFile = "/home/rainy/nix-config/secrets.conf"; + +{ + networking.networkmanager.enable = true; +}