Compare commits

...

6 Commits

Author SHA1 Message Date
Peder Bergebakken Sundt 9c492ef548 mihon 2024-10-08 15:17:22 +02:00
Peder Bergebakken Sundt 8cf5d99c53 community builder 2024-10-08 15:17:08 +02:00
Peder Bergebakken Sundt 7c06b78278 test papers
evince ftw
2024-10-08 15:15:46 +02:00
Peder Bergebakken Sundt 6a20f1b792 waydroid 2024-10-08 15:14:55 +02:00
Peder Bergebakken Sundt 620ab5b259 guigobrrr 2024-10-08 12:11:27 +02:00
Peder Bergebakken Sundt 5e5b21e4cb iwd sucky sucky 2024-10-08 12:11:27 +02:00
13 changed files with 33 additions and 9 deletions

View File

@ -53,7 +53,7 @@
networking.firewall.enable = true; # default networking.firewall.enable = true; # default
#networking.nftables.enable = true; # wirewall backend, instead of iptables, breaks docker which uses iptables #networking.nftables.enable = true; # wirewall backend, instead of iptables, breaks docker which uses iptables
#networking.firewall.allowPing = false; #networking.firewall.allowPing = false;
networking.networkmanager.wifi.backend = "iwd"; # default is wpa_supplicant #networking.networkmanager.wifi.backend = "iwd"; # default is wpa_supplicant, iwd doesn't support eduroam
#system.switch.enable = false; #system.switch.enable = false;
#system.switch.enableNg = true; # rewritten in rust #system.switch.enableNg = true; # rewritten in rust

View File

@ -33,6 +33,7 @@
#../../profiles/desktop/xboxdrv.nix # TODO: try out #../../profiles/desktop/xboxdrv.nix # TODO: try out
../../profiles/desktop/lutris.nix ../../profiles/desktop/lutris.nix
../../profiles/desktop/flatpak.nix ../../profiles/desktop/flatpak.nix
../../profiles/desktop/waydroid.nix
../../profiles/remote-builders.nix ../../profiles/remote-builders.nix
#../../profiles/autossh-reverse-tunnels #../../profiles/autossh-reverse-tunnels

View File

@ -121,7 +121,7 @@
# Networking # Networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
#networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
#networking.iwd.enable = true #networking.iwd.enable = true # # alternative wireless backend, doesn't support eduroam
networking.interfaces.eno1.ipv4.addresses = [ networking.interfaces.eno1.ipv4.addresses = [
{ address = "192.168.1.9"; prefixLength = 24; } { address = "192.168.1.9"; prefixLength = 24; }
]; ];

View File

