mirror of
https://github.com/youwen5/nixos.git
synced 2025-01-18 13:12:10 -08:00
Merge branch 'main' into asahi-safe
This commit is contained in:
commit
6505a51b0e
19 changed files with 206 additions and 317 deletions
28
flake.lock
28
flake.lock
|
@ -778,32 +778,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734978744,
|
"lastModified": 1735834308,
|
||||||
"narHash": "sha256-R80xsDCKZOPJv5T+fB5G1ZVgS/51tJgUenGmGFjZat4=",
|
"narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b74a56e2acce8fe88a575287a20ac196d8d01938",
|
"rev": "6df24922a1400241dae323af55f30e4318a6ca65",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"ref": "nixos-unstable",
|
||||||
"rev": "b74a56e2acce8fe88a575287a20ac196d8d01938",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1735268880,
|
|
||||||
"narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -1176,7 +1160,9 @@
|
||||||
"viminal": {
|
"viminal": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixCats": "nixCats",
|
"nixCats": "nixCats",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"plugins-blink-ripgrep": "plugins-blink-ripgrep",
|
"plugins-blink-ripgrep": "plugins-blink-ripgrep",
|
||||||
"plugins-pomo-nvim": "plugins-pomo-nvim"
|
"plugins-pomo-nvim": "plugins-pomo-nvim"
|
||||||
},
|
},
|
||||||
|
|
13
flake.nix
13
flake.nix
|
@ -2,7 +2,7 @@
|
||||||
description = "System configuration flake.";
|
description = "System configuration flake.";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/b74a56e2acce8fe88a575287a20ac196d8d01938";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
# stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
# stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||||
# bleedingpkgs.url = "github:nixos/nixpkgs/master";
|
# bleedingpkgs.url = "github:nixos/nixpkgs/master";
|
||||||
# nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
|
# nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
|
||||||
|
@ -67,6 +67,7 @@
|
||||||
|
|
||||||
viminal = {
|
viminal = {
|
||||||
url = "git+https://code.youwen.dev/youwen5/viminal2";
|
url = "git+https://code.youwen.dev/youwen5/viminal2";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
vesktop-bin = {
|
vesktop-bin = {
|
||||||
|
@ -140,9 +141,13 @@
|
||||||
./reference/hosts/callisto
|
./reference/hosts/callisto
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
adrastea = buildLiminalOS {
|
adrastea = nixpkgs.lib.nixosSystem {
|
||||||
inherit inputs nixpkgs;
|
specialArgs = {
|
||||||
systemModule = ./reference/hosts/adrastea;
|
inherit inputs self;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
./reference/hosts/adrastea
|
||||||
|
];
|
||||||
};
|
};
|
||||||
cassini = buildLiminalOS {
|
cassini = buildLiminalOS {
|
||||||
inherit inputs nixpkgs;
|
inherit inputs nixpkgs;
|
||||||
|
|
|
@ -251,39 +251,54 @@ in
|
||||||
|
|
||||||
"hyprland/workspaces" = {
|
"hyprland/workspaces" = {
|
||||||
show-special = true;
|
show-special = true;
|
||||||
# persistent-workspaces = {
|
|
||||||
# "*" = [
|
|
||||||
# 1
|
|
||||||
# 2
|
|
||||||
# 3
|
|
||||||
# 4
|
|
||||||
# 5
|
|
||||||
# 6
|
|
||||||
# 7
|
|
||||||
# 8
|
|
||||||
# 9
|
|
||||||
# 10
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
format = "{icon}";
|
format = "{icon}";
|
||||||
on-click = "activate";
|
on-click = "activate";
|
||||||
format-icons = {
|
format-icons =
|
||||||
"1" = "";
|
{
|
||||||
"2" = "";
|
"1" = "";
|
||||||
"3" = "";
|
"2" = "";
|
||||||
"4" = "";
|
"3" = "";
|
||||||
"5" = "";
|
"4" = "";
|
||||||
"6" = "";
|
"5" = "";
|
||||||
"7" = "";
|
"6" = "";
|
||||||
"8" = "";
|
"7" = "";
|
||||||
"9" = "";
|
"8" = "";
|
||||||
"10" = "";
|
"9" = "";
|
||||||
active = "";
|
"10" = "";
|
||||||
empty = "";
|
active = "";
|
||||||
default = "";
|
empty = "";
|
||||||
urgent = "";
|
default = "";
|
||||||
special = "";
|
urgent = "";
|
||||||
};
|
special = "";
|
||||||
|
}
|
||||||
|
// (
|
||||||
|
if (config.liminalOS.desktop.hyprland.useAdvancedBindings) then
|
||||||
|
{
|
||||||
|
"1" = "";
|
||||||
|
"2" = "";
|
||||||
|
"3" = "";
|
||||||
|
"4" = "";
|
||||||
|
"5" = "";
|
||||||
|
"6" = "";
|
||||||
|
"7" = "";
|
||||||
|
"8" = "";
|
||||||
|
"9" = "";
|
||||||
|
"10" = "";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
"1" = "";
|
||||||
|
"2" = "";
|
||||||
|
"3" = "";
|
||||||
|
"4" = "";
|
||||||
|
"5" = "";
|
||||||
|
"6" = "";
|
||||||
|
"7" = "";
|
||||||
|
"8" = "";
|
||||||
|
"9" = "";
|
||||||
|
"10" = "";
|
||||||
|
}
|
||||||
|
);
|
||||||
sort-by-number = true;
|
sort-by-number = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -3,61 +3,50 @@
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
inputs,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
inputs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [ ./hardware-configuration.nix ];
|
||||||
# Include the results of the hardware scan.
|
|
||||||
./hardware-configuration.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
# Bootloader.
|
networking.hostName = "adrastea";
|
||||||
|
|
||||||
|
liminalOS = {
|
||||||
|
flakeLocation = "/home/youwen/.config/liminalOS";
|
||||||
|
config.allowUnfree = true;
|
||||||
|
defaultEditor = inputs.viminal.packages.${pkgs.system}.default;
|
||||||
|
formFactor = "desktop";
|
||||||
|
system = {
|
||||||
|
audio.prod.enable = true;
|
||||||
|
networking = {
|
||||||
|
firewallPresets.vite = true;
|
||||||
|
cloudflareNameservers.enable = true;
|
||||||
|
};
|
||||||
|
graphics.nvidia.enable = true;
|
||||||
|
};
|
||||||
|
extras.gaming = {
|
||||||
|
enable = true;
|
||||||
|
roblox.enable = true;
|
||||||
|
utilities.gamemode = {
|
||||||
|
enable = true;
|
||||||
|
gamemodeUsers = [ "youwen" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
extras.distrobox.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
plymouth = {
|
|
||||||
enable = true;
|
|
||||||
# theme = "rings";
|
|
||||||
# themePackages = with pkgs; [
|
|
||||||
# # By default we would install all themes
|
|
||||||
# (adi1090x-plymouth-themes.override {
|
|
||||||
# selected_themes = [ "rings" ];
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
font = "${config.stylix.fonts.monospace.package}/share/fonts/truetype/NerdFonts/CaskaydiaCove/CaskaydiaCoveNerdFontMono-Regular.ttf";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable "Silent Boot"
|
|
||||||
consoleLogLevel = 3;
|
|
||||||
initrd.verbose = false;
|
|
||||||
kernelParams = [
|
|
||||||
"quiet"
|
|
||||||
"splash"
|
|
||||||
"boot.shell_on_fail"
|
|
||||||
"rd.systemd.show_status=false"
|
|
||||||
"rd.udev.log_level=3"
|
|
||||||
"udev.log_priority=3"
|
|
||||||
# "display=HDMI-A-1:2560x1440@144D"
|
|
||||||
];
|
|
||||||
# Hide the OS choice for bootloaders.
|
|
||||||
# It's still possible to open the bootloader list by pressing any key
|
|
||||||
# It will just not appear on screen unless a key is pressed
|
|
||||||
loader = {
|
loader = {
|
||||||
efi.canTouchEfiVariables = true;
|
efi.canTouchEfiVariables = true;
|
||||||
# timeout = 15;
|
|
||||||
# Lanzaboote currently replaces the systemd-boot module.
|
|
||||||
# This setting is usually set to true in configuration.nix
|
|
||||||
# generated at installation time. So we force it to false
|
|
||||||
# for now.
|
|
||||||
# timeout = 0;
|
|
||||||
systemd-boot = {
|
systemd-boot = {
|
||||||
enable = true;
|
enable = true;
|
||||||
consoleMode = "auto";
|
consoleMode = "auto";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
initrd.systemd.enable = true;
|
kernelPackages = pkgs.linuxPackages_zen;
|
||||||
|
initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device =
|
||||||
|
"/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.ucodenix = {
|
services.ucodenix = {
|
||||||
|
@ -65,101 +54,28 @@
|
||||||
cpuModelId = "00A50F00";
|
cpuModelId = "00A50F00";
|
||||||
};
|
};
|
||||||
|
|
||||||
# boot.lanzaboote = {
|
|
||||||
# enable = false;
|
|
||||||
# pkiBundle = "/etc/secureboot";
|
|
||||||
# };
|
|
||||||
|
|
||||||
# services.keyd = {
|
|
||||||
# enable = true;
|
|
||||||
# keyboards = {
|
|
||||||
# default = {
|
|
||||||
# ids = [ "*" ];
|
|
||||||
# settings = {
|
|
||||||
# main = {
|
|
||||||
# capslock = "esc";
|
|
||||||
# leftalt = "leftcontrol";
|
|
||||||
# leftcontrol = "leftalt";
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device =
|
|
||||||
"/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c";
|
|
||||||
|
|
||||||
services.tlp.enable = true;
|
services.tlp.enable = true;
|
||||||
|
|
||||||
powerManagement = {
|
powerManagement.cpuFreqGovernor = "performance";
|
||||||
powerDownCommands = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock";
|
|
||||||
cpuFreqGovernor = "performance";
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.hostName = "adrastea"; # Define your hostname.
|
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
|
||||||
|
|
||||||
# select kernel
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_zen;
|
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
|
||||||
|
|
||||||
# Enable networking
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
|
|
||||||
# Set your time zone.
|
|
||||||
time.timeZone = "America/Los_Angeles";
|
time.timeZone = "America/Los_Angeles";
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# hardware.nvidia = {
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
# modesetting.enable = true;
|
||||||
|
# powerManagement.enable = true;
|
||||||
i18n.extraLocaleSettings = {
|
# powerManagement.finegrained = false;
|
||||||
LC_ADDRESS = "en_US.UTF-8";
|
# nvidiaSettings = true;
|
||||||
LC_IDENTIFICATION = "en_US.UTF-8";
|
# open = true;
|
||||||
LC_MEASUREMENT = "en_US.UTF-8";
|
# # prime = {
|
||||||
LC_MONETARY = "en_US.UTF-8";
|
# # amdgpuBusId = "PCI:4:0:0";
|
||||||
LC_NAME = "en_US.UTF-8";
|
# # nvidiaBusId = "PCI:1:0:0";
|
||||||
LC_NUMERIC = "en_US.UTF-8";
|
# # # offload = {
|
||||||
LC_PAPER = "en_US.UTF-8";
|
# # # enable = true;
|
||||||
LC_TELEPHONE = "en_US.UTF-8";
|
# # # enableOffloadCmd = true;
|
||||||
LC_TIME = "en_US.UTF-8";
|
# # # };
|
||||||
};
|
# # sync.enable = true;
|
||||||
|
# # };
|
||||||
systemd.services = {
|
# };
|
||||||
NetworkManager-wait-online.enable = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
# You can disable this if you're only using the Wayland session.
|
|
||||||
services.xserver.enable = false;
|
|
||||||
|
|
||||||
programs.nix-ld = {
|
|
||||||
enable = true;
|
|
||||||
libraries = with pkgs; [
|
|
||||||
icu
|
|
||||||
xorg.libXtst
|
|
||||||
xorg.libXi
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.nvidia = {
|
|
||||||
modesetting.enable = true;
|
|
||||||
powerManagement.enable = true;
|
|
||||||
powerManagement.finegrained = false;
|
|
||||||
nvidiaSettings = true;
|
|
||||||
open = true;
|
|
||||||
# prime = {
|
|
||||||
# amdgpuBusId = "PCI:4:0:0";
|
|
||||||
# nvidiaBusId = "PCI:1:0:0";
|
|
||||||
# # offload = {
|
|
||||||
# # enable = true;
|
|
||||||
# # enableOffloadCmd = true;
|
|
||||||
# # };
|
|
||||||
# sync.enable = true;
|
|
||||||
# };
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.graphics.enable = true;
|
hardware.graphics.enable = true;
|
||||||
|
|
||||||
|
@ -167,61 +83,8 @@
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ "nvidia" ];
|
services.xserver.videoDrivers = [ "nvidia" ];
|
||||||
|
|
||||||
# services.desktopManager.plasma6.enable = true;
|
|
||||||
|
|
||||||
# Configure keymap in X11
|
|
||||||
services.xserver = {
|
|
||||||
xkb.layout = "us";
|
|
||||||
xkb.variant = "";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
|
||||||
# services.xserver.libinput.enable = true;
|
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
|
||||||
users.users.youwen = {
|
|
||||||
isNormalUser = true;
|
|
||||||
description = "Youwen Wu";
|
|
||||||
extraGroups = [ "networkmanager" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
nix.settings = {
|
|
||||||
trusted-users = [
|
|
||||||
"root"
|
|
||||||
"youwen"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
|
||||||
KERNEL=="cpu_dma_latency", GROUP="realtime"
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Allow unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
wget
|
|
||||||
git
|
|
||||||
curl
|
|
||||||
];
|
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
|
||||||
# started in user sessions.
|
|
||||||
# programs.mtr.enable = true;
|
|
||||||
programs.gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
|
||||||
|
|
||||||
programs.hyprland.enable = true;
|
|
||||||
|
|
||||||
programs.zsh.enable = false;
|
|
||||||
programs.fish.enable = true;
|
|
||||||
users.users.youwen.shell = pkgs.fish;
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
|
@ -1,50 +1,24 @@
|
||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
|
self,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
../../modules/linux/gaming
|
../../modules
|
||||||
../../modules/linux/audio
|
self.nixosModules.liminalOS
|
||||||
../../modules/linux/networking
|
|
||||||
../../modules/linux/fonts
|
|
||||||
../../modules/linux/greeter
|
|
||||||
../../modules/linux/core
|
|
||||||
../../modules/linux/desktop-portal
|
|
||||||
../../modules/linux/audio-prod
|
|
||||||
../../modules/linux/wine
|
|
||||||
../../modules/linux/stylix
|
|
||||||
../../modules/linux/distrobox
|
|
||||||
../../modules/linux/flatpak
|
|
||||||
../../overlays
|
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.backupFileExtension = "backup";
|
|
||||||
home-manager.extraSpecialArgs = {
|
|
||||||
inherit inputs;
|
|
||||||
};
|
|
||||||
home-manager.users.youwen = {
|
home-manager.users.youwen = {
|
||||||
imports =
|
imports = [
|
||||||
[
|
./home.nix
|
||||||
./home-manager-extras
|
self.homeManagerModules.default
|
||||||
../../users/youwen/linux/laptop
|
];
|
||||||
../../users/youwen/linux/packages/x86_64
|
|
||||||
../../users/youwen/linux/programs
|
|
||||||
../../users/youwen/common
|
|
||||||
../../users/youwen/linux/spicetify
|
|
||||||
(import ../../users/youwen/common/fastfetch { })
|
|
||||||
]
|
|
||||||
++ (with inputs; [
|
|
||||||
nix-index-database.hmModules.nix-index
|
|
||||||
]);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
++ (with inputs; [
|
++ (with inputs; [
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
ucode.nixosModules.default
|
ucode.nixosModules.default
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
{ pkgs, lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
wayland.windowManager.hyprland.settings.monitor = pkgs.lib.mkForce [
|
imports = [
|
||||||
|
../../users/youwen/hm.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
home.stateVersion = "24.05";
|
||||||
|
|
||||||
|
wayland.windowManager.hyprland.settings.monitor = lib.mkForce [
|
||||||
# "eDP-1,2560x1440@165,0x0,1.6"
|
# "eDP-1,2560x1440@165,0x0,1.6"
|
||||||
"eDP-1, disable"
|
"eDP-1, disable"
|
||||||
"HDMI-A-1,2560x1440@144,0x0,1.0"
|
"HDMI-A-1,2560x1440@144,0x0,1.0"
|
||||||
];
|
];
|
||||||
wayland.windowManager.hyprland.settings.cursor.no_hardware_cursors = true;
|
|
||||||
|
|
||||||
# since we are using this as a "desktop" of sorts, we have no need to save
|
# since we are using this as a "desktop" of sorts, we have no need to save
|
||||||
# power by using optimus. poor performance on external display, so we add
|
# power by using optimus. poor performance on external display, so we add
|
||||||
|
@ -16,5 +21,6 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.waybar.settings.mainBar.output = "HDMI-A-1";
|
programs.waybar.settings.mainBar.output = "HDMI-A-1";
|
||||||
programs.hyprlock.settings.background.monitor = lib.mkForce "HDMI-A-1";
|
|
||||||
|
liminalOS.desktop.hyprland.screenlocker.monitor = "HDMI-A-1";
|
||||||
}
|
}
|
|
@ -4,6 +4,8 @@ rec {
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIwqDFdb/cs5K9gsgP0ogyuq5pv9hSxsyPnDcWc5wRKs";
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIwqDFdb/cs5K9gsgP0ogyuq5pv9hSxsyPnDcWc5wRKs";
|
||||||
"youwen@callisto" =
|
"youwen@callisto" =
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+0w7l4jWN+b3Cqs9pjzjxUt2tRXk8HPIB3sqfUQMdx";
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+0w7l4jWN+b3Cqs9pjzjxUt2tRXk8HPIB3sqfUQMdx";
|
||||||
|
"youwen@adrastea" =
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX6RaulzFkoS4bqH3ngtOsRyZkWZyaBErhC1ZoE6wz7";
|
||||||
runner = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEEBFBqlbHn3gMuV0i8U48xctZUWXkmHsCK1O6LRpXpj";
|
runner = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEEBFBqlbHn3gMuV0i8U48xctZUWXkmHsCK1O6LRpXpj";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -11,6 +13,7 @@ rec {
|
||||||
demeter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP4BRdoxPnmlhMD1kI7qXwVE//6h1XWUnkwpzDuJaAyC";
|
demeter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP4BRdoxPnmlhMD1kI7qXwVE//6h1XWUnkwpzDuJaAyC";
|
||||||
gallium = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJzDKscmZIz7GF0nfKpnKHq63/fwzx2PXir0mUtRDOgu";
|
gallium = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJzDKscmZIz7GF0nfKpnKHq63/fwzx2PXir0mUtRDOgu";
|
||||||
callisto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7CqpsBe6+pAQa5CC8m2quJdDg6hRCJlTbVEcHN2xxV";
|
callisto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7CqpsBe6+pAQa5CC8m2quJdDg6hRCJlTbVEcHN2xxV";
|
||||||
|
adrastea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPzbEyvHr8aXbga6zg6bY+8ad/d+fHIKKD/Qpr8N440P";
|
||||||
};
|
};
|
||||||
|
|
||||||
all = users ++ systems;
|
all = users ++ systems;
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -81,7 +81,7 @@
|
||||||
end
|
end
|
||||||
'';
|
'';
|
||||||
|
|
||||||
alexa = ''
|
ale = ''
|
||||||
set vault_dir $HOME/Documents/alexandria/content
|
set vault_dir $HOME/Documents/alexandria/content
|
||||||
|
|
||||||
if test -d $vault_dir
|
if test -d $vault_dir
|
||||||
|
|
|
@ -1,12 +1,26 @@
|
||||||
age-encryption.org/v1
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
-> ssh-ed25519 ouRmYQ Oq5tmnpqpsHQWUzTAGQx4fILRx37H37+bvp/LKTURmo
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBrcTJN
|
||||||
odIZBDn724I2980yVFU1cc/YIgo+PxVpIK9Ir8aSn6A
|
Q1FjMWlHTEY0aU5NUFZ6NVFQOTlYem9PZ052T25OWWNTTit3VGhvClpKWDYyOWlq
|
||||||
-> ssh-ed25519 T+8d9Q Qb+zzkxUGwSp3/etMORdosrOJxDf+wEKXKcqgV3p22M
|
VmgrOTF5a2NRRWxRUi8vbUdXODZSd3Q5ZWF3aFBNVkJrOTQKLT4gc3NoLWVkMjU1
|
||||||
FC6uixXld1qKv5bB5upITUhtia+6Vf/iOFTVP0XxCas
|
MTkgQUk3S1Z3IHA4RHBUT3JnY09aejFsNHovT0x4SWxpa2I4OXdodERSdzExY0sz
|
||||||
-> ssh-ed25519 lpWvhA ZCd0HMrCf0dnwWEbAlSd84nkqi1JLEWR3f8y+0ui20I
|
TlluWGsKVW1XcWN5WmxnZXZoUTJPQ1FodXBkTWdSRU9WdzR5TzFiOW5PVnUwRHFk
|
||||||
UPT5u+zrFGPKON2Akxcf0bha1MQMFsbUNFy1W32ut9I
|
RQotPiBzc2gtZWQyNTUxOSBUKzhkOVEgRXpxR0lLQXVDYmVZaGdmN1FDUE01dGpu
|
||||||
--- DfTM37B+lqx+Ohucv/YjZKtsyO6CyBEF9YA2TXhnzo0
|
RDhzM1JxcEVkRnlDTFJRU3JFSQovekl1RytDU2pRS1MyZEdISmdOdTd6SDNXR0dr
|
||||||
$dQP2‡¿T‘LeÓí Úü¼ˆ¦¶H•óþv967lêw U?*Œ0´<30>ý¶IT%ü“`ÇKŸÏð¹òvåp-ͽ(*΋Žp–úL67XÑoûqŠ½Žº‡¹Ó”¦’}ë3úË´~9Gá‘®y?«X<>‡\î\e`Ya”8e8VõdbZ#á~E GèU¢ãTõ´¡ý良¯¬üÛñÑ‘u
|
Y2c3RDlUaGxsN3NNZXdNCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSBCSmQwd1JxNDhi
|
||||||
Š8ßçtK·‘_ˆeÑÚ•„j{ö™ã~Ó…£Ð]ãp ŽE:<3A>zwggV¼³¾á@ñ±zL}2‡üˆ
|
QXViT0xhaDhDMlRBbGtWRmdmRitvT3U2aVhGMWhqL213ClNCb29hWVhsdmRLYnJE
|
||||||
}uèûš_]ŠƒŸIDÑ°uWli/,ÚÍÊäbãëR¬ûØË®A¡å:š&˜ŒŸ=èÿ@ÊËê²cb3ÙÀó6ßoèé ä—«h¹'>ÀtBR¥ï·7Ýè7û×ðIÓ<49>/ÖዬbÕC`ߦb)X
|
b0hqcm52VmhiVUhFZnBaekxySzFweG5LSTVGNDQKLT4gX2lkfD0tZ3JlYXNlCmgx
|
||||||
'©#Ýg÷<67>8_º/ÔKÛζ|‡Ÿ2¦<32>m#~þR#xlÔ. Pôû¬”`OTçZl<Pqã{vÊT7c±•ÕÚI»¶<C2BB>b”ã½>@U`à‚‚ÊžÙ"‚6¸–H|Z£v'É=B%¦-sk–à8*#<23><Ûx¤*v͸x¯>^ù†C?8÷ú@5"Õ/A ªÅ¢Xð%®
|
WVZrbFRkMnViSEcrdnRsNDZwR1ZlVEttS3hNV1FLd3FYSVVyS0ljWGhxcE1vZmxX
|
||||||
|
SFU3MnNYdGl5UTlvSFcKL25pcUJ3cTNnaTNlR0JXSkppaFlLZwotLS0geXJuQUtB
|
||||||
|
bEJuVXRNOEJsQzB2cU9jYUlFdjA2S3RRcDNkOVpsYmJPRW5URQpuHYZgoJ+4eVUv
|
||||||
|
VdLIPy/KEFfBbjI9qrMCoRHYawLHYhIYwUNgKEj38Hy8KBp9Zgag3eLvKBpnFQfI
|
||||||
|
LFekughiTWVacAw7W3OhBy3Z6C7zFMXWIDQGIdYHY8NehH9mNPUPG6pPBJh2eQBx
|
||||||
|
C00IIHlBm4u1eFHwos845dlhtqzdd9xTH3VV3+/REbOHQ1/nI2uRIm9HX0YmU2P+
|
||||||
|
ANfk9TW4JwO1DE11A/aNogVN3BkAYeVeGzif0H4mTGL+mx5eqkeH0fBPQzunkx4Z
|
||||||
|
eoAMNhp3+YltyUnrkB3OBVZyGS9YtAG1Dc3P5ljvnyvo5pNzh0BginhVbZ/7T/A9
|
||||||
|
2UEuLIXFTeMuZ6EUOjrj+GT7GwjBeCf+vXAbyJzI3ZGvHLTlUzi3JykHvzVKeUP1
|
||||||
|
C5+lnB9DxVas/X9dAQhlezkJ1rGqSO+w3lCrRaNN2gI2FY6/qFJPrQLQl6MMK9Pz
|
||||||
|
1T3ukiNXqZ4Hs36GaZSLybgPfVRMizSibuAaoa2oNg4S+VNS4f8McjIfLR2nhgc3
|
||||||
|
tgMAIuIfiOYVKnyF61NL/vWLr1Z/8J1AjX+cYYXwxxIntcO8sQao67lMbIxhCpR/
|
||||||
|
JTlbv22qCSY4WIV7ul8Q15YUgXQbs18je0OLrjQSOE+VN4kppCGZnUPBm11+m8o7
|
||||||
|
Y8CvOz2A
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,9 +1,16 @@
|
||||||
age-encryption.org/v1
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
-> ssh-ed25519 ouRmYQ z1+svKMUnI1N5eewzBIW9bE+qvZCWn6RpdOdnrpug1Q
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBYdXF3
|
||||||
zne0Xho17J5xNXxYxtlM5co615IQ8QDaE+PfJn32Uz0
|
dFBmc2lXUG16MEtVMnlSdUVwZHcrbVlseDNCM2ZBMzQ1ZVRQY1RrCjJpd0lZZXI3
|
||||||
-> ssh-ed25519 T+8d9Q kjEffTlxGdcnb70nXSHdTPSvklzB8Cjhx/3/3Jh6WR4
|
TFBIQ1ppN0VSMFp5N3c0TlhWbDlFZGh2bXR0VHpwN3FXWm8KLT4gc3NoLWVkMjU1
|
||||||
gK3jX9r0sZjVjEGfPwvZpNo0NroMZkeBj7rNj3khkGg
|
MTkgQUk3S1Z3IER6U3BvRGR5cHgzNUhtN2VydFFVNC9Gb2cwNWczalBsenFXUXRo
|
||||||
-> ssh-ed25519 lpWvhA B7oq1HTF93sZRuxkbgUWl9WszHFHPP75Ibjx/r2RnmU
|
Z3BoZ0UKbUI1Y3YvUjhNaUtHcTQ2NXZ0VGdaTXp0dTFsR3NrMnJMejR6NFRnOVhn
|
||||||
odWZzhkSGf5kDdN7Rk/EIKIi42feWMSv+ZnT4+NXJFI
|
awotPiBzc2gtZWQyNTUxOSBUKzhkOVEgMDRBejZXY0NVRnZYN3FKa3cxRXhXOXFE
|
||||||
--- ASffGuHTVEG5QGbe0KETZyi+TfoxV9IqxZs3cLbSZWg
|
MDNnUlNWcno0YUFsRExVKzkyVQp0NjZYU1BPUW1oeituK3BNazh2Q2RsdTlST0FH
|
||||||
Ìg›‚ÊÕÚAWý»Oá‘ÐŒŠBÆÝŠ¡;áDÆ6JaÈ&•f}Öã©YýU“:<3A>Ü5«
|
cnNMV2RPbGNOanhCWTBrCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSB0dHZmb2Z3N2Yy
|
||||||
|
T09qU0lrcHVJbXNtbHE3TmthK1BqS1NrUlZrWXUvd1VVCnpGNjVhb3lxN0hvbWlw
|
||||||
|
eXY5YlNCQ1hYenMyNk04WUNlbEFRbnVxUlRIMlUKLT4gMzs6JSsiWC1ncmVhc2Ug
|
||||||
|
egptSS9XOVFUc25UVFRzejJuUFVvNm5DMEtGcFBKL2EzM2lqc3pQbW9oclRrd0da
|
||||||
|
dUJYNXBhZlFldUxMakR0bmdTCmxPVWc5b2NQL3dLRUZKVlp1V3dxSUEKLS0tIDda
|
||||||
|
N1FnMGxIZWRXQmIwY1A3eEVOaVYxa2REVW5kZEhZQy8wT3Y0amtqNW8KfZtPqD8R
|
||||||
|
E45F18wrFcuhdoVPnUhLD6iI5E2FqC6qadSNW/NI0aFNkr4um2OEBQZQVSup7Q==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,9 +1,17 @@
|
||||||
age-encryption.org/v1
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
-> ssh-ed25519 ouRmYQ wTfEjois29npFhLpSxvIQV5tCZ2JwISnauU4TYupNAM
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBuSnNZ
|
||||||
9iUvGSHq/lCrpHv7WR6Jz9ukZdiOx0ZM2pDGUKIVNQQ
|
NFdBV1JUbGNidnlFRExSU0pYUVJ4UDYzRE9pc2lMaDFjbUxpSDBjCmFOUUo1d3lB
|
||||||
-> ssh-ed25519 T+8d9Q SAiJq5ojy/SGH3kEYX3IQUZdYkdiMvGYdu88W9I8fV0
|
TGxUYmUzSCswSzBlOTBTbVdRdXBxb1RZeVZ5d0xuKys0a3cKLT4gc3NoLWVkMjU1
|
||||||
OqeyOakmHteRAZbcYptwu6BGXDOa/v4a+8uVY5wia28
|
MTkgQUk3S1Z3IEpTTzA0VThyeDI4Mm5WOGc2MG82YUk5c3FBK2E1YytCektHcTR5
|
||||||
-> ssh-ed25519 lpWvhA 4BPe70ZFYdfH9Etuq46XutSKo4tP7B66Kg8s8t04+Qk
|
cC9GQVUKU2pvQ3EvZnVTZ2hKQ3g5VWpYQUlUREVlUThJYUJpaDJpVjdoVHl0M1Rx
|
||||||
nX+9QWUgtzaYtXwjuw4PRIpOxQslP0DJzVPbHCo4++Y
|
TQotPiBzc2gtZWQyNTUxOSBUKzhkOVEgOVB5cklzNHY4cERtbHFIcDEwQmJaYmFi
|
||||||
--- Xgm7UZUBQMN0HdcqSwLwDustfDUOkyF2Plzobm0Anfw
|
OHRWVXVOYXJXVGtNd3FZZkdIRQowaWJPS3RZSVJ0TWlPYlNodTgzT2NWRTdYY1dE
|
||||||
oYîC§žÈ%—L(¢[~GNý…¬-0-›ï¾ <C2BE>P—r—Û%Ä©wÄW;€.Sî;îäPTlbo&£ULì™:Ø!
|
SzdmWHBoVjFGbXVQZ0NzCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSBRUUk2eFNyZXZ0
|
||||||
|
R2RkU1VlNzgyeWkvbzlLYmNNWWs0TUJQZGFXUVNNVVRrCkNjazl1Z0ovc0sxaEpj
|
||||||
|
T2ExYnp3TVI5K25iYUtWbW5URGtWVGcxRTlRb1EKLT4gWygmP1tCWS1ncmVhc2Ug
|
||||||
|
a3NHUzJhICkyY2IicApEcmQ1YUVrYXhJV2ZlVFEzanBJVUZTVGNWSlVIMkYxMjkx
|
||||||
|
c25MVG5tZXRpanZ4Mld4VHBESW9DL0UwSjlQTndMCm9KT3AxSlN3RUZRQmZ0K2pt
|
||||||
|
azlQUUFIUVZLZk1xaEk0bENqVFI1SQotLS0gUVR6VHAxMTFTMEtUdUtTMVVQb0dw
|
||||||
|
SjE3ekpISFRqRmpFVDBSb2tKclVaNArEYURvve80HWRWrn805d1au1Awo/whCz5c
|
||||||
|
uqqlsuCMliGASMNebPJ7omfr97E4YASyw+v/vK0VYQDwpuMGNjLjCO7xsA==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
|
|
@ -1,9 +1,17 @@
|
||||||
age-encryption.org/v1
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
-> ssh-ed25519 ouRmYQ tbwaMoL5eIqWyB4W/iREdxLEkdZ86pvf5x2aFYVDsEo
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBaTThL
|
||||||
fnm2IQKdTJznUOQWIWALoBSA07PRL1oQ6EmrwQNQysI
|
dFhCOENXRjRvMElkNmsyak03YmVoTXFYT05hTWdSejJZMGt5UVNrCnAzcGtZYnIz
|
||||||
-> ssh-ed25519 T+8d9Q 47ulo/C+9MkBKv7+kRG2agjApE+R64daXDX2Q99IAAE
|
TExDWWFyd2drU2p1WjZDd21YaEdkM1MyRUY1QVc2M0VhM1kKLT4gc3NoLWVkMjU1
|
||||||
V7Jx/+oI7GcebYKbFYr0IuZSf8fUZwHLyAwwW9yK3eY
|
MTkgQUk3S1Z3IFd1RHpMbklIVWg4YTB4dWFPc0ZTZWh2b3BTVytEWkNuc0hSOXph
|
||||||
-> ssh-ed25519 lpWvhA RZr1XWsdWZQA0ggAoxW0Qr70ji8fc67Wb53HHOJu/y0
|
NTA3VjQKd3RhR3B6dmFHN3QrQXNESFJvNEZSNmpnVmZaWnpiMW94VXVpaytEQWNV
|
||||||
L1+1zFnWNMGFTlCNmnHtsIcj03C8Grk2V+BoqXnH5P4
|
cwotPiBzc2gtZWQyNTUxOSBUKzhkOVEgeGZtaHh6RWFYdEFHUnhLR3JqNlJQMDNZ
|
||||||
--- n0pdCgIvJ79wLetQ1bGU6+gpZ4UwoN3XhbilyOREuDk
|
RmlIVklDbnZQR28zU1pFN1FWcwpzUzVOWTEvS2xKMWZLMjFkVlk0eVhmckdwOVhw
|
||||||
Ôb¤Æ–ÓH
Céè<C3A9>Lòíâ<Ón<C393>•…ÿEп|0³<30>ß8gµøh «Ÿ<C2AB>’קšøWÞ
|
SXE4NlRLbWxIUFlVUXFjCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSBpZi9hb200eW8v
|
||||||
|
aTh0UU5IN0R0NE9NbnQ4NWszUmtNYU94WTQ3U1dqbjFvCnF2QjB2cTYrVjJBNGFz
|
||||||
|
SDdtZTExWjdTcDA5RVo1WGVZaWgxY0hJdWU2ckkKLT4gWDYtZ3JlYXNlIGViZ3ZV
|
||||||
|
QyBCe1QmNCAsICt9ClBoOHFSUTZmczh4SkhvenozOHVuUzN1ejJwVzk5dzg1dith
|
||||||
|
cUlYMTFJcTlkTkdIOGpxSExUU1lITTBzL3p5Y0UKaE15QzZ5SzlrbTlkOEEKLS0t
|
||||||
|
IC9OYWtyNHFkWE9TSXU2NkJHT3lmMVpUVlAyaHAvVjFvRExIcTBKN3VsczAKOnZc
|
||||||
|
mK5mNFuOPyHNlC0PIaNPff3nYWd0yZ9ixX9hW9StLazI7Ff6YsPSJw9a8OAdFFoe
|
||||||
|
lw==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
|
Loading…
Reference in a new issue