chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

trying to fix hyprland

Browse source
This commit is contained in:
Chris Cochrun 2024-06-21 11:08:42 -05:00
parent 7bb3b4b573
commit 31560fe067
4 changed files with 232 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

215
flake.lock
View file

@ -139,7 +139,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -157,7 +157,7 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -194,6 +194,169 @@
"type": "github" "type": "github"
} }
}, },
"hyprcursor": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1718450675,
"narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [
"nixpkgs-stable"
],
"systems": "systems_3",
"xdph": "xdph"
},
"locked": {
"lastModified": 1718983111,
"narHash": "sha256-8WHp9SbdF8+vTB/YdM6qG0Abzq++6dwk+kQz/f59b24=",
"ref": "refs/heads/main",
"rev": "c345694bcd9e6393786d58a7d6739da61dd407f7",
"revCount": 4871,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
},
"original": {
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"xdph",
"nixpkgs"
],
"systems": [
"hyprland",
"xdph",
"systems"
]
},
"locked": {
"lastModified": 1714869498,
"narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1717881852,
"narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "ec6938c66253429192274d612912649a0cfe4d28",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1718804078,
"narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "4f1351295c55a8f51219b25aa4a6497a067989d0",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1718119275,
"narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "1419520d5f7f38d35e05504da5c1b38212a38525",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"libre-presenter": { "libre-presenter": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
@ -413,6 +576,7 @@
"emacs": "emacs", "emacs": "emacs",
"eww": "eww", "eww": "eww",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland",
"libre-presenter": "libre-presenter", "libre-presenter": "libre-presenter",
"nix-bitcoin": "nix-bitcoin", "nix-bitcoin": "nix-bitcoin",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@ -517,6 +681,21 @@
} }
}, },
"systems_3": { "systems_3": {
"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"
}
},
"systems_4": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -531,7 +710,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": { "systems_5": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -560,6 +739,36 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1718619174,
"narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

25
flake.nix
View file

@ -9,12 +9,12 @@
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# hyprland = { hyprland = {
# type = "git"; type = "git";
# url = "https://github.com/hyprwm/Hyprland"; url = "https://github.com/hyprwm/Hyprland";
# submodules = true; submodules = true;
# inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs-stable";
# }; };
# hyprland-plugins = { # hyprland-plugins = {
# url = "github:hyprwm/hyprland-plugins"; # url = "github:hyprwm/hyprland-plugins";
# inputs.hyprland.follows = "hyprland"; # inputs.hyprland.follows = "hyprland";
@ -57,7 +57,7 @@
outputs = { nixpkgs, outputs = { nixpkgs,
nixpkgs-stable, nixpkgs-stable,
home-manager, home-manager,
# hyprland, hyprland,
nixos-hardware, nixos-hardware,
emacs, emacs,
nix-bitcoin, nix-bitcoin,
@ -68,6 +68,10 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
username = "chris"; username = "chris";
stable = import nixpkgs-stable {
inherit system;
config = { allowUnfree = true; };
};
pkgsForSystem = import nixpkgs { pkgsForSystem = import nixpkgs {
inherit system; inherit system;
config = { allowUnfree = true; }; config = { allowUnfree = true; };
@ -85,10 +89,13 @@
syl = lib.nixosSystem { syl = lib.nixosSystem {
inherit system; inherit system;
pkgs = pkgsForSystem; pkgs = pkgsForSystem;
specialArgs = {
stable = stable;
};
modules = [ modules = [
./systems/syl/configuration.nix ./systems/syl/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# hyprland.nixosModules.default hyprland.nixosModules.default
nixos-hardware.nixosModules.framework-11th-gen-intel nixos-hardware.nixosModules.framework-11th-gen-intel
# libre-presenter.defaultPackage # libre-presenter.defaultPackage
{ {
@ -105,7 +112,7 @@
modules = [ modules = [
./systems/kaladin/configuration.nix ./systems/kaladin/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
# hyprland.nixosModules.default hyprland.nixosModules.default
nixos-hardware.nixosModules.common-gpu-amd nixos-hardware.nixosModules.common-gpu-amd
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

2
home/modules/hyprland.nix
View file

@ -81,7 +81,7 @@ in
''; '';
}; };
home.file.".config/hypr/hyprpaper.conf" = { home.file.".config/hypr/hyprpaper.conf" = {
source = if laptop then /root/dotfiles/.config/hypr/hyprpaper.conf else /root/dotfiles/.config/hypr/hyprpaper.conf; source = if laptop then /home/chris/.dotfiles/.config/hypr/hyprpaper.conf else /home/chris/.dotfiles/.config/hypr/hyprpaper.conf;
}; };
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {

7
modules/desktop.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, stable, ... }:
with lib; with lib;
{ {
@ -122,9 +122,8 @@ with lib;
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
# package = (pkgs.hyprland.override { # legacyRenderer = true;
# portalPackage = pkgs.xdg-desktop-portal-kde; package = stable.hyprland;
# });
# portalPackage = pkgs.xdg-desktop-portal-kde; # portalPackage = pkgs.xdg-desktop-portal-kde;
# xwayland.hidpi = true; # xwayland.hidpi = true;
}; };