aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Disabled wayland-overlay

Browse source
This commit is contained in:
Andrea Ciceri 2021-12-29 13:56:23 +01:00
parent 264b1d0ac4
commit 5ec83521ea
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
9 changed files with 199 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
README.org
View file

@ -4,9 +4,9 @@
Nix fleet, this includes the following machines: Nix fleet, this includes the following machines:
- [X] my main home workstation ~pc~ - [X] my main home workstation ~pc~
- [ ] homeserver (mainly a nas) ~hs~ - [X] homeserver (mainly a nas) ~hs~
- [X] my arm based [[https://wiki.pine64.org/wiki/Pinebook_Pro][PineBook Pro]] ~pbp~, almost completely open hardware - [X] my arm based [[https://wiki.pine64.org/wiki/Pinebook_Pro][PineBook Pro]] ~pbp~, almost completely open hardware
- [X] MacBook PRO that I use for work, for this I'll use [[https://github.com/LnL7/nix-darwin][nix-darwin]] keeping macOs 11 Big Sur - [X] MacBook PRO that I use for work, for this I'll use [[https://github.com/LnL7/nix-darwin][nix-darwin]] keeping macOs 11 Monterey.
The different confgurations share many profiles, in fact my original The different confgurations share many profiles, in fact my original
goal was to avoid to rewrite the same Nix derivations for my goal was to avoid to rewrite the same Nix derivations for my
@ -30,14 +30,14 @@ nix -Lv build
".#nixosConfigurations.<host>.config.system.build.toplevel" ".#nixosConfigurations.<host>.config.system.build.toplevel"
#+end_src #+end_src
Where ~<host>~ is the hostname e.g. ~pc~. where ~<host>~ is the hostname e.g. ~pc~.
*** Testing new config *** Testing new config
#+begin_src shell #+begin_src shell
bud rebuild <host> test bud rebuild <host> test
#+end_src #+end_src
Where ~<host>~ is the hostname e.g. ~pc~. where ~<host>~ is the hostname e.g. ~pc~.
*** Switching *** Switching
@ -45,11 +45,17 @@ Where ~<host>~ is the hostname e.g. ~pc~.
bud rebuild <host> switch bud rebuild <host> switch
#+end_src #+end_src
Where ~<host>~ is the hostname e.g. ~pc~. where ~<host>~ is the hostname e.g. ~pc~.
*** Remote deploy *** Remote deploy
Using ~deploy-rs~ I guess, still finding out how to do.
#+begin_src shell
deploy -d --hostname <hostname> '.#<host>' --skip-checks --ssh-user root
#+end_src
where
- ~<hostname>~ is the remote machine hostname or ip
- ~<host>~ is one between ~pc~, ~pbp~ or ~hs~
** Github Actions ** Github Actions
*** Check and build *** Check and build
@ -60,6 +66,6 @@ Currently this workflow will skip ~aarch64~ hosts since the runner is
*** Release *** Release
At every tagged commit whose tag name starts with ~release-~ a process At every tagged commit whose tag name starts with ~release-~ a process
that release all the bootstrap ISOs for the systems is started. Here that releases all the bootstrap ISOs for the systems is started. Here
I've the same problem with ~aarch64~ hosts so the runner will skip I've the same problem with ~aarch64~ hosts so the runner will skip
them. them.

235
flake.lock generated
View file

@ -3,10 +3,7 @@
"beautysh": { "beautysh": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"bud",
"nixpkgs"
],
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
@ -70,11 +67,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1634994402, "lastModified": 1640117230,
"narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=", "narHash": "sha256-W7LXeJavyIzNfNaoEsK65sEaCGqE9MVWvK0xSzNR4ls=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "44da835ac40dab5fd231298b59d83487382d2fab", "rev": "5851d9613edf8b2279746c7e5b9faac55ff17e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,14 +83,8 @@
"deploy": { "deploy": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": "nixpkgs_3",
"digga", "utils": "utils"
"latest"
],
"utils": [
"digga",
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1632822684, "lastModified": 1632822684,
@ -129,7 +120,7 @@
"blank": "blank", "blank": "blank",
"deploy": "deploy", "deploy": "deploy",
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"flake-utils-plus": "flake-utils-plus", "flake-utils-plus": "flake-utils-plus",
"home-manager": [ "home-manager": [
"unstable" "unstable"
@ -144,11 +135,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1638227261, "lastModified": 1640031018,
"narHash": "sha256-CbleULqH3NRnnLdwqHqi0qk1sEmhyXE8ZOzjofilGM4=", "narHash": "sha256-ZzyS803XuCl99XE4581m0Suni+q1Hz+Mpw6A9bs7VKM=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "1ce6cef4230f82cb986ef3d08d57a2e3a0e6e80d", "rev": "3157889810e51a1ae03f82bf6bf6657ba8cf93c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,11 +150,11 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1638785903, "lastModified": 1640688616,
"narHash": "sha256-Fdcppk+4AIZilRpbSCVPWuDy1/GbV64Slyahf5XR4J4=", "narHash": "sha256-m/dTZ/rJcZijJHaZ4LBPwZtP9WX0dyDwoGScBP5ngfY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d266fd6e14cde2a2aa17fd821dd1e7ca6b62f012", "rev": "fc51b697d20a4c7ad3ee296491f7468f6478dda1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -205,17 +196,14 @@
}, },
"flake-utils-plus": { "flake-utils-plus": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_4"
"digga",
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1630859749, "lastModified": 1638994888,
"narHash": "sha256-qkoU2rIbbP2+T0dfcqXW35GCWNsi0Y1IgN9BELmt4Zo=", "narHash": "sha256-iz/ynGNZlvqKCOnFrEKqGA+BVKGQMG+g2JT+e3OOLN8=",
"owner": "divnix", "owner": "divnix",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "a4e267e3fc87e60c5029c6c3855935ff1ff3018e", "rev": "b4f9f517574cb7bd6ee3f19c72c19634c9f536e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,6 +227,36 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -246,11 +264,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1638553958, "lastModified": 1639871969,
"narHash": "sha256-leETjYMtD9y37CvfRSQhIGibcIl4dNVlFkY/8QgqmAM=", "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6ce1d64073f48b9bc9425218803b1b607454c1e7", "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -276,6 +294,21 @@
"type": "github" "type": "github"
} }
}, },
"nixlib": {
"locked": {
"lastModified": 1640478849,
"narHash": "sha256-S4lNc3fb9UpYgVtTa/mZZXphq7+xGy74YGIlOWB1ceE=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "c85a293f7d094a799dcf1197c31925bc44e94d6b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1632257251, "lastModified": 1632257251,
@ -291,14 +324,8 @@
}, },
"nixos-generators": { "nixos-generators": {
"inputs": { "inputs": {
"nixlib": [ "nixlib": "nixlib",
"digga", "nixpkgs": "nixpkgs_4"
"nixlib"
],
"nixpkgs": [
"digga",
"blank"
]
}, },
"locked": { "locked": {
"lastModified": 1637655461, "lastModified": 1637655461,
@ -316,11 +343,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1638440530, "lastModified": 1640686209,
"narHash": "sha256-kmoNW+RmSka988iWvSrkiAxO8g6D76O0gW2cIIhL6U8=", "narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a", "rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,6 +356,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": {
"locked": {
"lastModified": 1640642730,
"narHash": "sha256-+CEqjEird1aRaIlx4G1Cpc7XH+NVmy/mQvteiICsycU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7efd936e4fbe267dbb3c1b572a4a381282ac2bac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"cachix": [ "cachix": [
@ -339,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1638622184, "lastModified": 1640387278,
"narHash": "sha256-Q4sqRwSphmMg/gTmvvXCB+q+bKAg1QrEMessnMOLyvQ=", "narHash": "sha256-8bLZfs9aOHWR12HaUYz+4IC0zPo8SnqntDVN6Bb0XcM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "f08f674a02761c1c30941e747b405ac5fe4cccca", "rev": "1ffd1e219ef9ef8fa70fe4d0ce4b385ef48ba633",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -352,13 +395,60 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1640693861,
"narHash": "sha256-TLM84E+8IIye46pw1I2GoS9XCDfbdgTQ9kasP/2RaqU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1692997153e4b8300ce708ae20d37e268804a0fb",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1638781597, "lastModified": 1640693561,
"narHash": "sha256-a50uySjuYlhO0Tl/ynTyavXUzev8t+JXX9nlQkYj75c=", "narHash": "sha256-ciHcUNjgtH6NEYFIkmuhZ6rzS0GZrQzaknRQTBwy70A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "5e79be778f710458c533fea966809b0f3df01d03", "rev": "5a3d99a1f8e0950a1d1fed2831d8b8855290d228",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +474,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1634524567, "lastModified": 1640033174,
"narHash": "sha256-v9ZTZj1WNQaaVfs1P1mUPuh518mmwpqszj1EjdeGUmc=", "narHash": "sha256-b8w7NgobOYLlFV9j+XGbF+51LpOll0QeatxEGRv7uhg=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "807513f4bbd0e3b5863f4c3b91f8ac846ed6da9b", "rev": "8bbf1921a36343f9a78c68e2bbc9798ab8f3b768",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -432,16 +522,8 @@
}, },
"poetry2nix": { "poetry2nix": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_2",
"bud", "nixpkgs": "nixpkgs_2"
"beautysh",
"flake-utils"
],
"nixpkgs": [
"bud",
"beautysh",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1625240517, "lastModified": 1625240517,
@ -481,11 +563,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1638787439, "lastModified": 1640687268,
"narHash": "sha256-1Lptae0EZ/vugPJSEfmY9qEi+5li+Z8HgQNGL5gnpXE=", "narHash": "sha256-gsvoJSu8QqAd6GyXImrFuF/6qiZlNVyuhNfQgG1vb9g=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "93a707704d0ba1316cd01a205c3163e764f05fad", "rev": "0a82b483057d3c4e8a029d28d92ff80c288b0dca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,17 +579,32 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1634229982, "lastModified": 1640540585,
"narHash": "sha256-O4IfSHZ8+j35Gfp7/Gdhx3tWlfEDPXboUd8m1wzT1CQ=", "narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30aeeaded47d4e246941147acaa357d1605ad486", "rev": "ac169ec6371f0d835542db654a65e0f2feb07838",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30aeeaded47d4e246941147acaa357d1605ad486", "type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1638122382,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github" "type": "github"
} }
} }

4
flake.nix
View file

@ -4,7 +4,7 @@
inputs = inputs =
{ {
stable.url = "github:nixos/nixpkgs/release-21.11"; stable.url = "github:nixos/nixpkgs/release-21.11";
unstable.url = "github:nixos/nixpkgs/30aeeaded47d4e246941147acaa357d1605ad486"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -76,7 +76,7 @@
emacs-overlay.overlay emacs-overlay.overlay
nvfetcher.overlay nvfetcher.overlay
deploy.overlay deploy.overlay
nixpkgs-wayland.overlay #nixpkgs-wayland.overlay
./pkgs/default.nix ./pkgs/default.nix
]; ];
in in

2
profiles/adb/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
# programs.adb.enable = !pkgs.stdenv.hostPlatform.isAarch64; programs.adb.enable = !pkgs.stdenv.hostPlatform.isAarch64;
} }

1
profiles/xdg/default.nix
View file

@ -8,6 +8,5 @@
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
XDG_CURRENT_DESKTOP = "sway"; # https://github.com/emersion/xdg-desktop-portal-wlr/issues/20 XDG_CURRENT_DESKTOP = "sway"; # https://github.com/emersion/xdg-desktop-portal-wlr/issues/20
XDG_SESSION_TYPE = "wayland"; # https://github.com/emersion/xdg-desktop-portal-wlr/pull/11 XDG_SESSION_TYPE = "wayland"; # https://github.com/emersion/xdg-desktop-portal-wlr/pull/11
}; };
} }

