Compare commits
5
Commits
fd4bc1eaee
...
4f8ac3a85f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f8ac3a85f
|
||
|
|
23609e180e
|
||
|
|
0a566d99b1
|
||
|
|
ff3e201261
|
||
|
|
87c5a25123
|
Generated
+127
-7
@@ -31,6 +31,24 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
},
|
||||||
"gitignore": {
|
"gitignore": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -60,11 +78,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789235087,
|
"lastModified": 1790742230,
|
||||||
"narHash": "sha256-6hZ6Gy8isRQsWdI4l81Egag/PUIh68nSmFr2maInUNg=",
|
"narHash": "sha256-5399J1/O3DyLSsYGVa950JtOUDB9Reqvy7FhfDuTVzk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "fe48612c5321a2cc09b0f563757a9c9733d641f8",
|
"rev": "0aefa652eb6fd8b7396af25e8c81cb0790f12cc2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -97,6 +115,50 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-openclaw": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"home-manager": [
|
||||||
|
"home-manager"
|
||||||
|
],
|
||||||
|
"nix-openclaw-tools": "nix-openclaw-tools",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"qmd": "qmd"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1790163937,
|
||||||
|
"narHash": "sha256-oSsWtQ8mAH9KZkJKHeS3RedhrfDaMs1Ktrqs8rTP8PU=",
|
||||||
|
"owner": "openclaw",
|
||||||
|
"repo": "nix-openclaw",
|
||||||
|
"rev": "f62d33f760bcbdbc6a52ac589eae22bf99201f90",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "openclaw",
|
||||||
|
"repo": "nix-openclaw",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nix-openclaw-tools": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1790151707,
|
||||||
|
"narHash": "sha256-buJkQpTHNMawudMv2p00KwPAIuHMtK4CZXk7DgfHkx0=",
|
||||||
|
"owner": "openclaw",
|
||||||
|
"repo": "nix-openclaw-tools",
|
||||||
|
"rev": "8b674893eb3dfddc55ac76fa532a3b11b4330575",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "openclaw",
|
||||||
|
"repo": "nix-openclaw-tools",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixlib": {
|
"nixlib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736643958,
|
"lastModified": 1736643958,
|
||||||
@@ -135,11 +197,27 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789149629,
|
"lastModified": 1790055231,
|
||||||
"narHash": "sha256-H6GwaZzZf+4npqv0tph94w9tZddSjFjmQrVsW0z78uk=",
|
"narHash": "sha256-QpXotokGh5eeMG1Njiuh27oP0rK6t5+cMp7ymXSs7mc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
|
"rev": "b6c98e9e6633ee64753b594ff4a5febf0367fc00",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1790578696,
|
||||||
|
"narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -195,12 +273,39 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"qmd": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": [
|
||||||
|
"nix-openclaw",
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"nix-openclaw",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1786919312,
|
||||||
|
"narHash": "sha256-/7Z94r/9rXqzKlz/YkB6/nToSCPamV4Dnxm8EhelTDo=",
|
||||||
|
"owner": "tobi",
|
||||||
|
"repo": "qmd",
|
||||||
|
"rev": "facd35e01359e59d938bc9418e93fb9318addee3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tobi",
|
||||||
|
"ref": "v2.8.3",
|
||||||
|
"repo": "qmd",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
|
"nix-openclaw": "nix-openclaw",
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"plasma-manager": "plasma-manager",
|
"plasma-manager": "plasma-manager",
|
||||||
"secrix": "secrix"
|
"secrix": "secrix"
|
||||||
}
|
}
|
||||||
@@ -245,6 +350,21 @@
|
|||||||
"repo": "secrix",
|
"repo": "secrix",
|
||||||
"type": "github"
|
"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"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
@@ -26,16 +26,26 @@
|
|||||||
url = "github:nix-community/lanzaboote/v1.1.0";
|
url = "github:nix-community/lanzaboote/v1.1.0";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
nix-openclaw = {
|
||||||
|
url = "github:openclaw/nix-openclaw";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.home-manager.follows = "home-manager";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix, lanzaboote }:
|
outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix, lanzaboote, nix-openclaw }:
|
||||||
let
|
let
|
||||||
hmModule = file: {
|
hmModule = file: {
|
||||||
imports = [ home-manager.nixosModules.home-manager ];
|
imports = [ home-manager.nixosModules.home-manager ];
|
||||||
|
|
||||||
|
nixpkgs.overlays = [ nix-openclaw.overlays.default ];
|
||||||
|
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [ plasma-manager.homeModules.plasma-manager ];
|
home-manager.sharedModules = [
|
||||||
|
plasma-manager.homeModules.plasma-manager
|
||||||
|
nix-openclaw.homeManagerModules.openclaw
|
||||||
|
];
|
||||||
|
|
||||||
home-manager.users.cazzzer = import file;
|
home-manager.users.cazzzer = import file;
|
||||||
# Optionally, use home-manager.extraSpecialArgs to pass
|
# Optionally, use home-manager.extraSpecialArgs to pass
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
shellInit = "set fish_greeting";
|
shellInit = "set fish_greeting";
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
# Replace ls with exa
|
# Replace ls with eza
|
||||||
ls = "exa -al --color=always --group-directories-first --icons"; # preferred listing
|
ls = "eza -al --color=always --group-directories-first --icons=always"; # preferred listing
|
||||||
la = "exa -a --color=always --group-directories-first --icons"; # all files and dirs
|
la = "eza -a --color=always --group-directories-first --icons=always"; # all files and dirs
|
||||||
ll = "exa -l --color=always --group-directories-first --icons"; # long format
|
ll = "eza -l --color=always --group-directories-first --icons=always"; # long format
|
||||||
lt = "exa -aT --color=always --group-directories-first --icons"; # tree listing
|
lt = "eza -aT --color=always --group-directories-first --icons=always"; # tree listing
|
||||||
"l." = "exa -a | rg '^\.'"; # show only dotfiles
|
"l." = "exa -a | rg '^\.'"; # show only dotfiles
|
||||||
|
|
||||||
# Replace cat with bat
|
# Replace cat with bat
|
||||||
|
|||||||
@@ -31,6 +31,11 @@
|
|||||||
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
||||||
];
|
];
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
lmstudio
|
||||||
|
openclaw
|
||||||
|
];
|
||||||
|
|
||||||
networking.hostName = "Yura-PC"; # Define your hostname.
|
networking.hostName = "Yura-PC"; # Define your hostname.
|
||||||
networking.hostId = "110a2814"; # Required for ZFS.
|
networking.hostId = "110a2814"; # Required for ZFS.
|
||||||
|
|
||||||
|
|||||||
@@ -82,7 +82,6 @@
|
|||||||
# https://github.com/flatpak/flatpak/issues/2861
|
# https://github.com/flatpak/flatpak/issues/2861
|
||||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||||
|
|
||||||
workarounds.flatpak.enable = true;
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
fantasque-sans-mono
|
fantasque-sans-mono
|
||||||
nerd-fonts.fantasque-sans-mono
|
nerd-fonts.fantasque-sans-mono
|
||||||
|
|||||||
@@ -70,7 +70,6 @@
|
|||||||
# https://github.com/flatpak/flatpak/issues/2861
|
# https://github.com/flatpak/flatpak/issues/2861
|
||||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||||
|
|
||||||
# workarounds.flatpak.enable = true;
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-cjk-serif
|
noto-fonts-cjk-serif
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
{ ... }: {
|
{ ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./opts
|
./opts
|
||||||
./workarounds
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
imports = [
|
|
||||||
./flatpak.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
# https://github.com/knightpp/nixos-cfg/blob/main/modules/workarounds/flatpak.nix
|
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
cfg = config.workarounds.flatpak;
|
|
||||||
in {
|
|
||||||
options = {
|
|
||||||
workarounds.flatpak = {
|
|
||||||
enable = lib.mkEnableOption "flatpak workaround";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
system.fsPackages = [pkgs.bindfs];
|
|
||||||
fileSystems = let
|
|
||||||
mkRoSymBind = path: {
|
|
||||||
device = path;
|
|
||||||
fsType = "fuse.bindfs";
|
|
||||||
options = ["ro" "resolve-symlinks" "x-gvfs-hide"];
|
|
||||||
};
|
|
||||||
aggregated = pkgs.buildEnv {
|
|
||||||
name = "system-fonts-and-icons";
|
|
||||||
paths = builtins.attrValues {
|
|
||||||
inherit (pkgs.kdePackages) breeze;
|
|
||||||
inherit
|
|
||||||
(pkgs)
|
|
||||||
noto-fonts
|
|
||||||
noto-fonts-color-emoji
|
|
||||||
noto-fonts-cjk-sans
|
|
||||||
noto-fonts-cjk-serif
|
|
||||||
;
|
|
||||||
};
|
|
||||||
pathsToLink = ["/share/fonts" "/share/icons"];
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
# Create an FHS mount to support flatpak host icons/fonts
|
|
||||||
"/usr/share/icons" = mkRoSymBind "${aggregated}/share/icons";
|
|
||||||
"/usr/share/fonts" = mkRoSymBind "${aggregated}/share/fonts";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user