This commit is contained in:
shibazaki 2025-03-25 21:55:58 +01:00
parent 18799ad1d7
commit fbd2eda6a0
8 changed files with 171 additions and 190 deletions

300
flake.lock generated
View File

@ -133,7 +133,6 @@
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@ -166,9 +165,31 @@
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"stylix",
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
@ -185,24 +206,6 @@
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": [
"stylix",
@ -326,79 +329,6 @@
"type": "github"
}
},
"godot": {
"inputs": {
"flake-utils": "flake-utils",
"godot-desktop-file": "godot-desktop-file",
"godot-icon-png": "godot-icon-png",
"godot-icon-svg": "godot-icon-svg",
"godot-manpage": "godot-manpage",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1742384192,
"narHash": "sha256-01dA0ILQMMZF5diP/gx44av/iULgiGFF2DRI6TWjBcM=",
"ref": "refs/heads/main",
"rev": "b5b6a7c926ee3cdc08b953a10783b0872263e1c7",
"revCount": 3,
"type": "git",
"url": "https://git.foglar.tech/foglar/godot-4.4.1.git"
},
"original": {
"type": "git",
"url": "https://git.foglar.tech/foglar/godot-4.4.1.git"
}
},
"godot-desktop-file": {
"flake": false,
"locked": {
"narHash": "sha256-vFVYuHYKIcr/ngibwV9G2bsxzG3YWS9Mm4WjKaAUcbM=",
"type": "file",
"url": "https://raw.githubusercontent.com/godotengine/godot/master/misc/dist/linux/org.godotengine.Godot.desktop"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/godotengine/godot/master/misc/dist/linux/org.godotengine.Godot.desktop"
}
},
"godot-icon-png": {
"flake": false,
"locked": {
"narHash": "sha256-Y4Y2RpEiZOBJEEtgJZVHDJ+GUgN2fn9VPP+oZWQZMr0=",
"type": "file",
"url": "https://raw.githubusercontent.com/godotengine/godot/master/icon.png"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/godotengine/godot/master/icon.png"
}
},
"godot-icon-svg": {
"flake": false,
"locked": {
"narHash": "sha256-fIvrlGt9n3o45i3skf4LhIBWMR/d8Xo2rHPftfOoHZA=",
"type": "file",
"url": "https://raw.githubusercontent.com/godotengine/godot/master/icon.svg"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/godotengine/godot/master/icon.svg"
}
},
"godot-manpage": {
"flake": false,
"locked": {
"narHash": "sha256-QBl3N8oOgvzqoTiCCKWUq9PiBqjywhqvCaYM1g40FQw=",
"type": "file",
"url": "https://raw.githubusercontent.com/godotengine/godot/master/misc/dist/linux/godot.6"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/godotengine/godot/master/misc/dist/linux/godot.6"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -406,16 +336,16 @@
]
},
"locked": {
"lastModified": 1742234739,
"narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
"lastModified": 1742926508,
"narHash": "sha256-wgfY302ZaOsBCXb8aZDTG3Zt2kg3jDDaRrmtUw8nz00=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
"rev": "8bef8b7a0a95d347018f09b291e2fa0a77abd23f",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
@ -428,16 +358,15 @@
]
},
"locked": {
"lastModified": 1739757849,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"lastModified": 1741635347,
"narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
@ -514,15 +443,15 @@
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2",
"systems": "systems",
"xdph": "xdph"
},
"locked": {
"lastModified": 1742326985,
"narHash": "sha256-jC+nvjIdWQnvi7qmraIqAv6pcUzJpE89ug6BSbKhIkA=",
"lastModified": 1742860753,
"narHash": "sha256-ItOsU1v6CZNe6spfKtJ+cpVr0S87jq69PYe3lpOLzjI=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "03385fc07f82bb891ded33db464397d867eb503d",
"rev": "f7ba86d1f335112ae0d13548947ddbd76b1477b6",
"type": "github"
},
"original": {
@ -748,16 +677,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1742268799,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
"owner": "nixos",
"lastModified": 1742800061,
"narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "da044451c6a70518db5b730fe277b70f494188f1",
"rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -822,6 +751,29 @@
"type": "sourcehut"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"stylix",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1741693509,
"narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=",
"owner": "nix-community",
"repo": "NUR",
"rev": "5479646b2574837f1899da78bdf9a48b75a9fb27",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"nvf": {
"inputs": {
"nixpkgs": "nixpkgs_2",
@ -844,7 +796,7 @@
"nvf_2": {
"inputs": {
"flake-parts": "flake-parts",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"mnw": "mnw",
"nil": "nil",
"nixpkgs": "nixpkgs_3",
@ -1013,7 +965,7 @@
"plugin-vim-repeat": "plugin-vim-repeat",
"plugin-vim-startify": "plugin-vim-startify",
"plugin-which-key": "plugin-which-key",
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1737282111,
@ -3665,11 +3617,11 @@
]
},
"locked": {
"lastModified": 1742058297,
"narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=",
"lastModified": 1742649964,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"type": "github"
},
"original": {
@ -3680,7 +3632,6 @@
},
"root": {
"inputs": {
"godot": "godot",
"home-manager": "home-manager",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs",
@ -3719,49 +3670,36 @@
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_5",
"nur": "nur",
"systems": "systems_4",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux"
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1741961698,
"narHash": "sha256-utsgC6H3ja6sLAXMd8//I2D7yjyScFqVDRX0wpbqPZo=",
"lastModified": 1742926290,
"narHash": "sha256-63joFDrDekkI8papsDPwObKCCYSZ7t/1t94M398BxLY=",
"owner": "danth",
"repo": "stylix",
"rev": "9bfc74f330ead111e8ea354b2220a431b0cfaa26",
"rev": "61a5f77f2202f3a79797089752713e16b1ab5b10",
"type": "github"
},
"original": {
"owner": "danth",
"ref": "release-24.11",
"repo": "stylix",
"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": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -3776,6 +3714,21 @@
"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"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
@ -3806,21 +3759,6 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
@ -3855,6 +3793,22 @@
"type": "github"
}
},
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1741468895,
"narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "schemes",
"type": "github"
}
},
"tinted-tmux": {
"flake": false,
"locked": {
@ -3871,6 +3825,44 @@
"type": "github"
}
},
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1725758778,
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-zed",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"stylix",
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [

View File

@ -2,11 +2,12 @@
description = "real";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nvf.url = "git+https://gitea.homework.zip/five/neovim";
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
url = "github:nix-community/home-manager/master"; # Optional, use master for latest HM
inputs.nixpkgs.follows = "nixpkgs";
};
@ -16,12 +17,7 @@
};
stylix = {
url = "github:danth/stylix/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
godot = {
url = "git+https://git.foglar.tech/foglar/godot-4.4.1.git";
url = "github:danth/stylix"; # stylix follows unstable automatically
inputs.nixpkgs.follows = "nixpkgs";
};
};

