diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix index 11310d7d..1cf98189 100644 --- a/dotfiles/config/taffybar/flake.nix +++ b/dotfiles/config/taffybar/flake.nix @@ -1,8 +1,8 @@ { inputs = { - taffybar.url = path:./taffybar; flake-utils.url = github:numtide/flake-utils; xmonad.url = github:xmonad/xmonad/master; + taffybar.url = path:./taffybar; }; outputs = { self, flake-utils, taffybar, nixpkgs, xmonad }: let diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index b363aef5..db081854 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -56,6 +56,8 @@ (use-package org :defer t) +(use-package dash :demand t) + (let ((debug-on-error t)) (org-babel-load-file (concat (file-name-directory load-file-name) "README.org"))) diff --git a/nixos/flake.lock b/nixos/bootstrap/flake.lock similarity index 84% rename from nixos/flake.lock rename to nixos/bootstrap/flake.lock index 7e4d273c..555a1bea 100644 --- a/nixos/flake.lock +++ b/nixos/bootstrap/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "type": "github" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1687365523, - "narHash": "sha256-2l/cPXDCDVcLNm+EvCRGJcJ9YxxyLbc2vfTah/t8Qwc=", + "lastModified": 1687969886, + "narHash": "sha256-tC2qFLmuM0PFaw0tMHVcFmzsG/351q09qa1EpuL2n1U=", "owner": "nix-community", "repo": "home-manager", - "rev": "1fefd7bb8da0eec6755747f410fa491411a94296", + "rev": "a7002d6bfca54742d5fc9b485a1879953b4585b9", "type": "github" }, "original": { @@ -148,12 +148,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jXsF8mdwodVLK6tM9iA7Ce4jxpkhnkjeAsvirfHHWlc=", - "path": "../dotfiles/config/taffybar", + "narHash": "sha256-FDbBPRbfABuZ92x5azeEOIayP1AVnmF1KhFEi/rTTLo=", + "path": "../../dotfiles/config/taffybar", "type": "path" }, "original": { - "path": "../dotfiles/config/taffybar", + "path": "../../dotfiles/config/taffybar", "type": "path" } }, @@ -213,14 +213,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1, - "narHash": "sha256-k8YMkgmdeW/KnLDQ5oV5SOdpaLbSPaKyzc4qSTEV7Wc=", - "path": "./nixpkgs", - "type": "path" + "lastModified": 1687898314, + "narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e18dc963075ed115afb3e312b64643bf8fd4b474", + "type": "github" }, "original": { - "path": "./nixpkgs", - "type": "path" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-regression": { @@ -241,11 +245,11 @@ }, "nixpkgs-regression_2": { "locked": { - "lastModified": 1687391621, - "narHash": "sha256-FRuPdIr0XDtEMyl9qEfCGJ2y3NYR+pqki855GfTxZ7Y=", + "lastModified": 1688001024, + "narHash": "sha256-Zf88j+DUj6rDgveWfdEyUo4fL1KZTowzPAN6gpeqzKg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d208b9fea436df72b9aeb76ee693b6f30d418833", + "rev": "2c8591ad6a6f9d679817a94f847c59b0d1e3289e", "type": "github" }, "original": { @@ -363,23 +367,27 @@ ] }, "locked": { - "lastModified": 1, + "lastModified": 1685567526, "narHash": "sha256-JvoCkRmKzdJwoHL+m29W845eJmp4bRdlYiqUabHvzhY=", - "path": "../dotfiles/config/taffybar/taffybar", - "type": "path" + "owner": "taffybar", + "repo": "taffybar", + "rev": "741995d09da1264da669d69c6c26fe4575c5d4ba", + "type": "github" }, "original": { - "path": "../dotfiles/config/taffybar/taffybar", - "type": "path" + "owner": "taffybar", + "ref": "master", + "repo": "taffybar", + "type": "github" } }, "unstable": { "locked": { - "lastModified": 1686960236, - "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", + "lastModified": 1687898314, + "narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", + "rev": "e18dc963075ed115afb3e312b64643bf8fd4b474", "type": "github" }, "original": { @@ -403,14 +411,18 @@ "unstable": "unstable" }, "locked": { - "lastModified": 1, + "lastModified": 1663511234, "narHash": "sha256-gyIoxSygmW/d29P45kq/V1LlLlJ8jkT2D7O0OtdPcSc=", - "path": "../dotfiles/config/xmonad/xmonad", - "type": "path" + "owner": "IvanMalison", + "repo": "xmonad", + "rev": "a2259bb3091429f4293d371e13fd5a2ee8da30db", + "type": "github" }, "original": { - "path": "../dotfiles/config/xmonad/xmonad", - "type": "path" + "owner": "IvanMalison", + "ref": "master", + "repo": "xmonad", + "type": "github" } }, "xmonad-contrib": { diff --git a/nixos/bootstrap/flake.nix b/nixos/bootstrap/flake.nix index 47bcc1d2..0da539c3 100644 --- a/nixos/bootstrap/flake.nix +++ b/nixos/bootstrap/flake.nix @@ -123,12 +123,13 @@ modules = baseModules ++ modules; specialArgs = { inherit inputs; } // specialArgs; }); - machineFilenames = builtins.attrNames (builtins.readDir ../machines); + machinesPath = ../machines; + machineFilenames = builtins.attrNames (builtins.readDir machinesPath); machineNameFromFilename = filename: builtins.head (builtins.split "\\." filename); mkConfigurationParams = filename: { name = machineNameFromFilename filename; value = { - modules = [ (./machines + ("/" + filename)) ]; + modules = [ (machinesPath + ("/" + filename)) ]; }; }; defaultConfigurationParams = diff --git a/nixos/flake.nix b/nixos/flake.nix index 9a249d00..5af405b0 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -2,7 +2,7 @@ inputs = { nixos-hardware = { url = github:NixOS/nixos-hardware; }; - nixpkgs = { url = path:./nixpkgs; }; + nixpkgs = { url = github:NixOS/nixpkgs/nixos-unstable; }; home-manager = { url = github:nix-community/home-manager; diff --git a/nixos/machines/nixquick.nix b/nixos/machines/nixquick.nix new file mode 100644 index 00000000..ab718c95 --- /dev/null +++ b/nixos/machines/nixquick.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: +{ + imports = [ + ../base.nix + ../essential-no-arm.nix + ]; + + networking.hostName = "nixquick"; + + hardware.enableRedistributableFirmware = true; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + boot.loader.systemd-boot.enable = true; + + # install nvidia drivers in addition to intel one + hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; + hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ]; + services.xserver = { + videoDrivers = [ "nvidia" ]; + }; + + hardware.opengl.driSupport32Bit = true; + + hardware.nvidia.modesetting.enable = true; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/64a7c1f5-727a-413c-81a2-cb108728cff6"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/EE25-DC15"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/c0dcff59-8072-48fb-b242-a7a1797e4b48"; } + ]; + + # 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.enp4s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} \ No newline at end of file