From 2a8ada6b014187120d6955d9c291ddb693a47363 Mon Sep 17 00:00:00 2001 From: Varris Date: Tue, 13 Feb 2024 15:04:39 +0100 Subject: [PATCH] update --- flake.nix | 38 +++++++++++++--------- overlay.nix | 2 +- system/configuration.nix | 30 ++++++++++++++--- system/hardware-configuration.nix | 2 +- system/hardware/default.nix | 2 +- system/programs/default.nix | 2 +- system/services/default.nix | 4 +++ user/configs/firefox/default.nix | 1 - user/configs/wayland/eww/config/eww.yuck | 1 + user/configs/wayland/hyprland/settings.nix | 1 + user/home.nix | 7 ++-- 11 files changed, 63 insertions(+), 27 deletions(-) diff --git a/flake.nix b/flake.nix index 5b950b1..4f45f6d 100755 --- a/flake.nix +++ b/flake.nix @@ -11,36 +11,40 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nur = { - url = "github:nix-community/NUR"; - }; - chaotic-nyx = { url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-index-database = { - url = "github:Mic92/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - hyprland = { - # url = "github:hyprwm/hyprland/12d79d63421e2ed3f31130755c7a37f0e4fb5cb1"; - url = "github:hyprwm/hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - eww-systray = { url = "github:ralismark/eww/tray-3"; inputs.nixpkgs.follows = "nixpkgs"; }; + grub2-themes = { + url = "github:vinceliuice/grub2-themes"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + helix = { url = "github:helix-editor/helix"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprland = { + url = "github:hyprwm/hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nix-index-database = { + url = "github:Mic92/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nur = { + url = "github:nix-community/NUR"; + }; + wezterm = { url = "github:happenslol/wezterm/add-nix-flake?dir=nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -105,7 +109,9 @@ #edit as you see fit hostName = "terra"; userName = "manuel"; + emailAddress = "varris@posteo.net"; flakeDir = "/home/${userName}/.dotfiles"; + #------------------- in { formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra; overlays = import ./overlay.nix {inherit inputs;}; @@ -121,6 +127,7 @@ modules = [ ./system/configuration.nix inputs.chaotic-nyx.nixosModules.default + inputs.grub2-themes.nixosModules.default inputs.nur.nixosModules.nur ]; }; @@ -131,6 +138,7 @@ inherit inputs; inherit userName; inherit flakeDir; + inherit emailAddress; }; modules = [ ./user/home.nix diff --git a/overlay.nix b/overlay.nix index 620fd20..ea53120 100755 --- a/overlay.nix +++ b/overlay.nix @@ -26,7 +26,7 @@ openmw = prev.openmw.overrideAttrs (old: { version = "9999"; src = inputs.openmw-git; - buildInputs = (prev.lib.lists.remove prev.mygui old.buildInputs) ++ [prev.libyamlcpp prev.luajit prev.collada-dom final.mygui-openmw]; + buildInputs = (prev.lib.lists.remove prev.mygui old.buildInputs) ++ [prev.libyamlcpp prev.luajit prev.collada-dom prev.libsForQt5.qt5.qttools final.mygui-openmw]; cmakeFlags = old.cmakeFlags ++ [ diff --git a/system/configuration.nix b/system/configuration.nix index 0acd75c..0a1f179 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -22,20 +22,33 @@ kernelPackages = pkgs.linuxPackages_latest; kernelModules = ["i2c-dev" "i2c-piix4"]; kernelParams = [ - "amdgpu.ppfeaturemask=0xffffffff" "amd_pstate.shared_mem=1" "amd_pstate=active" + + #quiet boot + "quiet" + "splash" + "vga=current" + "quiet" + "rd.udev.log_level=3" + "udev.log_priority=3" + "splash" ]; + initrd.verbose = false; + consoleLogLevel = 0; + loader = { efi = { + efiSysMountPoint = "/boot"; canTouchEfiVariables = true; }; systemd-boot = { enable = true; - configurationLimit = 10; + consoleMode = "auto"; }; + timeout = 0; }; }; @@ -45,7 +58,7 @@ networking = { hostName = "${hostName}"; #hostname declared in flake.nix firewall.enable = false; - useNetworkd = true; + networkmanager.enable = true; extraHosts = '' 192.168.0.18 steam.deck 127.0.0.1 modules-cdn.eac-prod.on.epicgames.com @@ -92,6 +105,15 @@ } ]; }; + + wrappers = { + "wavemon" = { + source = "${pkgs.wavemon}/bin/wavemon"; + owner = "root"; + group = "root"; + capabilities = "cap_net_admin+eip"; + }; + }; }; users.users.${userName} = { @@ -186,5 +208,5 @@ }; }; - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index 1313e22..d4b6cac 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -13,7 +13,7 @@ ]; boot.initrd.availableKernelModules = ["nvme"]; - boot.initrd.kernelModules = []; + boot.initrd.kernelModules = ["amdgpu"]; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; diff --git a/system/hardware/default.nix b/system/hardware/default.nix index 94f6b2b..8cb5d14 100644 --- a/system/hardware/default.nix +++ b/system/hardware/default.nix @@ -4,7 +4,7 @@ extraPackages = [pkgs.libvdpau-va-gl]; driSupport32Bit = true; }; - # chaotic.mesa-git.enable = true; + chaotic.mesa-git.enable = true; hardware.steam-hardware.enable = true; diff --git a/system/programs/default.nix b/system/programs/default.nix index 9d5558c..9491bba 100644 --- a/system/programs/default.nix +++ b/system/programs/default.nix @@ -12,5 +12,5 @@ ssh.startAgent = true; steam.enable = true; }; - chaotic.steam.extraCompatPackages = with pkgs; [luxtorpeda proton-ge-custom]; + chaotic.steam.extraCompatPackages = with pkgs; [luxtorpeda]; } diff --git a/system/services/default.nix b/system/services/default.nix index 5f9e137..cb1bd6e 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -1,4 +1,8 @@ { + pkgs, + config, + ... +}: { imports = [ ./locate ./pipewire diff --git a/user/configs/firefox/default.nix b/user/configs/firefox/default.nix index b572a32..2b25519 100755 --- a/user/configs/firefox/default.nix +++ b/user/configs/firefox/default.nix @@ -18,7 +18,6 @@ gruvbox-dark-theme indie-wiki-buddy istilldontcareaboutcookies - nitter-redirect privacy-badger redirector return-youtube-dislikes diff --git a/user/configs/wayland/eww/config/eww.yuck b/user/configs/wayland/eww/config/eww.yuck index a5926d9..2befeef 100644 --- a/user/configs/wayland/eww/config/eww.yuck +++ b/user/configs/wayland/eww/config/eww.yuck @@ -83,6 +83,7 @@ :class "widget-systray" (systray :pack-direction "rtl" + :icon-size 26 ) ) ) diff --git a/user/configs/wayland/hyprland/settings.nix b/user/configs/wayland/hyprland/settings.nix index de7842e..5c50d47 100644 --- a/user/configs/wayland/hyprland/settings.nix +++ b/user/configs/wayland/hyprland/settings.nix @@ -98,6 +98,7 @@ }; exec-once = [ + "${pkgs.networkmanagerapplet}/bin/nm-applet" "${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp" "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" "${pkgs.ydotool}/bin/ydotoold" diff --git a/user/home.nix b/user/home.nix index cfdc230..532b61e 100755 --- a/user/home.nix +++ b/user/home.nix @@ -4,6 +4,7 @@ lib, inputs, userName, + emailAddress, ... }: { imports = [ @@ -152,7 +153,7 @@ enable = true; lfs.enable = true; userName = "Varris"; - userEmail = "varris@posteo.net"; + userEmail = "${emailAddress}"; }; nix-index = { @@ -170,7 +171,7 @@ enable = true; settings = { pinentry = "gtk2"; - email = "varris@posteo.net"; + email = "${emailAddress}"; }; }; }; @@ -195,5 +196,5 @@ programs.home-manager.enable = true; - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; }