deprekated/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: deprekated:6b09e9451f2c26a3f394611b77f3447a6c223b2e
Branches Tags
deprekated:main
..
compare: deprekated:771b662dd71a2bec39ba71226552b9e40b9ef745
Branches Tags
deprekated:main

No commits in common. "6b09e9451f2c26a3f394611b77f3447a6c223b2e" and "771b662dd71a2bec39ba71226552b9e40b9ef745" have entirely different histories.
6b09e9451f ... 771b662dd7

9 changed files with 380 additions and 439 deletions
Show stats Expand all files Collapse all files

56
flake.lock generated
View file

@ -395,11 +395,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754060289, "lastModified": 1753595562,
"narHash": "sha256-rWc9WUHtDCnHhnKEbiyLwBmvsXxHgBf56jvmmHPMUCk=", "narHash": "sha256-Ci88mAdtiP5RQkYmVhRUq69iYPMM7/lS9/mw+FnC7DE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "19f94a3e0e6c8573ea58dac685e96c36e2526cfa", "rev": "710771af3d1c8c3f86a9e5d562616973ed5f3f21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -419,11 +419,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1754068667, "lastModified": 1753573361,
"narHash": "sha256-qamvSPq9vPqcNe+gje61FMplCC+twHbSkkS+RNYA8z8=", "narHash": "sha256-fCaJ29ZqevsIT1yqbpgdKeYr5GHF6sDhHlcXo2m+VuI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "52872026fb77054c51a9b79c6ae93a17ecec8d89", "rev": "ef94901156c0c688ffffaa2c5caf1498119f01d4",
"revCount": 18234, "revCount": 18200,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -453,11 +453,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1753661392, "lastModified": 1752799399,
"narHash": "sha256-fK4INnIJQNAA8cyjcDRZSPleA+N/STI6I0oBDMZ2r+E=", "narHash": "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d", "rev": "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,11 +476,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1754040945, "lastModified": 1753514742,
"narHash": "sha256-Tr9KNijTgyu7hkkI4caAAFs/qDwPyDfYD66AzbA5MuU=", "narHash": "sha256-OP7hZTjnOLP3X6cWldPLcxQ4vvDYid6SlOf1mw+XRCg=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "861cc473b1fb92c93737d3918869cc3b084e338a", "rev": "af1af659e690b3e535d94c54a64700767bfc9544",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,11 +509,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1753983552, "lastModified": 1752870529,
"narHash": "sha256-xnPPjASWt4/u+GmRdrHADBKKSCtIhTFY53CSKM+Xtfk=", "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "91b6a111cf228fadaabba706d8f4d155efc63b3a", "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -786,11 +786,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1753749649, "lastModified": 1753345091,
"narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -865,11 +865,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1753939845, "lastModified": 1753429684,
"narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "94def634a20494ee057c76998843c015909d6311", "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -881,11 +881,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1753939845, "lastModified": 1753429684,
"narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "94def634a20494ee057c76998843c015909d6311", "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1096,11 +1096,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1753978157, "lastModified": 1753553562,
"narHash": "sha256-sVy8hb71VawSOIsLv/hMGzpvbbWszdP9aSKI5Drbt6Q=", "narHash": "sha256-CpTwdsrPU3UFy95Btg56RcVMgNpnw3C0DYTznE5aRq4=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "ded4f29a023e0f14506ec16b0e32d129e56341cc", "rev": "af85565aba0f4749cb18b118a7333a0745920950",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -284,8 +284,8 @@
modules = linuxOfflineGuiModules [ modules = linuxOfflineGuiModules [
./nixos/hosts/chrysalis ./nixos/hosts/chrysalis
./nixos/configs/virtualbox.nix
./nixos/configs/power-saving-amd.nix ./nixos/configs/power-saving-amd.nix
#./nixos/configs/vmware.nix
]; ];
}; };

28
nixos/configs/gui/niri.nix
View file

