colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kat/master'

Browse Source
This commit is contained in:
Ivan Malison 2023-06-28 21:46:13 -06:00
commit 579f33000f
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
6 changed files with 103 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/config/taffybar/flake.nix
View File

@ -1,8 +1,8 @@
{ {
inputs = { inputs = {
taffybar.url = path:./taffybar;
flake-utils.url = github:numtide/flake-utils; flake-utils.url = github:numtide/flake-utils;
xmonad.url = github:xmonad/xmonad/master; xmonad.url = github:xmonad/xmonad/master;
taffybar.url = path:./taffybar;
}; };
outputs = { self, flake-utils, taffybar, nixpkgs, xmonad }: outputs = { self, flake-utils, taffybar, nixpkgs, xmonad }:
let let

2
dotfiles/emacs.d/init.el
View File

@ -56,6 +56,8 @@
(use-package org (use-package org
:defer t) :defer t)
(use-package dash :demand t)
(let ((debug-on-error t)) (let ((debug-on-error t))
(org-babel-load-file (org-babel-load-file
(concat (file-name-directory load-file-name) "README.org"))) (concat (file-name-directory load-file-name) "README.org")))

74
nixos/flake.lock → nixos/bootstrap/flake.lock
View File

@ -23,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687171271, "lastModified": 1687709756,
"narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687365523, "lastModified": 1687969886,
"narHash": "sha256-2l/cPXDCDVcLNm+EvCRGJcJ9YxxyLbc2vfTah/t8Qwc=", "narHash": "sha256-tC2qFLmuM0PFaw0tMHVcFmzsG/351q09qa1EpuL2n1U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1fefd7bb8da0eec6755747f410fa491411a94296", "rev": "a7002d6bfca54742d5fc9b485a1879953b4585b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,12 +148,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-jXsF8mdwodVLK6tM9iA7Ce4jxpkhnkjeAsvirfHHWlc=", "narHash": "sha256-FDbBPRbfABuZ92x5azeEOIayP1AVnmF1KhFEi/rTTLo=",
"path": "../dotfiles/config/taffybar", "path": "../../dotfiles/config/taffybar",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "../dotfiles/config/taffybar", "path": "../../dotfiles/config/taffybar",
"type": "path" "type": "path"
} }
}, },
@ -213,14 +213,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1, "lastModified": 1687898314,
"narHash": "sha256-k8YMkgmdeW/KnLDQ5oV5SOdpaLbSPaKyzc4qSTEV7Wc=", "narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=",
"path": "./nixpkgs", "owner": "NixOS",
"type": "path" "repo": "nixpkgs",
"rev": "e18dc963075ed115afb3e312b64643bf8fd4b474",
"type": "github"
}, },
"original": { "original": {
"path": "./nixpkgs", "owner": "NixOS",
"type": "path" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-regression": { "nixpkgs-regression": {
@ -241,11 +245,11 @@
}, },
"nixpkgs-regression_2": { "nixpkgs-regression_2": {
"locked": { "locked": {
"lastModified": 1687391621, "lastModified": 1688001024,
"narHash": "sha256-FRuPdIr0XDtEMyl9qEfCGJ2y3NYR+pqki855GfTxZ7Y=", "narHash": "sha256-Zf88j+DUj6rDgveWfdEyUo4fL1KZTowzPAN6gpeqzKg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d208b9fea436df72b9aeb76ee693b6f30d418833", "rev": "2c8591ad6a6f9d679817a94f847c59b0d1e3289e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,23 +367,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1685567526,
"narHash": "sha256-JvoCkRmKzdJwoHL+m29W845eJmp4bRdlYiqUabHvzhY=", "narHash": "sha256-JvoCkRmKzdJwoHL+m29W845eJmp4bRdlYiqUabHvzhY=",
"path": "../dotfiles/config/taffybar/taffybar", "owner": "taffybar",
"type": "path" "repo": "taffybar",
"rev": "741995d09da1264da669d69c6c26fe4575c5d4ba",
"type": "github"
}, },
"original": { "original": {
"path": "../dotfiles/config/taffybar/taffybar", "owner": "taffybar",
"type": "path" "ref": "master",
"repo": "taffybar",
"type": "github"
} }
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1686960236, "lastModified": 1687898314,
"narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "rev": "e18dc963075ed115afb3e312b64643bf8fd4b474",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -403,14 +411,18 @@
"unstable": "unstable" "unstable": "unstable"
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1663511234,
"narHash": "sha256-gyIoxSygmW/d29P45kq/V1LlLlJ8jkT2D7O0OtdPcSc=", "narHash": "sha256-gyIoxSygmW/d29P45kq/V1LlLlJ8jkT2D7O0OtdPcSc=",
"path": "../dotfiles/config/xmonad/xmonad", "owner": "IvanMalison",
"type": "path" "repo": "xmonad",
"rev": "a2259bb3091429f4293d371e13fd5a2ee8da30db",
"type": "github"
}, },
"original": { "original": {
"path": "../dotfiles/config/xmonad/xmonad", "owner": "IvanMalison",
"type": "path" "ref": "master",
"repo": "xmonad",
"type": "github"
} }
}, },
"xmonad-contrib": { "xmonad-contrib": {

5
nixos/bootstrap/flake.nix
View File

@ -123,12 +123,13 @@
modules = baseModules ++ modules; modules = baseModules ++ modules;
specialArgs = { inherit inputs; } // specialArgs; 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); machineNameFromFilename = filename: builtins.head (builtins.split "\\." filename);
mkConfigurationParams = filename: { mkConfigurationParams = filename: {
name = machineNameFromFilename filename; name = machineNameFromFilename filename;
value = { value = {
modules = [ (./machines + ("/" + filename)) ]; modules = [ (machinesPath + ("/" + filename)) ];
}; };
}; };
defaultConfigurationParams = defaultConfigurationParams =

2
nixos/flake.nix
View File

@ -2,7 +2,7 @@
inputs = { inputs = {
nixos-hardware = { url = github:NixOS/nixos-hardware; }; nixos-hardware = { url = github:NixOS/nixos-hardware; };
nixpkgs = { url = path:./nixpkgs; }; nixpkgs = { url = github:NixOS/nixpkgs/nixos-unstable; };
home-manager = { home-manager = {
url = github:nix-community/home-manager; url = github:nix-community/home-manager;

53
nixos/machines/nixquick.nix Normal file
View File

@ -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.<interface>.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;
}