Compare commits
No commits in common. "d959aa19a1f99e53ad3bf18f83319c5190a95fd5" and "0101aa568dcf865a58c6dcbf57a99230f4a08cba" have entirely different histories.
d959aa19a1
...
0101aa568d
4 changed files with 106 additions and 77 deletions
66
flake.lock
66
flake.lock
|
|
@ -72,11 +72,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710281379,
|
||||
"narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=",
|
||||
"lastModified": 1710717205,
|
||||
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670",
|
||||
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -93,11 +93,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710427903,
|
||||
"narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=",
|
||||
"lastModified": 1711261295,
|
||||
"narHash": "sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "21d89b333ca300bef82c928c856d48b94a9f997c",
|
||||
"rev": "5d2d3e421ade554b19b4dbb0d11a04023378a330",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -225,11 +225,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710393236,
|
||||
"narHash": "sha256-3XUAUU170gvD8FZ5VnAYKzYLeC6PQHG2aBVW2d4BmHk=",
|
||||
"lastModified": 1711432179,
|
||||
"narHash": "sha256-7gqkf4VElAkDpDY2M+uRTNBoZ/r4ZVeeTNyHmlIvjuc=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "6c4d986c1b1ac4e350dced513b6608ba4464cde3",
|
||||
"rev": "07e21a10f065eab5491e1e4a1a7aa12000b47d59",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -246,11 +246,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710532761,
|
||||
"narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
|
||||
"lastModified": 1711133180,
|
||||
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
|
||||
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -308,11 +308,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1710123225,
|
||||
"narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=",
|
||||
"lastModified": 1711352745,
|
||||
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba",
|
||||
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -324,11 +324,11 @@
|
|||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1710494698,
|
||||
"narHash": "sha256-oMilsMpnRFzG7kpoWLoZePt4lttZGkN36OAf8DGnE00=",
|
||||
"lastModified": 1711455854,
|
||||
"narHash": "sha256-vnGpQEA9RpZhMSZqC1ClMcKfBQ6ooNGvsG+auVvtl+c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "453b69da7a400af2c669793ee504b016b3fd3639",
|
||||
"rev": "84b4b872f06c0c5a9e1bc82ff747267b45925df6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -340,11 +340,11 @@
|
|||
},
|
||||
"nixpkgs-nixos-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1710272261,
|
||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
||||
"lastModified": 1711163522,
|
||||
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
||||
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -356,11 +356,11 @@
|
|||
},
|
||||
"nixpkgs-rust-analyzer": {
|
||||
"locked": {
|
||||
"lastModified": 1710494698,
|
||||
"narHash": "sha256-oMilsMpnRFzG7kpoWLoZePt4lttZGkN36OAf8DGnE00=",
|
||||
"lastModified": 1711455854,
|
||||
"narHash": "sha256-vnGpQEA9RpZhMSZqC1ClMcKfBQ6ooNGvsG+auVvtl+c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "453b69da7a400af2c669793ee504b016b3fd3639",
|
||||
"rev": "84b4b872f06c0c5a9e1bc82ff747267b45925df6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -372,11 +372,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1710420202,
|
||||
"narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
|
||||
"lastModified": 1711124224,
|
||||
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
|
||||
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -388,11 +388,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1710494722,
|
||||
"narHash": "sha256-rjYCRxjuNJYH8/YJ3G3fQsdq17pVIdyH5yMSNDQznBg=",
|
||||
"lastModified": 1711454917,
|
||||
"narHash": "sha256-ftsufDtpDYgsAfe52qSWAv+mdf03Xv2Rnr3E3WodLqQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "e1d526df83b9ef104150b67d89afb4d4c20975d7",
|
||||
"rev": "562ebfd91a464029a2c3968f444a913f28b7e701",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -501,11 +501,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710433464,
|
||||
"narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=",
|
||||
"lastModified": 1711249319,
|
||||
"narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090",
|
||||
"rev": "405987a66cce9a4a82f321f11b205982a7127c88",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,12 @@
|
|||
{ config, pkgs, inputs, lib, system, nixpkgs-nixos-unstable-and-unfree, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
system,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
...
|
||||
}: {
|
||||
networking.hostName = "yoga";
|
||||
|
||||
imports = [
|
||||
|
|
@ -43,6 +51,22 @@
|
|||
|
||||
services.printing.enable = true;
|
||||
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
|
||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||
# no need to redefine it in your config for now)
|
||||
#media-session.enable = true;
|
||||
};
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, nixpkgs-nixos-unstable-and-unfree, lib, ... }: {
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
nixpkgs-nixos-unstable-and-unfree,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
boot.kernelModules = ["fuse"];
|
||||
services.smartd.enable = true;
|
||||
|
||||
|
|
@ -6,7 +12,8 @@
|
|||
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
dispatcherScripts = [{
|
||||
dispatcherScripts = [
|
||||
{
|
||||
source = pkgs.writeText "upHook" ''
|
||||
enable_disable_wifi ()
|
||||
{
|
||||
|
|
@ -27,7 +34,8 @@
|
|||
fi
|
||||
'';
|
||||
type = "basic";
|
||||
}];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
|
@ -39,6 +47,8 @@
|
|||
settings = {General = {Enable = "Source,Sink,Media,Socket";};};
|
||||
};
|
||||
|
||||
services.blueman.enable = true;
|
||||
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
|
|
@ -46,16 +56,13 @@
|
|||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
extraConfig.pipewire."92-low-latency" = {
|
||||
context.properties = {
|
||||
default.clock.rate = 48000;
|
||||
default.clock.quantum = 32;
|
||||
default.clock.min-quantum = 32;
|
||||
default.clock.max-quantum = 32;
|
||||
};
|
||||
};
|
||||
};
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
|
||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||
# no need to redefine it in your config for now)
|
||||
#media-session.enable = true;
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ghostscript poppler];
|
||||
services.printing = {
|
||||
enable = true;
|
||||
|
|
@ -74,8 +81,7 @@
|
|||
description = "Epson XP-540 via bolty";
|
||||
name = "epson_xp540_via_bolty";
|
||||
deviceUri = "ipp://bolty:631/printers/epson_xp540";
|
||||
model =
|
||||
"epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd";
|
||||
model = "epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd";
|
||||
ppdOptions = {
|
||||
PageSize = "A4";
|
||||
Duplex = "DuplexNoTumble";
|
||||
|
|
@ -84,8 +90,7 @@
|
|||
{
|
||||
description = "Samsung SCX-4623 Series";
|
||||
name = "samsung-SCX-4623";
|
||||
deviceUri =
|
||||
"usb://Samsung/SCX-4623%20Series?serial=Z2TYBFFZC01007W&interface=1";
|
||||
deviceUri = "usb://Samsung/SCX-4623%20Series?serial=Z2TYBFFZC01007W&interface=1";
|
||||
model = "samsung/SCX-4623FW.ppd";
|
||||
ppdOptions = {
|
||||
PageSize = "A4";
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
yubikey-manager-qt
|
||||
yubikey-personalization
|
||||
yubikey-personalization-gui
|
||||
]) ++ (with nixpkgs-nixos-unstable; [ thunderbird ])
|
||||
]) ++ (with nixpkgs-nixos-unstable; [ gnucash thunderbird ])
|
||||
++ [ nixpkgs-nixos-stable-and-unfree.discord ]
|
||||
++ (with nixpkgs-nixos-unstable-and-unfree; [
|
||||
hopper
|
||||
|
|
|
|||
Loading…
Reference in a new issue