Merge branch 'working' of https://git.disroot.org/Zonsopkomst/flake into working
This commit is contained in:
Zonsopkomst
commit
a9f250a141
30
flake.lock
30
flake.lock
|
|
@ -8,11 +8,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1679265143,
|
||||
"narHash": "sha256-5RDMW+O4owjdPz7t4K4YxH2fOHCNOcyVmSiKRUikiv0=",
|
||||
"lastModified": 1679394816,
|
||||
"narHash": "sha256-1V1esJt2YAxsKmRuGuB62RF5vhDAVFDvJXVNhtEO22A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "1b8bf5c3270386a1b6850bd77d79dbdbaf0d7a7c",
|
||||
"rev": "e386ec640e16dc91120977285cb8c72c77078164",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -29,11 +29,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1679192392,
|
||||
"narHash": "sha256-LMUG9/xgFaUlocHz4r5xJLAe1XT4rvA5ZL/vrQnfHBQ=",
|
||||
"lastModified": 1679351214,
|
||||
"narHash": "sha256-XiiwIRMk0XQRqu30tWJQUbdQVHYo1uJ16uH9jh9oT5c=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "928de3344767b1c8aeade24d57b188aeef57a273",
|
||||
"rev": "cb229f64360502c6774e7242fa353254dcacc931",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -65,11 +65,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1677676435,
|
||||
"narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
|
||||
"lastModified": 1679172431,
|
||||
"narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
|
||||
"rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -81,11 +81,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1679172431,
|
||||
"narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
|
||||
"lastModified": 1679262748,
|
||||
"narHash": "sha256-DQCrrAFrkxijC6haUzOC5ZoFqpcv/tg2WxnyW3np1Cc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
|
||||
"rev": "60c1d71f2ba4c80178ec84523c2ca0801522e0a6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -121,11 +121,11 @@
|
|||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"lastModified": 1677789111,
|
||||
"narHash": "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=",
|
||||
"lastModified": 1679340088,
|
||||
"narHash": "sha256-/1KiYoBivDj8HC/eVK2Tr2WYkVdKJxq2Lb0tQs0qqJo=",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "5ae17de23f5fd9bb252a698f3771c840280e2c05",
|
||||
"rev": "1d64e12391a638201c679e71d4e22bb45e5faa8e",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
./common/insecure.nix
|
||||
./common/networking.nix
|
||||
./common/unfree.nix
|
||||
#./common/waydroid.nix
|
||||
./common/waydroid.nix
|
||||
./common/x11.nix
|
||||
|
||||
# Host Specific
|
||||
|
|
@ -170,8 +170,8 @@
|
|||
home-manager.users.admin = import ./hosts/remote/tuisto/home.nix;
|
||||
}
|
||||
|
||||
hyprland.nixosModules.default
|
||||
{programs.hyprland.enable = true;}
|
||||
#hyprland.nixosModules.default
|
||||
#{programs.hyprland.enable = true;}
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,7 @@
|
|||
fonts.fontDir.enable = true;
|
||||
|
||||
fonts.fonts = with pkgs; [
|
||||
#font-awesome # Scalable vector icons
|
||||
helvetica-neue-lt-std # Helvetica Neue LT Std font
|
||||
maple-mono # Monospace Font
|
||||
roboto # Android Family of Fonts
|
||||
tamsyn # Monospace Bitmap Font for Programmers
|
||||
(nerdfonts.override { fonts = [ "FiraCode" "SpaceMono" ]; })
|
||||
];
|
||||
|
||||
|
|
|
|||
25
reference/failedtobuild.md
Normal file
25
reference/failedtobuild.md
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
07:11 AM zonsopkomst@weda $
|
||||
(~)>>>flkup | tee output.txt
|
||||
unpacking channels...
|
||||
warning: Git tree '/home/zonsopkomst/flake' is dirty
|
||||
warning: Git tree '/home/zonsopkomst/flake' is dirty
|
||||
building the system configuration...
|
||||
warning: Git tree '/home/zonsopkomst/flake' is dirty
|
||||
error: builder for '/nix/store/86y2gg3bjr21ci0l8606c1rq90s4snyb-wlroots-hyprland-hidpi-2023-03-20_1d64e12.drv' failed with exit code 1;
|
||||
last 10 log lines:
|
||||
> patching file xwayland/xwm.c
|
||||
> Hunk #1 FAILED at 19.
|
||||
> Hunk #3 succeeded at 966 (offset -3 lines).
|
||||
> Hunk #4 succeeded at 998 (offset -3 lines).
|
||||
> Hunk #5 succeeded at 1016 (offset -3 lines).
|
||||
> Hunk #6 succeeded at 1134 (offset -3 lines).
|
||||
> Hunk #7 succeeded at 1775 (offset -3 lines).
|
||||
> Hunk #8 succeeded at 1793 (offset -3 lines).
|
||||
> Hunk #9 succeeded at 2138 (offset -3 lines).
|
||||
> 1 out of 9 hunks FAILED -- saving rejects to file xwayland/xwm.c.rej
|
||||
For full logs, run 'nix log /nix/store/86y2gg3bjr21ci0l8606c1rq90s4snyb-wlroots-hyprland-hidpi-2023-03-20_1d64e12.drv'.
|
||||
error: 1 dependencies of derivation '/nix/store/k1zlzjv4sbb8pad9vmaw5zj2rii41kwl-hyprland-0.23.0+date=2023-03-20_cb229f6.drv' failed to build
|
||||
error: 1 dependencies of derivation '/nix/store/fyd5xpiqyx0dnzp6wfyj8ccb0lzvfq9j-desktops.drv' failed to build
|
||||
error: 1 dependencies of derivation '/nix/store/wqh2hd4xa1plnjr1k676rm39y7cy2r2k-hyprland-share-picker-0.pre+date=2023-01-07_d479c84.drv' failed to build
|
||||
error: 1 dependencies of derivation '/nix/store/jp0wfksndli16y81apav0r9d8byfkcyv-system-path.drv' failed to build
|
||||
error: 1 dependencies of derivation '/nix/store/q94fcxx31cbggk4v3w9h9zx1f2n98z3d-nixos-system-weda-23.05.20230319.60c1d71.drv' failed to build
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
keepassxc # GUI Password Manager with Cryptography
|
||||
kitty # Terminal Emulator
|
||||
mpv # Media Player
|
||||
mumble # Low-Latency, High Quality Voice Chat
|
||||
onlyoffice-bin # Office Suite
|
||||
pdfarranger # PDF Arranger
|
||||
retroarchFull # Multi-Platform Emulator
|
||||
|
|
|
|||
Loading…
Reference in a new issue