From ba84bc21cecdf2f5728be858b312151c3ebc082b Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Fri, 11 Nov 2022 14:34:31 +0100 Subject: [PATCH] Improved odin configuration --- flake.lock | 36 +++++++++++++++++------------------ hm_modules/__basic.nix | 1 + hm_modules/sxhkd.nix | 6 +++--- odin/common_configuration.nix | 5 +++-- odin/configuration-intel.nix | 1 + odin/configuration-nvidia.nix | 1 + odin/hm.nix | 2 +- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index b17a07b..8391a1c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1665996265, - "narHash": "sha256-/k9og6LDBQwT+f/tJ5ClcWiUl8kCX5m6ognhsAxOiCY=", + "lastModified": 1667907331, + "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "owner": "nix-community", "repo": "home-manager", - "rev": "b81e128fc053ab3159d7b464d9b7dedc9d6a6891", + "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1666873549, - "narHash": "sha256-a6Eu1Qv/EndjepSMja5SvcG+4vM5Rl2gzJD7xscRHss=", + "lastModified": 1668084757, + "narHash": "sha256-/RRIVnNrg1EZkYMaPdQFuxCQ72LPWkVjvWEClR8FqvI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "419dcc0ec767803182ed01a326f134230578bf60", + "rev": "11a42a580de22355934ffd9235b81b64004a2e98", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666961615, - "narHash": "sha256-+Sqz6zQA85Q14U/KwsJO386oxd47zDte8dqBGOtRJGg=", + "lastModified": 1668108235, + "narHash": "sha256-/Di1OkjDhSrkDi1i/V1T+9NnmWBm8VBAg9xRoX4Xy8E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "040c6d8374d090f46ab0e99f1f7c27a4529ecffd", + "rev": "58f933e321d5076cab0e0a98b994d84a9f175d40", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs-u": { "locked": { - "lastModified": 1666959691, - "narHash": "sha256-TRpWA3t8ata79HOGtFd5dDCl1kJQmIE16PDF53/Hcxo=", + "lastModified": 1667991831, + "narHash": "sha256-DHgEsLZI044B9T4AjA3K6+yB9/DqLr4dyA7OIx0FG7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "448a599c49978c2794401bfc3a2e1fba1a8663be", + "rev": "872fceeed60ae6b7766cc0a4cd5bf5901b9098ec", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1666604592, - "narHash": "sha256-Bxy7xeVAwC0yxFaeYZM7N9Us/ebxpMC9TCceKEFeay4=", + "lastModified": 1667992213, + "narHash": "sha256-8Ens8ozllvlaFMCZBxg6S7oUyynYx2v7yleC5M0jJsE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "1b436f36e2812c589e6d830e3223059ea9661100", + "rev": "ebcbfe09d2bd6d15f68de3a0ebb1e4dcb5cd324b", "type": "github" }, "original": { diff --git a/hm_modules/__basic.nix b/hm_modules/__basic.nix index 24eadc5..1243430 100644 --- a/hm_modules/__basic.nix +++ b/hm_modules/__basic.nix @@ -9,6 +9,7 @@ neofetch nixos-option nix-tree + pv unrar unzip wget diff --git a/hm_modules/sxhkd.nix b/hm_modules/sxhkd.nix index 4905a55..0a7c8f2 100644 --- a/hm_modules/sxhkd.nix +++ b/hm_modules/sxhkd.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { imports = [ - # ./nautilus.nix - ./thunar.nix + ./nautilus.nix + # ./thunar.nix ]; home.packages = with pkgs; [ bc @@ -20,7 +20,7 @@ let primaryTerminal = "kitty"; secondaryTerminal = "terminator"; - fileManager = "thunar"; + fileManager = "nautilus"; emojiChooser = "rofimoji --skin-tone light -a copy"; yad = "${pkgs.yad}/bin/yad"; in diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index 6826c38..51a21cf 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -19,7 +19,7 @@ with lib; { networking = { hostName = "odin"; networkmanager.enable = true; - networkmanager.wifi.backend = "iwd"; + # networkmanager.wifi.backend = "iwd"; # The global useDHCP flag is deprecated, therefore explicitly set to false here. # Per-interface useDHCP will be mandatory in the future, so this generated config @@ -217,8 +217,9 @@ with lib; { services.blueman.enable = true; services.gvfs = { enable = true; - package = lib.mkForce pkgs.gnome3.gvfs; + # package = lib.mkForce pkgs.gnome3.gvfs; }; + services.tumbler.enable = true; # services.tlp.enable = false; services.avahi = { enable = true; diff --git a/odin/configuration-intel.nix b/odin/configuration-intel.nix index 0107fb8..be70567 100644 --- a/odin/configuration-intel.nix +++ b/odin/configuration-intel.nix @@ -8,6 +8,7 @@ boot.initrd.kernelModules = [ "i915" ]; hardware.opengl.enable = true; + hardware.opengl.driSupport = true; hardware.opengl.extraPackages = with pkgs; [ intel-media-driver vaapiIntel diff --git a/odin/configuration-nvidia.nix b/odin/configuration-nvidia.nix index 6b439cf..0b7ed7f 100644 --- a/odin/configuration-nvidia.nix +++ b/odin/configuration-nvidia.nix @@ -3,6 +3,7 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { boot.initrd.kernelModules = [ "i915" ]; + # boot.kernelPackages = pkgs.linuxPackages; services.xserver = { videoDrivers = [ "nvidia" ]; diff --git a/odin/hm.nix b/odin/hm.nix index bf891c4..ee13cdd 100644 --- a/odin/hm.nix +++ b/odin/hm.nix @@ -147,7 +147,7 @@ ../hm_modules/mangohud.nix ../hm_modules/megasync.nix ../hm_modules/mpv.nix - ../hm_modules/nautilus.nix + # ../hm_modules/nautilus.nix ../hm_modules/nix-index.nix ../hm_modules/noti.nix ../hm_modules/nushell.nix