From 922dbb8f8cbc48ccc23f4dfddb232102d3e9a258 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 31 Aug 2023 00:37:17 +0200 Subject: --- flake.lock | 141 ++++++++++++++++++++++++++++++++++++++++++--- flake.nix | 12 ++-- hardware-configuration.nix | 51 ---------------- modules/hyprland.nix | 2 +- 4 files changed, 143 insertions(+), 63 deletions(-) delete mode 100644 hardware-configuration.nix diff --git a/flake.lock b/flake.lock index 9dbf1ef..3be5624 100644 --- a/flake.lock +++ b/flake.lock @@ -21,18 +21,65 @@ "type": "github" } }, + "hyprland": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "nixpkgs": "nixpkgs", + "systems": "systems", + "wlroots": "wlroots", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1693430615, + "narHash": "sha256-C53KCLA1AoTmotJCXk3Md2pwQ/GNgB/W9Qg5NTsEfyw=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "9c4f776757d673e5fb73716c874afbe20c66f045", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1693341273, - "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=", - "owner": "nixos", + "lastModified": 1693158576, + "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1", + "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-23.05", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -53,12 +100,92 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1693341273, + "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "hyprland": "hyprland", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } + }, + "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1692976565, + "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "type": "gitlab" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1691841170, + "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a4112d0..c64a2f5 100644 --- a/flake.nix +++ b/flake.nix @@ -9,17 +9,19 @@ url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + + hyprland.url = "github:hyprwm/Hyprland"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }: { + outputs = { nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: { nixosConfigurations = { - zenbook = nixpkgs.lib.nixosSystem { + nixos-zenbook = nixpkgs.lib.nixosSystem { modules = [ ./machines/zenbook/configuration.nix - ./hardware-configuation.nix + ./machines/zenbook/hardware-configuation.nix # Default users ./modules/user-profiles/defin.nix @@ -34,10 +36,12 @@ # arguments to home.nix } + hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} + ./modules/hyprland.nix + ./modules/bluetooth.nix ./modules/environment.nix ./modules/kde-connect.nix - ./modules/hyprland.nix ./modules/nix-common.nix ./modules/services.nix ./modules/sway.nix diff --git a/hardware-configuration.nix b/hardware-configuration.nix deleted file mode 100644 index 531b45b..0000000 --- a/hardware-configuration.nix +++ /dev/null @@ -1,51 +0,0 @@ -# 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, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/1a4350a8-db20-4c82-b8f4-7443fa5883f7"; - fsType = "btrfs"; - }; - - boot.initrd.luks.devices."nixos".device = "/dev/disk/by-uuid/f8a557dc-4571-408b-9689-a3be8180e3b1"; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/5806712b-acd3-46ec-b90e-ac5542cb210e"; - fsType = "btrfs"; - }; - - boot.initrd.luks.devices."home".device = "/dev/disk/by-uuid/dacb456e-d8bb-4a6b-a600-5d908c958032"; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/9ADD-2B42"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/1e7bfc05-3e03-4e27-8b60-92817ff780d4"; } - ]; - - boot.initrd.luks.devices."swap".device = "/dev/disk/by-uuid/f5f09c37-fb5d-4857-94f2-cfadcda7c82c"; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 0540606..1502c99 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -1,6 +1,6 @@ { config, lib, ...}: { - programs.hyprland.enable = true; + # programs.hyprland.enable = true; # Optional, hint electron apps to use wayland: environment.sessionVariables.NIXOS_OZONE_WL = "1"; } \ No newline at end of file -- cgit v1.2.3