View File

@ -9,7 +9,7 @@
default = ["kde"];
};
};
xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-kde];
xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];
home.sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1";
@ -286,7 +286,6 @@
];
windowrulev2 = [
];
layerrule = [

View File

@ -1,21 +1,16 @@
{
pkgs,
inputs,
...
}: {
home.packages =
(with pkgs; [
{pkgs, ...}: {
home.packages = with pkgs; [
dotnet-sdk
rustc
cargo
go
logisim-evolution
blender
krita
inkscape
aseprite
logisim-evolution
])
++ [inputs.godot.packages.x86_64-linux.godotMono];
godot_4-mono
];
}

View File

@ -21,7 +21,7 @@
csharpier.csharpier-vscode
];
userSettings = {
"godot.csharp.executablePath" = "${inputs.godot.packages.x86_64-linux.godotMono}/bin/godot-mono";
"godot.csharp.executablePath" = "${pkgs.godot_4-mono}/bin/godot-mono";
};
};
}

View File

@ -6,6 +6,6 @@
programs.hyprland = {
enable = true;
xwayland.enable = true;
portalPackage = pkgs.xdg-desktop-portal-kde;
portalPackage = pkgs.xdg-desktop-portal-gtk;
};
}

View File

@ -1,9 +1,8 @@
{ pkgs, ... }: {
{pkgs, ...}: {
fonts.packages = with pkgs; [
noto-fonts
noto-fonts-emoji
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
nerd-fonts.jetbrains-mono
monaspace
];
}

View File

@ -22,7 +22,7 @@
monospace = {
name = "JetBrainsMono Nerd Font";
package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
package = pkgs.nerd-fonts.jetbrains-mono;
};
};
};