@ -5,26 +5,15 @@
{ {
lib, lib,
pkgs, pkgs,
niri,
config, config,
... ...
}: }:
let let
niri-flake = niri;
sysConfig = config; sysConfig = config;
cfg = config.deprekated.niri;
in in
{ {
options.deprekated.niri = {
extraStartupCommands = lib.mkOption {
type = lib.types.str;
default = "";
example = ''
niri msg action spawn -- xmessage hi
'';
description = "Any extra commands to be added to Niri's startup.";
};
};
config = {
# Add in some basic control utilities to our system config. # Add in some basic control utilities to our system config.
environment.systemPackages = [ environment.systemPackages = [
pkgs.wlrctl pkgs.wlrctl
@ -199,12 +188,10 @@ in
# Make anki flashcard windows modal floats. # Make anki flashcard windows modal floats.
{ {
matches = [ matches = [{
{
app-id = "^anki$"; app-id = "^anki$";
title = "Add"; title = "Add";
} }];
];
open-floating = true; open-floating = true;
default-floating-position = { default-floating-position = {
@ -383,13 +370,9 @@ in
niri msg action spawn -- ${xwayland-satellite-loop}/bin/xwayland-satellite-loop niri msg action spawn -- ${xwayland-satellite-loop}/bin/xwayland-satellite-loop
niri msg action spawn -- home-assistant-desktop niri msg action spawn -- home-assistant-desktop
${ ${if (sysConfig.networking.hostName != "trailblazer") then "#" else ""}niri msg action spawn -- ${pkgs.mission-center}/bin/missioncenter
if (sysConfig.networking.hostName != "trailblazer") then "#" else ""
}niri msg action spawn -- ${pkgs.mission-center}/bin/missioncenter
niri msg action spawn -- ${pkgs.pcloud}/bin/pcloud niri msg action spawn -- ${pkgs.pcloud}/bin/pcloud
${cfg.extraStartupCommands}
sleep 10 sleep 10
niri msg action spawn -- kdeconnect-cli -l niri msg action spawn -- kdeconnect-cli -l
@ -398,5 +381,4 @@ in
[ { command = [ "${niri-init}/bin/niri-init" ]; } ]; [ { command = [ "${niri-init}/bin/niri-init" ]; } ];
}; };
}; };
};
} }

3
nixos/configs/nix.nix
View file

@ -27,8 +27,7 @@
# For non-trailblazer machines, allow building on Trailblazer. # For non-trailblazer machines, allow building on Trailblazer.
distributedBuilds = distributedBuilds =
!(config.networking.hostName == "trailblazer") && !(config.networking.hostName == "trailblazer");
!(config.networking.hostName == "chrysalis");
buildMachines = buildMachines =
if config.nix.distributedBuilds then if config.nix.distributedBuilds then
[ [

31
nixos/configuration.linux.nix
View file

@ -4,12 +4,7 @@
# #
# vim: et:ts=2:sw=2: # vim: et:ts=2:sw=2:
# #
{ { pkgs, deprekages, talon, ... }:
pkgs,
deprekages,
talon,
...
}:
{ {
# Ensures the system state isn't changed breakingly (e.g. by updating # Ensures the system state isn't changed breakingly (e.g. by updating
@ -45,6 +40,9 @@
# General tweaks and fixes. # General tweaks and fixes.
# #
# Make systemd not hang here forever.
systemd.extraConfig = "DefaultTimeoutStopSec=20";
# #
# Users. # Users.
# #
@ -101,18 +99,11 @@
services.mullvad-vpn.enable = true; services.mullvad-vpn.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
services.udev.packages = services.udev.packages = [
[
pkgs.minipro pkgs.minipro
] ] ++ (if pkgs.stdenv.isAarch64 then [] else [
++ (
if pkgs.stdenv.isAarch64 then
[ ]
else
[
#talon.default #talon.default
] ]);
);
services.fwupd.enable = true; services.fwupd.enable = true;
@ -126,12 +117,4 @@
userServices = true; userServices = true;
}; };
}; };
# No, you haven't doxed us.
# This is just the location of Amsterdam =P.
location = {
provider = "geoclue2";
latitude = 52.377956;
longitude = 4.897070;
};
} }

9
nixos/hosts/chrysalis/default.nix
View file

@ -9,7 +9,6 @@
pkgs, pkgs,
deprekages, deprekages,
modulesPath, modulesPath,
normalizeModule,
... ...
}: }:
{ {
@ -17,7 +16,6 @@
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
./audio.nix ./audio.nix
./ec_kmod.nix ./ec_kmod.nix
(normalizeModule ./wluma.hm.nix)
]; ];
# Bootloader. # Bootloader.
@ -58,9 +56,6 @@
# Override stylix font sizes. # Override stylix font sizes.
stylix.fonts.sizes.desktop = lib.mkForce 16; stylix.fonts.sizes.desktop = lib.mkForce 16;
# Use wluma to manage backlight with the ALS and screen content.
deprekated.niri.extraStartupCommands = "niri msg action spawn -- ${lib.getExe pkgs.wluma}";
# Accomodate the curved screen top by moving things in just a little. # Accomodate the curved screen top by moving things in just a little.
deprekated.waybar.hostSpecificCss = '' deprekated.waybar.hostSpecificCss = ''
.modules-left > :first-child > * { .modules-left > :first-child > * {
@ -78,8 +73,8 @@
# #
# Hardware config. # Hardware config.
# #
# Use the latest kernel, and our patches, until the Dell+Alienware stuff makes it into
# Use the latest kernel to try and ward off WiFi issues. # more mainline kernels. We'll include ccache so we can iterate sanely.
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.extraModprobeConfig = '' boot.extraModprobeConfig = ''

5
nixos/hosts/chrysalis/wluma.hm.nix
View file

@ -1,5 +0,0 @@
{ ... }:
{
# Set up wluma.
xdg.configFile."wluma/config.toml".source = ../../../wluma/chrysalis.toml;
}

2
nixos/packages/gui.pkgs.nix
View file

@ -30,7 +30,7 @@ with pkgs;
# Comms. # Comms.
dino dino
#gajim gajim
vesktop vesktop
nheko nheko

13
wluma/chrysalis.toml
View file

@ -1,13 +0,0 @@
[als.iio]
path = "/sys/bus/iio/devices"
thresholds = { 0 = "night", 20 = "dark", 80 = "dim", 250 = "normal", 500 = "bright", 800 = "outdoors" }
[[output.backlight]]
name = "eDP-1"
path = "/sys/class/backlight/amdgpu_bl1"
capturer = "wayland"
[[keyboard]]
name = "keyboard-framework"
path = "/sys/bus/platform/devices/framework_laptop/leds/framework_laptop::kbd_backlight"