From 363577cad3bea0a653bc17f610181c1a64cda9a8 Mon Sep 17 00:00:00 2001 From: shibazaki Date: Fri, 2 May 2025 07:49:00 +0200 Subject: [PATCH] newuser --- nixos/home/imports/waybar.nix | 1 + nixos/home/modules/development.nix | 2 +- nixos/system/zen.nix | 2 +- users/nine/configuration.nix | 3 ++- users/nine/hardware-configuration.nix | 11 +++++------ users/nine/home.nix | 8 +++----- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/nixos/home/imports/waybar.nix b/nixos/home/imports/waybar.nix index 9cb2ce3..b583e46 100644 --- a/nixos/home/imports/waybar.nix +++ b/nixos/home/imports/waybar.nix @@ -30,6 +30,7 @@ in { gtk-layer-shell = true; reload_style_on_change = true; output = [ + "eDP-1" "eDP-2" "HDMI-A-1" ]; diff --git a/nixos/home/modules/development.nix b/nixos/home/modules/development.nix index 625eca4..6d2bcfb 100644 --- a/nixos/home/modules/development.nix +++ b/nixos/home/modules/development.nix @@ -12,7 +12,7 @@ inkscape aseprite godot_4-mono - ciscoPacketTracer8 + #ciscoPacketTracer8 bruno diff --git a/nixos/system/zen.nix b/nixos/system/zen.nix index 538f061..366a6a5 100644 --- a/nixos/system/zen.nix +++ b/nixos/system/zen.nix @@ -8,7 +8,7 @@ src = fetchurl { url = "https://github.com/zen-browser/desktop/releases/latest/download/zen-x86_64.AppImage"; - sha256 = "sha256-OpdUeFzFAWi1ur2nKt4WSWJqj/J/4iigSmxMBCOGg+w="; + sha256 = "sha256-RFVkUhXmRS/cbZPBaUwV+I5NtLJZYcltxFpygqdp9Vg"; }; appimageContents = appimageTools.extract { diff --git a/users/nine/configuration.nix b/users/nine/configuration.nix index c1e3bf1..4f75f82 100644 --- a/users/nine/configuration.nix +++ b/users/nine/configuration.nix @@ -19,7 +19,8 @@ ./../../nixos/system/stylix.nix ./../../nixos/system/system-settings.nix ./../../nixos/system/neovim.nix - ./../../nixos/system/libgcc.nix + ./../../nixos/system/system-packages.nix + ./../../nixos/system/steam.nix ]; # Global configuration diff --git a/users/nine/hardware-configuration.nix b/users/nine/hardware-configuration.nix index d421608..395a647 100644 --- a/users/nine/hardware-configuration.nix +++ b/users/nine/hardware-configuration.nix @@ -8,24 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/6fcd74de-bf90-4d71-8094-07a13864ccf7"; + { device = "/dev/disk/by-uuid/5da2ec12-421e-47b7-a599-a18cb46279a9"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/115C-64F5"; + { device = "/dev/disk/by-uuid/FFC1-07B9"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/5c530ba1-8990-4372-9d18-5d6107009ba8"; } + [ { device = "/dev/disk/by-uuid/53c09675-dfb9-4afc-a94e-c4285e46921b"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -33,8 +33,7 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0f1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/users/nine/home.nix b/users/nine/home.nix index a58bc8f..b829b94 100644 --- a/users/nine/home.nix +++ b/users/nine/home.nix @@ -1,8 +1,4 @@ -{ - pkgs, - lib, - ... -}: { +{...}: { home.username = "nine"; home.homeDirectory = "/home/nine"; @@ -20,9 +16,11 @@ ./../../nixos/home/modules/environment.nix ./../../nixos/home/modules/session-variables.nix ./../../nixos/home/modules/cybersec-tools.nix + ./../../nixos/home/imports/waybar.nix ]; cybersec.enable = true; + desktop.hyprland.waybar.enable = true; home.stateVersion = "24.11"; # Please read the comment before changing. }