summaryrefslogtreecommitdiff
path: root/hosts/local
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/local')
-rw-r--r--hosts/local/fw11/configuration.nix27
-rw-r--r--hosts/local/fw11/hardware-configuration.nix7
-rw-r--r--hosts/local/wayland.nix5
3 files changed, 29 insertions, 10 deletions
diff --git a/hosts/local/fw11/configuration.nix b/hosts/local/fw11/configuration.nix
index b3b6b0f..bd9aa30 100644
--- a/hosts/local/fw11/configuration.nix
+++ b/hosts/local/fw11/configuration.nix
@@ -1,7 +1,21 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
-{...}: {
+{
+ inputs,
+ pkgs,
+ ...
+}: let
+ wrappers =
+ inputs.wrapper-manager.lib.build
+ {
+ inherit pkgs;
+ modules = [
+ ../../../wrappers/chromium
+ ../../../wrappers/brave
+ ];
+ };
+in {
imports = [
# Include the results of the hardware scan.
../../base.nix
@@ -12,6 +26,10 @@
# ../android.nix
];
+ environment.systemPackages = [
+ wrappers
+ ];
+
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@@ -27,6 +45,7 @@
# Set your time zone.
time.timeZone = "Asia/Bangkok";
+ # time.timeZone = "Europe/Madrid";
# Enable CUPS to print documents.
# services.printing.enable = true;
@@ -38,9 +57,7 @@
# firmware update
services.fwupd.enable = true;
- # android
- # programs.adb.enable = true;
- # users.users.y.extraGroups = ["adbusers"];
+ services.flatpak.enable = true;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
@@ -49,5 +66,5 @@
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
- system.stateVersion = "23.05"; # Did you read the comment?
+ system.stateVersion = "24.05"; # Did you read the comment?
}
diff --git a/hosts/local/fw11/hardware-configuration.nix b/hosts/local/fw11/hardware-configuration.nix
index 6b4e8bf..359ff8f 100644
--- a/hosts/local/fw11/hardware-configuration.nix
+++ b/hosts/local/fw11/hardware-configuration.nix
@@ -15,17 +15,18 @@
# to modeswitch usb dongle sudo usb_modeswitch -KW -v 0bda -p 1a2b
fileSystems."/" =
- { device = "/dev/disk/by-uuid/349f55f5-8726-47be-826c-33ae8da92346";
+ { device = "/dev/disk/by-uuid/176785ba-cd35-4d09-b7df-37e8b9843c33";
fsType = "ext4";
};
fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/0739-1303";
+ { device = "/dev/disk/by-uuid/043D-21E3";
fsType = "vfat";
+ options = ["fmask=0077" "dmask=0077"];
};
swapDevices =
- [ { device = "/dev/disk/by-uuid/5d13663a-3177-4338-b07a-4b0e10581084"; }
+ [
];
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix
index 256c84d..57fd4cc 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -73,7 +73,6 @@
obsidian
signal-desktop
tdesktop
- brave
gimp
vlc
mpv
@@ -81,7 +80,6 @@
thunderbird
kmail
firefox
- chromium
pavucontrol
# icons
polkit_gnome
@@ -113,9 +111,11 @@
i18n.inputMethod = {
type = "fcitx5";
+ enable = true;
fcitx5 = {
# enabled = true;
addons = with pkgs; [
+ rime-data
fcitx5-rime
fcitx5-mozc
fcitx5-configtool
@@ -125,6 +125,7 @@
waylandFrontend = true;
};
};
+ services.xserver.desktopManager.runXdgAutostartIfNone = true;
fonts = {
enableDefaultPackages = true;