This commit is contained in:
beanigen 2025-02-19 21:03:40 +08:00
parent 01004d0212
commit 061e92d763
No known key found for this signature in database
4 changed files with 56 additions and 45 deletions

57
flake.lock generated
View file

@ -1,27 +1,12 @@
{ {
"nodes": { "nodes": {
"blender-bin": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1739778001,
"narHash": "sha256-Pgt9FcqUJD/Mg+L2cMlvKw5z/WNDJRTg2ZvIho/2upE=",
"path": "/home/maya/.config/nixos/blender-bin",
"type": "path"
},
"original": {
"path": "/home/maya/.config/nixos/blender-bin",
"type": "path"
}
},
"catppuccin": { "catppuccin": {
"inputs": { "inputs": {
"catppuccin-v1_1": "catppuccin-v1_1", "catppuccin-v1_1": "catppuccin-v1_1",
"catppuccin-v1_2": "catppuccin-v1_2", "catppuccin-v1_2": "catppuccin-v1_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-stable": "home-manager-stable", "home-manager-stable": "home-manager-stable",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nuscht-search": "nuscht-search" "nuscht-search": "nuscht-search"
}, },
@ -291,7 +276,7 @@
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1713543440, "lastModified": 1713543440,
@ -309,17 +294,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733808091, "lastModified": 1734424634,
"narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
@ -351,22 +337,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1734424634,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1660551188, "lastModified": 1660551188,
"narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
@ -381,7 +351,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1736012469,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
@ -397,7 +367,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1737370608, "lastModified": 1737370608,
"narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=", "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=",
@ -458,7 +428,7 @@
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"mnw": "mnw", "mnw": "mnw",
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nmd": "nmd", "nmd": "nmd",
"plugin-aerial-nvim": "plugin-aerial-nvim", "plugin-aerial-nvim": "plugin-aerial-nvim",
"plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-alpha-nvim": "plugin-alpha-nvim",
@ -3302,12 +3272,11 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"blender-bin": "blender-bin",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nvf": "nvf" "nvf": "nvf"
} }
}, },

View file

@ -8,6 +8,7 @@
./sway.nix ./sway.nix
./theming.nix ./theming.nix
./packages.nix #general user packages not managed by home-manager but i want to install via hm anyways ./packages.nix #general user packages not managed by home-manager but i want to install via hm anyways
./syncthing.nix #this is a big block of configuration, really dont feel like cluttering this file more than it already is
]; ];
home = rec { home = rec {
username = vars.user; #this is set in flake.nix username = vars.user; #this is set in flake.nix
@ -19,6 +20,7 @@
}; };
}; };
programs.home-manager.enable = (!vars.isNixOS); #value is set in flake.nix programs.home-manager.enable = (!vars.isNixOS); #value is set in flake.nix
targets.genericLinux.enable = (!vars.isNixOS);
programs.foot = { programs.foot = {
enable = true; enable = true;
settings.main.font = "monospace:size=10"; settings.main.font = "monospace:size=10";

View file

@ -2,8 +2,8 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
prismlauncher prismlauncher
libgpod libgpod
nextcloud-client
blender-hip blender-hip
blender-bin.blender_3_3
libimobiledevice libimobiledevice
mpc mpc
strawberry strawberry

40
home/syncthing.nix Normal file
View file

@ -0,0 +1,40 @@
{
services.syncthing = {
enable = true;
overrideDevices = true;
overrideFolders = true;
settings = {
devices = {
"hypermac" = { id = "XVY5YLM-QETCA4H-KT4XBEH-IR4U47O-CJCJ5YM-DPVWQQX-VHEK4MS-GJCMIQ2"; };
"adventurer" = { id = "LLKP3BJ-5RBN5KR-63NXUCW-JC4FMAX-QOXTJBK-65OHI7V-OKZQPTD-5FJIIAB"; };
"callisto" = { id = "NPXGWEK-JP4C2NM-QZZPBYI-ISAXIZK-ORCNVGO-C4GFRHJ-SWWFQGC-F5JAMQC"; };
"traveler" = { id = "JVNNE3V-IMVW2YL-JKEWUJZ-N5PU4NE-3YQDEU7-77ZHIP3-ADW3LAA-NODOVA3"; };
};
folders = {
"General" = {
path = "/home/maya/sync/general";
devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
};
"Music" = {
path = "/home/maya/Music";
devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
};
"College" = {
path = "/home/maya/sync/college";
devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
versioning = {
type = "staggered";
params = {
cleanInterval = "3600";
maxAge = "15768000";
};
};
};
"PrusaSlicer" = {
path = "/home/maya/.config/PrusaSlicer";
devices = [ "callisto" "hypermac" "adventurer" "traveler" ];
};
};
};
};
}