alyx/shorkie-flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

brings back umbriel, adds isbritish for british keyboarded machines, and removes firefox in favour of librewolf. librewolf being the browser that was in use that i somehow managed to remove, and keep only firefox in. i can be stupid at times

Browse source
This commit is contained in:
cydiralis 2025-06-27 19:16:27 +01:00
parent c81537697d
commit 723b4c519e
No known key found for this signature in database
6 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
base/umbriel/configuration.nix
View file

@ -39,7 +39,12 @@
}; };
boot.supportedFilesystems = ["exfat" "ntfs" "xfs"]; boot.supportedFilesystems = ["exfat" "ntfs" "xfs"];
boot.loader.systemd-boot.enable = true; boot.loader.limine.enable = true;
boot.loader.limine.style.wallpapers = [];
boot.loader.limine.additionalFiles = {
"efi/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
"efi/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";
};
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
boot.loader.efi.efiSysMountPoint = "/boot/"; boot.loader.efi.efiSysMountPoint = "/boot/";
@ -193,6 +198,7 @@
wget wget
neovim neovim
cbfstool cbfstool
xwayland-satellite
git git
keepassxc keepassxc
pulseaudio pulseaudio

1
base/umbriel/default.nix
View file

@ -5,5 +5,6 @@
../ssh.nix ../ssh.nix
../substituters.nix ../substituters.nix
../fonts.nix ../fonts.nix
../greetd.nix
]; ];
} }

6
base/umbriel/hardware-configuration.nix
View file

@ -14,18 +14,18 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/a9d406d6-c188-4a65-91f7-ead5fd091e19"; { device = "/dev/disk/by-uuid/c1583ec8-704e-47b4-bba0-5d3534662962";
fsType = "xfs"; fsType = "xfs";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/5216-71E6"; { device = "/dev/disk/by-uuid/7598-14E1";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/852efacc-eea6-4d3b-af82-b43e30a7d1c4"; } [ { device = "/dev/disk/by-uuid/ebeb8bb4-7df9-4674-bcff-b81cc8b824e2"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

16
flake.nix
View file

@ -30,7 +30,7 @@
inherit inputs; inherit inputs;
vars = { vars = {
isNixOS = true; isNixOS = true;
isTough = false; isBritish = true;
useSyncthing = false; useSyncthing = false;
class = "desktop"; class = "desktop";
user = "alyx"; user = "alyx";
@ -51,7 +51,7 @@
inherit inputs; inherit inputs;
vars = { vars = {
isNixOS = true; isNixOS = true;
isTough = false; isBritish = false;
class = "lowspec"; class = "lowspec";
user = "maya"; user = "maya";
useSyncthing = true; useSyncthing = true;
@ -73,7 +73,7 @@
inherit inputs; inherit inputs;
vars = { vars = {
isNixOS = true; isNixOS = true;
isTough = false; isBritish = false;
class = "desktop"; class = "desktop";
user = "maya"; user = "maya";
useSyncthing = true; useSyncthing = true;
@ -94,7 +94,7 @@
inherit inputs; inherit inputs;
vars = { vars = {
isNixOS = true; isNixOS = true;
isTough = false; isBritish = false;
class = "desktop"; class = "desktop";
user = "maya"; user = "maya";
useSyncthing = true; useSyncthing = true;
@ -117,7 +117,7 @@
inherit inputs; inherit inputs;
vars = { vars = {
isNixOS = true; isNixOS = true;
isTough = true; isBritish = false;
useSyncthing = false; useSyncthing = false;
class = "laptop"; class = "laptop";
user = "alyx"; #cursed way of setting username user = "alyx"; #cursed way of setting username
@ -138,7 +138,7 @@
inherit inputs; inherit inputs;
vars = { vars = {
isNixOS = true; isNixOS = true;
isTough = true; isBritish = false;
class = "lowspec"; class = "lowspec";
user = "maya"; user = "maya";
useSyncthing = true; useSyncthing = true;
@ -163,7 +163,7 @@
inherit inputs; inherit inputs;
vars = { vars = {
isNixOS = true; isNixOS = true;
isTough = false; isBritish = false;
useSyncthing = false; useSyncthing = false;
class = "handheld"; class = "handheld";
user = "alyx"; #cursed way of setting username user = "alyx"; #cursed way of setting username
@ -186,7 +186,7 @@
inherit inputs; inherit inputs;
vars = { vars = {
isNixOS = true; isNixOS = true;
isTough = false; isBritish = false;
useSyncthing = false; useSyncthing = false;
class = "laptop"; class = "laptop";
user = "alyx"; #cursed way of setting username user = "alyx"; #cursed way of setting username

2
home/niri.nix
View file

@ -29,7 +29,7 @@
accel-profile = "flat"; accel-profile = "flat";
}; };
prefer-no-csd = true; prefer-no-csd = true;
input.keyboard.xkb.layout = (if vars.user == "alyx" && !vars.isTough then "gb" else "us"); input.keyboard.xkb.layout = (if vars.user == "alyx" && vars.isBritish then "gb" else "us");
input.focus-follows-mouse.enable = true; input.focus-follows-mouse.enable = true;
binds = with config.lib.niri.actions; lib.mkDefault { binds = with config.lib.niri.actions; lib.mkDefault {
"Mod+Return".action = spawn "foot"; "Mod+Return".action = spawn "foot";

2
home/packages.nix
View file

@ -7,7 +7,7 @@
comma comma
emacs emacs
fastfetch fastfetch
firefox librewolf
fzf fzf
gamescope gamescope
grayjay grayjay