From 7309bc192ef0327fad8a9f1c3c6745f52e0fd086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 25 Mar 2025 22:55:29 +0100 Subject: [PATCH] Arendia changes --- flake.lock | 24 +++++------ home/Arendia.nix | 1 + home/hyprland/default.nix | 2 +- hosts/Arendia/hardware-configuration.nix | 55 +++++++++++------------- 4 files changed, 38 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 5eaa79e..e0b6a3e 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1742416832, - "narHash": "sha256-ycok0eJJcoknqaibdv/TEEEOUqovC42XCqbfLDYmnoQ=", + "lastModified": 1742926508, + "narHash": "sha256-wgfY302ZaOsBCXb8aZDTG3Zt2kg3jDDaRrmtUw8nz00=", "owner": "nix-community", "repo": "home-manager", - "rev": "eb0f617aecbaf1eff5bacec789891e775af2f5a3", + "rev": "8bef8b7a0a95d347018f09b291e2fa0a77abd23f", "type": "github" }, "original": { @@ -197,11 +197,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -250,11 +250,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742420715, - "narHash": "sha256-xmBDr0v/UJjBpviEAisG/9SWLfv0lw1ju7Jhe7a+ZuI=", + "lastModified": 1742931896, + "narHash": "sha256-0RBs7CXYFhMaIG06f2oKo0Vp6VWB2M3HqlPjWdtxDwA=", "owner": "nix-community", "repo": "NUR", - "rev": "e35ce99602bd7c8de77eaf9c8aef04bb7b5b024c", + "rev": "6602c070a47cec20c1e2e0d30077f88a20b6e074", "type": "github" }, "original": { diff --git a/home/Arendia.nix b/home/Arendia.nix index 345a5c5..e742703 100644 --- a/home/Arendia.nix +++ b/home/Arendia.nix @@ -30,6 +30,7 @@ in gnome-power-manager jetbrains.pycharm-professional discord + smile ]; services.hyprpaper = { diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 035731b..6b55f3e 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -6,7 +6,7 @@ let gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar"; wpctl = "${pkgs.wireplumber}/bin/wpctl"; terminal-name = ".kitty-wrapped"; - terminal = "${pkgs.kitty}/bin/kitty"; + terminal = "${pkgs.kitty}/bin/kitty -1"; rofi = "${pkgs.rofi-wayland}/bin/rofi"; jq = "${pkgs.jq}/bin/jq"; rofi-ykman = pkgs.writeShellScriptBin "rofi-ykman" '' diff --git a/hosts/Arendia/hardware-configuration.nix b/hosts/Arendia/hardware-configuration.nix index f47169e..b3d17e9 100644 --- a/hosts/Arendia/hardware-configuration.nix +++ b/hosts/Arendia/hardware-configuration.nix @@ -1,44 +1,37 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "rpool/root"; - fsType = "zfs"; + fileSystems."/" = { + device = "rpool/root"; + fsType = "zfs"; }; - fileSystems."/home" = - { device = "rpool/home"; - fsType = "zfs"; + fileSystems."/home" = { + device = "rpool/home"; + fsType = "zfs"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/12CE-A600"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/12CE-A600"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; - swapDevices = [ ]; + swapDevices = [ ]; + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - # 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 - # 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.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + services.hardware.bolt.enable = true; }