This commit is contained in:
PapaTutuWawa 2022-01-12 17:35:17 +01:00
parent 94234b39c9
commit 364945f5f6
4 changed files with 22 additions and 27 deletions

View File

@ -84,10 +84,7 @@
}, },
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_4"
"ostylk",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1638281721, "lastModified": 1638281721,
@ -121,7 +118,7 @@
}, },
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1639947939, "lastModified": 1639947939,
@ -229,17 +226,15 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1638698569, "lastModified": 1639347265,
"narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=", "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
"path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source", "path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source",
"rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35", "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
"type": "path" "type": "path"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixos-21.05", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
@ -260,10 +255,10 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1638698569, "lastModified": 1639347265,
"narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=", "narHash": "sha256-q5feWoC64+h6T6J89o2HJJ8DOnB/4vwMODBlZIgeIlA=",
"path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source", "path": "/nix/store/swl04xiyn1a153n5lbaak903fysp6p0f-source",
"rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35", "rev": "b0bf5f888d377dd2f36d90340df6dc9f035aaada",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -273,11 +268,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1640929225, "lastModified": 1641734288,
"narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=", "narHash": "sha256-/7YwWbvkjinc4uu5aUQMRw3xAthhOVH/esm4tCXPzIQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9", "rev": "df123677560db3b0db7c19d71981b11091fbeaf6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -330,10 +325,7 @@
"rnix-lsp": { "rnix-lsp": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": [ "nixpkgs": "nixpkgs_7",
"ostylk",
"nixpkgs"
],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {

View File

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, inputs, ... }:
{ {
imports = with inputs.nixos-hardware.nixosModules; [ imports = with inputs.nixos-hardware.nixosModules; [
@ -20,7 +20,8 @@
initrd = { initrd = {
availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci"
# NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/common/pc/laptop/acpi_call.nix # NOTE: See https://github.com/NixOS/nixos-hardware/blob/master/common/pc/laptop/acpi_call.nix
"acpi_call" ]; #"acpi_call" ];
];
kernelModules = [ "dm-snapshot" ]; kernelModules = [ "dm-snapshot" ];
luks.devices = { luks.devices = {
cryptroot = { cryptroot = {
@ -52,6 +53,7 @@
office.enable = true; office.enable = true;
}; };
services = { services = {
gnome.enable = true;
kanshi = let kanshi = let
horizontal = "Samsung Electric Company C27F398 H4ZR101145"; horizontal = "Samsung Electric Company C27F398 H4ZR101145";

View File

@ -22,6 +22,7 @@ in {
gnomeExtensions.tray-icons-reloaded gnomeExtensions.tray-icons-reloaded
gnomeExtensions.gsconnect gnomeExtensions.gsconnect
gnomeExtensions.blur-my-shell gnomeExtensions.blur-my-shell
gnomeExtensions.forge
gnome.eog gnome.eog
gnome.nautilus gnome.nautilus
gnome.evince gnome.evince

View File

@ -54,7 +54,7 @@
# TODO: Maybe move this somewhere else # TODO: Maybe move this somewhere else
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
pinentryFlavor = "qt"; pinentryFlavor = "gnome3";
}; };
}; };
}; };