From 0cf5d70d20fae78018be613102cc1f3a133df8d3 Mon Sep 17 00:00:00 2001 From: TheCrazyInsanity Date: Sun, 7 Dec 2025 01:12:57 -0500 Subject: [PATCH] it finally builds --- flake.lock | 49 ++++++++++++++++++++++ flake.nix | 7 ++-- global/default.nix | 1 - home/bash.nix | 2 +- machines/homepc/configuration.nix | 15 ++++--- machines/homepc/hardware-configuration.nix | 11 +++++ machines/homepc/home.nix | 2 +- modules/communication/default.nix | 2 +- modules/creative/default.nix | 2 +- modules/development/default.nix | 2 +- 10 files changed, 79 insertions(+), 14 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..27ebc41 --- /dev/null +++ b/flake.lock @@ -0,0 +1,49 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f61125a668a320878494449750330ca58b78c557", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 5ce6604..21e7dae 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ system = "x86_64-linux"; modules = [ ./machines/homepc/configuration.nix + home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = {inherit inputs outputs;}; home-manager.useGlobalPkgs = true; @@ -36,8 +37,8 @@ home-manager.users.laythe = import ./machines/homepc/home.nix; } - ] - } - } + ]; + }; + }; }; } diff --git a/global/default.nix b/global/default.nix index f7bef3e..fb4d3dd 100644 --- a/global/default.nix +++ b/global/default.nix @@ -2,7 +2,6 @@ # There is no order for where things are in this, it's a little messy. {pkgs, ...}: { - time.timezone = "America/Eastern"; # Is there a better way for this? What if I'm travelling? # 🇺🇸 i18n.defaultLocale = "en_US.UTF-8"; diff --git a/home/bash.nix b/home/bash.nix index 28e38cf..088a08d 100644 --- a/home/bash.nix +++ b/home/bash.nix @@ -1,4 +1,4 @@ -{}: +{...}: { programs.bash = { enable = true; diff --git a/machines/homepc/configuration.nix b/machines/homepc/configuration.nix index 0c75151..5d83084 100644 --- a/machines/homepc/configuration.nix +++ b/machines/homepc/configuration.nix @@ -7,6 +7,7 @@ imports = [ ./hardware-configuration.nix + ../../global/default.nix ../../modules/communication/default.nix ../../modules/creative/default.nix ../../modules/development/default.nix @@ -27,11 +28,15 @@ networking.networkmanager.enable = true; # Only computer I own that can actually run ollama, and I don't want to make an ai folder. - services.ollama = { - enable = true; - acceleration = "cuda"; - host = "[::]"; - }; + # services.ollama = { + # enable = true; + # acceleration = "cuda"; + # host = "[::]"; + # }; + + environment.systemPackages = [ + pkgs.ollama-cuda + ]; # Set your time zone. # time.timeZone = "Europe/Amsterdam"; diff --git a/machines/homepc/hardware-configuration.nix b/machines/homepc/hardware-configuration.nix index 536830c..f9af47d 100644 --- a/machines/homepc/hardware-configuration.nix +++ b/machines/homepc/hardware-configuration.nix @@ -9,6 +9,17 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + fileSystems."/" = + { device = "/dev/disk/by-uuid/2849654b-6c3c-4db7-9603-5fa96ce561aa"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/90C0-8767"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + swapDevices = [ { device = "/dev/disk/by-uuid/7762478c-1123-4a1f-9402-1bba3723e53d"; } ]; diff --git a/machines/homepc/home.nix b/machines/homepc/home.nix index 5d62b56..c4c9345 100644 --- a/machines/homepc/home.nix +++ b/machines/homepc/home.nix @@ -2,7 +2,7 @@ { # These both are probably always going to be the same, but I'll keep them local just in case:tm: home.username = "laythe"; - home.homeDirectory = "/home/laythe"; + home.homeDirectory = lib.mkForce "/home/laythe"; imports = [ ../../home/default.nix diff --git a/modules/communication/default.nix b/modules/communication/default.nix index 1696d94..b9e1742 100644 --- a/modules/communication/default.nix +++ b/modules/communication/default.nix @@ -4,5 +4,5 @@ discord jami element-desktop - ] + ]; } \ No newline at end of file diff --git a/modules/creative/default.nix b/modules/creative/default.nix index 91451ff..97ac72d 100644 --- a/modules/creative/default.nix +++ b/modules/creative/default.nix @@ -5,5 +5,5 @@ shotcut glaxnimate kdePackages.kdenlive - ] + ]; } \ No newline at end of file diff --git a/modules/development/default.nix b/modules/development/default.nix index 6ca6f14..c824997 100644 --- a/modules/development/default.nix +++ b/modules/development/default.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { - environment.systemPackages = with pkgs [ + environment.systemPackages = with pkgs; [ vscode antigravity # Free Gemini 3 credits was too good of an offer to not take up, even if it requires selling my soul. ];