Compare commits

..

No commits in common. "48bf5f97dbc2ad3adb5228d3a6c5ce4e9f8e910a" and "09830775a550da22e4b28872ee457c678d6a6e11" have entirely different histories.

5 changed files with 65 additions and 48 deletions

View File

@ -40,12 +40,6 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./thelio76/configuration.nix ./thelio76/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.alex = import ./nixos76/alex/home.nix;
}
]; ];
}; };
nixosConfigurations.ursa-minor = nixpkgs.lib.nixosSystem nixosConfigurations.ursa-minor = nixpkgs.lib.nixosSystem

View File

@ -8,24 +8,18 @@
# Packages that should be installed to the user profile. # Packages that should be installed to the user profile.
home.packages = with pkgs; [ home.packages = with pkgs; [
aseprite
audacity
blender blender
darktable darktable
digikam
discord discord
famistudio
firefox firefox
flameshot flameshot
gimp-with-plugins gimp-with-plugins
gnucash gnucash
godot_4
grafx2 grafx2
jellyfin-media-player jellyfin-media-player
keepassxc keepassxc
krita krita
libreoffice libreoffice
lmms
lutris lutris
moonlight-qt moonlight-qt
mpv mpv
@ -33,7 +27,6 @@
nixpkgs-fmt nixpkgs-fmt
obsidian obsidian
picard picard
rawtherapee
spotify spotify
steam steam
syncthing syncthing

View File

@ -5,8 +5,7 @@
{ {
imports = imports =
[ [ (modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ];
@ -15,19 +14,18 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ { device = "/dev/disk/by-uuid/6d62467a-ccc1-44ed-a1cc-f473b3962c64";
device = "/dev/disk/by-uuid/6d62467a-ccc1-44ed-a1cc-f473b3962c64";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ { device = "/dev/disk/by-uuid/2330-1A62";
device = "/dev/disk/by-uuid/2330-1A62";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/fda4f9fe-383f-477c-b2a2-c07f7efcc161"; }]; [ { device = "/dev/disk/by-uuid/fda4f9fe-383f-477c-b2a2-c07f7efcc161"; }
];
# 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
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -6,40 +6,33 @@
{ {
imports = imports =
[ [ # Include the results of the hardware scan.
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
hardware.system76.enableAll = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0"
];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
boot.kernelParams = [ "quiet" ]; boot.kernelParams = ["quiet"];
boot.plymouth.enable = true; boot.plymouth.enable = true;
boot.plymouth.theme = "fade-in"; boot.plymouth.theme="fade-in";
boot.initrd.luks.devices."luks-7d758c82-9079-46a6-8bb2-05d5016ed623".device = "/dev/disk/by-uuid/7d758c82-9079-46a6-8bb2-05d5016ed623"; boot.initrd.luks.devices."luks-7d758c82-9079-46a6-8bb2-05d5016ed623".device = "/dev/disk/by-uuid/7d758c82-9079-46a6-8bb2-05d5016ed623";
environment.etc.crypttab.text = '' environment.etc.crypttab.text = ''
luks-9870176e-53f3-493e-94d8-560994fa8f35 UUID=9870176e-53f3-493e-94d8-560994fa8f35 /luks-9870176e-53f3-493e-94d8-560994fa8f35 nofail luks-9870176e-53f3-493e-94d8-560994fa8f35 UUID=9870176e-53f3-493e-94d8-560994fa8f35 /luks-9870176e-53f3-493e-94d8-560994fa8f35 nofail
''; '';
fileSystems."/home/alex/Documents" = { fileSystems."/home/alex/Documents" = {
device = "/run/media/alex/External/Documents"; device = "/run/media/alex/External/Documents";
options = [ "bind" ]; options = [ "bind" ];
}; };
networking.hostName = "thelio76"; # Define your hostname. networking.hostName = "thelio76"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -103,17 +96,59 @@
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0"
];
users.users.alex = { users.users.alex = {
isNormalUser = true; isNormalUser = true;
description = "Alex"; description = "Alex";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" ];
packages = with pkgs; [
aseprite
audacity
blender
darktable
digikam
discord
famistudio
firefox
flameshot
gimp-with-plugins
git
godot_4
gnucash
keepassxc
# kdePackages.kdenlive
krita
libreoffice
lmms
lutris
mpv
nextcloud-client
nixpkgs-fmt
obsidian
picard
spotify
steam
syncthing
rawtherapee
vim
vscode
yt-dlp
];
}; };
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget # wget
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

View File

@ -5,8 +5,7 @@
{ {
imports = imports =
[ [ (modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
@ -15,25 +14,23 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ { device = "/dev/disk/by-uuid/5b17c208-6c1b-4317-b59c-6596b1857f1f";
device = "/dev/disk/by-uuid/5b17c208-6c1b-4317-b59c-6596b1857f1f";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-b748a776-5e2c-4809-927e-1f4c051b9460".device = "/dev/disk/by-uuid/b748a776-5e2c-4809-927e-1f4c051b9460"; boot.initrd.luks.devices."luks-b748a776-5e2c-4809-927e-1f4c051b9460".device = "/dev/disk/by-uuid/b748a776-5e2c-4809-927e-1f4c051b9460";
fileSystems."/boot" = fileSystems."/boot" =
{ { device = "/dev/disk/by-uuid/EB52-074B";
device = "/dev/disk/by-uuid/EB52-074B";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/19de8142-e695-4425-a8cc-27e062204882"; }]; [ { device = "/dev/disk/by-uuid/19de8142-e695-4425-a8cc-27e062204882"; }
];
fileSystems."/run/media/alex/External" = fileSystems."/run/media/alex/External" =
{ { device = "/dev/disk/by-uuid/5057a0e6-649f-487f-a17c-11e379f9af19";
device = "/dev/disk/by-uuid/5057a0e6-649f-487f-a17c-11e379f9af19";
fsType = "auto"; fsType = "auto";
}; };
# 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