nix/config
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fixing things

Browse source
This commit is contained in:
Julia 2025-07-05 20:33:02 -07:00
parent 454a26a85a
commit b808a79ab2
5 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -150,9 +150,6 @@
user = "julia"; user = "julia";
host = "cattop"; host = "cattop";
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [
nixos-cosmic.nixosModules.default
];
}; };
# generate checks for "nix flake check --all-systems --no-build" # generate checks for "nix flake check --all-systems --no-build"

4
modules/nixos/services.nix
View file

@ -22,10 +22,6 @@
}; };
}; };
desktopManager.cosmic.enable = true;
displayManager.cosmic-greeter.enable = true;
desktopManager.cosmic.xwayland.enable = true;
# Auto mount devices # Auto mount devices
udisks2 = { udisks2 = {
enable = true; enable = true;

6
switch
View file

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
nh_subcommand="os" nh_subcommand="os"
fallback_command="nixos-rebuild" fallback_command="nixos-rebuild"
if [ "$(uname -o)" ]; then if [ "$(uname -o)" = "darwin" ]; then
nh_subcommand="darwin" nh_subcommand="darwin"
fallback_command="nix run .#darwin-rebuild" fallback_command="nix run .#darwin-rebuild"
fi; fi
if command -v nh > /dev/null; then if command -v nh >/dev/null; then
nh $nh_subcommand switch . nh $nh_subcommand switch .
else else
$fallback_command -- switch --flake . $fallback_command -- switch --flake .

36
users/julia/cattop/hardware-configuration.nix
View file

@ -1,31 +1,45 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"thunderbolt"
"vmd"
"nvme"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/8eb0d6a2-b8cf-4ef2-ba2a-e25a5555b0bc"; device = "/dev/disk/by-uuid/8eb0d6a2-b8cf-4ef2-ba2a-e25a5555b0bc";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot/efi" = {
{ device = "/dev/disk/by-uuid/3B51-4A1C"; device = "/dev/disk/by-uuid/3B51-4A1C";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/58ee9d19-292f-49b5-9979-341b42e8e09d"; } { device = "/dev/disk/by-uuid/58ee9d19-292f-49b5-9979-341b42e8e09d"; }
]; ];
# 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

5
users/natalie/desktop/configuration.nix
View file

@ -121,6 +121,11 @@
# Enable sound with pipewire. # Enable sound with pipewire.
security.rtkit.enable = true; security.rtkit.enable = true;
services = {
desktopManager.cosmic.enable = true;
displayManager.cosmic-greeter.enable = true;
desktopManager.cosmic.xwayland.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;