From e242ce9057a1dc458686a67da1f68127b34a5cae Mon Sep 17 00:00:00 2001 From: dixxe Date: Sun, 8 Dec 2024 20:41:35 +0300 Subject: [PATCH] winter update --- flake.lock | 98 ++++++++++++++-------------- home-manager/modules/stylix.nix | 2 +- home-manager/your-packages.nix | 6 -- nixos/modules/gaming-tweaks.nix | 1 - nixos/modules/minimal/bootloader.nix | 1 + nixos/modules/minimal/bundle.nix | 1 + nixos/modules/minimal/fonts.nix | 2 +- nixos/modules/minimal/kernel.nix | 5 ++ 8 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 nixos/modules/minimal/kernel.nix diff --git a/flake.lock b/flake.lock index 1e77580..1073c29 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -266,16 +266,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1733389730, + "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -329,11 +329,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1732016537, - "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", + "lastModified": 1733105089, + "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", + "rev": "c6b65d946097baf3915dd51373251de98199280d", "type": "github" }, "original": { @@ -393,11 +393,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731531548, - "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24f0d4acd634792badd6470134c387a3b039dace", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -454,11 +454,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732143099, - "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=", + "lastModified": 1733369744, + "narHash": "sha256-b2atMLs0myUiD5qnIxEko/gO/+ViNOGLNZnUFnYQ3bM=", "owner": "nix-community", "repo": "nixvim", - "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c", + "rev": "38885227461de58a712362c1c484803d6c90a8b2", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1733006402, + "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", "type": "github" }, "original": { @@ -516,11 +516,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1732261424, - "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", + "lastModified": 1733262405, + "narHash": "sha256-/AT315It87ll6mlZLYcmfoe6Uogx9MjPBCCZZZTq8xY=", "owner": "danth", "repo": "stylix", - "rev": "b667a340730dd3d0596083aa7c949eef01367c62", + "rev": "ffba1f1bab63ea49541f812c72a4fcf305461d67", "type": "github" }, "original": { @@ -596,11 +596,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1732111664, - "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=", + "lastModified": 1732894027, + "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0", + "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "type": "github" }, "original": { diff --git a/home-manager/modules/stylix.nix b/home-manager/modules/stylix.nix index 488bbcc..f17e61d 100644 --- a/home-manager/modules/stylix.nix +++ b/home-manager/modules/stylix.nix @@ -7,7 +7,7 @@ enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml"; - image = ../../wallpaper3.png; + image = ../../wallhaven-winter.png; cursor = { package = pkgs.oreo-cursors-plus; diff --git a/home-manager/your-packages.nix b/home-manager/your-packages.nix index 7d04900..77fb4b8 100644 --- a/home-manager/your-packages.nix +++ b/home-manager/your-packages.nix @@ -2,7 +2,6 @@ { home.packages = with pkgs; [ - obsidian logseq alacritty vlc @@ -19,13 +18,8 @@ #Development stuff krita - godot_4-mono ]; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "obsidian" - ]; - nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" ]; diff --git a/nixos/modules/gaming-tweaks.nix b/nixos/modules/gaming-tweaks.nix index 598f6c6..0fe0bc5 100644 --- a/nixos/modules/gaming-tweaks.nix +++ b/nixos/modules/gaming-tweaks.nix @@ -3,7 +3,6 @@ { programs.steam = { enable = true; - #extest.enable = true; remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; localNetworkGameTransfers.openFirewall = true; diff --git a/nixos/modules/minimal/bootloader.nix b/nixos/modules/minimal/bootloader.nix index fbbcafd..48f14ae 100644 --- a/nixos/modules/minimal/bootloader.nix +++ b/nixos/modules/minimal/bootloader.nix @@ -1,3 +1,4 @@ +{ pkgs, ...}: { # Bootloader. boot.loader.systemd-boot.enable = true; diff --git a/nixos/modules/minimal/bundle.nix b/nixos/modules/minimal/bundle.nix index 20e7b09..1e6bb06 100644 --- a/nixos/modules/minimal/bundle.nix +++ b/nixos/modules/minimal/bundle.nix @@ -7,5 +7,6 @@ ./xkb-settings.nix ./users.nix ./garbage-collector.nix + ./kernel.nix ]; } diff --git a/nixos/modules/minimal/fonts.nix b/nixos/modules/minimal/fonts.nix index b7b8bcd..d6870a0 100644 --- a/nixos/modules/minimal/fonts.nix +++ b/nixos/modules/minimal/fonts.nix @@ -2,7 +2,7 @@ { fonts.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "Ubuntu" ]; }) + nerd-fonts.ubuntu noto-fonts hack-font ]; diff --git a/nixos/modules/minimal/kernel.nix b/nixos/modules/minimal/kernel.nix new file mode 100644 index 0000000..e9915bd --- /dev/null +++ b/nixos/modules/minimal/kernel.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: +{ + #linux kernel + boot.kernelPackages = pkgs.linuxPackages_zen; +} \ No newline at end of file