forgor
This commit is contained in:
+119
-83
@@ -1,17 +1,22 @@
|
||||
# Edit this configuration file to define what should be installed on your system. Help is available
|
||||
# in the configuration.nix(5) man page and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{ imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
nix2511,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
inputs.home-manager.nixosModules.default
|
||||
];
|
||||
|
||||
nix.settings.trusted-users = [ "root" "nico" ];
|
||||
nix.settings.trusted-users = ["root" "nico"];
|
||||
# home manager
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
extraSpecialArgs = {inherit inputs;};
|
||||
users = {
|
||||
"nico" = import ./home-nico.nix;
|
||||
};
|
||||
@@ -26,30 +31,30 @@
|
||||
programs.niri.enable = true;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.grub.useOSProber = true;
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.grub.useOSProber = true;
|
||||
|
||||
fileSystems."mnt/win" = {
|
||||
fileSystems."mnt/win" = {
|
||||
device = "/dev/disk/by-partuuid/8d0a8dd9-7a4c-4d3e-a5eb-98c0aed35db5";
|
||||
fsType = "ntfs-3g";
|
||||
options = ["rw" "uid=1000"];
|
||||
};
|
||||
};
|
||||
|
||||
# hibernation
|
||||
swapDevices = [
|
||||
# hibernation
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/var/lib/swapfile";
|
||||
size = 32 * 1024;
|
||||
}
|
||||
];
|
||||
];
|
||||
|
||||
boot.resumeDevice = "/dev/disk/by-uuid/a4bfe07b-a6b5-47d9-80c7-f74b44f84f31";
|
||||
boot.resumeDevice = "/dev/disk/by-uuid/a4bfe07b-a6b5-47d9-80c7-f74b44f84f31";
|
||||
|
||||
powerManagement.enable = true;
|
||||
powerManagement.enable = true;
|
||||
|
||||
# Flakes
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
@@ -58,19 +63,19 @@ powerManagement.enable = true;
|
||||
# "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Enable networking
|
||||
boot.kernelParams = [ "ipv6.disable=1" "resume_offset=94015488"];
|
||||
boot.kernelParams = ["ipv6.disable=1" "resume_offset=94015488"];
|
||||
networking.networkmanager.enable = true;
|
||||
networking.hostName = "nixos"; # Define your hostname.
|
||||
networking.enableIPv6 = false;
|
||||
|
||||
# VM
|
||||
# virtualisation.virtualbox.host.enable = true;
|
||||
# virtualisation.virtualbox.host.enableExtensionPack = true;
|
||||
# virtualisation.virtualbox.host.enableKvm = true;
|
||||
# virtualisation.virtualbox.host.addNetworkInterface = false;
|
||||
# users.extraGroups.vboxusers.members = [ "nico" ];
|
||||
# # virtualisation.virtualbox.guest.enable = true;
|
||||
# # virtualisation.virtualbox.guest.dragAndDrop = true;
|
||||
# virtualisation.virtualbox.host.enable = true;
|
||||
# virtualisation.virtualbox.host.enableExtensionPack = true;
|
||||
# virtualisation.virtualbox.host.enableKvm = true;
|
||||
# virtualisation.virtualbox.host.addNetworkInterface = false;
|
||||
# users.extraGroups.vboxusers.members = [ "nico" ];
|
||||
# # virtualisation.virtualbox.guest.enable = true;
|
||||
# # virtualisation.virtualbox.guest.dragAndDrop = true;
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
# Set your time zone.
|
||||
@@ -79,11 +84,28 @@ powerManagement.enable = true;
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
i18n.extraLocaleSettings = { LC_ADDRESS = "en_US.UTF-8"; LC_IDENTIFICATION = "en_US.UTF-8";
|
||||
LC_MEASUREMENT = "en_US.UTF-8"; LC_MONETARY = "en_US.UTF-8"; LC_NAME = "en_US.UTF-8"; LC_NUMERIC =
|
||||
"en_US.UTF-8"; LC_PAPER = "en_US.UTF-8"; LC_TELEPHONE = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8";
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "en_US.UTF-8";
|
||||
LC_IDENTIFICATION = "en_US.UTF-8";
|
||||
LC_MEASUREMENT = "en_US.UTF-8";
|
||||
LC_MONETARY = "en_US.UTF-8";
|
||||
LC_NAME = "en_US.UTF-8";
|
||||
LC_NUMERIC = "en_US.UTF-8";
|
||||
LC_PAPER = "en_US.UTF-8";
|
||||
LC_TELEPHONE = "en_US.UTF-8";
|
||||
LC_TIME = "en_US.UTF-8";
|
||||
};
|
||||
|
||||
#hardware.opengl = {
|
||||
# enable = true;
|
||||
# driSupport32Bit = true;
|
||||
# extraPackages = with pkgs; [
|
||||
# vulkan-loader
|
||||
# vulkan-validation-layers
|
||||
# vulkan-extension-layer
|
||||
# ];
|
||||
#};
|
||||
|
||||
# Enable the X11 windowing system. You can disable this if you're only using the Wayland session.
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
@@ -101,28 +123,30 @@ powerManagement.enable = true;
|
||||
];
|
||||
config = {
|
||||
common = {
|
||||
default = [ "gtk" ];
|
||||
default = ["gtk"];
|
||||
};
|
||||
niri = {
|
||||
# default = [
|
||||
# "gtk"
|
||||
# "gnome"
|
||||
# ];
|
||||
"org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
|
||||
"org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
|
||||
"org.freedesktop.impl.portal.ScreenCast" = ["gnome"];
|
||||
"org.freedesktop.impl.portal.Screenshot" = ["gnome"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.ly.enable = false;
|
||||
services.displayManager.enable = true;
|
||||
services.displayManager.logToJournal = true;
|
||||
services.displayManager.sddm.enable = false;
|
||||
services.displayManager.ly.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver = { xkb.layout = "us"; xkb.variant = "";
|
||||
services.xserver = {
|
||||
xkb.layout = "us";
|
||||
xkb.variant = "";
|
||||
};
|
||||
|
||||
# Configure console keymap
|
||||
@@ -149,16 +173,26 @@ powerManagement.enable = true;
|
||||
systemd.user.services.orca.enable = false;
|
||||
# Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable
|
||||
# = true;
|
||||
services.mullvad-vpn.enable = true;
|
||||
services.mullvad-vpn.enable = true;
|
||||
services.mullvad-vpn.package = pkgs.mullvad-vpn;
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users.users.nico = { isNormalUser = true; description = "nico"; extraGroups = [ "networkmanager"
|
||||
"wheel" "adbusers" "docker" "input" "dialout"]; packages = with pkgs; [
|
||||
users.users.nico = {
|
||||
isNormalUser = true;
|
||||
description = "nico";
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
"adbusers"
|
||||
"docker"
|
||||
"input"
|
||||
"dialout"
|
||||
];
|
||||
packages = with pkgs; [
|
||||
];
|
||||
};
|
||||
|
||||
users.defaultUserShell = pkgs.zsh;
|
||||
environment.shells = with pkgs; [ zsh nushell ];
|
||||
environment.shells = with pkgs; [zsh nushell];
|
||||
programs.zsh.enable = true;
|
||||
|
||||
# Allow unfree packages
|
||||
@@ -169,49 +203,49 @@ services.mullvad-vpn.enable = true;
|
||||
pkgs.openocd
|
||||
];
|
||||
|
||||
# services.flatpak.enable = true;
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
# services.flatpak.enable = true;
|
||||
programs.nix-ld.enable = true;
|
||||
# List packages installed in system profile. To search, run: $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
environment.systemPackages = [
|
||||
nix2511.lutris
|
||||
# grayjay
|
||||
signal-desktop
|
||||
obsidian
|
||||
# anki
|
||||
grayjay
|
||||
lutris
|
||||
vim
|
||||
wget
|
||||
git
|
||||
tree
|
||||
ntfs3g
|
||||
heroic
|
||||
wineWow64Packages.stable
|
||||
sshfs
|
||||
devenv
|
||||
logiops
|
||||
pkgs.signal-desktop
|
||||
pkgs.obsidian
|
||||
pkgs.anki
|
||||
pkgs.grayjay
|
||||
# pkgs.vim
|
||||
pkgs.wget
|
||||
pkgs.git
|
||||
pkgs.tree
|
||||
pkgs.ntfs3g
|
||||
pkgs.heroic
|
||||
pkgs.wineWow64Packages.stable
|
||||
pkgs.sshfs
|
||||
pkgs.devenv
|
||||
pkgs.logiops
|
||||
pkgs.btop
|
||||
|
||||
# sway
|
||||
networkmanager
|
||||
networkmanagerapplet
|
||||
# wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
|
||||
cliphist
|
||||
# mako # notification system developed by swaywm maintainer
|
||||
waybar # bar
|
||||
pulseaudio
|
||||
pavucontrol
|
||||
brightnessctl # brightness controls
|
||||
# pkgs.sway
|
||||
pkgs.networkmanager
|
||||
pkgs.networkmanagerapplet
|
||||
# pkgs.wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
|
||||
pkgs.cliphist
|
||||
# pkgs. mako # notification system developed by swaywm maintainer
|
||||
pkgs.waybar # bar
|
||||
pkgs.pulseaudio
|
||||
pkgs.pavucontrol
|
||||
pkgs.brightnessctl # brightness controls
|
||||
# wpaperd # wallpaper manager
|
||||
];
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
# iosevka
|
||||
fonts.packages = with pkgs; [
|
||||
# iosevka
|
||||
# (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; })
|
||||
nerd-fonts.jetbrains-mono
|
||||
nerd-fonts.ubuntu-mono
|
||||
];
|
||||
];
|
||||
|
||||
hardware.amdgpu.opencl.enable = true;
|
||||
hardware.amdgpu.opencl.enable = true;
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
@@ -223,12 +257,10 @@ hardware.amdgpu.opencl.enable = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
};
|
||||
|
||||
|
||||
# programs.hyprland = {
|
||||
# enable = true;
|
||||
# package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
# };
|
||||
|
||||
# programs.hyprland = {
|
||||
# enable = true;
|
||||
# package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
# };
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are started in user sessions.
|
||||
# programs.mtr.enable = true; programs.gnupg.agent = {
|
||||
@@ -251,19 +283,23 @@ hardware.amdgpu.opencl.enable = true;
|
||||
networking.firewall = {
|
||||
enable = false;
|
||||
allowedTCPPortRanges = [
|
||||
{ from = 1714; to = 1764; } # KDE Connect
|
||||
{
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
} # KDE Connect
|
||||
];
|
||||
allowedUDPPortRanges = [
|
||||
{ from = 1714; to = 1764; } # KDE Connect
|
||||
{
|
||||
from = 1714;
|
||||
to = 1764;
|
||||
} # KDE Connect
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
# This value determines the NixOS release from which the default settings for stateful data, like
|
||||
# file locations and database versions on your system were taken. It‘s perfectly fine and
|
||||
# recommended to leave this value at the release version of the first install of this system. Before
|
||||
# changing this value read the documentation for this option (e.g. man configuration.nix or on
|
||||
# https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "24.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
Generated
+41
-201
@@ -45,11 +45,11 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775938181,
|
||||
"narHash": "sha256-3VRl7wTV2guWBI1kYT2OZEAMYU5nUZMo6um9UH+HYHE=",
|
||||
"lastModified": 1778836894,
|
||||
"narHash": "sha256-vZSADE7rkRw5D5BpyXf5W4/zNJ8GvqiSeFibetYNEto=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "8d8b4fd30aecbf30eef6b1d1977670a597d29494",
|
||||
"rev": "ec7044e195df9e00236190f13f573017d2771a26",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -73,44 +73,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751685974,
|
||||
"narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
|
||||
"revCount": 92,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nvf",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
@@ -135,11 +98,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775900011,
|
||||
"narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=",
|
||||
"lastModified": 1778954430,
|
||||
"narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e",
|
||||
"rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -156,11 +119,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774991950,
|
||||
"narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=",
|
||||
"lastModified": 1778805320,
|
||||
"narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f2d3e04e278422c7379e067e323734f3e8c585a7",
|
||||
"rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -169,43 +132,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mnw": {
|
||||
"locked": {
|
||||
"lastModified": 1770419553,
|
||||
"narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "mnw",
|
||||
"rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Gerg-L",
|
||||
"repo": "mnw",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ndg": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nvf",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768214250,
|
||||
"narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
|
||||
"owner": "feel-co",
|
||||
"repo": "ndg",
|
||||
"rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "feel-co",
|
||||
"ref": "refs/tags/v2.6.0",
|
||||
"repo": "ndg",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1775423009,
|
||||
@@ -239,11 +165,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1775423009,
|
||||
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
||||
"lastModified": 1778443072,
|
||||
"narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
||||
"rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -255,11 +181,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1775710090,
|
||||
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
|
||||
"lastModified": 1778869304,
|
||||
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
|
||||
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -270,35 +196,6 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1774386573,
|
||||
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1775036866,
|
||||
"narHash": "sha256-ByAX1LkhCwZ94+KnFAmnJSMAvui7kgCxjHgUHsWAbfI=",
|
||||
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
||||
"type": "tarball",
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre972949.6201e203d095/nixexprs.tar.xz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1769789167,
|
||||
"narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
|
||||
@@ -314,13 +211,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1774709303,
|
||||
"narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
|
||||
"lastModified": 1778443072,
|
||||
"narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
|
||||
"rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -330,26 +227,19 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvf": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"mnw": "mnw",
|
||||
"ndg": "ndg",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"systems": "systems"
|
||||
},
|
||||
"pkgs-nix2511": {
|
||||
"locked": {
|
||||
"lastModified": 1775892726,
|
||||
"narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=",
|
||||
"owner": "notashelf",
|
||||
"repo": "nvf",
|
||||
"rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436",
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "notashelf",
|
||||
"repo": "nvf",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@@ -359,8 +249,7 @@
|
||||
"catppuccin": "catppuccin",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nvf": "nvf",
|
||||
"spicetify-nix": "spicetify-nix",
|
||||
"pkgs-nix2511": "pkgs-nix2511",
|
||||
"zed": "zed",
|
||||
"zen-browser": "zen-browser"
|
||||
}
|
||||
@@ -373,11 +262,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775013181,
|
||||
"narHash": "sha256-zPrt6oNM1r/RO5bWYaZ3hthfG9vzkr6kQdoqDd5x4Qw=",
|
||||
"lastModified": 1777346187,
|
||||
"narHash": "sha256-oVxyGjpiIsrXhWTJVUOs38fZQkLjd0nZGOY9K7Kfot8=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "e8046c1d9ccadd497c2344d8fa49dab62f22f7be",
|
||||
"rev": "146e7bf7569b8288f24d41d806b9f584f7cfd5b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -386,68 +275,19 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"spicetify-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775421933,
|
||||
"narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "ec8d73085fdf807d55765335dc8126e14e7b2096",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"zed": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775935959,
|
||||
"narHash": "sha256-0dfWUEdfn/QEi3Myl0T75qkGfN92d9Bv0waHaWGH0Xc=",
|
||||
"lastModified": 1778959176,
|
||||
"narHash": "sha256-Xev9VeXyQ27gEcJvj4fr4xXNsUu6exCTEU7tLzhocuY=",
|
||||
"owner": "zed-industries",
|
||||
"repo": "zed",
|
||||
"rev": "5a47e9825babb293a4e4aea3359fb860085ab63f",
|
||||
"rev": "f7ca86e6eeabd135645c4f25aa1ae83f5cf0231b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -459,14 +299,14 @@
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775933978,
|
||||
"narHash": "sha256-I1ju8FT1J9nNUSw8DDMGCLLUweDAkr45D2HQn3bW43o=",
|
||||
"lastModified": 1778919017,
|
||||
"narHash": "sha256-P2+aRay2sPQGVXzNmiD4yYlhy4ytxqBvT4A2OLOvkoU=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "d1c71822cb8e861345c7ab6a9f841ac99d59d74a",
|
||||
"rev": "7c41a80acc12ab012448b84aec90ca9b4bf8b9ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
pkgs-nix2511.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@@ -11,29 +13,31 @@
|
||||
|
||||
ags.url = "github:Aylur/ags";
|
||||
|
||||
nvf.url = "github:notashelf/nvf";
|
||||
#nvf.url = "github:notashelf/nvf";
|
||||
|
||||
zen-browser.url = "github:0xc000022070/zen-browser-flake";
|
||||
|
||||
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
|
||||
|
||||
zed.url = "github:zed-industries/zed";
|
||||
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, zed, catppuccin, ... }@inputs:
|
||||
let system = "x86_64-linux"; in
|
||||
outputs = { self, nixpkgs, pkgs-nix2511, zen-browser, zed, catppuccin, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
nix2511 = import pkgs-nix2511 { system = system; config.allowUnfree = true; };
|
||||
in
|
||||
{
|
||||
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit nix2511;
|
||||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
./configuration.nix
|
||||
# inputs.zen-browser.packages."${system}".default
|
||||
# nvf.homeManagerModules.default
|
||||
# nvf.homeManagerModules.default
|
||||
# inputs.zed.packages."${system}".default
|
||||
catppuccin.nixosModules.catppuccin
|
||||
inputs.home-manager.nixosModules.default
|
||||
|
||||
+21
-22
@@ -6,7 +6,6 @@
|
||||
|
||||
imports = [
|
||||
./packages
|
||||
inputs.spicetify-nix.homeManagerModules.default
|
||||
inputs.zen-browser.homeModules.default
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
];
|
||||
@@ -57,27 +56,27 @@
|
||||
|
||||
|
||||
|
||||
programs.spicetify =
|
||||
let
|
||||
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
|
||||
in
|
||||
{
|
||||
enable = false;
|
||||
theme = spicePkgs.themes.catppuccin;
|
||||
colorScheme = "mocha";
|
||||
|
||||
enabledExtensions = with spicePkgs.extensions; [
|
||||
keyboardShortcut
|
||||
wikify
|
||||
songStats
|
||||
betterGenres
|
||||
hidePodcasts
|
||||
fullScreen
|
||||
];
|
||||
enabledCustomApps = with spicePkgs.apps; [
|
||||
lyricsPlus
|
||||
];
|
||||
};
|
||||
# programs.spicetify =
|
||||
# let
|
||||
# spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
|
||||
# in
|
||||
# {
|
||||
# enable = false;
|
||||
# theme = spicePkgs.themes.catppuccin;
|
||||
# colorScheme = "mocha";
|
||||
#
|
||||
# enabledExtensions = with spicePkgs.extensions; [
|
||||
# keyboardShortcut
|
||||
# wikify
|
||||
# songStats
|
||||
# betterGenres
|
||||
# hidePodcasts
|
||||
# fullScreen
|
||||
# ];
|
||||
# enabledCustomApps = with spicePkgs.apps; [
|
||||
# lyricsPlus
|
||||
# ];
|
||||
# };
|
||||
|
||||
home.stateVersion = "24.05";
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
home.packages = with pkgs; [
|
||||
lua-language-server
|
||||
alejandra
|
||||
nil
|
||||
ripgrep
|
||||
lldb
|
||||
@@ -18,8 +19,11 @@ programs.neovim = {
|
||||
vimAlias = true;
|
||||
withRuby = false;
|
||||
withPython3 = false;
|
||||
|
||||
initLua = builtins.readFile ./init.lua;
|
||||
};
|
||||
catppuccin.nvim.enable = false;
|
||||
|
||||
# catppuccin.nvim.enable = true;
|
||||
|
||||
programs.neovim.plugins = [
|
||||
pkgs.vimPlugins.lazy-nvim
|
||||
@@ -28,7 +32,7 @@ programs.neovim.plugins = [
|
||||
home.file =
|
||||
lib.mkMerge [
|
||||
{
|
||||
".config/nvim/init.lua".source = ./init.lua;
|
||||
# ".config/nvim/init.lua".source = ./init.lua;
|
||||
".config/nvim/lua/config/lazy.lua".source = ./lua/config/lazy.lua;
|
||||
".config/nvim/lua/plugins/flutter.lua".source = ./lua/plugins/flutter.lua;
|
||||
# ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua;
|
||||
@@ -50,7 +54,7 @@ programs.neovim.plugins = [
|
||||
# ".config/nvim/lua/plugins/rustaceanvim.lua".source = ./lua/plugins/rustaceanvim.lua;
|
||||
".config/nvim/lua/plugins/lazygit.lua".source = ./lua/plugins/lazygit.lua;
|
||||
".config/nvim/lua/plugins/toggleterm.lua".source = ./lua/plugins/toggleterm.lua;
|
||||
".config/nvim/lua/plugins/love.lua".source = ./lua/plugins/love.lua;
|
||||
# ".config/nvim/lua/plugins/love.lua".source = ./lua/plugins/love.lua;
|
||||
".config/nvim/lua/plugins/code-action.lua".source = ./lua/plugins/code-action.lua;
|
||||
".config/nvim/lua/plugins/tabby.lua".source = ./lua/plugins/tabby.lua;
|
||||
".config/nvim/lua/plugins/tabout.lua".source = ./lua/plugins/tabout.lua;
|
||||
|
||||
@@ -5,6 +5,7 @@ vim.opt.shiftwidth = 2 -- insert 4 spaces on a tab
|
||||
vim.opt.expandtab = true -- tabs are spaces, mainly because of python
|
||||
|
||||
-- UI config
|
||||
-- vim.lsp.document_color.enable = true
|
||||
vim.opt.number = true -- show absolute number
|
||||
vim.opt.relativenumber = true -- add numbers to each line on the left side
|
||||
vim.opt.splitbelow = true -- open new vertical split bottom
|
||||
|
||||
@@ -65,7 +65,7 @@ return {
|
||||
focus_on_open = true, -- focus on the newly opened log window
|
||||
},
|
||||
dev_tools = {
|
||||
autostart = true, -- autostart devtools server if not detected
|
||||
autostart = false, -- autostart devtools server if not detected
|
||||
auto_open_browser = false, -- Automatically opens devtools in the browser
|
||||
},
|
||||
outline = {
|
||||
@@ -73,14 +73,6 @@ return {
|
||||
auto_open = false -- if true this will open the outline automatically when it is first populated
|
||||
},
|
||||
lsp = {
|
||||
color = { -- show the derived colours for dart variables
|
||||
enabled = true, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10
|
||||
background = true, -- highlight the background
|
||||
background_color = nil, -- required, when background is transparent (i.e. background_color = { r = 19, g = 17, b = 24},)
|
||||
foreground = false, -- highlight the foreground
|
||||
virtual_text = true, -- show the highlight using virtual text
|
||||
virtual_text_str = "■", -- the virtual text character to highlight
|
||||
},
|
||||
-- see the link below for details on each option:
|
||||
-- https://github.com/dart-lang/sdk/blob/master/pkg/analysis_server/tool/lsp_spec/README.md#client-workspace-configuration
|
||||
settings = {
|
||||
|
||||
@@ -26,6 +26,6 @@ programs.git = {
|
||||
|
||||
services.kdeconnect = {
|
||||
enable = false;
|
||||
indicator = true;
|
||||
indicator = false;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user