Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update dependencies #137

Merged
merged 8 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
585 changes: 159 additions & 426 deletions flake.lock

Large diffs are not rendered by default.

17 changes: 5 additions & 12 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
# substituers will be appended to the default substituters when fetching packages
extra-substituters = [
"https://anyrun.cachix.org"
"https://hyprland.cachix.org"
"https://nix-gaming.cachix.org"
# "https://nixpkgs-wayland.cachix.org"
];
extra-trusted-public-keys = [
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
# "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
];
Expand All @@ -36,9 +34,9 @@
# which represents the GitHub repository URL + branch/commit-id/tag.

# Official NixOS package source, using nixos's unstable branch by default
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
# nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";

# for macos
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
Expand All @@ -50,8 +48,8 @@

# home-manager, used for managing user configuration
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
# url = "github:nix-community/home-manager/master";
url = "github:nix-community/home-manager/master";
# url = "github:nix-community/home-manager/release-24.05";

# The `follows` keyword in inputs is used for inheritance.
# Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake,
Expand All @@ -60,17 +58,12 @@
};

lanzaboote = {
url = "github:nix-community/lanzaboote/v0.3.0";
url = "github:nix-community/lanzaboote/v0.4.1";
inputs.nixpkgs.follows = "nixpkgs";
};

impermanence.url = "github:nix-community/impermanence";

hyprland = {
url = "github:hyprwm/Hyprland/v0.39.1";
inputs.nixpkgs.follows = "nixpkgs";
};

# community wayland nixpkgs
# nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
# anyrun - a wayland launcher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ return {
"kdl",
"csv",
"xml",
"vhdl",

---- Misc
"diff",
Expand Down
2 changes: 1 addition & 1 deletion home/base/tui/editors/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
lldb

#-- python
nodePackages.pyright # python language server
pyright # python language server
(python311.withPackages (
ps:
with ps; [
Expand Down
4 changes: 2 additions & 2 deletions home/linux/gui/base/note-taking.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{pkgs, ...}: {
home.packages = with pkgs; [
{pkgs-stable, ...}: {
home.packages = with pkgs-stable; [
# https://joplinapp.org/help/
joplin # joplin-cli
joplin-desktop
Expand Down
4 changes: 4 additions & 0 deletions home/linux/gui/hyprland/conf/scripts/startup
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

## Fix anyrun
## https://github.com/anyrun-org/anyrun/issues/153
ln -s $XDG_RUNTIME_DIR/hypr /tmp/hypr

## Autostart Programs

# Kill already running process
Expand Down
8 changes: 5 additions & 3 deletions home/linux/gui/hyprland/values/hyprland.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{
pkgs,
lib,
hyprland,
nur-ryan4yin,
...
}: let
package = hyprland.packages.${pkgs.system}.hyprland;
package = pkgs.hyprland;
in {
# NOTE:
# We have to enable hyprland/i3's systemd user service in home-manager,
Expand All @@ -30,7 +29,10 @@ in {
};
extraConfig = builtins.readFile ../conf/hyprland.conf;
# gammastep/wallpaper-switcher need this to be enabled.
systemd.enable = true;
systemd = {
enable = true;
variables = ["--all"];
};
};

# NOTE: this executable is used by greetd to start a wayland session when system boot up
Expand Down
6 changes: 2 additions & 4 deletions hosts/idols-ai/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,10 @@ in {
};
virtualisation.docker.enableNvidia = true; # for nvidia-docker

hardware.opengl = {
hardware.graphics = {
enable = true;
# if hardware.opengl.driSupport is enabled, mesa is installed and provides Vulkan for supported hardware.
driSupport = true;
# needed by nvidia-docker
driSupport32Bit = true;
enable32Bit = true;
};

# This value determines the NixOS release from which the default
Expand Down
2 changes: 0 additions & 2 deletions modules/nixos/desktop/peripherals.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
};
# rtkit is optional but recommended
security.rtkit.enable = true;
# Remove sound.enable or turn it off if you had it set previously, it seems to cause conflicts with pipewire
sound.enable = false;
# Disable pulseaudio, it conflicts with pipewire too.
hardware.pulseaudio.enable = false;

Expand Down
10 changes: 5 additions & 5 deletions outputs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
# To use chrome, we need to allow the installation of non-free software
config.allowUnfree = true;
};
# pkgs-stable = import inputs.nixpkgs-stable {
# inherit system;
# # To use chrome, we need to allow the installation of non-free software
# config.allowUnfree = true;
# };
pkgs-stable = import inputs.nixpkgs-stable {
inherit system;
# To use chrome, we need to allow the installation of non-free software
config.allowUnfree = true;
};
};

# This is the args for all the haumea modules in this folder.
Expand Down