updat
This commit is contained in:
parent
53459c1fa5
commit
23df038895
GPG key ID:
0FF5B8826803F895
7 changed files with 589 additions and 300 deletions
12
flake.in.nix
12
flake.in.nix
|
|
@ -25,28 +25,30 @@
|
|||
chaotic = mkInput "chaotic-cx/nyx/nyxpkgs-unstable";
|
||||
emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git";
|
||||
ghostty = mkInput "ghostty-org/ghostty";
|
||||
hypr-dynamic-cursors = mkFollowing "VirtCode/hypr-dynamic-cursors" "hyprland";
|
||||
hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland";
|
||||
hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland";
|
||||
hyprpanel = mkInput "ThomasCarey4/HyprPanel-NixFix";
|
||||
hyprswitch = mkInput "h3rmt/hyprswitch/release";
|
||||
hyprspace = mkFollowing "KZDKM/Hyprspace" "hyprland";
|
||||
hypr-dynamic-cursors = mkFollowing "VirtCode/hypr-dynamic-cursors" "hyprland";
|
||||
jovian = mkInput "Jovian-Experiments/Jovian-NixOS";
|
||||
hyprswitch = mkInput "h3rmt/hyprswitch/release";
|
||||
impermanence = mkInput "nix-community/impermanence";
|
||||
jovian = mkInput "Jovian-Experiments/Jovian-NixOS";
|
||||
kirsch = mkCustomUrl "https://flakehub.com/f/molarmanful/kirsch/0.3.0";
|
||||
nix-colors = mkInput "Misterio77/nix-colors";
|
||||
nixos-apple-silicon = mkInput "tpwrules/nixos-apple-silicon";
|
||||
nixos-facter-modules = mkInput "numtide/nixos-facter-modules";
|
||||
nixpkgs = mkInput "NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-jdk16 = mkInput "NixOS/nixpkgs/0e713aed46a8a43f6b6cc31c98c017a10dcf8810"; # last version to have temurin 16
|
||||
nixvim = mkInput "pupbrained/nvim-config";
|
||||
treefmt-nix = mkInput "numtide/treefmt-nix";
|
||||
xmonad-contrib = mkInput "xmonad/xmonad-contrib";
|
||||
wezterm = mkInput "wez/wezterm?dir=nix";
|
||||
xmonad-contrib = mkInput "xmonad/xmonad-contrib";
|
||||
zen-browser = mkInput "youwen5/zen-browser-flake";
|
||||
|
||||
niri = mkFollowingNixpkgs "sodiboo/niri-flake";
|
||||
cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic";
|
||||
darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master";
|
||||
home-manager = mkFollowingNixpkgs "nix-community/home-manager";
|
||||
niri = mkFollowingNixpkgs "sodiboo/niri-flake";
|
||||
nix-index-database = mkFollowingNixpkgs "nix-community/nix-index-database";
|
||||
snowfall-flake = mkFollowingNixpkgs "snowfallorg/flake";
|
||||
snowfall-lib = mkFollowingNixpkgs "snowfallorg/lib/dev";
|
||||
|
|
|
|||
691
flake.lock
generated
691
flake.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -40,6 +40,7 @@
|
|||
hyprswitch.url = "github:h3rmt/hyprswitch/release";
|
||||
impermanence.url = "github:nix-community/impermanence";
|
||||
jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
|
||||
kirsch.url = "https://flakehub.com/f/molarmanful/kirsch/0.3.0";
|
||||
niri = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
url = "github:sodiboo/niri-flake";
|
||||
|
|
@ -52,6 +53,7 @@
|
|||
nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon";
|
||||
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-jdk16.url = "github:NixOS/nixpkgs/0e713aed46a8a43f6b6cc31c98c017a10dcf8810";
|
||||
nixvim.url = "github:pupbrained/nvim-config";
|
||||
snowfall-flake = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
|
|
@ -3,9 +3,27 @@
|
|||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
}: let
|
||||
nixpkgs-jdk16 = import inputs.nixpkgs-jdk16 {
|
||||
inherit (pkgs) system;
|
||||
|
||||
config = {
|
||||
permittedInsecurePackages = [
|
||||
"temurin-bin-16.0.2"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
additionalJDKs = with pkgs; [
|
||||
temurin-bin-23
|
||||
temurin-bin-21
|
||||
temurin-bin-17
|
||||
nixpkgs-jdk16.temurin-bin-16
|
||||
temurin-bin-8
|
||||
];
|
||||
in {
|
||||
imports = with inputs; [
|
||||
catppuccin.homeManagerModules.catppuccin
|
||||
catppuccin.homeModules.catppuccin
|
||||
chaotic.homeManagerModules.default
|
||||
hyprland.homeManagerModules.default
|
||||
nix-colors.homeManagerModules.default
|
||||
|
|
@ -28,6 +46,13 @@
|
|||
};
|
||||
|
||||
home = {
|
||||
sessionPath = ["$HOME/.jdks"];
|
||||
file = builtins.listToAttrs (builtins.map (jdk: {
|
||||
name = ".jdks/${jdk.version}";
|
||||
value = {source = jdk;};
|
||||
})
|
||||
additionalJDKs);
|
||||
|
||||
packages = with pkgs;
|
||||
[
|
||||
alacritty
|
||||
|
|
@ -47,7 +72,6 @@
|
|||
firefox
|
||||
glow
|
||||
grc
|
||||
jdk21
|
||||
killall
|
||||
libnotify
|
||||
lm_sensors
|
||||
|
|
@ -70,13 +94,10 @@
|
|||
]))
|
||||
telegram-desktop
|
||||
]
|
||||
# ++ (with jetbrains; [
|
||||
# clion
|
||||
# rust-rover
|
||||
# phpstorm
|
||||
# webstorm
|
||||
# idea-ultimate
|
||||
# ])
|
||||
++ (with jetbrains; [
|
||||
clion
|
||||
idea-ultimate
|
||||
])
|
||||
++ (with inputs; [
|
||||
chaotic.packages.${pkgs.system}.distrobox_git
|
||||
chaotic.packages.${pkgs.system}.zed-editor_git
|
||||
|
|
@ -99,7 +120,7 @@
|
|||
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
pointerCursor.enable = false;
|
||||
pointerCursor.enable = true;
|
||||
flavor = "mocha";
|
||||
accent = "green";
|
||||
};
|
||||
|
|
@ -168,6 +189,11 @@
|
|||
signing.key = "0FF5B8826803F895";
|
||||
};
|
||||
|
||||
java = {
|
||||
enable = true;
|
||||
package = pkgs.temurin-bin-21;
|
||||
};
|
||||
|
||||
mpv = {
|
||||
enable = true;
|
||||
scripts = [pkgs.mpvScripts.uosc];
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ with pkgs; {
|
|||
device = [
|
||||
{
|
||||
name = "logitech-usb-receiver";
|
||||
sensitivity = -0.5;
|
||||
sensitivity = -0.6;
|
||||
}
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@
|
|||
packages = with pkgs;
|
||||
[
|
||||
ibm-plex
|
||||
inputs.kirsch.packages.${system}.kirsch-nerd
|
||||
recursive
|
||||
]
|
||||
++ (with nerd-fonts; [
|
||||
|
|
@ -482,6 +483,13 @@
|
|||
flake = "/home/marshall/nix-config";
|
||||
};
|
||||
|
||||
nix-ld = {
|
||||
enable = true;
|
||||
libraries = with pkgs; [
|
||||
libGL
|
||||
];
|
||||
};
|
||||
|
||||
obs-studio = {
|
||||
enable = true;
|
||||
enableVirtualCamera = true;
|
||||
|
|
|
|||
|
|
@ -1133,7 +1133,6 @@
|
|||
"range": 0
|
||||
},
|
||||
"unix_device_names": [
|
||||
"/dev/disk/by-diskseq/2",
|
||||
"/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841",
|
||||
"/dev/disk/by-id/nvme-HFM512GD3JX013N_FYA7N020713207841_1",
|
||||
"/dev/disk/by-id/nvme-nvme.1c5c-465941374e303230373133323037383431-48464d3531324744334a583031334e-00000001",
|
||||
|
|
@ -1222,7 +1221,6 @@
|
|||
"range": 0
|
||||
},
|
||||
"unix_device_names": [
|
||||
"/dev/disk/by-diskseq/1",
|
||||
"/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z",
|
||||
"/dev/disk/by-id/nvme-Samsung_SSD_970_EVO_Plus_1TB_S6S1NG0RA02239Z_1",
|
||||
"/dev/disk/by-id/nvme-eui.0025385a1150c740",
|
||||
|
|
@ -1283,9 +1281,8 @@
|
|||
"range": 1
|
||||
},
|
||||
"unix_device_names": [
|
||||
"/dev/disk/by-diskseq/4",
|
||||
"/dev/disk/by-label/zram0",
|
||||
"/dev/disk/by-uuid/5fbe8f4e-6328-4c97-bbec-3d0f2ca01bf3",
|
||||
"/dev/disk/by-uuid/eb21fee5-5b3d-4abc-b3a3-31ee35527094",
|
||||
"/dev/zram0"
|
||||
],
|
||||
"resources": [
|
||||
|
|
@ -2249,7 +2246,7 @@
|
|||
{
|
||||
"type": "mem",
|
||||
"base": 0,
|
||||
"range": 67128041472,
|
||||
"range": 67128045568,
|
||||
"enabled": true,
|
||||
"access": "read_write",
|
||||
"prefetch": "unknown"
|
||||
|
|
@ -2856,6 +2853,29 @@
|
|||
"network_interface": [
|
||||
{
|
||||
"index": 74,
|
||||
"attached_to": 0,
|
||||
"class_list": [
|
||||
"network_interface"
|
||||
],
|
||||
"base_class": {
|
||||
"hex": "0107",
|
||||
"name": "Network Interface",
|
||||
"value": 263
|
||||
},
|
||||
"sub_class": {
|
||||
"hex": "0000",
|
||||
"name": "Loopback",
|
||||
"value": 0
|
||||
},
|
||||
"model": "Loopback network interface",
|
||||
"sysfs_id": "/class/net/lo",
|
||||
"unix_device_name": "lo",
|
||||
"unix_device_names": [
|
||||
"lo"
|
||||
]
|
||||
},
|
||||
{
|
||||
"index": 75,
|
||||
"attached_to": 32,
|
||||
"class_list": [
|
||||
"network_interface"
|
||||
|
|
@ -2897,7 +2917,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"index": 75,
|
||||
"index": 76,
|
||||
"attached_to": 36,
|
||||
"class_list": [
|
||||
"network_interface"
|
||||
|
|
@ -2937,29 +2957,6 @@
|
|||
"driver_modules": [
|
||||
"iwlwifi"
|
||||
]
|
||||
},
|
||||
{
|
||||
"index": 76,
|
||||
"attached_to": 0,
|
||||
"class_list": [
|
||||
"network_interface"
|
||||
],
|
||||
"base_class": {
|
||||
"hex": "0107",
|
||||
"name": "Network Interface",
|
||||
"value": 263
|
||||
},
|
||||
"sub_class": {
|
||||
"hex": "0000",
|
||||
"name": "Loopback",
|
||||
"value": 0
|
||||
},
|
||||
"model": "Loopback network interface",
|
||||
"sysfs_id": "/class/net/lo",
|
||||
"unix_device_name": "lo",
|
||||
"unix_device_names": [
|
||||
"lo"
|
||||
]
|
||||
}
|
||||
],
|
||||
"pci": [
|
||||
|
|
@ -5222,6 +5219,9 @@
|
|||
"range": 1
|
||||
},
|
||||
"unix_device_names": [
|
||||
"/dev/input/by-id/usb-SteelSeries_SteelSeries_Arctis_7-event-if05",
|
||||
"/dev/input/by-path/pci-0000:00:14.0-usb-0:3.3:1.5-event",
|
||||
"/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.3:1.5-event",
|
||||
"/dev/input/event7"
|
||||
],
|
||||
"resources": [
|
||||
|
|
@ -5829,38 +5829,40 @@
|
|||
]
|
||||
}
|
||||
],
|
||||
"chassis": {
|
||||
"handle": 3,
|
||||
"manufacturer": "ASUSTeK COMPUTER INC.",
|
||||
"version": "1.0",
|
||||
"chassis_type": {
|
||||
"hex": "000a",
|
||||
"name": "Notebook",
|
||||
"value": 10
|
||||
},
|
||||
"lock_present": false,
|
||||
"bootup_state": {
|
||||
"hex": "0003",
|
||||
"name": "Safe",
|
||||
"value": 3
|
||||
},
|
||||
"power_state": {
|
||||
"hex": "0003",
|
||||
"name": "Safe",
|
||||
"value": 3
|
||||
},
|
||||
"thermal_state": {
|
||||
"hex": "0003",
|
||||
"name": "Safe",
|
||||
"value": 3
|
||||
},
|
||||
"security_state": {
|
||||
"hex": "0003",
|
||||
"name": "None",
|
||||
"value": 3
|
||||
},
|
||||
"oem": "0x0"
|
||||
},
|
||||
"chassis": [
|
||||
{
|
||||
"handle": 3,
|
||||
"manufacturer": "ASUSTeK COMPUTER INC.",
|
||||
"version": "1.0",
|
||||
"chassis_type": {
|
||||
"hex": "000a",
|
||||
"name": "Notebook",
|
||||
"value": 10
|
||||
},
|
||||
"lock_present": false,
|
||||
"bootup_state": {
|
||||
"hex": "0003",
|
||||
"name": "Safe",
|
||||
"value": 3
|
||||
},
|
||||
"power_state": {
|
||||
"hex": "0003",
|
||||
"name": "Safe",
|
||||
"value": 3
|
||||
},
|
||||
"thermal_state": {
|
||||
"hex": "0003",
|
||||
"name": "Safe",
|
||||
"value": 3
|
||||
},
|
||||
"security_state": {
|
||||
"hex": "0003",
|
||||
"name": "None",
|
||||
"value": 3
|
||||
},
|
||||
"oem": "0x0"
|
||||
}
|
||||
],
|
||||
"config": {
|
||||
"handle": 22,
|
||||
"options": [
|
||||
|
|
@ -5884,7 +5886,7 @@
|
|||
304942678086,
|
||||
309237645383,
|
||||
438086664264,
|
||||
4471060955238
|
||||
4488240824422
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue