Sadan/dotfiles
1
0
Fork 0
mirror of https://github.com/sadan4/dotfiles.git synced 2025-01-18 11:13:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix syntax and stable / unstable

Browse source
This commit is contained in:
sadan 2024-11-26 20:17:02 -05:00
parent 49571bbba2
commit a96c69cf08
No known key found for this signature in database
10 changed files with 84 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/users/homeModules/kde.nix
View file

@ -7,5 +7,5 @@
libsForQt5.kcolorchooser libsForQt5.kcolorchooser
gnome.gnome-calculator gnome.gnome-calculator
]; ];
} };
} }

4
common/users/homeModules/media/cli.nix
View file

@ -5,5 +5,5 @@
ffmpeg ffmpeg
yt-dlp yt-dlp
]; ];
} };
} }

4
common/users/homeModules/media/gui.nix
View file

@ -7,5 +7,5 @@
inkscape inkscape
obs-studio obs-studio
]; ];
} };
} }

4
common/users/homeModules/prisma.nix
View file

@ -1,4 +1,4 @@
{pkgs, unstable ? pkgs, ...}: { {pkgs, unstable, ...}: {
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
unstable.prisma unstable.prisma
@ -10,4 +10,4 @@
PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node"; PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node";
}; };
}; };
} }

4
common/users/homeModules/terminal.nix
View file

@ -14,5 +14,5 @@
target = "./.config/kitty"; target = "./.config/kitty";
}; };
}; };
} };
} }

2
common/users/meyer-wsl/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, inputs, stable ? pkgs, unstable ? pkgs, ... }: { pkgs, inputs, stable, unstable, ... }:
let let
NAME = "meyer"; NAME = "meyer";
in in

4
common/users/meyer/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, inputs, systemImports, ... }: { pkgs, inputs, stable, unstable, ... }:
let let
NAME = "meyer"; NAME = "meyer";
in in
@ -29,7 +29,7 @@ in
}; };
}; };
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs stable unstable; };
users = { users = {
"${NAME}" = import ./home.nix; "${NAME}" = import ./home.nix;
}; };

4
common/users/meyer/home.nix
View file

@ -10,7 +10,7 @@ in {
nixpkgs.config.allowUnfreePredicate = (pkg: true); nixpkgs.config.allowUnfreePredicate = (pkg: true);
imports = [ imports = [
../homeModules/util.nix ../homeModules/utils.nix
../homeModules/dev ../homeModules/dev
../homeModules/dev/ide ../homeModules/dev/ide
../homeModules/dev/ide/jb/idea.nix ../homeModules/dev/ide/jb/idea.nix
@ -50,7 +50,7 @@ in {
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
pinned.etcher pinned.etcher
] ];
}; };
home.shellAliases = { home.shellAliases = {
sd = ''lsusb | grep Elgato | grep --perl-regexp "(?<=Device 0{0,10})[1-9]+" --only-matching | xargs printf "usb.device_address eq %s" | copy''; sd = ''lsusb | grep Elgato | grep --perl-regexp "(?<=Device 0{0,10})[1-9]+" --only-matching | xargs printf "usb.device_address eq %s" | copy'';

103
flake.lock
View file

@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1708890466, "lastModified": 1732200724,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae", "rev": "153d52373b0fb2d343592871009a286ec8837aec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716150083, "lastModified": 1731949548,
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +199,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +254,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1731533236,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1689549921, "lastModified": 1731966426,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "fromYaml", "repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", "rev": "106af9e2f715e2d828df706c386a685698f3223b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,11 +340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730016908, "lastModified": 1732482255,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e83414058edd339148dc142a8437edb9450574c8", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730837930, "lastModified": 1732482255,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +423,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729999765, "lastModified": 1732519917,
"narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -461,11 +461,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729717678, "lastModified": 1731682434,
"narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-wsl", "repo": "nixos-wsl",
"rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,11 +476,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729880355, "lastModified": 1732521221,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -490,22 +490,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1729973466,
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1730200266, "lastModified": 1730200266,
@ -524,11 +508,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1729951556, "lastModified": 1731763621,
"narHash": "sha256-bpb6r3GjzhNW8l+mWtRtLNg5PhJIae041sPyqcFNGb4=", "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4e0eec54db79d4d0909f45a88037210ff8eaffee", "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -572,15 +556,14 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3"
"nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1729999681, "lastModified": 1732575825,
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -608,11 +591,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1731920923, "lastModified": 1732608183,
"narHash": "sha256-Pqe38TdvfyywhlhpR1WLJlD7uTOGXRRuzpHIh2edOz0=", "narHash": "sha256-T5k5ill+PNIEW6KuS4CpUacMtZNJe2J2q5eBOF4xWuU=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "f8699483e46972f64b0dee5d5e41bf4bb142629b", "rev": "7689e621f87bce7b6ab1925dfd70ad1f4c80f334",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -719,11 +702,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696725902, "lastModified": 1729501581,
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
flake.nix
View file

@ -15,8 +15,8 @@
inputs.nixpkgs.follows = "nix-stable"; inputs.nixpkgs.follows = "nix-stable";
}; };
stylix-stable = { stylix-stable = {
url = "github:danth/stylix/release-24.05"; url = "github:danth/stylix/release-24.05";
inputs.nixpkgs.follows = "nix-stable"; inputs.nixpkgs.follows = "nix-stable";
}; };
home-manager-stable = { home-manager-stable = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
@ -31,8 +31,8 @@
url = "github:sadan4/scripts"; url = "github:sadan4/scripts";
}; };
stylix = { stylix = {
url = "github:danth/stylix"; url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = outputs =
@ -83,11 +83,21 @@
inherit inputs; inherit inputs;
stable = import nix-stable { stable = import nix-stable {
inherit system; inherit system;
config = { allowUnfree = true; }; config = {
allowUnfree = true;
};
}; };
}; };
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
(
{ pkgs, ... }:
{
_module.args = {
unstable = pkgs;
};
}
)
./boxes/desktop/configuration.nix ./boxes/desktop/configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
inputs.nix-index-database.nixosModules.nix-index inputs.nix-index-database.nixosModules.nix-index
@ -104,10 +114,20 @@
}; };
unstable = import nixpkgs { unstable = import nixpkgs {
inherit system; inherit system;
config = { allowUnfree = true; }; config = {
allowUnfree = true;
};
}; };
}; };
modules = [ modules = [
(
{ pkgs, ... }:
{
_module.args = {
stable = pkgs;
};
}
)
./boxes/wsl/configuration.nix ./boxes/wsl/configuration.nix
inputs.home-manager-stable.nixosModules.default inputs.home-manager-stable.nixosModules.default
nixos-wsl.nixosModules.wsl nixos-wsl.nixosModules.wsl