pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge branch 'main' into b12f

Browse source
This commit is contained in:
Benjamin Bädorf 2022-08-13 12:14:16 +02:00
parent c2227ed013 69a48b4225
commit 2dda411388
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
11 changed files with 88 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
flake.lock
View file

@ -67,11 +67,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1642035816, "lastModified": 1654190822,
"narHash": "sha256-1Lq5c1AeUv/1SK08+O704JVfDdD/zodHzA0cv0TIga8=", "narHash": "sha256-B8z3stYaULNDBBjzJHrFHGgiJHrLqhBkxH+9u5iBP7E=",
"owner": "divnix", "owner": "divnix",
"repo": "bud", "repo": "bud",
"rev": "a789d710851441ba7e7cd59be378623b1fe05688", "rev": "0ff3e4e4b8791ea4d827bf5bfcac28cef060f209",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1651916036, "lastModified": 1657835815,
"narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=", "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba", "rev": "54a24f042f93c79f5679f133faddedec61955cf2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,11 +108,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1650976225, "lastModified": 1651916036,
"narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=", "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0", "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -130,11 +130,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1653594315, "lastModified": 1659725433,
"narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=", "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "184349d8149436748986d1bdba087e4149e9c160", "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1650389807, "lastModified": 1655976588,
"narHash": "sha256-GFRBdHMJ/T/ifaE2GS58RWpxyufH0LqI3oGS6oWAnHk=", "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "5a53bbf3eb4c908d83884d725a86b3a3bde35979", "rev": "899ca4629020592a13a46783587f6e674179d1db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -188,11 +188,11 @@
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
"lastModified": 1652713922, "lastModified": 1659622306,
"narHash": "sha256-era1h0M+QP9wP/hbwXRpxOiT8M5n+loWX/Zrq7duq5w=", "narHash": "sha256-Kpfm2PNs+kZU0W7qcugoPATLG8I2P7FJFGTgsf1LJiU=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "29bbac0173859812893d777fdce204af83a231ea", "rev": "d1193743a535d7fbbc7f3eda4e51295b10bd4d2c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -269,15 +269,16 @@
"flake-utils": "flake-utils_4" "flake-utils": "flake-utils_4"
}, },
"locked": { "locked": {
"lastModified": 1652704544, "lastModified": 1654029967,
"narHash": "sha256-UTKE33tYgCmDszaVyWA33a8mtegM5xfH4fH8w4y6TxA=", "narHash": "sha256-my3GQ3mQIw/1f6GPV1IhUZrcYQSWh0YJAMPNBjhXJDw=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "f8d6d1f87b6177e3bc674c29f247bdbf897ba274", "rev": "6271cf3842ff9c8a9af9e3508c547f86bc77d199",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"ref": "refs/pull/120/head",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }
@ -329,11 +330,11 @@
}, },
"flake-utils_5": { "flake-utils_5": {
"locked": { "locked": {
"lastModified": 1652776076, "lastModified": 1656928814,
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,11 +365,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654113405, "lastModified": 1656169755,
"narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,11 +381,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1650701402, "lastModified": 1657265485,
"narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=", "narHash": "sha256-PUQ9C7mfi0/BnaAUX2R/PIkoNCb/Jtx9EpnhMBNrO/o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe", "rev": "b39924fc7764c08ae3b51beef9a3518c414cdb7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +397,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1653931853, "lastModified": 1660305968,
"narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", "narHash": "sha256-r0X1pZCSEA6mzt5OuTA7nHuLmvnbkwgpFAh1iLIx4GU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", "rev": "c4a0efdd5a728e20791b8d8d2f26f90ac228ee8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +418,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1653413650, "lastModified": 1659610603,
"narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=", "narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "69daaceebe12c070cd5ae69ba38f277bbf033695", "rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +439,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1653198236, "lastModified": 1660180791,
"narHash": "sha256-nzW2BaqWTGGQthOtFzHUJTHK5wK+mkh4aOhETGj5nBk=", "narHash": "sha256-oPO+keK4S9daL9ubU51hZ+QOWVSMbZ56F20iFI9Px3s=",
"owner": "dramforever", "owner": "dramforever",
"repo": "nix-dram", "repo": "nix-dram",
"rev": "e10086d39ca49abfd2a3b77d2a77baa6037ec31e", "rev": "ae7f0b7c5d39eec5941fe21e9f202106bdea9ac2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +469,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1654005557, "lastModified": 1660318005,
"narHash": "sha256-J6elwUzPoco+r5qWPHhvS2EHVWomUtNcxzkfdAQOwEU=", "narHash": "sha256-g9WCa9lVUmOV6dYRbEPjv/TLOR5hamjeCcKExVGS3OQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08950a6e29cf7bddee466592eb790a417550f7f9", "rev": "5c211b47aeadcc178c5320afd4e74c7eed5c389f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,11 +489,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1653339081, "lastModified": 1657748715,
"narHash": "sha256-dpim9Mtd57Yj6qt7p7UKwjWm6NnOU3S7jaEyEscSyPE=", "narHash": "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "fb3ee0f618b8c80dea1239691b15dfeb4bb46331", "rev": "3323b944d99b026aebfd8de439e001409dde067d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +504,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1654057797, "lastModified": 1660291411,
"narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=", "narHash": "sha256-9UfJMJeCl+T/DrOJMd1vLCoV8U3V7f9Qrv/QyH0Nn28=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af", "rev": "78f56d8ec2c67a1f80f2de649ca9aadc284f65b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +535,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1650726686, "lastModified": 1657292830,
"narHash": "sha256-hE5PCqQlsdgWH3AUTwesvjZWs5ZUZ8SjMS5cnFB6W54=", "narHash": "sha256-ldfVSTveWceDCmW6gf3B4kR6vwmz/XS80y5wsLLHFJU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3c0f57e36ed0cf9947281e3b31f1bebb7ce5d4a1", "rev": "334ec8b503c3981e37a04b817a70e8d026ea9e84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,11 +601,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1650169042, "lastModified": 1654975372,
"narHash": "sha256-x8469XNOU/ebIh5YCuvjcOAaAptwHjkEl1aTFrevu1o=", "narHash": "sha256-wkNZ16akgKViuZzE/IM+bux4uaJ04KIwUeexH8gBjgw=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "db780dba6923e531b5aedca502a36d3d9627fca9", "rev": "d4b237c10f14f72f8266b0f658faad822e491e55",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -77,7 +77,6 @@
overlays = [ overlays = [
nur.overlay nur.overlay
agenix.overlay agenix.overlay
nvfetcher.overlay
./pkgs/default.nix ./pkgs/default.nix
]; ];
}; };

8
hosts/PubSolarOS.nix
View file

@ -12,4 +12,12 @@
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; }; fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment?
} }

