From 1a000235647b6526733295d18a3b0700e4a9d668 Mon Sep 17 00:00:00 2001 From: kiana-S Date: Mon, 15 May 2023 10:47:52 -0400 Subject: [PATCH] Update dependencies --- config/packages.nix | 1 + flake.lock | 42 +++++++++--------------------- flake.nix | 8 +++--- hardware-configuration/desktop.nix | 3 --- hardware-configuration/laptop.nix | 7 ++--- hardware-configuration/mobile.nix | 3 --- home-manager/wayland/mako.nix | 2 +- 7 files changed, 21 insertions(+), 45 deletions(-) diff --git a/config/packages.nix b/config/packages.nix index 1b766e4..1450e2f 100644 --- a/config/packages.nix +++ b/config/packages.nix @@ -27,6 +27,7 @@ in { nix-direnv-with-flakes ]; + programs.fish.enable = true; programs.sway.enable = true; programs.sway.extraPackages = []; diff --git a/flake.lock b/flake.lock index 0839276..3e57a7e 100644 --- a/flake.lock +++ b/flake.lock @@ -4,15 +4,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1670280307, - "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=", + "lastModified": 1682779989, + "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2af0d07678fc15612345e0dd55337550dcf6465f", + "rev": "3144311f31194b537808ae6848f86f3dbf977d59", "type": "github" }, "original": { @@ -25,11 +24,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1670190044, - "narHash": "sha256-YA3ochLKXQAv2p5GWHToIJdqJ/iyVIwCBeE5DoSrS0o=", + "lastModified": 1677546929, + "narHash": "sha256-KwGBgdRq/yWBfp3UVSm3s+kI2PGpsNkXVqsDMQppBaI=", "owner": "wentam", "repo": "mobile-nixos", - "rev": "93ce16b1a18e1ef83027d93c1f478926c6d75a76", + "rev": "7f49a14c58fc8cace414a04b48ba5619ed025e13", "type": "github" }, "original": { @@ -41,11 +40,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1670174919, - "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -56,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670242877, - "narHash": "sha256-jBLh7dRHnbfvPPA9znOC6oQfKrCPJ0El8Zoe0BqnCjQ=", + "lastModified": 1682692304, + "narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e51c97f1c849efdfd4f3b78a4870e6aa2da4198", + "rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37", "type": "github" }, "original": { @@ -111,21 +110,6 @@ "repo": "tokyo-night-sddm", "type": "github" } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7ba9368..75e5753 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ outputs = { self, lib = nixpkgs.lib; in { nixosConfigurations = { - "${username}-desktop" = lib.makeOverridable lib.nixosSystem { + "${username}-desktop" = lib.nixosSystem { system = "x86_64-linux"; modules = [ ./config @@ -51,7 +51,7 @@ outputs = { self, ]; }; - "${username}-laptop" = lib.makeOverridable lib.nixosSystem { + "${username}-laptop" = lib.nixosSystem { system = "x86_64-linux"; modules = [ ./config @@ -61,7 +61,7 @@ outputs = { self, ./platform.nix ./hardware-configuration/laptop.nix home-manager.nixosModules.home-manager - nixos-hardware.nixosModules.microsoft-surface + nixos-hardware.nixosModules.microsoft-surface-pro-intel { home-manager.users.${username} = import ./home-manager; @@ -73,7 +73,7 @@ outputs = { self, ]; }; - "${username}-mobile" = lib.makeOverridable lib.nixosSystem { + "${username}-mobile" = lib.nixosSystem { system = "aarch64-linux"; modules = [ ./config diff --git a/hardware-configuration/desktop.nix b/hardware-configuration/desktop.nix index d1d709a..3727d6f 100644 --- a/hardware-configuration/desktop.nix +++ b/hardware-configuration/desktop.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { boot.loader.grub.useOSProber = true; diff --git a/hardware-configuration/laptop.nix b/hardware-configuration/laptop.nix index a9b285e..abddc18 100644 --- a/hardware-configuration/laptop.nix +++ b/hardware-configuration/laptop.nix @@ -1,12 +1,11 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { boot.loader.grub.useOSProber = true; hardware.enableRedistributableFirmware = true; hardware.enableAllFirmware = true; + microsoft-surface.kernelVersion = "6.1.18"; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; @@ -27,6 +26,4 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; virtualisation.hypervGuest.enable = true; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; } diff --git a/hardware-configuration/mobile.nix b/hardware-configuration/mobile.nix index 7a78174..5c8614b 100644 --- a/hardware-configuration/mobile.nix +++ b/hardware-configuration/mobile.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, ... }: { fileSystems."/" = diff --git a/home-manager/wayland/mako.nix b/home-manager/wayland/mako.nix index d3cb205..e75c5e7 100644 --- a/home-manager/wayland/mako.nix +++ b/home-manager/wayland/mako.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - programs.mako = { + services.mako = { enable = true; font = "UbuntuMono Light 11";