christoph/flake-nixinator
1
Fork 0
Code Activity

Use upstream hyprland instead of flake inputs

Browse Source
This commit is contained in:
Christoph Urlacher
2023-11-25 20:01:10 +01:00
parent 7e232e93e6
commit 68ce1fb0fb
2 changed files with 9 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
flake.lock generated
View File

@ -108,89 +108,6 @@
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_3",
"systems": "systems_3",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1700934998,
"narHash": "sha256-85TggoP7zfZJfo7nN6n9IxsS4XXS7XSJRVCQOtfS88Q=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "b281d8647a557f51977c25cb6c0d2f818fe4e4e4",
"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"
}
},
"hyprpaper": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1699969928,
"narHash": "sha256-c3ZGon18Cm37iTIe86nLkeNkVj16DvEvzvs6UqbvAd4=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "38e18b70777be4e8af45698b8c7bdbf3a04387a0",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprpaper",
"type": "github"
}
},
"hyprpicker": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1698684516,
"narHash": "sha256-x+6yy526dR75HBmTJvbrzN+sXINVL26yN5TY75Dgpwk=",
"owner": "hyprwm",
"repo": "hyprpicker",
"rev": "b6130e3901ed5c6d423f168705929e555608d870",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprpicker",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1677383253,
@ -240,54 +157,6 @@
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1700612854,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1700612854,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
@ -325,10 +194,7 @@
"firefox-gnome-theme": "firefox-gnome-theme",
"hardware": "hardware",
"home-manager": "home-manager",
"hyprland": "hyprland",
"hyprpaper": "hyprpaper",
"hyprpicker": "hyprpicker",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_3",
"nur": "nur"
}
},
@ -361,69 +227,6 @@
"repo": "default",
"type": "github"
}
},
"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"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1700736101,
"narHash": "sha256-1Fh1xf/JX5zFbGIF9LDaffaleG6JDwwwnKby0LyiXEA=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "f1762f428b0ef2989c81f57ea9e810403d34d946",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "f1762f428b0ef2989c81f57ea9e810403d34d946",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1700508250,
"narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
}
},
"root": "root",

16
flake.nix
View File

@ -20,9 +20,9 @@
nur.url = "github:nix-community/NUR";
# musnix.url = "github:musnix/musnix";
devshell.url = "github:numtide/devshell";
hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
hyprpicker.url = "github:hyprwm/hyprpicker";
# hyprland.url = "github:hyprwm/Hyprland"; # NOTE: only for Home-Manager, NixOS includes hyprland
# hyprpaper.url = "github:hyprwm/hyprpaper"; # NOTE: replaced with hyprpaper package
# hyprpicker.url = "github:hyprwm/hyprpicker"; # NOTE: replaced with hyprpicker package
# nixvim.url = "github:pta2002/nixvim";
# nixified-ai.url = "github:nixified-ai/flake";
@ -47,7 +47,7 @@
outputs = inputs @ {
nixpkgs,
# home-manager,
hyprland,
# hyprland,
...
}:
# With let you can define local variables
@ -72,8 +72,8 @@
inputs.devshell.overlays.default
inputs.nur.overlay
inputs.emacs-overlay.overlay
inputs.hyprpaper.overlays.default
inputs.hyprpicker.overlays.default
# inputs.hyprpaper.overlays.default
# inputs.hyprpicker.overlays.default
# All my own overlays
(import ./overlays {inherit nixpkgs inputs mylib;})
@ -98,7 +98,7 @@
username = "christoph";
extraModules = [
hyprland.nixosModules.default # Use system module for SDDM config
# hyprland.nixosModules.default # NOTE: NixOS includes system module
];
};
@ -110,7 +110,7 @@
username = "christoph";
extraModules = [
hyprland.nixosModules.default # Use system module for SDDM config
# hyprland.nixosModules.default # NOTE: NixOS includes system module
];
};
};