relms/flake
Archived
0
0
Fork 0
Code Activity

Compare commits

base: relms:147c3c41faaa02d86f882ef57b2e22211b5e80eb
Branches Tags
relms:main
...
compare: relms:70e4bc2e6904974c90e07cc9a0e644e4b6348af9
Branches Tags
relms:main

10 commits
147c3c41fa ... 70e4bc2e69

Author SHA1 Message Date
Daryl Ronningen
70e4bc2e69
update flake lock 2023-06-21 06:21:22 -07:00
Daryl Ronningen
98dedde20e
add libvirtd 2023-05-29 23:03:31 -07:00
Daryl Ronningen
7f8c07cb13
update flake lock 2023-05-29 02:25:02 -07:00
Daryl Ronningen
8da0c35a3d
update flake lock 2023-05-22 23:07:02 -07:00
Daryl Ronningen
a02ccf2a53
fix neovim 2023-05-15 22:38:02 -07:00
Daryl Ronningen
82f69ae8b1
update flake lock 2023-05-15 22:28:22 -07:00
Daryl Ronningen
3ebc6dc3d4
add spicetify to path startup 2023-05-13 23:46:10 -07:00
Daryl Ronningen
215f05bdba
update flake lock 2023-05-13 21:44:31 -07:00
Daryl Ronningen
8f6c58aea8
update st 2023-05-06 23:24:53 -07:00
Daryl Ronningen
131cc7b1ec
some file reordering 2023-05-06 22:58:39 -07:00
12 changed files with 309 additions and 80 deletions
Show stats Expand all files Collapse all files

10
common/desktop/drivers/skynet.nix
View file

@ -1,10 +0,0 @@
{pkgs, ...}: {
hardware.opengl.extraPackages = with pkgs; [
intel-compute-runtime
mesa_drivers
vaapiIntel
vaapiVdpau
libvdpau-va-gl
intel-media-driver
];
}

2
common/personal.nix
View file

@ -2,7 +2,7 @@
users.users.relms = {
isNormalUser = true;
description = "Daryl Ronningen";
extraGroups = ["networkmanager" "wheel" "adbusers"];
extraGroups = ["networkmanager" "wheel" "adbusers" "libvirtd"];
shell = pkgs.fish;
hashedPassword = "$y$j9T$fiNCczxfgXQRoDCYlRlgy.$8GVAPknKhtp0kq6g9YnJCaAU1GxE9W9puogCXLLYD2/";
};

12
common/virt/libvirt.nix Normal file
View file

@ -0,0 +1,12 @@
{pkgs, ...}: {
virtualisation.libvirtd = {
enable = true;
qemu = {
package = pkgs.qemu_full;
ovmf.packages = [pkgs.OVMFFull];
swtpm = {
enable = true;
};
};
};
}

22
devices/common-mbr.nix
View file

@ -1,22 +0,0 @@
{pkgs, ...}: {
boot = {
loader = {
grub = {
enable = true;
device = "/dev/sda";
useOSProber = true;
};
};
kernelPackages = pkgs.linuxPackages_latest;
};
hardware = {
xpadneo.enable = true;
};
time.timeZone = "America/Los_Angeles";
zramSwap.enable = true;
system.stateVersion = "23.05";
}

0
devices/common-gpt.nix → devices/common.nix
View file

16
devices/crystal-gitlab/base.nix
View file

@ -23,6 +23,22 @@
};
};
boot = {
loader = {
grub = {
enable = true;
device = "/dev/sda";
};
};
kernelPackages = pkgs.linuxPackages_latest;
};
time.timeZone = "America/Los_Angeles";
zramSwap.enable = true;
system.stateVersion = "23.05";
networking.hostName = "crystal-gitlab";
networking.useDHCP = true;
nixpkgs.hostPlatform = "x86_64-linux";

8
devices/skynet/base.nix
View file

