From 1af514e45758f099f1f01e6af306fae036add5ef Mon Sep 17 00:00:00 2001
From: notohh <github@notohh.dev>
Date: Mon, 24 Mar 2025 13:52:35 -0400
Subject: [PATCH] ame: update hardware and add cosmic
ame: update home pkgs
---
home/profiles/ame/default.nix | 28 ++++++++--------------------
hosts/ame/default.nix | 9 +++++----
hosts/ame/hardware.nix | 14 ++++++++------
3 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/home/profiles/ame/default.nix b/home/profiles/ame/default.nix
index cd5a4bd..01fa84f 100644
--- a/home/profiles/ame/default.nix
+++ b/home/profiles/ame/default.nix
@@ -1,32 +1,20 @@
-{pkgs, ...}: {
+{
+ inputs,
+ pkgs,
+ ...
+}: {
imports = [
../../services
- ../../programs/anyrun
- ../../programs/browsers/firefox
- ../../programs/browsers/chromium
- ../../programs/terminal/wezterm
../../programs/terminal/zellij
- # ../../programs/themes.nix
- ../../programs/media/cava.nix
- ../../programs/media/zathura.nix
];
home.packages = with pkgs; [
- discord
+ discord-canary
pavucontrol
- imv
- mpv
- rustypaste-cli
- playerctl
- obsidian
- cryptomator
wayland
glib
- grim
- slurp
- wl-clipboard
- swww
- hyprpicker
+ technorino
+ inputs.zen.packages.${pkgs.system}.default
];
programs.ssh = {
enable = true;
diff --git a/hosts/ame/default.nix b/hosts/ame/default.nix
index 774281b..42d2db9 100644
--- a/hosts/ame/default.nix
+++ b/hosts/ame/default.nix
@@ -1,4 +1,4 @@
-_: {
+{inputs, ...}: {
imports = [
./hardware.nix
./services
@@ -6,13 +6,13 @@ _: {
./topology.nix
../common
../common/fonts.nix
+ inputs.nixos-cosmic.nixosModules.default
];
- programs.hyprland.enable = true;
-
services = {
pulseaudio.enable = false;
- displayManager.sddm.enable = true;
+ desktopManager.cosmic.enable = true;
+ displayManager.cosmic-greeter.enable = true;
pipewire = {
enable = true;
alsa.enable = true;
@@ -27,5 +27,6 @@ _: {
};
};
};
+ system.stateVersion = "23.05";
security.rtkit.enable = true;
}
diff --git a/hosts/ame/hardware.nix b/hosts/ame/hardware.nix
index bde282a..fdaa2a2 100644
--- a/hosts/ame/hardware.nix
+++ b/hosts/ame/hardware.nix
@@ -31,16 +31,18 @@
fileSystems = {
"/" = {
- device = "/dev/disk/by-uuid";
+ device = "/dev/disk/by-uuid/825f1188-82bd-4a1d-9434-6b5dd29041c3";
fsType = "ext4";
};
+ "/boot/efi" = {
+ device = "/dev/disk/by-uuid/59C2-1D06";
+ fsType = "vfat";
+ };
};
- zramSwap = {
- enable = true;
- swapDevices = 1;
- algorithm = "zstd";
- };
+ swapDevices = [
+ {device = "/dev/disk/by-uuid/d62dbf49-e51e-4823-a9cb-f2af486cd0f7";}
+ ];
networking.useDHCP = lib.mkDefault true;