move all artemision files into systems/
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
@ -1,36 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# rtkit is optional but recommended
|
||||
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;
|
||||
};
|
||||
|
||||
services.pipewire.wireplumber.configPackages = [
|
||||
(pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" ''
|
||||
bluez_monitor.properties = {
|
||||
["bluez5.enable-sbc-xq"] = true,
|
||||
["bluez5.enable-msbc"] = true,
|
||||
["bluez5.enable-hw-volume"] = true,
|
||||
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
|
||||
}
|
||||
'')
|
||||
];
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.powerOnBoot = true;
|
||||
services.blueman.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [ pavucontrol ];
|
||||
}
|
@ -1,73 +0,0 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
../configuration.nix
|
||||
../programs.nix
|
||||
./programs.nix
|
||||
./desktop.nix
|
||||
./wifi.nix
|
||||
./zerotier.nix
|
||||
./fonts.nix
|
||||
./polkit.nix
|
||||
./audio.nix
|
||||
./fingerprint.nix
|
||||
./steam.nix
|
||||
./graphics.nix
|
||||
];
|
||||
|
||||
time.timeZone = "America/New_York";
|
||||
|
||||
# temp workaround for building while in nixos-enter
|
||||
#services.logrotate.checkConfig = false;
|
||||
|
||||
networking = {
|
||||
hostId = "58f50a15";
|
||||
firewall.enable = true;
|
||||
};
|
||||
|
||||
boot = {
|
||||
useSystemdBoot = true;
|
||||
default = true;
|
||||
};
|
||||
|
||||
i18n = {
|
||||
defaultLocale = "en_US.utf8";
|
||||
supportedLocales = [ "en_US.UTF-8/UTF-8" ];
|
||||
};
|
||||
|
||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
|
||||
services.fwupd.package =
|
||||
(import (builtins.fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
|
||||
sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
|
||||
}) { inherit (pkgs) system; }).fwupd;
|
||||
|
||||
services.fprintd.enable = true;
|
||||
|
||||
services.spotifyd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
username = "snowinginwonderland@gmail.com";
|
||||
password_cmd = "cat ${config.sops.secrets."apps/spotify".path}";
|
||||
use_mpris = false;
|
||||
};
|
||||
};
|
||||
#systemd.services.spotifyd.serviceConfig = systemd.services.spotifyd.
|
||||
};
|
||||
|
||||
system.autoUpgrade.enable = false;
|
||||
system.stateVersion = "24.05";
|
||||
|
||||
sops = {
|
||||
defaultSopsFile = ./secrets.yaml;
|
||||
secrets = {
|
||||
"apps/spotify" = {
|
||||
group = "audio";
|
||||
restartUnits = [ "spotifyd.service" ];
|
||||
mode = "0440";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -1,21 +0,0 @@
|
||||
{ inputs, ... }:
|
||||
{
|
||||
system = "x86_64-linux";
|
||||
home = true;
|
||||
sops = true;
|
||||
modules = [
|
||||
inputs.nixos-hardware.nixosModules.framework-16-7040-amd
|
||||
#({ pkgs, ... }: {
|
||||
# nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ];
|
||||
# environment.systemPackages = [ rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
|
||||
# extensions = [ "rust-src" "miri" "rust-analyzer" ];
|
||||
# }) ];
|
||||
#})
|
||||
{
|
||||
environment.systemPackages = [
|
||||
inputs.wired-notify.packages.x86_64-linux.default
|
||||
inputs.hyprland-contrib.packages.x86_64-linux.grimblast
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
@ -1,47 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# installs hyprland, and its dependencies
|
||||
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
};
|
||||
# Optional, hint electron apps to use wayland:
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
services.xserver.displayManager.gdm = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
services.dbus = {
|
||||
enable = true;
|
||||
implementation = "broker";
|
||||
};
|
||||
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
#pinentryPackage = pkgs.pinentry-rofi;
|
||||
pinentryPackage = pkgs.pinentry-gnome3;
|
||||
#settings = {
|
||||
# keyserver-options = "auto-key-retrieve";
|
||||
# auto-key-locate = "hkps://keys.openpgp.org";
|
||||
# keyserver = "hkps://keys.openpgp.org";
|
||||
#keyserver = "hkp://pgp.mit.edu";
|
||||
# "na.pool.sks-keyservers.net"
|
||||
# "ipv4.pool.sks-keyservers.net"
|
||||
# "p80.pool.sks-keyservers.net"
|
||||
# ];
|
||||
#};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
libsForQt5.qt5.qtwayland
|
||||
qt6.qtwayland
|
||||
];
|
||||
}
|
@ -1,32 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
# custom module from modules/pam-fingerprint-swap.nix
|
||||
# swaps password and fingerprint in pam ordering
|
||||
security.pam.fprintd-order = {
|
||||
enable = false;
|
||||
order = 11501;
|
||||
};
|
||||
|
||||
# to auto-flip to password when the laptop lid is closed (ie. docked)
|
||||
services.acpid = {
|
||||
enable = true;
|
||||
lidEventCommands = ''
|
||||
export PATH=$PATH:/run/current-system/sw/bin
|
||||
|
||||
if grep -Fq closed /proc/acpi/button/lid/LID0/state; then
|
||||
${pkgs.systemd}/bin/systemctl stop fprintd.service
|
||||
${pkgs.coreutils}/bin/ln -s /dev/null /run/systemd/transient/fprintd.service
|
||||
${pkgs.systemd}/bin/systemctl daemon-reload
|
||||
else
|
||||
${pkgs.coreutils}/bin/rm -f /run/systemd/transient/fprintd.service
|
||||
${pkgs.systemd}/bin/systemctl daemon-reload
|
||||
${pkgs.systemd}/bin/systemctlstart fprintd.service
|
||||
fi
|
||||
'';
|
||||
};
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
fonts = {
|
||||
fontconfig.enable = true;
|
||||
enableDefaultPackages = true;
|
||||
packages = with pkgs; [
|
||||
(nerdfonts.override {
|
||||
fonts = [
|
||||
"FiraCode"
|
||||
"DroidSansMono"
|
||||
"Hack"
|
||||
"DejaVuSansMono"
|
||||
"Noto"
|
||||
"OpenDyslexic"
|
||||
];
|
||||
})
|
||||
];
|
||||
};
|
||||
}
|
@ -1,18 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
hardware.opengl = {
|
||||
## radv: an open-source Vulkan driver from freedesktop
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
|
||||
## amdvlk: an open-source Vulkan driver from AMD
|
||||
extraPackages = [ pkgs.amdvlk ];
|
||||
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
|
||||
};
|
||||
}
|
@ -1,105 +0,0 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"thunderbolt"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [
|
||||
"dm-snapshot"
|
||||
"r8152"
|
||||
];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.kernelParams = [
|
||||
"amdgpu.sg_display=0"
|
||||
"amdgpu.graphics_sg=0"
|
||||
"amdgpu.abmlevel=3"
|
||||
];
|
||||
boot.kernelPatches = lib.mkIf (lib.versionOlder pkgs.linux.version "6.9") [
|
||||
{
|
||||
name = "add panel_power_savings sysfs entry to eDP connectors";
|
||||
patch = ./kernel-patches/panel_power_savings.patch;
|
||||
}
|
||||
{
|
||||
name = "respect the abmlevel module parameter value if it is set";
|
||||
patch = ./kernel-patches/respect_abmlevel.patch;
|
||||
}
|
||||
];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/f3c11d62-37f4-495e-b668-1ff49e0d3a47";
|
||||
fsType = "ext4";
|
||||
options = [
|
||||
"noatime"
|
||||
"nodiratime"
|
||||
"discard"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/720af942-464c-4c1e-be41-0438936264f0";
|
||||
fsType = "ext4";
|
||||
options = [
|
||||
"noatime"
|
||||
"nodiratime"
|
||||
"discard"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/035f23f8-d895-4b0c-bcf5-45885a5dbbd9";
|
||||
fsType = "ext4";
|
||||
options = [
|
||||
"noatime"
|
||||
"nodiratime"
|
||||
"discard"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/5AD7-6005";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"noatime"
|
||||
"nodiratime"
|
||||
"discard"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/7f0dba0f-d04e-4c94-9fba-1d0811673df1"; } ];
|
||||
|
||||
boot.initrd.luks.devices = {
|
||||
"nixos-pv" = {
|
||||
device = "/dev/disk/by-uuid/12a7f660-bbcc-4066-81d0-e66005ee534a";
|
||||
preLVM = true;
|
||||
allowDiscards = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp196s0f3u2u1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
@ -1,100 +0,0 @@
|
||||
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||
index 3c826a9a593ed88c5ec4e6e6c2dd448812199e8c..5fe8dc6536966ce0bc9017dbec5445833b80ae92 100644
|
||||
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||
@@ -6437,10 +6437,81 @@ int amdgpu_dm_connector_atomic_get_property(struct drm_connector *connector,
|
||||
return ret;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * DOC: panel power savings
|
||||
+ *
|
||||
+ * The display manager allows you to set your desired **panel power savings**
|
||||
+ * level (between 0-4, with 0 representing off), e.g. using the following::
|
||||
+ *
|
||||
+ * # echo 3 > /sys/class/drm/card0-eDP-1/amdgpu/panel_power_savings
|
||||
+ *
|
||||
+ * Modifying this value can have implications on color accuracy, so tread
|
||||
+ * carefully.
|
||||
+ */
|
||||
+
|
||||
+static ssize_t panel_power_savings_show(struct device *device,
|
||||
+ struct device_attribute *attr,
|
||||
+ char *buf)
|
||||
+{
|
||||
+ struct drm_connector *connector = dev_get_drvdata(device);
|
||||
+ struct drm_device *dev = connector->dev;
|
||||
+ u8 val;
|
||||
+
|
||||
+ drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
|
||||
+ val = to_dm_connector_state(connector->state)->abm_level ==
|
||||
+ ABM_LEVEL_IMMEDIATE_DISABLE ? 0 :
|
||||
+ to_dm_connector_state(connector->state)->abm_level;
|
||||
+ drm_modeset_unlock(&dev->mode_config.connection_mutex);
|
||||
+
|
||||
+ return sysfs_emit(buf, "%u\n", val);
|
||||
+}
|
||||
+
|
||||
+static ssize_t panel_power_savings_store(struct device *device,
|
||||
+ struct device_attribute *attr,
|
||||
+ const char *buf, size_t count)
|
||||
+{
|
||||
+ struct drm_connector *connector = dev_get_drvdata(device);
|
||||
+ struct drm_device *dev = connector->dev;
|
||||
+ long val;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = kstrtol(buf, 0, &val);
|
||||
+
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ if (val < 0 || val > 4)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
|
||||
+ to_dm_connector_state(connector->state)->abm_level = val ?:
|
||||
+ ABM_LEVEL_IMMEDIATE_DISABLE;
|
||||
+ drm_modeset_unlock(&dev->mode_config.connection_mutex);
|
||||
+
|
||||
+ drm_kms_helper_hotplug_event(dev);
|
||||
+
|
||||
+ return count;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR_RW(panel_power_savings);
|
||||
+
|
||||
+static struct attribute *amdgpu_attrs[] = {
|
||||
+ &dev_attr_panel_power_savings.attr,
|
||||
+ NULL
|
||||
+};
|
||||
+
|
||||
+static const struct attribute_group amdgpu_group = {
|
||||
+ .name = "amdgpu",
|
||||
+ .attrs = amdgpu_attrs
|
||||
+};
|
||||
+
|
||||
static void amdgpu_dm_connector_unregister(struct drm_connector *connector)
|
||||
{
|
||||
struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
|
||||
|
||||
+ if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
|
||||
+ sysfs_remove_group(&connector->kdev->kobj, &amdgpu_group);
|
||||
+
|
||||
drm_dp_aux_unregister(&amdgpu_dm_connector->dm_dp_aux.aux);
|
||||
}
|
||||
|
||||
@@ -6542,6 +6613,13 @@ amdgpu_dm_connector_late_register(struct drm_connector *connector)
|
||||
to_amdgpu_dm_connector(connector);
|
||||
int r;
|
||||
|
||||
+ if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
|
||||
+ r = sysfs_create_group(&connector->kdev->kobj,
|
||||
+ &amdgpu_group);
|
||||
+ if (r)
|
||||
+ return r;
|
||||
+ }
|
||||
+
|
||||
amdgpu_dm_register_backlight_device(amdgpu_dm_connector);
|
||||
|
||||
if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
|
@ -1,86 +0,0 @@
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
|
||||
index 1291b8eb9dffa3cfa0209d26e9fa3271eb8973cc..f5c8187e0d5829399463933719c0b0cd51cfce89 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
|
||||
@@ -196,7 +196,7 @@ extern int amdgpu_smu_pptable_id;
|
||||
extern uint amdgpu_dc_feature_mask;
|
||||
extern uint amdgpu_dc_debug_mask;
|
||||
extern uint amdgpu_dc_visual_confirm;
|
||||
-extern uint amdgpu_dm_abm_level;
|
||||
+extern int amdgpu_dm_abm_level;
|
||||
extern int amdgpu_backlight;
|
||||
extern int amdgpu_damage_clips;
|
||||
extern struct amdgpu_mgpu_info mgpu_info;
|
||||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
||||
index 6ef7f22c1152c163f106cac24954ec2550595401..af7fae7907d71ed9efb771f50acdf483b4230113 100644
|
||||
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
||||
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
||||
@@ -849,12 +849,13 @@ module_param_named(visualconfirm, amdgpu_dc_visual_confirm, uint, 0444);
|
||||
* the ABM algorithm, with 1 being the least reduction and 4 being the most
|
||||
* reduction.
|
||||
*
|
||||
- * Defaults to 0, or disabled. Userspace can still override this level later
|
||||
- * after boot.
|
||||
+ * Defaults to -1, or disabled. Userspace can only override this level after
|
||||
+ * boot if it's set to auto.
|
||||
*/
|
||||
-uint amdgpu_dm_abm_level;
|
||||
-MODULE_PARM_DESC(abmlevel, "ABM level (0 = off (default), 1-4 = backlight reduction level) ");
|
||||
-module_param_named(abmlevel, amdgpu_dm_abm_level, uint, 0444);
|
||||
+int amdgpu_dm_abm_level = -1;
|
||||
+MODULE_PARM_DESC(abmlevel,
|
||||
+ "ABM level (0 = off, 1-4 = backlight reduction level, -1 auto (default))");
|
||||
+module_param_named(abmlevel, amdgpu_dm_abm_level, int, 0444);
|
||||
|
||||
int amdgpu_backlight = -1;
|
||||
MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))");
|
||||
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||
index ede6469c80afb2a399a40c427e8cfecb194bd089..367868ad20d7783e09028713b468f38c24d7a20d 100644
|
||||
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||
@@ -6512,7 +6512,8 @@ static void amdgpu_dm_connector_unregister(struct drm_connector *connector)
|
||||
{
|
||||
struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
|
||||
|
||||
- if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
|
||||
+ if (connector->connector_type == DRM_MODE_CONNECTOR_eDP &&
|
||||
+ amdgpu_dm_abm_level < 0)
|
||||
sysfs_remove_group(&connector->kdev->kobj, &amdgpu_group);
|
||||
|
||||
drm_dp_aux_unregister(&amdgpu_dm_connector->dm_dp_aux.aux);
|
||||
@@ -6576,9 +6577,12 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
|
||||
state->vcpi_slots = 0;
|
||||
state->pbn = 0;
|
||||
|
||||
- if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
|
||||
- state->abm_level = amdgpu_dm_abm_level ?:
|
||||
- ABM_LEVEL_IMMEDIATE_DISABLE;
|
||||
+ if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
|
||||
+ if (amdgpu_dm_abm_level <= 0)
|
||||
+ state->abm_level = ABM_LEVEL_IMMEDIATE_DISABLE;
|
||||
+ else
|
||||
+ state->abm_level = amdgpu_dm_abm_level;
|
||||
+ }
|
||||
|
||||
__drm_atomic_helper_connector_reset(connector, &state->base);
|
||||
}
|
||||
@@ -6616,7 +6620,8 @@ amdgpu_dm_connector_late_register(struct drm_connector *connector)
|
||||
to_amdgpu_dm_connector(connector);
|
||||
int r;
|
||||
|
||||
- if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
|
||||
+ if (connector->connector_type == DRM_MODE_CONNECTOR_eDP &&
|
||||
+ amdgpu_dm_abm_level < 0) {
|
||||
r = sysfs_create_group(&connector->kdev->kobj,
|
||||
&amdgpu_group);
|
||||
if (r)
|
||||
@@ -7646,7 +7651,8 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm,
|
||||
aconnector->base.state->max_requested_bpc = aconnector->base.state->max_bpc;
|
||||
|
||||
if (connector_type == DRM_MODE_CONNECTOR_eDP &&
|
||||
- (dc_is_dmcu_initialized(adev->dm.dc) || adev->dm.dc->ctx->dmub_srv)) {
|
||||
+ (dc_is_dmcu_initialized(adev->dm.dc) ||
|
||||
+ adev->dm.dc->ctx->dmub_srv) && amdgpu_dm_abm_level < 0) {
|
||||
drm_object_attach_property(&aconnector->base.base,
|
||||
adev->mode_info.abm_level_property, 0);
|
||||
}
|
@ -1,56 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# Adds some items from the server config without importing everything
|
||||
security.auditd.enable = true;
|
||||
|
||||
i18n = {
|
||||
defaultLocale = "en_US.utf8";
|
||||
supportedLocales = [ "en_US.UTF-8/UTF-8" ];
|
||||
};
|
||||
|
||||
boot = {
|
||||
default = true;
|
||||
};
|
||||
|
||||
users = {
|
||||
defaultUserShell = pkgs.zsh;
|
||||
};
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = lib.mkDefault true;
|
||||
allowedTCPPorts = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
# programs = {
|
||||
# zsh = {
|
||||
# enable = true;
|
||||
# syntaxHighlighting.enable = true;
|
||||
# zsh-autoenv.enable = true;
|
||||
# enableCompletion = true;
|
||||
# enableBashCompletion = true;
|
||||
# ohMyZsh.enable = true;
|
||||
# autosuggestions = {
|
||||
# enable = true;
|
||||
# strategy = [ "completion" ];
|
||||
# async = true;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
nix = {
|
||||
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
};
|
||||
}
|
@ -1,27 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
security.polkit.enable = true;
|
||||
environment.systemPackages = with pkgs; [ polkit_gnome ];
|
||||
|
||||
systemd = {
|
||||
user.services.polkit-gnome-authentication-agent-1 = {
|
||||
description = "polkit-gnome-authentication-agent-1";
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
wants = [ "graphical-session.target" ];
|
||||
after = [ "graphical-session.target" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
TimeoutStopSec = 10;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -1,49 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
alacritty
|
||||
amdgpu_top
|
||||
bat
|
||||
brightnessctl
|
||||
btop
|
||||
croc
|
||||
deadnix
|
||||
direnv
|
||||
fd
|
||||
file
|
||||
grim
|
||||
htop
|
||||
hwloc
|
||||
iperf3
|
||||
jp2a
|
||||
jq
|
||||
lsof
|
||||
lynis
|
||||
ncdu
|
||||
neofetch
|
||||
nix-init
|
||||
nix-output-monitor
|
||||
nix-prefetch
|
||||
nix-tree
|
||||
nixpkgs-fmt
|
||||
nmap
|
||||
pciutils
|
||||
qrencode
|
||||
ripgrep
|
||||
signal-desktop
|
||||
slurp
|
||||
smartmontools
|
||||
telegram-desktop
|
||||
terraform
|
||||
tig
|
||||
tokei
|
||||
tree
|
||||
unzip
|
||||
uutils-coreutils-noprefix
|
||||
ventoy
|
||||
wget
|
||||
wl-clipboard
|
||||
zoom-us
|
||||
zoxide
|
||||
];
|
||||
}
|
@ -1,54 +0,0 @@
|
||||
hello: ENC[AES256_GCM,data:UJlsd5kvnhEv7eJeYwg+NHm9sgUAxYM5DoR0gDPLi9J7P+8FI8WPMkN1wEAHJA==,iv:NFSdZQ1OK4BT+EAGZz122NB7WrVCEzv4wwMxFIE/OKI=,tag:6YT7Vw8tFrw9iEFKxeKRFQ==,type:str]
|
||||
example_key: ENC[AES256_GCM,data:KMXgMrqe7M101ZMJ2g==,iv:MJ3Iiu/0KIVhPFnqfovysqvPJAv1OsnxE4VIsuexFkE=,tag:X6KIKNGym8/9VglmG3SNRw==,type:str]
|
||||
#ENC[AES256_GCM,data:QR3WNE/a1hZIXnTjFjK3kA==,iv:eXoZJ5rQaYqN7LjEp2M13OCMwuQ+80M5AXjV0uNc4C8=,tag:sCvL6pr9zAyWZziffVFMzg==,type:comment]
|
||||
example_array:
|
||||
- ENC[AES256_GCM,data:g8PulCLrXZYSEdZJELE=,iv:irGwciFn1zXBxFpGAJtD46EQLGUO5oqdCzRgv1204JE=,tag:2MuDdRYMjhtTY++lPuj1FQ==,type:str]
|
||||
- ENC[AES256_GCM,data:qv7GvmoOX8VSdaiW/90=,iv:6NOWeWqHUV9ciKPmZF4C7ijuIPFr3YZi3Dh7xWnb07k=,tag:VHXdBhWmEpb7uavCPqGZ4w==,type:str]
|
||||
example_number: ENC[AES256_GCM,data:g8BIEIcwKRLSbw==,iv:Ay4aiukAvXeDhzlpMPn++zR0Tt2lMqCx362uN37S+ac=,tag:NTtNaIu5u8YsIm0M4OgL0A==,type:float]
|
||||
example_booleans:
|
||||
- ENC[AES256_GCM,data:94T9mg==,iv:qKGJke4SGhgN09Yebh5MPrRBDNnguJQ+1dl5XQffGZQ=,tag:0Pa3eujmSxDCnAHKHsx6yQ==,type:bool]
|
||||
- ENC[AES256_GCM,data:gEvfi+Q=,iv:0DrXoZk8OkdUShc7WAKOL8xG26RFZp3M3qYFAb1hDAs=,tag:uemBrdF87nrfLpfnQ8bD8g==,type:bool]
|
||||
apps:
|
||||
spotify: ENC[AES256_GCM,data:bp1pdOfS+VGWLtepUjg7KFWw8Fk=,iv:twGO3CjzRxAU81C93mX8qIEZ/FYIQRJnMd2HIuvP9q8=,tag:AJgs0QGFH30E8+ZpaB02TQ==,type:str]
|
||||
wifi-env: ENC[AES256_GCM,data:B0uD10unz8QC5FiWFyqh1bNiUOkxvVL9dI+TzAs88i6h8uqp0fXPVI1mUy5A75X2VhGhYBnPBXLWLTbEq5RHKkGo89P2/kM5eNrimNPfKWM0PoKWu2gwQXctfWUzQmjc+f6NmfT7dDG3ANWEr+A2HAAItHtGJr8SqoffEypEChKxVE3PHSA=,iv:Xk+DSZ40uqS7ZixCGp+aRJX1WOyYa5PwLL6jMtvEOp0=,tag:l5pJ4BRJACswmbYUN0NfwQ==,type:str]
|
||||
#ENC[AES256_GCM,data:pC2Kdy7wNc0=,iv:J7Ggfv6K3dCzL42j5MGd+BjQGseoAoYs4k6+yc3FSiA=,tag:9MriduP9SEIi+c1q4tfzlQ==,type:comment]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age1jd2dcpykagz20kpk2kkchte3augqncwfn6nywursx0dkfyze6feqdzxkq2
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRZUNHeDdqaGt0QnFIejdM
|
||||
MU5uaDNiN2xOeVlZNzQyZXZ0R2NYUU83ZWxrCmNDL3J6ZjNmejBuUXk3cldwZUEz
|
||||
UWVqMTVPelN1MTJDNzc0UU9XNWkralUKLS0tIDU2b053Uk5VZGlWUk9XMXZ5Wllk
|
||||
UlhhNzNjTHdVaXlPOFJhc0EyZGh3RDQK1c7nctmrorze4Kr0Grmcmx3N/UYXPwJc
|
||||
FfClOoGxO+4ZDtxG61SDU1UdYae4loQ8roM8jDIPFMfoEum2bT8oXw==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-03-30T20:46:58Z"
|
||||
mac: ENC[AES256_GCM,data:vQqivKr2s2rEs2F3E/7t37kczCvrNiH5/X++WQfBHmsIYS66EuJiHml3ec/j6Bgm9voEVWtfl7BjnKxcxQdXzzM2PIbn9TBI6wP3JYNsvUTLoAZQ6psKIo90uub3idFcfCUGLiEL/OtCScLCSCPUYIvK5WAoQ0BQ4JqfsAvRuz8=,iv:ffcpayEibCv3kj0YxDOjWpSmale7PbyoEAH5WKyWi7s=,tag:CzXCuYoXnMosrceStJ0qTQ==,type:str]
|
||||
pgp:
|
||||
- created_at: "2024-03-23T05:46:35Z"
|
||||
enc: |-
|
||||
-----BEGIN PGP MESSAGE-----
|
||||
|
||||
hQIMA84hNUGIgI/nAQ/+IwyPDjs/jDCBlnYFboHh6TXx8ulysESst4hz5crM4L0u
|
||||
wylKyfEIBx0eLy0mLLA4DhcpYza0Nry5RLdwDNfimhATErfQxnwqlZ6RnYKnh3Hk
|
||||
93L66+BEKPd3EZOH+RC/wb0qiTDmU0yna8jtVO0uU7s6//hm/g7bdmQAK0YIJLcb
|
||||
sd83n99R4oHVrq7iFc74/AV5isW9GcfmvLI94eodFpaE1dpqm4KzNpLueDCOvA/1
|
||||
vPo5Lgtp9WM4FhXUqMiplCNqMIt+Hyj3F+p+9jgQ2dLfHuVkI8pzd47gOHyMDYPy
|
||||
fn6SVKZtOyfNDwhs7L5piiarSXISBGtx36ISDvtvtr/vgMydTdvILIOo9pkSGVtN
|
||||
4W7+ywMaFjfAeShTVtUJNJqmp/8agt2WtaUX4kPPha4SxlNSOMpeTQ31bs89gBtc
|
||||
g2325afL2WPK4NSAOmU8VMXqmFc2A10aFlx5nsfT4S1wkoNbitTWgoAcCa7kGRPW
|
||||
xZca225cwLUzkggv74cfYT3YnQL40AMSOMqSRS8pbTFEENG1BtsB5A++Jji2i4tO
|
||||
xoGIL8LRCEfiHpTC7eBwDDVmKb5StgKsXs6yYbQG5XW2W+/Jgum64Sb7+LviQ9Mq
|
||||
WHNiu5MZPeKyHFu9jI9Ne1HpYJnb7/X9AxFw2e/vFwVn+kjaXcH/PhsYuPUyqkzS
|
||||
XgG3tFbcgNtMWyoLU2EL1Qvwq1pHVrwmeNXHidESx23HeJtnIwoKkdopl4qqqNle
|
||||
uQYP89bvb6zFWlqOSwLORZmj1W1wVTYV9eXplDbJob8agBKIcIuhtwri5e96gf4=
|
||||
=XdJo
|
||||
-----END PGP MESSAGE-----
|
||||
fp: F63832C3080D6E1AC77EECF80B4245FFE305BC82
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.8.1
|
@ -1,22 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
environment.systemPackages = [ pkgs.steam-run ];
|
||||
hardware.steam-hardware.enable = true;
|
||||
programs = {
|
||||
gamescope.enable = true;
|
||||
steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true;
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
extraCompatPackages = with pkgs; [ proton-ge-bin ];
|
||||
gamescopeSession.enable = true;
|
||||
extest.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
@ -1,42 +0,0 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
networking.wireless = {
|
||||
enable = true;
|
||||
environmentFile = config.sops.secrets."wifi-env".path;
|
||||
networks = {
|
||||
"taetaethegae-2.0".psk = "@PASS_taetaethegae_20@";
|
||||
"k".psk = "@PASS_k@";
|
||||
"Bloomfield".psk = "@PASS_bloomfield@";
|
||||
"9872441500".psk = "@PASS_longboat_home@";
|
||||
"9872441561".psk = "@PASS_longboat_home@";
|
||||
"5HuFios".psk = "@PASS_longboat_home@";
|
||||
"24HuFios".psk = "@PASS_longboat_home@";
|
||||
};
|
||||
};
|
||||
|
||||
networking.nameservers = [
|
||||
"192.168.76.1"
|
||||
"9.9.9.9"
|
||||
];
|
||||
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
dnssec = "true";
|
||||
domains = [ "~." ];
|
||||
fallbackDns = [
|
||||
"1.1.1.1#one.one.one.one"
|
||||
"1.0.0.1#one.one.one.one"
|
||||
];
|
||||
dnsovertls = "true";
|
||||
};
|
||||
|
||||
sops = {
|
||||
defaultSopsFile = ./secrets.yaml;
|
||||
secrets = {
|
||||
"wifi-env" = {
|
||||
owner = "root";
|
||||
restartUnits = [ "wpa_supplicant.service" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
{ ... }:
|
||||
{
|
||||
services.zerotierone = {
|
||||
enable = true;
|
||||
joinNetworks = [ "52b337794f23c1d4" ];
|
||||
};
|
||||
}
|
@ -1,37 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [ ./non-server.nix ];
|
||||
|
||||
services.fwupd.enable = true;
|
||||
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://cache.nixos.org/?priority=1&want-mass-query=true"
|
||||
"https://attic.alicehuston.xyz/cache-nix-dot?priority=4&want-mass-query=true"
|
||||
"https://cache.alicehuston.xyz/?priority=5&want-mass-query=true"
|
||||
"https://nix-community.cachix.org/?priority=10&want-mass-query=true"
|
||||
];
|
||||
trusted-substituters = [
|
||||
"https://cache.nixos.org"
|
||||
"https://attic.alicehuston.xyz/cache-nix-dot"
|
||||
"https://cache.alicehuston.xyz"
|
||||
"https://nix-community.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"cache.alicehuston.xyz:SJAm8HJVTWUjwcTTLAoi/5E1gUOJ0GWum2suPPv7CUo=%"
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"cache-nix-dot:0hp/F6mUJXNyZeLBPNBjmyEh8gWsNVH+zkuwlWMmwXg="
|
||||
];
|
||||
trusted-users = [
|
||||
"root"
|
||||
"@wheel"
|
||||
];
|
||||
};
|
||||
}
|
@ -1,52 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# Adds some items from the server config without importing everything
|
||||
security.auditd.enable = true;
|
||||
|
||||
i18n = {
|
||||
defaultLocale = "en_US.utf8";
|
||||
supportedLocales = [ "en_US.UTF-8/UTF-8" ];
|
||||
};
|
||||
|
||||
boot = {
|
||||
default = true;
|
||||
};
|
||||
|
||||
users = {
|
||||
defaultUserShell = pkgs.zsh;
|
||||
};
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = lib.mkDefault true;
|
||||
allowedTCPPorts = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
services.openssh.enable = false;
|
||||
services.autopull = {
|
||||
enable = false;
|
||||
ssh-key = "/root/.ssh/id_ed25519_ghdeploy";
|
||||
path = /root/dotfiles;
|
||||
};
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
zsh-autoenv.enable = true;
|
||||
enableCompletion = true;
|
||||
enableBashCompletion = true;
|
||||
ohMyZsh.enable = true;
|
||||
autosuggestions = {
|
||||
enable = true;
|
||||
strategy = [ "completion" ];
|
||||
async = true;
|
||||
};
|
||||
};
|
||||
}
|
@ -1,62 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
bfg-repo-cleaner
|
||||
bitwarden-cli
|
||||
candy-icons
|
||||
calibre
|
||||
# calibre dedrm?
|
||||
cinnamon.nemo
|
||||
discord-canary
|
||||
eza
|
||||
fanficfare
|
||||
ferium
|
||||
firefox
|
||||
# gestures replacement
|
||||
git
|
||||
glances
|
||||
gpu-viewer
|
||||
headsetcontrol
|
||||
ipmiview
|
||||
ipscan
|
||||
kitty
|
||||
libtool
|
||||
masterpdfeditor4
|
||||
mons
|
||||
# nbt explorer?
|
||||
neovim
|
||||
noisetorch
|
||||
ocrmypdf
|
||||
playonlinux
|
||||
protonmail-bridge
|
||||
protontricks
|
||||
redshift
|
||||
restic
|
||||
ripgrep
|
||||
rpi-imager
|
||||
rofi-wayland
|
||||
# signal in tray?
|
||||
siji
|
||||
simple-mtpfs
|
||||
slack
|
||||
snyk
|
||||
sops
|
||||
spotify
|
||||
spotify-player
|
||||
#swaylock/waylock?
|
||||
sweet-nova
|
||||
unipicker
|
||||
ventoy
|
||||
vscode
|
||||
watchman
|
||||
xboxdrv
|
||||
yubioath-flutter
|
||||
zoom
|
||||
];
|
||||
# ++ [ inputs.wired.packages.${system}.wired ];
|
||||
}
|
Reference in New Issue
Block a user