@ -25,6 +25,14 @@
hardware.enableRedistributableFirmware = true;
hardware.cpu.intel.updateMicrocode = true;
hardware.sensor.iio.enable = true;
hardware.opengl.extraPackages = with pkgs; [
intel-compute-runtime
mesa_drivers
vaapiIntel
vaapiVdpau
libvdpau-va-gl
intel-media-driver
];
boot = {
initrd = {

294
flake.lock
View file

@ -3,16 +3,19 @@
"agenix": {
"inputs": {
"darwin": "darwin",
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1682101079,
"narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=",
"lastModified": 1684153753,
"narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
"owner": "ryantm",
"repo": "agenix",
"rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447",
"rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
"type": "github"
},
"original": {
@ -59,7 +62,102 @@
"type": "github"
}
},
"flake-compat_2": {
"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-parts": {
"inputs": {
"nixpkgs-lib": [
"neovim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"neovim",
"hercules-ci-effects",
"hercules-ci-agent",
"nixpkgs"
]
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -74,6 +172,64 @@
"type": "github"
}
},
"haskell-flake": {
"locked": {
"lastModified": 1684780604,
"narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
"owner": "srid",
"repo": "haskell-flake",
"rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "0.3.0",
"repo": "haskell-flake",
"type": "github"
}
},
"hercules-ci-agent": {
"inputs": {
"flake-parts": "flake-parts_3",
"haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1686721748,
"narHash": "sha256-ilD6ANYID+b0/+GTFbuZXfmu92bqVqY5ITKXSxqIp5A=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "7192b83935ab292a8e894db590dfd44f976e183b",
"type": "github"
},
"original": {
"id": "hercules-ci-agent",
"type": "indirect"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_2",
"hercules-ci-agent": "hercules-ci-agent",
"nixpkgs": [
"neovim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1686830987,
"narHash": "sha256-1XLTM0lFr3NV+0rd55SQW/8oQ3ACnqlYcda3FelIwHU=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "04e4ab63b9eed2452edee1bb698827e1cb8265c6",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -81,11 +237,11 @@
]
},
"locked": {
"lastModified": 1683276747,
"narHash": "sha256-T3st1VBg3wmhHyBQb0z12sTSGsQgiu3mxkS61nLO8Xs=",
"lastModified": 1687337969,
"narHash": "sha256-5b58eo7Eku2ae+62HHHTbHtwe4jlS44JfYCDulGdopg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "669669fcb403e3137dfe599bbcc26e60502c3543",
"rev": "9ce6977fe76fb408042a432e314764f8d1d86263",
"type": "github"
},
"original": {
@ -96,20 +252,43 @@
},
"neovim": {
"inputs": {
"flake-utils": [
"utils"
],
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-flake": "neovim-flake",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1687305901,
"narHash": "sha256-dOxIJUGafmsBgvQp9wrX7AkH9Dgc55bFUtARBSsvvg8=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "3293647eeb76c09d03f6d12ee38472a87f303836",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"type": "github"
}
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"neovim",
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
"lastModified": 1683417608,
"narHash": "sha256-qdWRY50WhpjHKLKe7ngYdEnA+gYjOnE3PScQws0YofY=",
"lastModified": 1687288633,
"narHash": "sha256-ruvOPW2915R3Jbb/PCKUCwojA9koBK+D+NFu1ZWpZHA=",
"owner": "neovim",
"repo": "neovim",
"rev": "fa1baa9a47cdb3eed17d48b6011a164d4009d2ee",
"rev": "3bf887f6e08fa272679187340ca483809275b20a",
"type": "github"
},
"original": {
@ -155,11 +334,11 @@
"nmd": "nmd_2"
},
"locked": {
"lastModified": 1670198918,
"narHash": "sha256-oNlUhAM0/a3pDdCMmBWA+CLrDAIYJqAAMyrDp8fNSM4=",
"lastModified": 1684353543,
"narHash": "sha256-0b85kcdeM1WgGZZn0L4fke39xcVpO99hidzcpqvNOcQ=",
"owner": "t184256",
"repo": "nix-on-droid",
"rev": "b00cb5e7e2a47d85a019119069b153cda4002d0a",
"rev": "064e1b280e4711ecea0d7abbe885362cbf7b717a",
"type": "github"
},
"original": {
@ -170,11 +349,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1683269598,
"narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=",
"lastModified": 1686838567,
"narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "51559e691f1493a26f94f1df1aaf516bb507e78b",
"rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89",
"type": "github"
},
"original": {
@ -185,7 +364,7 @@
},
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat",
"flake-compat": "flake-compat_2",
"flake-utils": [
"utils"
],
@ -194,11 +373,11 @@
]
},
"locked": {
"lastModified": 1682982995,
"narHash": "sha256-PK0pSY48JkcLDFphafjpLqeTDs0XUqGMHjsiNuEq5s0=",
"lastModified": 1687279045,
"narHash": "sha256-LR0dsXd/A07M61jclyBUW0wRojEQteWReKM35zoJXp0=",
"owner": "nix-community",
"repo": "nixos-wsl",
"rev": "c5d7db84c422be515dac8fc26420900c349374e8",
"rev": "a8486b5d191f11d571f15d80b6e265d1712d01cf",
"type": "github"
},
"original": {
@ -209,16 +388,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1683392273,
"narHash": "sha256-pZTuxvcuDeBG+vvE1zczNyEUzlPbzXVh8Ed45Fzo+tQ=",
"owner": "nixos",
"lastModified": 1686501370,
"narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "16b3b0c53b1ee8936739f8c588544e7fcec3fc60",
"rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -239,6 +418,40 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1685564631,
"narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": {
"flake": false,
"locked": {
@ -289,11 +502,11 @@
},
"nur": {
"locked": {
"lastModified": 1683432572,
"narHash": "sha256-GPi990XR/OvHghGj2nZaxp/7m4LxTjlYuD77FsGjCrQ=",
"lastModified": 1687352478,
"narHash": "sha256-vMXSNPRlBoZfvBM5AsJWl4kOqdMeArw4Jf8L1L3FWsI=",
"owner": "nix-community",
"repo": "NUR",
"rev": "2305adfd63c885defb4d8c81e1e813d1a7e83331",
"rev": "df4604971171682d14dc49e71106f9e2ba1f3512",
"type": "github"
},
"original": {
@ -310,14 +523,29 @@
"nix-on-droid": "nix-on-droid",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nur": "nur",
"utils": "utils"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"flake-utils": "flake-utils"
"flake-utils": "flake-utils_2"
},
"locked": {
"lastModified": 1657226504,

18
flake.nix
View file

@ -3,9 +3,8 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
neovim.url = "github:neovim/neovim?dir=contrib";
neovim.url = "github:nix-community/neovim-nightly-overlay";
neovim.inputs.nixpkgs.follows = "nixpkgs";
neovim.inputs.flake-utils.follows = "utils";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -26,6 +25,7 @@
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";
agenix.inputs.home-manager.follows = "home-manager";
};
outputs = {
self,
@ -58,12 +58,7 @@
common = [
./common/personal.nix
./common/nix.nix
./devices/common-gpt.nix
];
common-mbr = [
./common/personal.nix
./common/nix.nix
./devices/common-mbr.nix
./devices/common.nix
];
dev = [
./common/dev/podman.nix
@ -102,7 +97,7 @@
++ modules.nixos.desktops.common
++ modules.nixos.desktops.gnome
++ [
./common/desktop/drivers/skynet.nix
./common/virt/libvirt.nix
./devices/skynet/base.nix
nixos-hardware.nixosModules.framework-12th-gen-intel
agenix.nixosModules.default
@ -124,12 +119,13 @@
pkgs = pkgsForSystem "x86_64-linux";
system = "x86_64-linux";
modules =
modules.nixos.common-mbr
++ modules.nixos.services.common
modules.nixos.services.common
++ [
agenix.nixosModules.default
./devices/crystal-gitlab/base.nix
./services/crystal/gitlab-runner.nix
./common/personal.nix
./common/nix.nix
];
};
};

4
users/relms/gui.nix
View file

@ -7,8 +7,8 @@
papirus-icon-theme
(st.overrideAttrs (oldAttrs: {
src = builtins.fetchTarball {
url = "https://code.relms.dev/Relms/st/archive/9973cc2bdd0b18f134b8065f8a840a77002cd977.tar.gz";
sha256 = "sha256:13vh5x4yapaspbd3and53syrri161mfhji8scf8424r7v5ijmysg";
url = "https://code.relms.dev/Relms/st/archive/50a72324cd9e81efb7985dca26ac77cf781305f0.tar.gz";
sha256 = "sha256:1kmn775fzgdlb6wp4c9zzkiqa4mjv84zyaash842yqwh72zal62y";
};
buildInputs = oldAttrs.buildInputs ++ [harfbuzz xorg.libXcursor];
}))

1
users/relms/shell.nix
View file

@ -25,6 +25,7 @@
nixos-rebuild = "sudo nixos-rebuild --flake ~/git/flake#";
home-manager = "home-manager --flake ~/git/flake#relms";
};
programs.fish.interactiveShellInit = "fish_add_path ~/.spicetify";
programs.bash.enable = true;
programs.bash.enableVteIntegration = true;