From c87410b1aa9f82c274235d9c1802cdd46010ed3a Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Fri, 27 Jan 2023 07:02:30 +0530 Subject: [PATCH] enable iwd Signed-off-by: Amneesh Singh --- flake.lock | 64 +++++++++++++++++++++++----------- flake.nix | 10 +++++- hosts/modules/nvim/default.nix | 1 + hosts/satori/networking.nix | 6 +++- hosts/satori/pkgs.nix | 1 - hosts/satori/stuff.nix | 10 +++--- hosts/satori/wayland.nix | 4 ++- 7 files changed, 67 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 8c0a4b8..314a8d9 100644 --- a/flake.lock +++ b/flake.lock @@ -154,7 +154,9 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "wlroots": "wlroots", "xdph": "xdph" }, @@ -172,6 +174,26 @@ "type": "github" } }, + "hyprland-contrib": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1672071700, + "narHash": "sha256-Z0pbBVtijv4xbL42rPzMoYFSOqALFRYDMN9iOumSEso=", + "owner": "hyprwm", + "repo": "contrib", + "rev": "37c8121f98d76f57caa00dd7106877876e0d7483", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "contrib", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -332,22 +354,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1673540789, - "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1674236650, "narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=", @@ -363,7 +369,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1671983799, "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", @@ -383,7 +389,7 @@ "inputs": { "flake-compat": "flake-compat_2", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1674288814, @@ -405,12 +411,14 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprland-contrib": "hyprland-contrib", "mailserver": "mailserver", "nbfc": "nbfc", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nvim-overlay": "nvim-overlay", "rust-overlay": "rust-overlay", + "stable": "stable", "webcord": "webcord" } }, @@ -435,6 +443,22 @@ "type": "github" } }, + "stable": { + "locked": { + "lastModified": 1674638707, + "narHash": "sha256-yGYxlb5jPAiuvzCZ4MQAfPqp8DxfgkFEoBzYPhQxX4Y=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d278b8c3f6b9fd9604fd0b7ddb3bf29f1cbaea39", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index d012282..8a962a7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable; + stable.url = github:nixos/nixpkgs/release-22.11; flake-parts.url = github:hercules-ci/flake-parts; home-manager = { url = github:nix-community/home-manager; @@ -29,7 +30,14 @@ url = github:nix-community/neovim-nightly-overlay; inputs.nixpkgs.url = github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836; }; - hyprland.url = github:hyprwm/Hyprland; + hyprland = { + url = github:hyprwm/Hyprland; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprland-contrib = { + url = github:hyprwm/contrib; + inputs.nixpkgs.follows = "nixpkgs"; + }; webcord.url = github:huantianad/nixpkgs/webcord; }; diff --git a/hosts/modules/nvim/default.nix b/hosts/modules/nvim/default.nix index eb68621..43f46ea 100644 --- a/hosts/modules/nvim/default.nix +++ b/hosts/modules/nvim/default.nix @@ -38,6 +38,7 @@ vim-latex-live-preview lspkind-nvim catppuccin-nvim + yuck-vim ]; }; }; diff --git a/hosts/satori/networking.nix b/hosts/satori/networking.nix index 7959b12..8460ddd 100644 --- a/hosts/satori/networking.nix +++ b/hosts/satori/networking.nix @@ -5,8 +5,12 @@ hostName = "satori"; hostId = "beca3df0"; defaultGateway = "192.168.1.1"; + wireless = { + enable = false; + iwd.enable = true; + interfaces = [ "wlp0s20f3" ]; + }; networkmanager.enable = true; - wireless.interfaces = [ "wlp0s20f3" ]; firewall = { allowedTCPPorts = [ 22 18172 6600 8001 25565 ]; allowedUDPPorts = [ 22 17840 18172 ]; diff --git a/hosts/satori/pkgs.nix b/hosts/satori/pkgs.nix index 3878582..f8fe626 100644 --- a/hosts/satori/pkgs.nix +++ b/hosts/satori/pkgs.nix @@ -46,6 +46,5 @@ adb.enable = true; light.enable = true; gamemode.enable = true; - nm-applet.enable = true; }; } diff --git a/hosts/satori/stuff.nix b/hosts/satori/stuff.nix index 6604869..8de285c 100644 --- a/hosts/satori/stuff.nix +++ b/hosts/satori/stuff.nix @@ -23,17 +23,17 @@ console.useXkbConfig = true; fonts.fonts = with pkgs; [ - fira-mono fira-code + fira-mono + monoid + font-awesome + material-icons + material-design-icons lohit-fonts.devanagari lohit-fonts.gurmukhi - nerdfonts - font-awesome - monoid office-code-pro eb-garamond noto-fonts-cjk - hanazono takao liberation_ttf ]; diff --git a/hosts/satori/wayland.nix b/hosts/satori/wayland.nix index 59d78b3..761c9ae 100644 --- a/hosts/satori/wayland.nix +++ b/hosts/satori/wayland.nix @@ -3,6 +3,8 @@ { xdg.portal = { enable = true; - extraPortals = [ inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland ]; + extraPortals = [ + inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + ]; }; }