9
users/ccr/default.nix
View file

@ -22,7 +22,14 @@
yarn2nix yarn2nix
python39Packages.poetry python39Packages.poetry
texlive.combined.scheme-full texlive.combined.scheme-full
] else [ ]); gphoto2
digikam
rawtherapee
freecad
deploy-rs.deploy-rs
] ++
(if !stdenv.hostPlatform.isAarch64 then [ wineWowPackages.full ] else [ ])
else [ ]);
}; };
users.users.ccr = { users.users.ccr = {

3
users/profiles/cura/default.nix
View file

@ -3,4 +3,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
cura cura
]; ];
home.sessionVariables = {
QT_QPA_PLATFORM = "xcb";
};
} }

9
users/profiles/gtk/default.nix
View file

@ -3,10 +3,11 @@
gtk = { gtk = {
enable = true; enable = true;
font.name = "DejaVu Sans"; font.name = "DejaVu Sans";
theme = { # broken
name = "WhiteSur-dark-alt-blue"; #theme = {
package = pkgs.whitesur-gtk-theme; # name = "WhiteSur-dark-alt-blue";
}; # package = pkgs.whitesur-gtk-theme;
#};
iconTheme = { iconTheme = {
name = "Adwaita"; name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme; package = pkgs.gnome.adwaita-icon-theme;

2
users/profiles/sway/default.nix
View file

@ -24,7 +24,7 @@
}; };
}; };
#fonts = [ "Font Awesome" "Fira Code" ]; #fonts = [ "Font Awesome" "Fira Code" ];
terminal = "${pkgs.foot}/bin/footclient"; terminal = "footclient";
bars = [ bars = [
{ {
command = "${pkgs.waybar}/bin/waybar"; command = "${pkgs.waybar}/bin/waybar";