From 5da0cbe27c2595a20bd4514a2f7f2a240abb525f Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Sun, 3 Sep 2023 18:40:13 +0200 Subject: [PATCH] Update flake inputs; dustbowl: go back to 5.15 kernel --- flake.lock | 102 ++++----------------------------------------- flake.nix | 4 +- nixos/dustbowl.nix | 20 ++++----- 3 files changed, 19 insertions(+), 107 deletions(-) diff --git a/flake.lock b/flake.lock index b0150ae..c5ab91b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,53 +1,15 @@ { "nodes": { - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1688922352, - "narHash": "sha256-aNapXmAnFz2elWWSa80XQlYgroHSKrdvV+Vzv7NUKEM=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "491cafb35537047a53b63190345a7a22356af841", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -58,43 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688679045, - "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=", + "lastModified": 1693663421, + "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c7487575d9445185249a159046cc02ff364bff8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1688868408, - "narHash": "sha256-RR9N5XTAxSBhK8MCvLq9uxfdkd7etC//seVXldy0k48=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "510d721ce097150ae3b80f84b04b13b039186571", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1688679045, - "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c7487575d9445185249a159046cc02ff364bff8", + "rev": "e56990880811a451abd32515698c712788be5720", "type": "github" }, "original": { @@ -106,9 +36,8 @@ }, "root": { "inputs": { - "emacs-overlay": "emacs-overlay", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" } }, "systems": { @@ -125,21 +54,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 147c159..e7e0bcf 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,8 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.emacs-overlay.url = "github:nix-community/emacs-overlay"; - outputs = { self, nixpkgs, flake-utils, emacs-overlay }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let @@ -84,7 +83,6 @@ system = "x86_64-linux"; modules = [ (import ./nixos/dustbowl.nix { - emacs-overlay = emacs-overlay; nixpkgs = nixpkgs; }) ]; diff --git a/nixos/dustbowl.nix b/nixos/dustbowl.nix index 287a3e7..d009656 100644 --- a/nixos/dustbowl.nix +++ b/nixos/dustbowl.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ emacs-overlay, nixpkgs }: +{ nixpkgs }: { config, lib, pkgs, ... }: { @@ -26,7 +26,7 @@ }; # Kernel version - boot.kernelPackages = pkgs.linuxPackages_6_1; + boot.kernelPackages = pkgs.linuxPackages_5_15; # Use the systemd-boot EFI boot loader. # boot.loader.systemd-boot.enable = true; @@ -52,10 +52,10 @@ ]; # Enable systemd watchdog - systemd.watchdog = { - runtimeTime = "30s"; - rebootTime = "10m"; - }; + # systemd.watchdog = { + # runtimeTime = "30s"; + # rebootTime = "10m"; + # }; boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback.out @@ -199,7 +199,7 @@ wl-mirror # GUI software - emacs-pgtk + emacs29-pgtk firefox thunderbird mpv @@ -224,6 +224,8 @@ (callPackage ./posy-cursor-black.nix { }) ]; + services.gnome.gnome-keyring.enable = true; + # Use doas instead of sudo security.sudo.enable = false; security.doas = { @@ -270,8 +272,6 @@ # Steam programs.steam.enable = true; - nixpkgs.overlays = [ emacs-overlay.overlay ]; - # Open ports in the firewall. networking.firewall.enable = false; # networking.firewall.allowedTCPPorts = [ 8080 6600 ]; @@ -396,7 +396,7 @@ xdg.portal.enable = true; # Fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ fira-code noto-fonts noto-fonts-emoji