framework: tweaks

This commit is contained in:
tristan 2025-04-03 18:59:17 +01:00
parent 3d18f696aa
commit 58a2547bc5
3 changed files with 21 additions and 30 deletions

View file

@ -1,6 +1,3 @@
# 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, ... }:
{
@ -14,7 +11,7 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/745ff46c-6fec-44cf-97eb-40ced0442b0d";
{ device = "/dev/mapper/crypted";
fsType = "btrfs";
options = [ "subvol=@root" ];
};
@ -22,24 +19,25 @@
boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/84ad0e15-0056-4d46-801d-7735c2c6a5f6";
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/745ff46c-6fec-44cf-97eb-40ced0442b0d";
{ device = "/dev/mapper/crypted";
fsType = "btrfs";
options = [ "subvol=@home" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/745ff46c-6fec-44cf-97eb-40ced0442b0d";
{ device = "/dev/mapper/crypted";
fsType = "btrfs";
options = [ "subvol=@nix" ];
neededForBoot = true;
options = [ "subvol=@nix" "noatime" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/9EA1-04BB";
{ device = "/dev/disk/by-label/BOOT";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/b22fb59e-3882-4acc-b7cd-d24916ae3c63"; }
[ { device = "/dev/disk/by-label/SWAP"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -80,9 +78,9 @@
stylix.fonts.sizes = {
applications = 20;
desktop = 12;
terminal = 20;
applications = 12;
desktop = 10;
terminal = 15;
};

View file

@ -28,7 +28,6 @@
# other
element-desktop
brave
bitwarden
];
@ -55,4 +54,9 @@
"file:///home/tristan/Downloads"
];
};
programs.chromium = {
enable = true;
package = pkgs.brave;
};
}

View file

@ -4,11 +4,6 @@
...
}: let
modifier = config.windowManager.modifierKey;
browser = "${pkgs.brave}/opt/brave.com/brave/brave-browser";
pwa = {
slack = "mpagibdhafmlkgpemeicgogjnhclenoc";
teams = "cifhbcnohmdccbgoicgdjpfamggdegmo";
};
in {
roles.email = {
enable = true;
@ -26,16 +21,6 @@ in {
pkgs.thunderbird
pkgs.remmina
pkgs.postman
(import ../../lib/mkapp.nix "slack" {
inherit pkgs browser;
desktopName = "Slack";
app-id = pwa.slack;
})
(import ../../lib/mkapp.nix "teams" {
inherit pkgs browser;
app-id = pwa.teams;
desktopName = "Microsoft Teams";
})
pkgs.devcontainer
(pkgs.writeShellScriptBin "devcontainer-open" (
let
@ -77,8 +62,12 @@ in {
wayland.windowManager.hyprland.settings = {
bind = [
"${modifier}, e, focuswindow, thunderbird"
"${modifier}, t, focuswindow, brave-${pwa.teams}-Profile_2"
"${modifier}, s, focuswindow, brave-${pwa.slack}-Profile_2"
];
};
programs.chromium = {
extensions = [
{id = "bfogiafebfohielmmehodmfbbebbbpei";}
];
};
}