From 83876e8d4d5550694e73ab75468559f0c89496a1 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 12 Dec 2024 15:53:17 -0500 Subject: [PATCH] don't repurpose suspend key --- nix/configuration.nix | 8 ++++++-- nix/flake.lock | 37 +++++++++++++++++++++++++++---------- nix/flake.nix | 1 + 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/nix/configuration.nix b/nix/configuration.nix index 00b832c..6403cb4 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -81,7 +81,8 @@ shell = pkgs.zsh; packages = with pkgs; [ firefox - ungoogled-chromium + inputs.master.legacyPackages.${system}.ungoogled-chromium + # ungoogled-chromium librewolf bitwarden-desktop bitwarden-cli @@ -146,6 +147,7 @@ sshfs nextcloud-client python312Packages.python-lsp-server + gopls (callPackage ./anki-bin.nix { }) ]; @@ -231,6 +233,7 @@ "**/cache" "**/Cache" "/var/lib/docker" + "/var/lib/private/ollama" "/home/**/Downloads" "**/.steam" "**/.rustup" @@ -275,7 +278,6 @@ services.logind = { lidSwitch = "hibernate"; - suspendKey = "ignore"; powerKey = "hibernate"; }; @@ -368,4 +370,6 @@ intel-media-sdk ]; }; + + services.ollama.enable = true; } diff --git a/nix/flake.lock b/nix/flake.lock index 68637b2..504bf67 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { @@ -20,13 +20,29 @@ "type": "github" } }, - "nixpkgs": { + "master": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733663081, + "narHash": "sha256-QuLqwYUULkwINu9XAynv3Df/wsVZ0OOxJLQtQRfEA0k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "2ab79c44f98391b6ee2edfb11f4c7a57ce1404b5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2ab79c44f98391b6ee2edfb11f4c7a57ce1404b5", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -38,6 +54,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "master": "master", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix" } @@ -49,11 +66,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index be0ed91..70aa29d 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -11,6 +11,7 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + master.url = "github:NixOS/nixpkgs/2ab79c44f98391b6ee2edfb11f4c7a57ce1404b5"; }; outputs = { self, nixpkgs, sops-nix, home-manager, ... }@inputs: