Compare commits

..

No commits in common. "master" and "niri" have entirely different histories.
master ... niri

6 changed files with 32 additions and 5 deletions

View File

@ -38,6 +38,8 @@
} @ inputs: let } @ inputs: let
supportedSystems = ["x86_64-linux" "aarch64-linux"]; supportedSystems = ["x86_64-linux" "aarch64-linux"];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems; forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
system = builtins.currentSystem;
pkgs = nixpkgs.legacyPackages.${system};
commonModules = host: user: [ commonModules = host: user: [
./hosts/${host}/hardware-configuration.nix ./hosts/${host}/hardware-configuration.nix
{ {
@ -46,7 +48,7 @@
(self: super: {utillinux = super.util-linux;}) (self: super: {utillinux = super.util-linux;})
]; ];
} }
({pkgs, ...}: { {
networking.hostName = host; networking.hostName = host;
time.timeZone = "Asia/Bangkok"; time.timeZone = "Asia/Bangkok";
nix.settings = { nix.settings = {
@ -68,7 +70,7 @@
}; };
users.users.${user} = { users.users.${user} = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel" "video"]; # Enable 'sudo' for the user. extraGroups = ["wheel" "video"]; # Enable sudo for the user.
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAa3tMzSCRuprEACrBsKI0F/o73o6J9L1qR3TaZn/N8 user@Kell" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKAa3tMzSCRuprEACrBsKI0F/o73o6J9L1qR3TaZn/N8 user@Kell"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByLwLAdJbmoDV5sx4hg5NbzKbOh1GmWEhDOUJ1GQBhK user@Riva" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByLwLAdJbmoDV5sx4hg5NbzKbOh1GmWEhDOUJ1GQBhK user@Riva"
@ -83,7 +85,7 @@
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
}) }
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {

View File

@ -32,6 +32,15 @@ in {
smile smile
]; ];
services.hyprpaper = {
settings = {
wallpaper = [
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
"eDP-1,${./hyprland/files/wallpaper.png}"
];
};
};
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"eDP-1,2560x1440@60.01,0x0,1" "eDP-1,2560x1440@60.01,0x0,1"

View File

@ -38,6 +38,15 @@ in {
jetbrains.rider jetbrains.rider
]; ];
services.hyprpaper = {
settings = {
wallpaper = [
"DP-1,${./hyprland/files/wallpaper.png}"
"DP-2,${./hyprland/files/wallpaper.png}"
"HDMI-A-1,${./hyprland/files/wallpaper.png}"
];
};
};
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"DP-2,preferred,0x550,1" "DP-2,preferred,0x550,1"

View File

@ -30,6 +30,13 @@ in {
jq jq
rclone rclone
]; ];
services.hyprpaper = {
settings = {
wallpaper = [
"Virtual-1,${./hyprland/files/wallpaper.png}"
];
};
};
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ monitor = [
"Virtual-1,2560x1440,0x0,1" "Virtual-1,2560x1440,0x0,1"

View File

@ -26,8 +26,6 @@
}; };
ignores = [ ignores = [
"*.direnv/" "*.direnv/"
"*.nix/"
"uv.lock"
".dmypy.json" ".dmypy.json"
]; ];
}; };

View File

@ -12,6 +12,7 @@ in {
# (import ../Common/nvidia.nix { inherit inputs pkgs config; }) # (import ../Common/nvidia.nix { inherit inputs pkgs config; })
(import ../Common/desktop.nix {inherit inputs pkgs config;}) (import ../Common/desktop.nix {inherit inputs pkgs config;})
(import ../Common/nfs.nix {inherit pkgs serverIP;}) (import ../Common/nfs.nix {inherit pkgs serverIP;})
(import ../Common/android.nix {inherit pkgs;})
]; ];
# Kernel # Kernel
@ -39,6 +40,7 @@ in {
nixpkgs.config.rocmSupport = true; nixpkgs.config.rocmSupport = true;
services.ollama = { services.ollama = {
enable = true; enable = true;
acceleration = "rocm";
}; };
# nixpkgs.config.cudaSupport = true; # nixpkgs.config.cudaSupport = true;
services.logind.settings.Login = { services.logind.settings.Login = {