From 5be623fd12387de539f57957d88638f0272a71cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sun, 7 Jun 2026 11:53:55 +0200 Subject: [PATCH] first commit from desktop --- flake.lock | 13 ------ modules/applications/git.nix | 4 +- modules/hardware/hardware-configuration.nix | 45 +++++++++++++++++++++ modules/hosts/desktop.nix | 3 +- modules/utilities/development.nix | 1 + 5 files changed, 49 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 98d1feb..586697c 100755 --- a/flake.lock +++ b/flake.lock @@ -203,18 +203,6 @@ "type": "github" } }, - "nixpkgs-local": { - "locked": { - "lastModified": 1780728942, - "narHash": "sha256-NjXPlIssFzJ8vazKaihsW773r/Kq2TTby7FKBlbWIg4=", - "path": "/home/tomasr/devel/fugit2-gpgme", - "type": "path" - }, - "original": { - "path": "/home/tomasr/devel/fugit2-gpgme", - "type": "path" - } - }, "nixpkgs-notifier": { "inputs": { "flake-utils": [ @@ -325,7 +313,6 @@ "microPlugins-vivify": "microPlugins-vivify", "nixos-grub-themes": "nixos-grub-themes", "nixpkgs": "nixpkgs_2", - "nixpkgs-local": "nixpkgs-local", "nixpkgs-notifier": "nixpkgs-notifier", "nixpkgs-unstable": "nixpkgs-unstable", "notewrapper": "notewrapper" diff --git a/modules/applications/git.nix b/modules/applications/git.nix index 474a9cb..02a2c6e 100644 --- a/modules/applications/git.nix +++ b/modules/applications/git.nix @@ -2,9 +2,9 @@ _: { flake.homeModules.git = _: { programs.git = { enable = true; - settings = { + /*settings = { init.defaultBranch = "main"; - }; + };*/ }; programs.gh = { enable = true; diff --git a/modules/hardware/hardware-configuration.nix b/modules/hardware/hardware-configuration.nix index d6da02c..1cbe592 100644 --- a/modules/hardware/hardware-configuration.nix +++ b/modules/hardware/hardware-configuration.nix @@ -33,4 +33,49 @@ _: { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }; +flake.nixosModules.hardware-configuration-desktop = # 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, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; + fsType = "btrfs"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/14bcd132-b4a3-46f2-ac35-3497340de4b2"; + fsType = "btrfs"; + options = [ "subvol=nix" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BAB4-34F6"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/ce6f9a68-0517-4f8a-b375-66f2173efe59"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}; } diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index e973963..cd83d20 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -27,7 +27,7 @@ documentation disk # this only installs some disk utilities. disko will format the drives fonts - #hardware-configuration-desktop + hardware-configuration-desktop hyprland IO #kdrive-desktop # we will setup this later @@ -54,7 +54,6 @@ development eza fastfetch - git gtk hyprland hyprland-desktop diff --git a/modules/utilities/development.nix b/modules/utilities/development.nix index b02c10e..8ed33c9 100644 --- a/modules/utilities/development.nix +++ b/modules/utilities/development.nix @@ -24,6 +24,7 @@ gnumake go direnv + git gh cling # c interpreter used for coding # lsp clang-tools