From 238024c25a250f6c9af5ea9e1bfcd8f71f73af10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Apr 2024 16:20:04 +0100 Subject: [PATCH] update --- flake.lock | 66 ++++++++++---------- nixos/gui/default.nix | 135 +++++++++++++++++++++------------------- nixos/helix/default.nix | 2 +- 3 files changed, 106 insertions(+), 97 deletions(-) diff --git a/flake.lock b/flake.lock index 17a35c73..be09fdad 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713543876, + "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", "type": "github" }, "original": { @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1712947906, - "narHash": "sha256-T0eT2lMbcK7RLelkx0qx4SiFpOS/0dt0aSfLB+WsGV8=", + "lastModified": 1713406758, + "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", "owner": "nix-community", "repo": "disko", - "rev": "8d4ae698eaac8bd717e23507da2ca8b345bec4b5", + "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713054897, - "narHash": "sha256-1RpjL4Erczw5Q1szSd543w+F1jsj5bXp2a74cpiyqIg=", + "lastModified": 1713668430, + "narHash": "sha256-HnM70sE7OryisMQ8GYOovO/zRXTcFGIDg4BKrGiFtWk=", "owner": "helix-editor", "repo": "helix", - "rev": "9df1266376323b3dae07e48bd1e64463d3aec1dd", + "rev": "26d9610e78b287c2316577af91adfd920baa7fa6", "type": "github" }, "original": { @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1713077896, - "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", + "lastModified": 1713707619, + "narHash": "sha256-g73hSx1osp8G7pbFQbiz7OCosAogf0WrLSOWyEF+F9M=", "owner": "nix-community", "repo": "home-manager", - "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", + "rev": "ad83c154bdfedad9807e86dd0633729ea3b116c5", "type": "github" }, "original": { @@ -308,11 +308,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1713521961, + "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", "type": "github" }, "original": { @@ -324,11 +324,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1713084354, - "narHash": "sha256-QKtRsAcq/7CplQGXwTgJUgaI6E+E7fmZ7+r+n+E9p4E=", + "lastModified": 1713709641, + "narHash": "sha256-Q4bPpC8UNjiR7Gg4GEeIi5XrG8yQai9cxOjkXlRQmVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32d9e07959a285ff73ffcd55a7be694649d585c0", + "rev": "6e8bfab8324ef1aab71d47339ea5662e0249c4c0", "type": "github" }, "original": { @@ -340,11 +340,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -356,11 +356,11 @@ }, "nixpkgs-rust-analyzer": { "locked": { - "lastModified": 1713084354, - "narHash": "sha256-QKtRsAcq/7CplQGXwTgJUgaI6E+E7fmZ7+r+n+E9p4E=", + "lastModified": 1713709641, + "narHash": "sha256-Q4bPpC8UNjiR7Gg4GEeIi5XrG8yQai9cxOjkXlRQmVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32d9e07959a285ff73ffcd55a7be694649d585c0", + "rev": "6e8bfab8324ef1aab71d47339ea5662e0249c4c0", "type": "github" }, "original": { @@ -372,11 +372,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1712867921, - "narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=", + "lastModified": 1713564160, + "narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51651a540816273b67bc4dedea2d37d116c5f7fe", + "rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nur": { "locked": { - "lastModified": 1713081784, - "narHash": "sha256-t0RoW0DTQQ8MaQ6DXbkOZtPapv9rNZa5UYwOan5Th/k=", + "lastModified": 1713707886, + "narHash": "sha256-eixmKYCzDqq0II8yOiuoQNmTE/lNCiIt71lh7V4PSvk=", "owner": "nix-community", "repo": "NUR", - "rev": "34dd0b90d8075657d7816e31f3955fcc958e22f7", + "rev": "e558232e47b407866c8e2974739fac7ccc17e452", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1713066950, - "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=", + "lastModified": 1713668495, + "narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87", + "rev": "09f1bc8ba3277c0f052f7887ec92721501541938", "type": "github" }, "original": { diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 3781da08..165b3f49 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -1,8 +1,16 @@ -{ config, pkgs, discord, inputs, nixpkgs-nixos-unstable -, nixpkgs-nixos-stable-and-unfree, nixpkgs-nixos-unstable-and-unfree, ... }: { +{ + config, + pkgs, + discord, + inputs, + nixpkgs-nixos-unstable, + nixpkgs-nixos-stable-and-unfree, + nixpkgs-nixos-unstable-and-unfree, + ... +}: { security.chromiumSuidSandbox.enable = true; - home-manager.users.cyryl = { ... }: { + home-manager.users.cyryl = {...}: { gtk = { enable = true; iconTheme = { @@ -10,71 +18,72 @@ package = pkgs.gnome3.adwaita-icon-theme; }; }; - qt = { enable = true; }; + qt = {enable = true;}; - imports = [ ]; + imports = []; programs.chromium.enable = true; programs.firefox.enable = true; programs.sioyek.enable = true; - home.packages = (with pkgs; - with pkgs.gnome3; - with pkgs.python39Packages; [ - anarchism - calibre - cheese - digikam - electrum - element-desktop - eog - evince - fontconfig - ghidra-bin - gimp - glxinfo - gnome-screenshot - gparted - inkscape - kdenlive - koreader - krusader - libreoffice - logseq - mediainfo - mindforger - modem-manager-gui - nautilus - nyxt - obs-studio - openscad - organicmaps - passff-host - pdfarranger - pkgs.gsettings-desktop-schemas - pkgs.shotwell - qcad - qemu - remmina - signal-desktop - simple-scan - spotify - ssb-patchwork - tigervnc - tlaplusToolbox - tlaps - uefitool - vlc - winePackages.full - wireshark - wsjtx - xclip - xidlehook - yubico-piv-tool - yubikey-manager-qt - yubikey-personalization - yubikey-personalization-gui - ]) ++ (with nixpkgs-nixos-unstable; [ thunderbird ]) - ++ [ nixpkgs-nixos-stable-and-unfree.discord ] + home.packages = + (with pkgs; + with pkgs.gnome3; + with pkgs.python39Packages; [ + anarchism + cheese + digikam + electrum + element-desktop + eog + evince + fontconfig + ghidra-bin + gimp + glxinfo + gnome-screenshot + gparted + inkscape + kdenlive + koreader + krusader + libreoffice + logseq + mediainfo + mindforger + modem-manager-gui + nautilus + nyxt + obs-studio + openscad + organicmaps + passff-host + pdfarranger + pkgs.gsettings-desktop-schemas + pkgs.shotwell + qcad + qemu + remmina + signal-desktop + simple-scan + spotify + ssb-patchwork + tigervnc + tlaplusToolbox + tlaps + uefitool + vlc + winePackages.full + wireshark + wsjtx + xclip + xidlehook + yubico-piv-tool + yubikey-manager-qt + yubikey-personalization + yubikey-personalization-gui + ]) + ++ (with nixpkgs-nixos-unstable; [thunderbird]) + ++ [nixpkgs-nixos-stable-and-unfree.discord] ++ (with nixpkgs-nixos-unstable-and-unfree; [ hopper jetbrains.rust-rover diff --git a/nixos/helix/default.nix b/nixos/helix/default.nix index 63fbac2c..72ef39e1 100644 --- a/nixos/helix/default.nix +++ b/nixos/helix/default.nix @@ -8,7 +8,7 @@ trusted-substituters = [ "https://helix.cachix.org" ]; - extra-trusted-public-keys = [ + trusted-public-keys = [ "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" ]; };