8
hosts/bootstrap.nix
View file

@ -18,4 +18,12 @@
# will be overridden by the bootstrapIso instrumentation # will be overridden by the bootstrapIso instrumentation
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; }; fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "21.05"; # Did you read the comment?
} }

35
modules/audio/default.nix
View file

@ -68,32 +68,19 @@ in
}; };
}; };
config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json); config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
};
# Bluetooth configuration for pipewire # Bluetooth configuration using wireplumber
media-session.config.bluez-monitor.rules = mkIf cfg.bluetooth.enable [ # https://nixos.wiki/wiki/PipeWire#Bluetooth_Configuration
{ environment.etc = mkIf cfg.bluetooth.enable {
# Matches all cards "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
matches = [{ "device.name" = "~bluez_card.*"; }]; bluez_monitor.properties = {
actions = { ["bluez5.enable-sbc-xq"] = true,
"update-props" = { ["bluez5.enable-msbc"] = true,
"bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ]; ["bluez5.enable-hw-volume"] = true,
# mSBC is not expected to work on all headset + adapter combinations. ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
"bluez5.msbc-support" = true;
};
};
} }
{ '';
matches = [
# Matches all sources
{ "node.name" = "~bluez_input.*"; }
# Matches all outputs
{ "node.name" = "~bluez_output.*"; }
];
actions = {
"node.pause-on-idle" = false;
};
}
];
}; };
# Enable bluetooth # Enable bluetooth

1
modules/audio/mopidy.nix
View file

@ -1,7 +1,6 @@
pkgs: { pkgs: {
enable = true; enable = true;
extensionPackages = with pkgs; [ extensionPackages = with pkgs; [
mopidy-spotify
mopidy-mpd mopidy-mpd
mopidy-soundcloud mopidy-soundcloud
mopidy-youtube mopidy-youtube

2
modules/social/default.nix
View file

@ -12,7 +12,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
home.packages = [ home.packages = [
ps-signal-desktop signal-desktop
tdesktop tdesktop
element-desktop element-desktop
irssi irssi

2
modules/sway/config/config.d/custom-keybindings.conf
View file

@ -22,7 +22,7 @@ bindsym $mod+F3 exec $term -e vifm
bindsym $mod+Shift+F3 exec gksu $term -e vifm bindsym $mod+Shift+F3 exec gksu $term -e vifm
bindsym $mod+F4 exec nautilus -w bindsym $mod+F4 exec nautilus -w
bindsym $mod+Shift+F4 exec signal-desktop bindsym $mod+Shift+F4 exec signal-desktop --use-tray-icon
bindsym $mod+Shift+m exec qMasterPassword bindsym $mod+Shift+m exec qMasterPassword

1
pkgs/default.nix
View file

@ -20,7 +20,6 @@ with final; {
record-screen = writeShellScriptBin "record-screen" (import ./record-screen.nix final); record-screen = writeShellScriptBin "record-screen" (import ./record-screen.nix final);
# ps-fixes # ps-fixes
ps-signal-desktop = writeShellScriptBin "signal-desktop" (import ./ps-signal-desktop.nix final);
scan2paperless = writeShellScriptBin "scan2paperless" (import ./scan2paperless.nix final); scan2paperless = writeShellScriptBin "scan2paperless" (import ./scan2paperless.nix final);
drone-docker-runner = writeShellScriptBin "drone-docker-runner" (import ./drone-docker-runner.nix final); drone-docker-runner = writeShellScriptBin "drone-docker-runner" (import ./drone-docker-runner.nix final);

9
pkgs/ps-signal-desktop.nix
View file

@ -1,9 +0,0 @@
self: with self;
let
signal-desktop = self.signal-desktop.overrideAttrs (old: {
meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
});
in
''
exec ${signal-desktop}/bin/signal-desktop --disable-gpu -- "$@"
''

8
shell/devos.nix
View file

@ -38,15 +38,15 @@ in
(devos agenix) (devos agenix)
{ {
category = "devos"; category = "devos";
name = pkgs.nvfetcher-bin.pname; name = pkgs.nvfetcher.pname;
help = pkgs.nvfetcher-bin.meta.description; help = pkgs.nvfetcher.meta.description;
command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@"; command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher}/bin/nvfetcher -c ./sources.toml $@";
} }
(linter nixpkgs-fmt) (linter nixpkgs-fmt)
(linter editorconfig-checker) (linter editorconfig-checker)
# (docs python3Packages.grip) too many deps # (docs python3Packages.grip) too many deps
(docs mdbook) (docs mdbook)
(devos inputs.deploy.packages.${pkgs.system}.deploy-rs) (devos deploy-rs)
] ]
++ lib.optional ++ lib.optional
(system != "i686-linux") (system != "i686-linux")