@ -28,6 +28,8 @@
libheif # HEIF thumbnails libheif # HEIF thumbnails
gnomeExtensions.appindicator gnomeExtensions.appindicator
loupe
desktop-file-utils # update-desktop-database desktop-file-utils # update-desktop-database
]; ];
@ -46,10 +48,16 @@
gnome-tour gnome-tour
(pkgs.gedit or pkgs.gnome.gedit) # text editor (24.05 vs 23.11) (pkgs.gedit or pkgs.gnome.gedit) # text editor (24.05 vs 23.11)
]) ++ (with pkgs.gnome; [ ]) ++ (with pkgs.gnome; [
eog
#cheese # webcam tool #cheese # webcam tool
simple-scan # scanning utility
yelp # Help
#baobab # Disk Usage Analyser
evince # Document Viewer
papers # Document Viewer (new)
gnome-music gnome-music
gnome-terminal gnome-terminal
#epiphany # web browser epiphany # web browser
geary # email reader geary # email reader
totem # video player totem # video player
tali # poker game tali # poker game

View File

@ -0,0 +1,3 @@
{
virtualisation.waydroid.enable = true;
}

View File

@ -57,8 +57,13 @@ let
''; '';
sops.secrets = lib.mkIf (lib.hasPrefix "/run/secrets/" (thatHost.ssh.userPrivateKey or "")) { sops.secrets = lib.mkIf (lib.hasPrefix "/run/secrets/" (thatHost.ssh.userPrivateKey or "")) {
"${lib.removePrefix "/run/secrets/" thatHost.ssh.userPrivateKey}" = {}; "${lib.removePrefix "/run/secrets/" thatHost.ssh.userPrivateKey}" = {
mode = "0440";
group = "nix-community-builder";
}; };
};
users.groups.nix-community-builder = {};
}) })
# in # in
(mkIf ((thisHostIsBuilder || thisHostIsHopHost) && thatHostIsConsumer) { (mkIf ((thisHostIsBuilder || thisHostIsHopHost) && thatHostIsConsumer) {

View File

@ -1,3 +1,4 @@
transgui: ENC[AES256_GCM,data:wncfhWQzIsGAjgOwo7NzEGGoRvpo2g==,iv:WRuCNgYN+PiyoDbzwRb2dfUcOybgTrY7WNXkrvub9BY=,tag:F/Uau3WEy/0vb6PG18jHgA==,type:str]
nix-community-builders-ssh-key-pub: ENC[AES256_GCM,data:WvjdlG/k+Hm8ZRaIc+6KzJvPIN6GXuepK9zwonOPbeST0IAcDU3OGxPW4as4ENZAaRdwd4ZnIUVhcTmgKlpGaBLhxTQgXYw1rIBgBP1gsSKSaGwE4/yzEIyN99E=,iv:H0ogbpBocFi+jgnKt3Jg9AkAV9YDQTbYAtejusQIBl8=,tag:XfC/1+3qd6J6LC4GKSMKxw==,type:str] nix-community-builders-ssh-key-pub: ENC[AES256_GCM,data:WvjdlG/k+Hm8ZRaIc+6KzJvPIN6GXuepK9zwonOPbeST0IAcDU3OGxPW4as4ENZAaRdwd4ZnIUVhcTmgKlpGaBLhxTQgXYw1rIBgBP1gsSKSaGwE4/yzEIyN99E=,iv:H0ogbpBocFi+jgnKt3Jg9AkAV9YDQTbYAtejusQIBl8=,tag:XfC/1+3qd6J6LC4GKSMKxw==,type:str]
nix-community-builders-ssh-key: ENC[AES256_GCM,data:9QNhqQS/6Cu7VMUoWEWkpDCMPu7df6dmreI3duzesonaW6F4W6vL+YLMMTvnnR6BpgmpGvHdvk1aDQnVmpneie6WRfbL4PbLARJviyh1Z/tLQhY9i/MMIADk8D+o4HXBnzLRIWLt319h5eUN1pvmGlJLrgfC0IZLRnPCQLjulIrlhDBlswkNgTrrS0VoRFSXk59JUm8/vWu2OQef2Q99Sug7wquiDZ/XJfqYYxYsGj9SeKiVpyxyuMkviuddee+IOr92KmT19UlekuXAjrYAGeRITrVj1lBSd8DSlBm1ww+0BRqzsAAFojM6N3TkyTjjoXRbVDzDcsMaoCQ7U4Ab9FVz7GdxeNKmeulZMUi4ORPlo4PQ6uDX6RjbWyLwiP33fl5VXMN9+YByVRUrpdtjkQF6jlylCBBRcWl/yOJbYcNg3zcWmJtdVu9t29SU45J2BcJ4Oi18oPf5P6QiU6dJiX1Ba8oR1QeLbFum724J+L5k64Rd84oLkxzVr5GLfXsp54sQ7FkrwEK9HWRfwN8F,iv:NTnnv0Hax/H7EoyHn0VRMG8sbb8tF23Ur2Ak4WYp8Bk=,tag:4hyGKetJ+I3zSqh1zOw/jg==,type:str] nix-community-builders-ssh-key: ENC[AES256_GCM,data:9QNhqQS/6Cu7VMUoWEWkpDCMPu7df6dmreI3duzesonaW6F4W6vL+YLMMTvnnR6BpgmpGvHdvk1aDQnVmpneie6WRfbL4PbLARJviyh1Z/tLQhY9i/MMIADk8D+o4HXBnzLRIWLt319h5eUN1pvmGlJLrgfC0IZLRnPCQLjulIrlhDBlswkNgTrrS0VoRFSXk59JUm8/vWu2OQef2Q99Sug7wquiDZ/XJfqYYxYsGj9SeKiVpyxyuMkviuddee+IOr92KmT19UlekuXAjrYAGeRITrVj1lBSd8DSlBm1ww+0BRqzsAAFojM6N3TkyTjjoXRbVDzDcsMaoCQ7U4Ab9FVz7GdxeNKmeulZMUi4ORPlo4PQ6uDX6RjbWyLwiP33fl5VXMN9+YByVRUrpdtjkQF6jlylCBBRcWl/yOJbYcNg3zcWmJtdVu9t29SU45J2BcJ4Oi18oPf5P6QiU6dJiX1Ba8oR1QeLbFum724J+L5k64Rd84oLkxzVr5GLfXsp54sQ7FkrwEK9HWRfwN8F,iv:NTnnv0Hax/H7EoyHn0VRMG8sbb8tF23Ur2Ak4WYp8Bk=,tag:4hyGKetJ+I3zSqh1zOw/jg==,type:str]
pbsbot-gh-token: ENC[AES256_GCM,data:iPTIei8KLfHKeGey08CfSsyuTufvxO4WHG9qE1TqmWHv5/vqW8YyGQ==,iv:JOKI1aFsnqPFkkkZuCmcIFZAbXe7kANt3QEuD+3GyWs=,tag:quwvq3FBiXE1GrzzdWVQww==,type:str] pbsbot-gh-token: ENC[AES256_GCM,data:iPTIei8KLfHKeGey08CfSsyuTufvxO4WHG9qE1TqmWHv5/vqW8YyGQ==,iv:JOKI1aFsnqPFkkkZuCmcIFZAbXe7kANt3QEuD+3GyWs=,tag:quwvq3FBiXE1GrzzdWVQww==,type:str]
@ -107,8 +108,8 @@ sops:
SklPV3NUSkxwSk1rWHg5N2tiN0xHeVkKhUqu6rVayVeGi00YMRXF1npO7j9oXySX SklPV3NUSkxwSk1rWHg5N2tiN0xHeVkKhUqu6rVayVeGi00YMRXF1npO7j9oXySX
rxVQgH6hYlLbeCIW4T6cP2eCbchWDi3Pear1DVknwEDa+DhHey7Bmg== rxVQgH6hYlLbeCIW4T6cP2eCbchWDi3Pear1DVknwEDa+DhHey7Bmg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-09-13T21:10:52Z" lastmodified: "2024-10-01T17:21:34Z"
mac: ENC[AES256_GCM,data:1SeFSFHPr7UPMJkrP4YxNsbp6bRLOPVtLHs/prj4d1t11qdpVUsYEuIVscfN8ZUvrshZwKFAcrJhVokMje1bMFbg2MxEvPh9j+3GX75K7dLfIW8pXc+5wpN+i/y61C+GFsrMLI1SBJT5xImiTBVwLlnMiGjcIXroDQg6NlDTp9w=,iv:WZagk2fQ1+OlkxZSZeJOIYtxR/hG43zWFDkGfHCGE3M=,tag:4Tigh9H0oCuI0b4y17dqLw==,type:str] mac: ENC[AES256_GCM,data:ThhI6Cq1oVBNiEgw2mgDn+3klabSlfS1rYjYhSr7pTWj6sWIDudwentDPL4lJJgbl3C9RiGcNcSodnC52rru0pLb1heD+Gf9ktSCXm4NsMB/KfrW/BlDY+QBzTrmVHkT5hudK2+tiEC6tfFH2yu1fMM1S4lSOiV3fTAE0rRpN5c=,iv:9kSaKV7jqtErAsX5DmHEGJM/zYR5DiAhhQhjj1Gyt0Q=,tag:bwfnEaBM/5NVf5xvUZqT1A==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.0 version: 3.9.0

View File

@ -1,3 +1,5 @@
# cleanup
* deduplicate `users/pbsds/home/profiles/desktop.nix` and `users/pbsds/home/profiles/desktop/default.nix`
# projects # projects
* [ ] https://github.com/NixOS/nixos-hardware/tree/master/pine64/pinebook-pro * [ ] https://github.com/NixOS/nixos-hardware/tree/master/pine64/pinebook-pro
* [ ] riscv * [ ] riscv

View File

@ -42,6 +42,7 @@
extraGroups = [ extraGroups = [
"pbsds" "pbsds"
"users" # backward compat "users" # backward compat
"nix-community-builder"
"networkmanager" "networkmanager"
"audio" "audio"
"sound" "sound"

View File

@ -50,6 +50,9 @@
firefox firefox
zotero zotero
(pkgs.loupe or pkgs.gnome.eog) (pkgs.loupe or pkgs.gnome.eog)
evince
/* papers */
gnome-connections gnome-connections
scrcpy scrcpy
#spotify # use flathub version instead #spotify # use flathub version instead

View File

@ -105,8 +105,7 @@ let
audio = ["mpv.desktop"]; audio = ["mpv.desktop"];
video = ["mpv.desktop"]; video = ["mpv.desktop"];
fonts = ["org.gnome.font-viewer.desktop"]; fonts = ["org.gnome.font-viewer.desktop"];
docs = ["org.gnome.Evince.desktop"]; docs = ["org.gnome.Papers.desktop" "org.gnome.Evince.desktop"];
/* docs = ["org.gnome.Papers.desktop"]; */
web = ["firefox.desktop"]; web = ["firefox.desktop"];
/* code = ["Pulsar.desktop"]; */ /* code = ["Pulsar.desktop"]; */
/* code = ["micro.desktop"]; */ /* code = ["micro.desktop"]; */

View File

@ -41,7 +41,7 @@
"rocm.pbsds.net".proxyJump = "isvegg.pvv.ntnu.no"; "rocm.pbsds.net".proxyJump = "isvegg.pvv.ntnu.no";
# nix-community # nix-community
/* "darwin-build-box.nix-community.org" = {}; */ "darwin-build-box.nix-community.org" = {};
# ntnu # ntnu
"garmr.idi.ntnu.no".forwardX11 = true; "garmr.idi.ntnu.no".forwardX11 = true;

View File

@ -48,6 +48,7 @@
/* "ntnu".ignorePerms = false; # `false` means sync file permissions */ /* "ntnu".ignorePerms = false; # `false` means sync file permissions */
"DCIM".devices = [ "bjarte" "sopp" "pjudduzen" ]; "DCIM".devices = [ "bjarte" "sopp" "pjudduzen" ];
"ntnu".devices = [ "bjarte" "sopp" "rocm" ]; "ntnu".devices = [ "bjarte" "sopp" "rocm" ];
"mihon".devices = [ "pjudduzen" "bjarte" "nord" ];
"ewesticker".devices = [ "pjudduzen" "bjarte" "sopp" "rocm" "nord" ]; "ewesticker".devices = [ "pjudduzen" "bjarte" "sopp" "rocm" "nord" ];
"pjudduzen-clover".devices = [ "pjudduzen" "sopp" ]; "pjudduzen-clover".devices = [ "pjudduzen" "sopp" ];
"pjudduzen-movies".devices = [ "pjudduzen" "sopp" ]; "pjudduzen-movies".devices = [ "pjudduzen" "sopp" ];