ricing and config changes
This commit is contained in:
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
inputs.agenix.nixosModules.default
|
inputs.agenix.nixosModules.default
|
||||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||||
|
inputs.chaotic.nixosModules.default
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfreePredicate =
|
nixpkgs.config.allowUnfreePredicate =
|
||||||
@@ -47,7 +48,7 @@
|
|||||||
|
|
||||||
# kernel options
|
# kernel options
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = pkgs.linuxPackages_latest;
|
kernelPackages = pkgs.linuxPackages_cachyos-lto;
|
||||||
|
|
||||||
kernel.sysctl = {
|
kernel.sysctl = {
|
||||||
# dmesg shushhhhh
|
# dmesg shushhhhh
|
||||||
@@ -156,7 +157,7 @@
|
|||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
hardware.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio
|
services.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
159
etcnixos/flake.lock
generated
159
etcnixos/flake.lock
generated
@@ -23,6 +23,31 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"chaotic": {
|
||||||
|
"inputs": {
|
||||||
|
"fenix": "fenix",
|
||||||
|
"flake-schemas": "flake-schemas",
|
||||||
|
"home-manager": "home-manager_2",
|
||||||
|
"jovian": "jovian",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1738552004,
|
||||||
|
"narHash": "sha256-eYE+8F0ZrSIYvlVkgTjTBlnM1COqUdSs4GKyWnel6I4=",
|
||||||
|
"owner": "chaotic-cx",
|
||||||
|
"repo": "nyx",
|
||||||
|
"rev": "894d1db77131a4a449d1993c7ba314ee15dd4e36",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "chaotic-cx",
|
||||||
|
"ref": "nyxpkgs-unstable",
|
||||||
|
"repo": "nyx",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731098351,
|
"lastModified": 1731098351,
|
||||||
@@ -60,6 +85,28 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"fenix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"chaotic",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1738477724,
|
||||||
|
"narHash": "sha256-S1x0F7q9cJ6EEmZsakse2Ps6Adi7NadxRtGiuWUlwT0=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "fenix",
|
||||||
|
"rev": "1936bb37b1d8597273e3611873dc09dd61b09818",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "fenix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -97,6 +144,20 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-schemas": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1721999734,
|
||||||
|
"narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
|
||||||
|
"rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
|
||||||
|
"revCount": 75,
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
|
||||||
|
}
|
||||||
|
},
|
||||||
"gitignore": {
|
"gitignore": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -140,6 +201,49 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"home-manager_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"chaotic",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1738448366,
|
||||||
|
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"jovian": {
|
||||||
|
"inputs": {
|
||||||
|
"nix-github-actions": "nix-github-actions",
|
||||||
|
"nixpkgs": [
|
||||||
|
"chaotic",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1738478597,
|
||||||
|
"narHash": "sha256-it7lc+HRSQiLV+3CcA+c6fkr2355HyT2GGUowHdfa/E=",
|
||||||
|
"owner": "Jovian-Experiments",
|
||||||
|
"repo": "Jovian-NixOS",
|
||||||
|
"rev": "77fb0818cb42ca0db98839d47bbc6a317c286282",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Jovian-Experiments",
|
||||||
|
"repo": "Jovian-NixOS",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"lanzaboote": {
|
"lanzaboote": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
@@ -165,13 +269,36 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-github-actions": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"chaotic",
|
||||||
|
"jovian",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1729697500,
|
||||||
|
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
|
||||||
|
"owner": "zhaofengli",
|
||||||
|
"repo": "nix-github-actions",
|
||||||
|
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "zhaofengli",
|
||||||
|
"ref": "matrix-name",
|
||||||
|
"repo": "nix-github-actions",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738391520,
|
"lastModified": 1738638143,
|
||||||
"narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=",
|
"narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773",
|
"rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -183,16 +310,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738277201,
|
"lastModified": 1738410390,
|
||||||
"narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=",
|
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554",
|
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -243,11 +370,29 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
|
"chaotic": "chaotic",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"rust-analyzer-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1738433753,
|
||||||
|
"narHash": "sha256-lyhEsEf5FQzV+KHVkfxIApMOFWHqyls5+llcQ/uhV6Y=",
|
||||||
|
"owner": "rust-lang",
|
||||||
|
"repo": "rust-analyzer",
|
||||||
|
"rev": "88b901878e684e4f68f104fdbc48749f41bcccd3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "rust-lang",
|
||||||
|
"ref": "nightly",
|
||||||
|
"repo": "rust-analyzer",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
description = "System nixOS flake";
|
description = "System nixOS flake";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
# nixpkgs.url = "github:NixOS/nixpkgs/master";
|
|
||||||
|
|
||||||
lanzaboote = {
|
lanzaboote = {
|
||||||
url = "github:nix-community/lanzaboote";
|
url = "github:nix-community/lanzaboote";
|
||||||
@@ -16,6 +15,11 @@
|
|||||||
url = "github:ryantm/agenix";
|
url = "github:ryantm/agenix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
chaotic = {
|
||||||
|
url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
@@ -30,29 +34,26 @@
|
|||||||
let
|
let
|
||||||
username = "primary";
|
username = "primary";
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
hostnames = [
|
||||||
|
"mreow"
|
||||||
|
"yarn"
|
||||||
|
];
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# desktop
|
nixosConfigurations = nixpkgs.lib.foldl' (
|
||||||
nixosConfigurations.yarn = nixpkgs.lib.nixosSystem {
|
config: hostname:
|
||||||
specialArgs = {
|
config
|
||||||
hostname = "yarn";
|
// {
|
||||||
inherit inputs username;
|
"${hostname}" = nixpkgs.lib.nixosSystem {
|
||||||
};
|
specialArgs = {
|
||||||
modules = [
|
inherit inputs username hostname;
|
||||||
./system-yarn.nix
|
};
|
||||||
];
|
modules = [
|
||||||
};
|
./system-${hostname}.nix
|
||||||
|
];
|
||||||
# laptop
|
};
|
||||||
nixosConfigurations.mreow = nixpkgs.lib.nixosSystem {
|
}
|
||||||
specialArgs = {
|
) { } hostnames;
|
||||||
hostname = "mreow";
|
|
||||||
inherit inputs username;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
./system-mreow.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,77 @@
|
|||||||
{ pkgs, username, ... }:
|
|
||||||
{
|
{
|
||||||
|
pkgs,
|
||||||
|
username,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# https://github.com/quickemu-project/quickemu
|
||||||
|
(quickemu.overrideAttrs (old: {
|
||||||
|
patches = [
|
||||||
|
(pkgs.fetchpatch {
|
||||||
|
url = "https://github.com/Titaniumtown/quickemu/commit/f96d52a6b6f4b3187171d8cab61a273475da3b6c.diff";
|
||||||
|
sha256 = "vXVI4EeJGhOlx8ARTCvB98Ajalk0bVakL98WojqcI3c=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
}))
|
||||||
|
];
|
||||||
|
|
||||||
programs.virt-manager.enable = true;
|
programs.virt-manager.enable = true;
|
||||||
|
|
||||||
users.groups.libvirtd.members = [ username ];
|
users.groups.libvirtd.members = [ username ];
|
||||||
|
|
||||||
virtualisation.libvirtd.enable = true;
|
virtualisation.libvirtd = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
package = pkgs.libvirt;
|
||||||
|
|
||||||
|
qemu = {
|
||||||
|
package = (
|
||||||
|
pkgs.qemu_kvm.overrideAttrs (old: {
|
||||||
|
patches = old.patches ++ [
|
||||||
|
# amd?
|
||||||
|
# (pkgs.fetchpatch {
|
||||||
|
# url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/amd-qemu-9.2.0.patch";
|
||||||
|
# sha256 = "BbzgjRa3qaYH1yXXqU6M/S68SxXWpAc9ObTG5qXu6YA=";
|
||||||
|
# })
|
||||||
|
|
||||||
|
# or intel!
|
||||||
|
(pkgs.fetchpatch {
|
||||||
|
url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/intel-qemu-9.2.0.patch";
|
||||||
|
sha256 = "kXY6R/0Tsotf0mGUIevDLlLWHEznnF1dt0K2ayX7XAg=";
|
||||||
|
})
|
||||||
|
|
||||||
|
(pkgs.fetchpatch {
|
||||||
|
url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/qemu-9.2.0-libnfs6.patch";
|
||||||
|
sha256 = "DkkC7KiQLnL7jbBOtgyLKVvozEG388hdfl5seEqvu3o=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
ovmf.packages = lib.mkForce [
|
||||||
|
(pkgs.OVMF.overrideAttrs (old: {
|
||||||
|
secureBoot = true;
|
||||||
|
tpmSupport = true;
|
||||||
|
})).fd
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
virtualisation.spiceUSBRedirection.enable = true;
|
virtualisation.spiceUSBRedirection.enable = true;
|
||||||
|
|
||||||
users.users."${username}".extraGroups = [ "libvirtd" ];
|
users.users."${username}".extraGroups = [ "libvirtd" ];
|
||||||
|
|
||||||
|
boot.kernelPatches = [
|
||||||
|
{
|
||||||
|
name = "undetected-kvm";
|
||||||
|
patch = pkgs.fetchurl {
|
||||||
|
url = "https://raw.githubusercontent.com/Scrut1ny/Hypervisor-Phantom/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/Kernel/linux-6.13-svm.patch";
|
||||||
|
sha256 = "zz18xerutulLGzlHhnu26WCY8rVQXApyeoDtCjbejIk=";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
44
home-manager/flake.lock
generated
44
home-manager/flake.lock
generated
@@ -54,11 +54,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738415006,
|
"lastModified": 1738610386,
|
||||||
"narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=",
|
"narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "8544cd092047a7e92d0dce011108a563de7fc0f2",
|
"rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -79,11 +79,11 @@
|
|||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738410471,
|
"lastModified": 1738583235,
|
||||||
"narHash": "sha256-j0XZIViI4ZEFwhrEzVKz696/4DZ9pRiWtGfxJogA+MM=",
|
"narHash": "sha256-Tk5w3uqp045W/W0mDQT0swwy90ex0l3JWS2crimG8Wo=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "16f8e14385163479aca7231d8fab0091adac2e56",
|
"rev": "1511396846427b58f1d6ca5442a228ede7673c67",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -112,11 +112,11 @@
|
|||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738404307,
|
"lastModified": 1738579367,
|
||||||
"narHash": "sha256-BFtfL5kZbIsDAMgbVP5E0HbqDapYWw4NBw1xS0AOCCc=",
|
"narHash": "sha256-820QsR/C9+Gyn3v65LHNwwW7KxSA6u6MQtky3SUrZ3A=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "32ad545f842f4c176548e30d183d10e0a2bab752",
|
"rev": "553b1ba85256e2cb290e8a67f709a14e603606bc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -127,27 +127,27 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738277201,
|
"lastModified": 1738410390,
|
||||||
"narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=",
|
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554",
|
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738277201,
|
"lastModified": 1738435198,
|
||||||
"narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=",
|
"narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554",
|
"rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -174,11 +174,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738376888,
|
"lastModified": 1738635966,
|
||||||
"narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=",
|
"narHash": "sha256-5MbJhh6nz7tx8FYVOJ0+ixMaEn0ibGzV/hScPMmqVTE=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "83284068670d5ae4a43641c4afb150f3446be70d",
|
"rev": "1ff8663cd75a11e61f8046c62f4dbb05d1907b44",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -242,11 +242,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738421728,
|
"lastModified": 1738639173,
|
||||||
"narHash": "sha256-+4w7zluaVoM1WrbhuBkWUF5hiXVCmXORlVT/p0Dm4vQ=",
|
"narHash": "sha256-fZnh8ypF2NJ99heI3C/MdtvRUDlIhuSCnhduKEJy86o=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "d0022d9a6c2a18ea8da0ecaa6482b4607f3d7591",
|
"rev": "5bce21504d22f7d9d984b4f008cbc74b4ce76273",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
description = "My nixOS flake for home-manager";
|
description = "My nixOS flake for home-manager";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
|
|||||||
@@ -21,103 +21,105 @@
|
|||||||
"apple_cursor"
|
"apple_cursor"
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages =
|
||||||
#calculator
|
with pkgs;
|
||||||
gnome-calculator
|
[
|
||||||
|
#calculator
|
||||||
|
gnome-calculator
|
||||||
|
|
||||||
#productivity stuff
|
#productivity stuff
|
||||||
libreoffice
|
libreoffice
|
||||||
hunspell # spellcheck
|
hunspell # spellcheck
|
||||||
hunspellDicts.en_US # spellcheck dictionary
|
hunspellDicts.en_US # spellcheck dictionary
|
||||||
|
|
||||||
#video and audio downloading
|
#video and audio downloading
|
||||||
parabolic
|
parabolic
|
||||||
|
|
||||||
#soulseek client
|
#soulseek client
|
||||||
nicotine-plus
|
nicotine-plus
|
||||||
|
|
||||||
#dark web browsing deep web browsing
|
#dark web browsing deep web browsing
|
||||||
tor-browser
|
tor-browser
|
||||||
|
|
||||||
#audio editing
|
#audio editing
|
||||||
audacity
|
audacity
|
||||||
|
|
||||||
#fonts
|
#fonts
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
liberation_ttf
|
liberation_ttf
|
||||||
|
|
||||||
#for ebook reading
|
#for ebook reading
|
||||||
foliate
|
foliate
|
||||||
|
|
||||||
#audio mixer (pavucontrol but for pipewire)
|
#audio mixer (pavucontrol but for pipewire)
|
||||||
pwvucontrol
|
pwvucontrol
|
||||||
|
|
||||||
#minecraft launcher
|
#minecraft launcher
|
||||||
prismlauncher
|
prismlauncher
|
||||||
|
|
||||||
mpv
|
mpv
|
||||||
mumble
|
mumble
|
||||||
system76-keyboard-configurator
|
system76-keyboard-configurator
|
||||||
|
|
||||||
#jellyfin
|
#jellyfin
|
||||||
finamp # music player
|
finamp # music player
|
||||||
delfin # jellyfin client
|
delfin # jellyfin client
|
||||||
|
|
||||||
signal-desktop
|
signal-desktop
|
||||||
|
|
||||||
#accounting
|
#accounting
|
||||||
# gnucash
|
# gnucash
|
||||||
|
|
||||||
# image tools
|
# image tools
|
||||||
inkscape
|
inkscape
|
||||||
nomacs
|
nomacs
|
||||||
|
|
||||||
# partitioning utilities
|
# partitioning utilities
|
||||||
gparted
|
gparted
|
||||||
gnome-disk-utility
|
gnome-disk-utility
|
||||||
|
|
||||||
# small nicities
|
# small nicities
|
||||||
wl-clipboard # wl-copy & wl-paste
|
wl-clipboard # wl-copy & wl-paste
|
||||||
libnotify # notifications library
|
libnotify # notifications library
|
||||||
xdg-utils # xdg utils
|
xdg-utils # xdg utils
|
||||||
|
|
||||||
# music tagging utility
|
# music tagging utility
|
||||||
picard
|
picard
|
||||||
|
|
||||||
# music lyric fetcher
|
# music lyric fetcher
|
||||||
lrcget
|
lrcget
|
||||||
|
|
||||||
inputs.zen-browser.packages."${system}".default
|
inputs.zen-browser.packages."${system}".default
|
||||||
|
|
||||||
# freecad-wayland
|
# freecad-wayland
|
||||||
puddletag
|
puddletag
|
||||||
|
|
||||||
epiphany
|
epiphany
|
||||||
|
|
||||||
mcaselector
|
mcaselector
|
||||||
|
|
||||||
wireshark
|
wireshark
|
||||||
|
|
||||||
darktable
|
darktable
|
||||||
rawtherapee
|
rawtherapee
|
||||||
hugin
|
hugin
|
||||||
|
|
||||||
# nufraw
|
# nufraw
|
||||||
nufraw-thumbnailer
|
nufraw-thumbnailer
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
nautilus
|
nautilus
|
||||||
|
|
||||||
enblend-enfuse
|
enblend-enfuse
|
||||||
|
|
||||||
nerdfonts
|
savvycan
|
||||||
|
|
||||||
savvycan
|
# nerdfonts
|
||||||
|
|
||||||
# simple screen recording on wayland
|
# simple screen recording on wayland
|
||||||
wl-screenrec
|
wl-screenrec
|
||||||
];
|
]
|
||||||
# ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts));
|
++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts));
|
||||||
|
|
||||||
programs.zed-editor = {
|
programs.zed-editor = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -144,11 +144,11 @@
|
|||||||
nmap
|
nmap
|
||||||
];
|
];
|
||||||
|
|
||||||
home.file.".cargo/config.toml".text = ''
|
# home.file.".cargo/config.toml".text = ''
|
||||||
[target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu]
|
# [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu]
|
||||||
linker = "${pkgs.clang}/bin/clang"
|
# linker = "${pkgs.clang}/bin/clang"
|
||||||
rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"]
|
# rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"]
|
||||||
'';
|
# '';
|
||||||
|
|
||||||
# default applications
|
# default applications
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
decorations = "none";
|
decorations = "none";
|
||||||
|
|
||||||
# semi-transparent
|
# semi-transparent
|
||||||
opacity = 0.975;
|
opacity = 0.90;
|
||||||
|
|
||||||
# padding between the content of the terminal and the edge
|
# padding between the content of the terminal and the edge
|
||||||
padding = {
|
padding = {
|
||||||
|
|||||||
@@ -43,12 +43,8 @@ in
|
|||||||
pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy";
|
pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy";
|
||||||
pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
||||||
|
|
||||||
nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc";
|
|
||||||
|
|
||||||
gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'";
|
gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'";
|
||||||
|
|
||||||
chess = "${pkgs.chess-tui}/bin/chess-tui -e ${pkgs.stockfish}/bin/stockfish";
|
|
||||||
|
|
||||||
run-steam = "gamescope --backend sdl -W 2256 -H 1504 -f --steam -- steam -tenfoot -pipewire-dmabuf";
|
run-steam = "gamescope --backend sdl -W 2256 -H 1504 -f --steam -- steam -tenfoot -pipewire-dmabuf";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,13 @@
|
|||||||
|
|
||||||
# wrapping!!
|
# wrapping!!
|
||||||
soft-wrap.enable = true;
|
soft-wrap.enable = true;
|
||||||
|
|
||||||
|
end-of-line-diagnostics = "hint";
|
||||||
|
inline-diagnostics = {
|
||||||
|
cursor-line = "warning";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
languages = {
|
languages = {
|
||||||
|
|||||||
@@ -47,10 +47,8 @@
|
|||||||
{
|
{
|
||||||
command = [
|
command = [
|
||||||
"${pkgs.swaybg}/bin/swaybg"
|
"${pkgs.swaybg}/bin/swaybg"
|
||||||
"-m"
|
|
||||||
"center"
|
|
||||||
"-i"
|
"-i"
|
||||||
"${homeDirectory}/.wallpaper.png"
|
"${../wallpaper.png}"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -158,9 +158,10 @@
|
|||||||
|
|
||||||
style = ''
|
style = ''
|
||||||
/*base background color*/
|
/*base background color*/
|
||||||
@define-color bg_main rgba(25, 25, 25, 1.0);
|
/* color picked from a celeste background bc it looks pretty and matches my background */
|
||||||
@define-color bg_main_tooltip rgba(0, 0, 0, 0.7);
|
@define-color bg_main rgba(39.6, 51.4, 76.1, 1.0);
|
||||||
|
|
||||||
|
@define-color bg_main_tooltip rgba(0, 0, 0, 0.7);
|
||||||
|
|
||||||
/*base background color of selections */
|
/*base background color of selections */
|
||||||
@define-color bg_hover rgba(200, 200, 200, 0.3);
|
@define-color bg_hover rgba(200, 200, 200, 0.3);
|
||||||
|
|||||||
@@ -32,8 +32,6 @@
|
|||||||
xwayland-satellite-unstable
|
xwayland-satellite-unstable
|
||||||
];
|
];
|
||||||
|
|
||||||
services.blueman-applet.enable = true;
|
|
||||||
|
|
||||||
# media controls
|
# media controls
|
||||||
systemd.user.services.mpris-proxy = {
|
systemd.user.services.mpris-proxy = {
|
||||||
Unit.Description = "Mpris proxy";
|
Unit.Description = "Mpris proxy";
|
||||||
|
|||||||
BIN
home-manager/wallpaper.png
Normal file
BIN
home-manager/wallpaper.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
Reference in New Issue
Block a user