Compare commits

...

3 Commits

Author SHA1 Message Date
42751bf2f0 add: miracast support 2025-03-14 18:59:13 +01:00
893aa88155 add user configuration 2025-03-09 16:47:39 +01:00
61090d1439 simplify fingerprint module 2025-02-22 08:59:27 +01:00
13 changed files with 125 additions and 112 deletions

View File

@ -1,36 +1,36 @@
{ config, pkgs, ... }:
{
# DO NOT change this unless you know what you're doing!
system.stateVersion = "24.11";
# DO NOT change this unless you know what you're doing!
system.stateVersion = "24.11";
environment.variables = {
XDG_SESSION_TYPE = "wayland";
XDG_CURRENT_DESKTOP = "Hyprland";
NIXPKGS_ALLOW_INSECURE = 1;
};
environment.variables = {
XDG_SESSION_TYPE = "wayland";
XDG_CURRENT_DESKTOP = "Hyprland";
NIXPKGS_ALLOW_INSECURE = 1;
};
nixpkgs.config = {
allowInsecurePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [
"fluffychat-linux"
"olm"
"python312Packages.youtube-dl"
];
};
nixpkgs.config = {
allowInsecurePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [
"fluffychat-linux"
"olm"
"python312Packages.youtube-dl"
];
};
environment.systemPackages = with pkgs; [
alacritty
vim
bluez
xwayland
unzip
networkmanager
];
environment.systemPackages = with pkgs; [
alacritty
vim
bluez
xwayland
unzip
networkmanager
];
services.automatic-timezoned.enable = true;
services.automatic-timezoned.enable = true;
boot.loader.grub.enable = false;
boot.loader.systemd-boot.enable = true;
boot.loader.grub.enable = false;
boot.loader.systemd-boot.enable = true;
programs.xwayland.enable = true;
programs.xwayland.enable = true;
}

View File

@ -7,7 +7,9 @@ let
pkgs = inputs.nixpkgs.legacyPackages.${system};
mkSystem = pkgs: hostname:
pkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
specialArgs = {
inherit inputs;
};
modules = [
./base-configuration.nix
./${hostname}

View File

@ -1,10 +1,9 @@
{ inputs, ... }:
{
imports = [
../../modules/greetd.nix
../../modules/nvidia-support.nix
../../modules/open-fprint-suspend-fix.nix
inputs.fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
];
imports = [
../../modules/greetd.nix
../../modules/nvidia-support.nix
../../modules/fingerprint.nix
];
}

View File

@ -8,4 +8,16 @@ in {
networking.wireless.enable = pkgs.lib.mkIf wirelessEnabled true;
networking.wireless.userControlled.enable = pkgs.lib.mkIf wirelessEnabled true;
networking.firewall = {
trustedInterfaces = [ "p2p-wl+" ];
allowedTCPPorts = [
7236
7250
];
allowedUDPPorts = [
7236
5353
];
};
}

View File

@ -1,6 +1,7 @@
{ pkgs, ... }:
{
programs.adb.enable = true;
programs.thunar.enable = true;
programs.thunar.plugins = with pkgs.xfce; [

View File

@ -18,24 +18,11 @@
};
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = false;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
systemd.services.bluetooth.serviceConfig.ExecStart = pkgs.lib.mkForce [
""
"${pkgs.bluez}/libexec/bluetooth/bluetoothd -f /etc/bluetooth/main.conf -C"
];
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
services.blueman.enable = true;
services.gvfs.enable = true;
services.tlp = {
enable = true;
@ -45,5 +32,25 @@
};
};
services.geoclue2 = {
enableWifi = true;
geoProviderUrl = "https://api.beacondb.net/v1/geolocate";
};
services.dbus.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
};
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
};
services.blueman.enable = true;
hardware.enableAllFirmware = true;
}

View File

@ -1,16 +1,16 @@
{ pkgs, ... }:
let
username = "sadorowo";
fullname = "Franek";
preferredShell = pkgs.fish;
username = "sadorowo";
fullname = "Franek";
preferredShell = pkgs.fish;
in {
users.users.${username} = {
isNormalUser = true;
description = fullname;
home = "/home/${username}";
extraGroups = [ "wheel" "networkmanager" ];
shell = preferredShell;
ignoreShellProgramCheck = true; # Will do it later in profile configuration
};
users.users.${username} = {
isNormalUser = true;
description = fullname;
home = "/home/${username}";
extraGroups = [ "wheel" "networkmanager" "plugdev" "adbusers" ];
shell = preferredShell;
ignoreShellProgramCheck = true; # Will do it later in profile configuration
};
}

View File

