From 88113157dc2d21590621629df1c20d8037948de2 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 2 Dec 2023 16:05:29 +0100 Subject: [PATCH] some changes --- flake.lock | 105 ++++++++++++++++-- flake.nix | 3 + nixos/components/gui/browser.nix | 12 +- nixos/machines/cream/configuration.nix | 2 +- nixos/machines/cream/packages-development.nix | 4 + 5 files changed, 110 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 3e93c9d..8ea6b21 100644 --- a/flake.lock +++ b/flake.lock @@ -420,6 +420,24 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { "locked": { "lastModified": 1631561581, "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", @@ -434,9 +452,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_8": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -808,6 +826,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1701263465, + "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1632855891, "narHash": "sha256-crW76mt9/kbUBiKy/KiSnsQ9JEYgD3StDuYAMVkTbM0=", @@ -821,7 +855,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1700108881, "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", @@ -837,7 +871,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1679793451, "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", @@ -933,6 +967,43 @@ "type": "github" } }, + "overviewer": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_5", + "pandoc_template": "pandoc_template" + }, + "locked": { + "lastModified": 1701464175, + "narHash": "sha256-TPITLC3vKtR2vX++k+QD5D7cRMHQneTYSmOvxBkiZNc=", + "ref": "main", + "rev": "f41b79dec8ee7c8fb22bdd971bc187ce2d768206", + "revCount": 23, + "type": "git", + "url": "ssh://gitea@git.ingolf-wagner.de/palo/overviewer.git" + }, + "original": { + "ref": "main", + "type": "git", + "url": "ssh://gitea@git.ingolf-wagner.de/palo/overviewer.git" + } + }, + "pandoc_template": { + "flake": false, + "locked": { + "lastModified": 1597233765, + "narHash": "sha256-ixEY21akLEjvSmOaH3z+K73jHqOMtijaOxesw1DKseA=", + "owner": "tajmone", + "repo": "pandoc-goodies", + "rev": "c7963da8590c2815d733ddf194d82d950ba94648", + "type": "github" + }, + "original": { + "owner": "tajmone", + "repo": "pandoc-goodies", + "type": "github" + } + }, "permown": { "inputs": { "nixpkgs": [ @@ -971,8 +1042,8 @@ }, "polygon-art": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1688766095, @@ -1054,6 +1125,7 @@ "nixpkgs-legacy_2205": "nixpkgs-legacy_2205", "nixpkgs-legacy_2211": "nixpkgs-legacy_2211", "nixpkgs-unstable": "nixpkgs-unstable", + "overviewer": "overviewer", "permown": "permown", "polygon-art": "polygon-art", "private_assets": "private_assets", @@ -1132,7 +1204,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1154,7 +1226,7 @@ "base16": "base16", "flake-compat": "flake-compat_2", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1688308288, @@ -1201,9 +1273,24 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "taskshell": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 5bf5d37..747d65e 100644 --- a/flake.nix +++ b/flake.nix @@ -80,6 +80,7 @@ url = "github:mrvandalo/taskshell"; inputs.nixpkgs.follows = "nixpkgs"; }; + overviewer.url = "git+ssh://gitea@git.ingolf-wagner.de/palo/overviewer.git?ref=main"; }; outputs = @@ -101,6 +102,7 @@ , nixpkgs-legacy_2205 , nixpkgs-legacy_2211 , nixpkgs-unstable + , overviewer , permown , polygon-art , private_assets @@ -147,6 +149,7 @@ trilium-server = nixpkgs-unstable.legacyPackages.${system}.trilium-server; kmonad = kmonad.packages.${system}.kmonad; tasksh = taskshell.packages.${system}.tasksh; + overviewer = overviewer.packages.${system}.overviewer; }) (import ./nixos/pkgs) ]; diff --git a/nixos/components/gui/browser.nix b/nixos/components/gui/browser.nix index 59d1b44..a9d6538 100644 --- a/nixos/components/gui/browser.nix +++ b/nixos/components/gui/browser.nix @@ -34,17 +34,17 @@ in gpu = false; }; jobrad = { - browserType = "firefox"; - home = "${homeFolder}/jobrad"; - homeBackup = "${backupFolder}/jobrad-browser"; - gpu = false; - }; - jobrad-chrome = { browserType = "chrome"; home = "${homeFolder}/jobrad-chrome"; homeBackup = "${backupFolder}/jobrad-chrome"; gpu = false; }; + #jobrad-chrome = { + # browserType = "chrome"; + # home = "${homeFolder}/jobrad-chrome"; + # homeBackup = "${backupFolder}/jobrad-chrome"; + # gpu = false; + #}; firefox-tmp = { browserType = "firefox"; home = "${homeFolder}/firefox-tmp"; diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index e154570..0623daa 100644 --- a/nixos/machines/cream/configuration.nix +++ b/nixos/machines/cream/configuration.nix @@ -30,10 +30,10 @@ ]; - components.gui.enable = true; components.mainUser.enable = true; components.media.enable = true; + components.media.tts-client.enable = false; components.network.enable = true; components.network.wifi.enable = true; components.terminal.enable = true; diff --git a/nixos/machines/cream/packages-development.nix b/nixos/machines/cream/packages-development.nix index 39915e5..395d0f5 100644 --- a/nixos/machines/cream/packages-development.nix +++ b/nixos/machines/cream/packages-development.nix @@ -39,6 +39,10 @@ awscli2 + unstable.mdbook + + overviewer + cura # record your terminal