mirror of
https://github.com/Superredstone/nixos.git
synced 2026-06-17 15:24:39 +02:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4a6a50a593
|
|||
|
eeac9a9e65
|
+10
-1
@@ -27,7 +27,16 @@ let
|
|||||||
HMConfig = ../home;
|
HMConfig = ../home;
|
||||||
systemPackages = ../modules/packages.nix;
|
systemPackages = ../modules/packages.nix;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit gamingSystem workSystem enableZram nixvim sops-nix noctalia inputs additionalModules;
|
inherit
|
||||||
|
gamingSystem
|
||||||
|
workSystem
|
||||||
|
enableZram
|
||||||
|
nixvim
|
||||||
|
sops-nix
|
||||||
|
noctalia
|
||||||
|
inputs
|
||||||
|
additionalModules
|
||||||
|
;
|
||||||
pkgs-unstable = import nixpkgs {
|
pkgs-unstable = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# Required to change nextcloud port
|
# Required to change nextcloud port
|
||||||
nginx.virtualHosts."${config.services.nextcloud.hostName}".listen = [
|
nginx.virtualHosts."${config.services.nextcloud.hostName}".listen = [
|
||||||
{
|
{
|
||||||
addr = "127.0.0.1";
|
addr = "127.0.0.1";
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
services.vikunja = {
|
services.vikunja = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 8011;
|
port = 8011;
|
||||||
frontendScheme = "http";
|
frontendScheme = "http";
|
||||||
frontendHostname = "vikunja.patrickcanal.it";
|
frontendHostname = "vikunja.patrickcanal.it";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,13 @@
|
|||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ # Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.loader.grub.enable = true;
|
boot.loader.grub.enable = true;
|
||||||
boot.loader.grub.device = "/dev/vda";
|
boot.loader.grub.device = "/dev/vda";
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,26 +1,32 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
(modulesPath + "/profiles/qemu-guest.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
|
boot.initrd.availableKernelModules = [
|
||||||
|
"ahci"
|
||||||
|
"xhci_pci"
|
||||||
|
"virtio_pci"
|
||||||
|
"sr_mod"
|
||||||
|
"virtio_blk"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/b3a05e5f-6394-4115-b206-8fb51c235067";
|
device = "/dev/disk/by-uuid/b3a05e5f-6394-4115-b206-8fb51c235067";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [
|
||||||
[ { device = "/dev/disk/by-uuid/c94fa719-f29a-41bb-8e85-e186fe96846c"; }
|
{ device = "/dev/disk/by-uuid/c94fa719-f29a-41bb-8e85-e186fe96846c"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-9
@@ -15,7 +15,8 @@
|
|||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs;
|
environment.systemPackages =
|
||||||
|
with pkgs;
|
||||||
let
|
let
|
||||||
hostSystem = pkgs.stdenv.hostPlatform.system;
|
hostSystem = pkgs.stdenv.hostPlatform.system;
|
||||||
basePackages = [
|
basePackages = [
|
||||||
@@ -73,7 +74,6 @@
|
|||||||
guiPackages = lib.optionals (currentSystemDe != "none") [
|
guiPackages = lib.optionals (currentSystemDe != "none") [
|
||||||
baobab
|
baobab
|
||||||
bazaar
|
bazaar
|
||||||
blackbox-terminal
|
|
||||||
discord
|
discord
|
||||||
firefox
|
firefox
|
||||||
gapless
|
gapless
|
||||||
@@ -99,7 +99,7 @@
|
|||||||
arrpc
|
arrpc
|
||||||
cura-appimage
|
cura-appimage
|
||||||
heroic
|
heroic
|
||||||
obs-studio
|
obs-studio
|
||||||
openrgb
|
openrgb
|
||||||
prismlauncher
|
prismlauncher
|
||||||
protonplus
|
protonplus
|
||||||
@@ -117,6 +117,7 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
gnomePackages = lib.optionals (currentSystemDe == "gnome") [
|
gnomePackages = lib.optionals (currentSystemDe == "gnome") [
|
||||||
|
blackbox-terminal
|
||||||
gnome-tweaks
|
gnome-tweaks
|
||||||
gnomeExtensions.appindicator
|
gnomeExtensions.appindicator
|
||||||
gnomeExtensions.caffeine
|
gnomeExtensions.caffeine
|
||||||
@@ -132,11 +133,11 @@
|
|||||||
];
|
];
|
||||||
in
|
in
|
||||||
basePackages
|
basePackages
|
||||||
++ guiPackages
|
++ guiPackages
|
||||||
++ gamingPackages
|
++ gamingPackages
|
||||||
++ workPackages
|
++ workPackages
|
||||||
++ plasmaPackages
|
++ plasmaPackages
|
||||||
++ gnomePackages
|
++ gnomePackages
|
||||||
++ niriPackages;
|
++ niriPackages;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user