@ -1,11 +1,15 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, inputs, ... }:
{
options.services.fingerprint-fix.enable = lib.mkEnableOption "Enable systemd service to restart fingerprint services after suspend.";
options.services.fingerprint-fix.enable = lib.mkEnableOption "Enable support for fingerprint for P51S-like ThinkPads.";
options.services.fingerprint-fix.calibDataFile = lib.mkOption {
description = "Path to calibration data file.";
};
imports = [
inputs.fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor"
];
config = lib.mkIf config.services.fingerprint-fix.enable {
# Needed because we're getting TLS error with open-fprintd-resume
systemd.services.validity-restart = let
@ -13,11 +17,8 @@
in {
description = "Restart services to fix fingerprint integration";
wantedBy = targets;
after = targets;
serviceConfig = {
type = "oneshot";
ExecStart = "systemctl restart python3-validity.service";
};
after = targets;
serviceConfig.ExecStart = "systemctl restart open-fprintd python3-validity";
};
services."06cb-009a-fingerprint-sensor" = {
@ -26,6 +27,9 @@
calib-data-file = config.services.fingerprint-fix.calibDataFile;
};
services.fprintd.enable = lib.mkForce true; # Fprintd is not working with P51s
};
security.pam.services.su.fprintAuth = true;
security.pam.services.sudo.fprintAuth = true;
security.pam.services.login.fprintAuth = true;
security.pam.services.greetd.fprintAuth = true;
};
}

View File

@ -8,7 +8,6 @@ in {
./packages.nix # Packages to install
./programs.nix # Programs to enable
./theme.nix # System-wide/GTK theme
./portal.nix # Desktop portals
];
home = {
@ -25,3 +24,4 @@ in {
programs.home-manager.enable = true;
home.stateVersion = "24.11"; # DO NOT change this unless you know what you're doing!
}

View File

@ -44,7 +44,8 @@ in {
starship
firefox-beta-bin
thunderbird-bin
element-desktop
youtube-music
fluffychat
libreoffice-qt6-fresh
gimp
vscodium git nodejs
@ -56,7 +57,6 @@ in {
greetd.greetd greetd.tuigreet
playerctl
adwaita-icon-theme
darkman
android-tools
filezilla
bitwarden-desktop

View File

@ -1,29 +0,0 @@
{ pkgs, ... }:
let
portals-config = pkgs.writeTextDir "share/xdg-desktop-portal/portals/portals.conf" ''
[preferred]
default=hyprland
org.freedesktop.impl.portal.Settings=darkman
'';
packages = [
pkgs.xdg-desktop-portal
pkgs.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal-gtk
pkgs.darkman
];
portals = pkgs.symlinkJoin {
name = "xdg-portals";
paths = [ portals-config ] ++ packages;
pathsToLink = [
"/share/xdg-desktop-portal/portals"
"/share/applications"
];
};
in {
home.sessionVariables = {
XDG_DESKTOP_PORTAL_DIR = "${portals}/share/xdg-desktop-portal/portals";
};
home.packages = packages;
}

View File

@ -13,21 +13,36 @@
];
};
programs.obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [
obs-backgroundremoval
obs-pipewire-audio-capture
#advanced-scene-switcher
obs-tuna
obs-move-transition
waveform
wlrobs
];
};
services.darkman = {
enable = true;
darkModeScripts = {
gtk-theme = ''
${pkgs.dconf}/bin/dconf write\
theme = ''
${pkgs.dconf}/bin/dconf write\
/org/gnome/desktop/interface/color-scheme "'prefer-dark'"
'';
wallpaper = ''
$HOME/.config/hypr/scripts/random-wallpaper.sh
'';
pywalfox = "command -v pywalfox &>/dev/null && pywalfox dark && pywalfox update";
};
lightModeScripts = {
gtk-theme = ''
theme = ''
${pkgs.dconf}/bin/dconf write\
/org/gnome/desktop/interface/color-scheme "'prefer-light'"
'';
@ -35,8 +50,10 @@
wallpaper = ''
$HOME/.config/hypr/scripts/random-wallpaper.sh
'';
pywalfox = "command -v pywalfox &>/dev/null && pywalfox light && pywalfox update";
};
settings.usegeoclue = false;
settings.usegeoclue = true;
};
}

View File

@ -1,17 +1,17 @@
{ pkgs, inputs, ... }:
let
nerdfonts = (pkgs.nerdfonts.override {
fonts = [
"CascadiaCode"
"JetBrainsMono"
"FiraCode"
"SpaceMono"
];
});
nerdfonts = (pkgs.nerdfonts.override {
fonts = [
"CascadiaCode"
"JetBrainsMono"
"FiraCode"
"SpaceMono"
];
});
cursor-theme = "Bibata-Modern-Classic";
cursor-pkg = pkgs.bibata-cursors;
cursor-theme = "Bibata-Modern-Classic";
cursor-pkg = pkgs.bibata-cursors;
in
{
home = {