annika/nixos
1
0
Fork 0
mirror of https://forgejo.merr.is/annika/nixos.git synced 2025-12-11 11:05:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Flake Update and Add Lutris

Browse source
This commit is contained in:
Annika Merris 2024-11-20 17:09:06 -05:00
parent 33239e79f7
commit 68326e9a63
6 changed files with 66 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

59
flake.lock generated
View file

@ -5,12 +5,12 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1721282986,
"narHash": "sha256-v5/9BWQJG06AZH9eTheuq5xMOi7pFK/TkeSCuXs3x9A=",
"rev": "94e2135389b52eff1b372473d0676537393fbf9a",
"revCount": 495,
"lastModified": 1731106889,
"narHash": "sha256-acq5Rbg2swreKyZDswqd9c9X1NtTNexMkKZNws/l4s8=",
"rev": "39e26a0e1bd5a84899c2b786b9119d6e9174297f",
"revCount": 523,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/catppuccin/vscode/3.15.0/01911a6e-38d5-7d5f-a914-ab6be68e8b23/source.tar.gz?rev=94e2135389b52eff1b372473d0676537393fbf9a&revCount=495"
"url": "https://api.flakehub.com/f/pinned/catppuccin/vscode/3.16.0/01931044-41cd-79d3-882f-dd68e6ebfa38/source.tar.gz?rev=39e26a0e1bd5a84899c2b786b9119d6e9174297f&revCount=523"
},
"original": {
"type": "tarball",
@ -24,11 +24,11 @@
]
},
"locked": {
"lastModified": 1729942962,
"narHash": "sha256-xzt7tb4YUw6VZXSCGw4sukirJSfYsIcFyvmhK5KMiKw=",
"lastModified": 1732109232,
"narHash": "sha256-iYh6h8yueU8IyOfNclbiBG2+fBFcjjUfXm90ZBzk0c0=",
"owner": "nix-community",
"repo": "disko",
"rev": "58cd832497f9c87cb4889744b86aba4284fd0474",
"rev": "a0c384e0a3b8bcaed30a6bcf3783f8a7c8b35be4",
"type": "github"
},
"original": {
@ -77,11 +77,11 @@
]
},
"locked": {
"lastModified": 1730016908,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
"lastModified": 1732025103,
"narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e83414058edd339148dc142a8437edb9450574c8",
"rev": "a46e702093a5c46e192243edbd977d5749e7f294",
"type": "github"
},
"original": {
@ -141,29 +141,13 @@
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1729973466,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1729880355,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github"
},
"original": {
@ -175,11 +159,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1729951556,
"narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=",
"lastModified": 1731763621,
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee",
"rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d",
"type": "github"
},
"original": {
@ -201,15 +185,14 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1729999681,
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
"lastModified": 1731954233,
"narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
"rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
"type": "github"
},
"original": {

1
hosts/kim/default.nix
View file

@ -78,6 +78,7 @@ inputs.nixpkgs.lib.nixosSystem {
# Gaming
steam.enable = true;
wowup.enable = true;
lutris.enable = true;
# Programming Stuff
nixpkgs-fmt.enable = true;
openscad.enable = true;

42
hosts/kim/hardware-configuration.nix
View file

@ -1,27 +1,37 @@
{ config, lib, pkgs, modulesPath, ... }:
{
{ config, lib, pkgs, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
services.xserver.videoDrivers = [ "amdgpu" ]; # TODO: I use wayland, do I need this?
hardware.enableRedistributableFirmware = true;
# TODO: I use wayland, do I need this?
services.xserver.videoDrivers = [ "amdgpu" ];
hardware = {
graphics = {
extraPackages = with pkgs; [ amdvlk ];
};
graphics = {
enable = true;
};
enableRedistributableFirmware = true;
};
powerManagement.cpuFreqGovernor = "performance";
fileSystems."/" =
{
device = "/dev/disk/by-uuid/ba4362a3-3a0b-4227-b460-a5a9302f5966";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/ba4362a3-3a0b-4227-b460-a5a9302f5966";
fsType = "ext4";
};
fileSystems."/boot" =
{
device = "/dev/disk/by-uuid/DB88-8E65";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/DB88-8E65";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [ ];

1
modules/common/applications/default.nix
View file

@ -6,6 +6,7 @@
./firefox.nix
./kcalc.nix
./kitty.nix
./lutris.nix
./netbird.nix
./obsidian.nix
./openrgb.nix

16
modules/common/applications/lutris.nix Normal file
View file

@ -0,0 +1,16 @@
{ config, pkgs, lib, ... }:
{
options = {
lutris = {
enable = lib.mkEnableOption {
description = "Enable Lutris";
default = false;
};
};
};
config = lib.mkIf (config.gui.enable && config.lutris.enable) {
environment.systemPackages = [
pkgs.lutris
];
};
}

2
modules/common/applications/spotifyd.nix
View file

@ -25,7 +25,7 @@
# username = "me@annikamerris.com"
username = "317omerbg5kalklxwpenedfcnrcq"
# password = "${config.sops.placeholder."spotifyd/settings/global/password"}"
cache_directory = "/home/annika/.cache/spotifyd"
cache_path = "/home/annika/.cache/spotifyd"
use_mpris = true
device_name = "kim-nix"
device_type = "computer"