From 01640b1ecb67147ba4efbfaa70299ec231701edb Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 29 Jun 2023 03:30:23 +0000 Subject: [PATCH] [NixOS] Changes from nixquick --- dotfiles/config/taffybar/flake.nix | 2 +- dotfiles/emacs.d/init.el | 2 + nixos/bootstrap/flake.lock | 2 +- nixos/bootstrap/flake.nix | 5 +- nixos/flake.lock | 449 ----------------------------- nixos/flake.nix | 2 +- nixos/machines/nixquick.nix | 53 ++++ 7 files changed, 61 insertions(+), 454 deletions(-) delete mode 100644 nixos/flake.lock create mode 100644 nixos/machines/nixquick.nix 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/bootstrap/flake.lock b/nixos/bootstrap/flake.lock index 75029ca9..555a1bea 100644 --- a/nixos/bootstrap/flake.lock +++ b/nixos/bootstrap/flake.lock @@ -148,7 +148,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-jXsF8mdwodVLK6tM9iA7Ce4jxpkhnkjeAsvirfHHWlc=", + "narHash": "sha256-FDbBPRbfABuZ92x5azeEOIayP1AVnmF1KhFEi/rTTLo=", "path": "../../dotfiles/config/taffybar", "type": "path" }, 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.lock b/nixos/flake.lock deleted file mode 100644 index 7e4d273c..00000000 --- a/nixos/flake.lock +++ /dev/null @@ -1,449 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "git-ignore-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gtk-sni-tray": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ], - "status-notifier-item": [ - "status-notifier-item" - ] - }, - "locked": { - "lastModified": 1663379298, - "narHash": "sha256-m18+G7V1N+g/pPeKJG9hkblGA5c8QTnUYnsU5t14sOw=", - "owner": "taffybar", - "repo": "gtk-sni-tray", - "rev": "1927d86308d34b5d21a709cf8ff5332ec5d37de4", - "type": "github" - }, - "original": { - "owner": "taffybar", - "repo": "gtk-sni-tray", - "type": "github" - } - }, - "gtk-strut": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1663377859, - "narHash": "sha256-UrBd+R3NaJIDC2lt5gMafS3KBeLs83emm2YorX2cFCo=", - "owner": "taffybar", - "repo": "gtk-strut", - "rev": "d946eb230cdccf5afc063642b3215723e555990b", - "type": "github" - }, - "original": { - "owner": "taffybar", - "repo": "gtk-strut", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1687365523, - "narHash": "sha256-2l/cPXDCDVcLNm+EvCRGJcJ9YxxyLbc2vfTah/t8Qwc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1fefd7bb8da0eec6755747f410fa491411a94296", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "imalison-taffybar": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "taffybar": [ - "taffybar" - ], - "xmonad": [ - "xmonad" - ] - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-jXsF8mdwodVLK6tM9iA7Ce4jxpkhnkjeAsvirfHHWlc=", - "path": "../dotfiles/config/taffybar", - "type": "path" - }, - "original": { - "path": "../dotfiles/config/taffybar", - "type": "path" - } - }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat", - "lowdown-src": "lowdown-src", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1687315983, - "narHash": "sha256-a+ov9nNzb1VAm8GtdHtWEZJYiafacMkio1neCGZr61k=", - "owner": "IvanMalison", - "repo": "nix", - "rev": "93b3147f34d0f48ea4a95f45a77639bdc602ebd1", - "type": "github" - }, - "original": { - "owner": "IvanMalison", - "repo": "nix", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1686838567, - "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1, - "narHash": "sha256-k8YMkgmdeW/KnLDQ5oV5SOdpaLbSPaKyzc4qSTEV7Wc=", - "path": "./nixpkgs", - "type": "path" - }, - "original": { - "path": "./nixpkgs", - "type": "path" - } - }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1687391621, - "narHash": "sha256-FRuPdIr0XDtEMyl9qEfCGJ2y3NYR+pqki855GfTxZ7Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d208b9fea436df72b9aeb76ee693b6f30d418833", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "notifications-tray-icon": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1627789093, - "narHash": "sha256-rnQ7vDF9g2xqRpw62lkCyxBiq6cXhWgfoF7lx1WoNMI=", - "owner": "IvanMalison", - "repo": "notifications-tray-icon", - "rev": "2fd47641d0cb046c78de9b4577cb30bc49e607ea", - "type": "github" - }, - "original": { - "owner": "IvanMalison", - "repo": "notifications-tray-icon", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "git-ignore-nix": "git-ignore-nix", - "gtk-sni-tray": "gtk-sni-tray", - "gtk-strut": "gtk-strut", - "home-manager": "home-manager", - "imalison-taffybar": "imalison-taffybar", - "nix": "nix", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression_2", - "notifications-tray-icon": "notifications-tray-icon", - "status-notifier-item": "status-notifier-item", - "systems": "systems", - "taffybar": "taffybar", - "xmonad": "xmonad", - "xmonad-contrib": "xmonad-contrib" - } - }, - "status-notifier-item": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1641783528, - "narHash": "sha256-wJymJfYPFj4/r1e4kT/wt9FEsyCXo5JkkcOoozpuhag=", - "owner": "taffybar", - "repo": "status-notifier-item", - "rev": "f4f9c66ab57fc42eeed0de8cfac9f5f9d30d9dc7", - "type": "github" - }, - "original": { - "owner": "taffybar", - "repo": "status-notifier-item", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "taffybar": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "gtk-sni-tray": [ - "gtk-sni-tray" - ], - "gtk-strut": [ - "gtk-strut" - ], - "nixpkgs": [ - "nixpkgs" - ], - "xmonad": [ - "xmonad" - ] - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-JvoCkRmKzdJwoHL+m29W845eJmp4bRdlYiqUabHvzhY=", - "path": "../dotfiles/config/taffybar/taffybar", - "type": "path" - }, - "original": { - "path": "../dotfiles/config/taffybar/taffybar", - "type": "path" - } - }, - "unstable": { - "locked": { - "lastModified": 1686960236, - "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "xmonad": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ], - "unstable": "unstable" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-gyIoxSygmW/d29P45kq/V1LlLlJ8jkT2D7O0OtdPcSc=", - "path": "../dotfiles/config/xmonad/xmonad", - "type": "path" - }, - "original": { - "path": "../dotfiles/config/xmonad/xmonad", - "type": "path" - } - }, - "xmonad-contrib": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "git-ignore-nix": [ - "git-ignore-nix" - ], - "nixpkgs": [ - "nixpkgs" - ], - "xmonad": [ - "xmonad" - ] - }, - "locked": { - "lastModified": 1686731483, - "narHash": "sha256-gARNKrY2Eud5BlW8CyJVJ29owfNLZRF3Ov/QMGjCItc=", - "owner": "IvanMalison", - "repo": "xmonad-contrib", - "rev": "ac9bc49022ca7d1076d00ab87e7ecc45216117b8", - "type": "github" - }, - "original": { - "owner": "IvanMalison", - "ref": "withMyChanges", - "repo": "xmonad-contrib", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nixos/flake.nix b/nixos/flake.nix index 776d6790..2e55d335 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