Compare commits

..

No commits in common. "a411f2a07387dfcd2686b3a2015b44aee1a3f8c1" and "a4e1487158ddbc81a71428d13adb1041f501fdcd" have entirely different histories.

5 changed files with 41 additions and 61 deletions

31
flake.lock generated
View File

@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1747862697, "lastModified": 1746810718,
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,26 +37,9 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1748026106,
"narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
}, },
@ -64,15 +47,15 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1748090150, "lastModified": 1746976679,
"narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=", "narHash": "sha256-zY1wU9gp4B8I+5MrJha8Te4/0VQTzUwbQN+9XztOhLg=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d", "rev": "9c9a9814a733509c4b46014cf60066eed0fdd72f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -3,11 +3,10 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
zen-browser = { zen-browser = {
url = "github:0xc000022070/zen-browser-flake"; url = "github:0xc000022070/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

View File

@ -6,8 +6,7 @@
{ {
imports = imports =
[ [ # Include the results of the hardware scan.
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./packages.nix ./packages.nix
./mnt.nix ./mnt.nix
@ -108,11 +107,6 @@
pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-hyprland
]; ];
}; };
#xdg.portal = {
# enable = true;
# hyprland.enable = true;
# extraPortals = [ "gtk" ]; # Optional, for GTK apps support
#};
# Configure console keymap # Configure console keymap
console.keyMap = "uk"; console.keyMap = "uk";
@ -161,9 +155,6 @@
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [
"electron-33.4.11"
];
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget

View File

@ -17,7 +17,7 @@
# Override the Docker service to disable autostart # Override the Docker service to disable autostart
systemd.services.docker = { systemd.services.docker = {
enable = true; enable = false;
wants = [ "docker.socket" ]; wants = [ "docker.socket" ];
after = [ "docker.socket" ]; after = [ "docker.socket" ];
serviceConfig = { serviceConfig = {

View File

@ -9,7 +9,9 @@ in
#flakes #flakes
zen-browser.packages."${system}".twilight zen-browser.packages."${system}".twilight
# Text Editors # Text Editors
vim
sublime sublime
lunarvim
vscode vscode
# Development Tools # Development Tools
@ -25,11 +27,14 @@ in
vulkan-tools vulkan-tools
vulkan-headers vulkan-headers
wayland-protocols wayland-protocols
golangci-lint
golangci-lint-langserver
python3 python3
php php
php83Packages.composer php83Packages.composer
exercism exercism
betterdiscord-installer betterdiscord-installer
go
bun bun
air air
tailwindcss tailwindcss
@ -48,6 +53,8 @@ in
# Shell Utilities # Shell Utilities
home-manager home-manager
fish
zsh
curl curl
wget wget
tree tree
@ -119,6 +126,7 @@ in
# Media # Media
vlc vlc
simplescreenrecorder simplescreenrecorder
obs-studio
davinci-resolve-studio davinci-resolve-studio
audacity audacity
haruna haruna
@ -133,7 +141,6 @@ in
wine64 wine64
# Fonts # Fonts
noto-fonts
noto-fonts-color-emoji noto-fonts-color-emoji
twemoji-color-font twemoji-color-font
catppuccin-kvantum catppuccin-kvantum
@ -188,7 +195,7 @@ in
#games #games
flightgear flightgear
# unstable.luanti minetest
openttd openttd
endless-sky endless-sky
cataclysm-dda cataclysm-dda
@ -199,7 +206,7 @@ in
mindustry-wayland mindustry-wayland
speed_dreams speed_dreams
simutrans_binaries simutrans_binaries
#modrinth-app modrinth-app
minecraft minecraft
nsnake nsnake