lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates to foxtrot

Browse source
This commit is contained in:
Daniel Flanagan 2023-10-18 09:14:19 -05:00
parent fa9478a427
commit 4269f2a1de
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
7 changed files with 56 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
flake.lock
View file

@ -242,7 +242,7 @@
"nix": { "nix": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1609520816, "lastModified": 1609520816,
@ -259,16 +259,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1690026219, "lastModified": 1697456312,
"narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -289,22 +289,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1696019113,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1696125185, "lastModified": 1696125185,
@ -316,7 +300,7 @@
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixpkgs",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -370,6 +354,22 @@
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": {
"lastModified": 1697456312,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1694760568, "lastModified": 1694760568,
"narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
@ -380,12 +380,12 @@
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixpkgs",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1602702596, "lastModified": 1602702596,
"narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=",
@ -400,7 +400,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1692447944, "lastModified": 1692447944,
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
@ -424,7 +424,7 @@
"helix": "helix", "helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs": "nixpkgs_6",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"ssbm": "ssbm" "ssbm": "ssbm"
} }
@ -472,7 +472,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_7",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
@ -492,7 +492,7 @@
"ssbm": { "ssbm": {
"inputs": { "inputs": {
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_9",
"slippi-desktop": "slippi-desktop" "slippi-desktop": "slippi-desktop"
}, },
"locked": { "locked": {

32
flake.nix
View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
helix.url = "github:helix-editor/helix/75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b"; helix.url = "github:helix-editor/helix/75c0a5ceb32d8a503915a93ccc1b64c8ad1cba8b";
disko.url = "github:nix-community/disko/master"; disko.url = "github:nix-community/disko/master";
@ -20,7 +20,7 @@
outputs = { outputs = {
self, self,
nixpkgs-unstable, nixpkgs,
home-manager, home-manager,
... ...
} @ inputs: let } @ inputs: let
@ -34,7 +34,7 @@
"x86_64-darwin" "x86_64-darwin"
]; ];
forAllSystems = nixpkgs-unstable.lib.genAttrs systems; forAllSystems = nixpkgs.lib.genAttrs systems;
color-schemes = (import ./lib/colors.nix inputs).schemes; color-schemes = (import ./lib/colors.nix inputs).schemes;
colors = color-schemes.catppuccin-mocha-sapphire; colors = color-schemes.catppuccin-mocha-sapphire;
@ -49,11 +49,11 @@
# Your custom packages # Your custom packages
# Acessible through 'nix build', 'nix shell', etc # Acessible through 'nix build', 'nix shell', etc
packages = forAllSystems (system: import ./pkgs nixpkgs-unstable.legacyPackages.${system}); packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
# Formatter for your nix files, available through 'nix fmt' # Formatter for your nix files, available through 'nix fmt'
# Other options beside 'alejandra' include 'nixpkgs-fmt' # Other options beside 'alejandra' include 'nixpkgs-fmt'
formatter = forAllSystems (system: nixpkgs-unstable.legacyPackages.${system}.alejandra); formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
# Your custom packages and modifications, exported as overlays # Your custom packages and modifications, exported as overlays
overlays = import ./overlays {inherit inputs;}; overlays = import ./overlays {inherit inputs;};
@ -69,8 +69,8 @@
# NixOS configuration entrypoint # NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname' # Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = let nixosConfigurations = let
mkNixosSystem = cb: system: modules: homeManagerModules: mkNixosSystem = system: modules: homeManagerModules:
cb { nixpkgs.lib.nixosSystem {
system = system; system = system;
specialArgs = { specialArgs = {
inherit inputs outputs system colors font; inherit inputs outputs system colors font;
@ -94,29 +94,27 @@
} }
]; ];
}; };
# mkNixosStableSystem = mkNixosSystem nixpkgs-stable.lib.nixosSystem;
mkNixosUnstableSystem = mkNixosSystem nixpkgs-unstable.lib.nixosSystem;
in { in {
dragon = mkNixosUnstableSystem "x86_64-linux" [./nixos/dragon] (with outputs.homeManagerModules; [ dragon = mkNixosSystem "x86_64-linux" [./nixos/dragon] (with outputs.homeManagerModules; [
dragon dragon
]); ]);
thinker = mkNixosUnstableSystem "x86_64-linux" [./nixos/thinker] (with outputs.homeManagerModules; [ thinker = mkNixosSystem "x86_64-linux" [./nixos/thinker] (with outputs.homeManagerModules; [
thinker thinker
]); ]);
foxtrot = mkNixosUnstableSystem "x86_64-linux" [./nixos/foxtrot] (with outputs.homeManagerModules; [ foxtrot = mkNixosSystem "x86_64-linux" [./nixos/foxtrot] (with outputs.homeManagerModules; [
foxtrot foxtrot
]); ]);
beefcake = beefcake =
mkNixosUnstableSystem "x86_64-linux" [ mkNixosSystem "x86_64-linux" [
inputs.api-lyte-dev.nixosModules.x86_64-linux.api-lyte-dev inputs.api-lyte-dev.nixosModules.x86_64-linux.api-lyte-dev
./nixos/beefcake ./nixos/beefcake
] (with outputs.homeManagerModules; [ ] (with outputs.homeManagerModules; [
linux linux
]); ]);
rascal = mkNixosUnstableSystem "x86_64-linux" [./nixos/rascal] (with outputs.homeManagerModules; [ rascal = mkNixosSystem "x86_64-linux" [./nixos/rascal] (with outputs.homeManagerModules; [
linux linux
]); ]);
musicbox = mkNixosUnstableSystem "x86_64-linux" [./nixos/musicbox] (with outputs.homeManagerModules; [ musicbox = mkNixosSystem "x86_64-linux" [./nixos/musicbox] (with outputs.homeManagerModules; [
sway sway
]); ]);
}; };
@ -129,7 +127,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
in in
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs-unstable.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = {inherit inputs outputs system colors font;}; extraSpecialArgs = {inherit inputs outputs system colors font;};
modules = with outputs.homeManagerModules; [linux]; modules = with outputs.homeManagerModules; [linux];
}; };
@ -137,7 +135,7 @@
system = "aarch64-darwin"; system = "aarch64-darwin";
in in
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs-unstable.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = {inherit inputs outputs system colors font;}; extraSpecialArgs = {inherit inputs outputs system colors font;};
modules = with outputs.homeManagerModules; [macos]; modules = with outputs.homeManagerModules; [macos];
}; };

4
lib/colors.nix
View file

@ -1,4 +1,4 @@
{nixpkgs-unstable, ...}: { {nixpkgs, ...}: {
schemes = let schemes = let
mkColorScheme = scheme @ { mkColorScheme = scheme @ {
scheme-name, scheme-name,
@ -51,7 +51,7 @@
// scheme; // scheme;
in in
{ {
withHashPrefix = nixpkgs-unstable.lib.mapAttrs (_: value: "#${value}") base; withHashPrefix = nixpkgs.lib.mapAttrs (_: value: "#${value}") base;
} }
// base; // base;
in { in {

2
modules/home-manager/common.nix
View file

@ -72,7 +72,7 @@
programs.eza = { programs.eza = {
enable = true; enable = true;
package = inputs.nixpkgs-unstable.legacyPackages.${system}.eza; package = inputs.nixpkgs.legacyPackages.${system}.eza;
}; };
programs.skim = { programs.skim = {

4
modules/nixos/common.nix
View file

@ -77,6 +77,8 @@
]); ]);
}; };
users.groups.daniel = {};
users.users = { users.users = {
daniel = { daniel = {
isNormalUser = true; isNormalUser = true;
@ -194,7 +196,7 @@
id = "nixpkgs"; id = "nixpkgs";
type = "indirect"; type = "indirect";
}; };
flake = inputs.nixpkgs-unstable; flake = inputs.nixpkgs;
}; };
}; };
}; };

8
modules/nixos/desktop-usage.nix
View file

@ -1,6 +1,7 @@
{ {
pkgs, pkgs,
inputs, inputs,
outputs,
system, system,
... ...
}: { }: {
@ -12,12 +13,14 @@
./user-installed-applications.nix ./user-installed-applications.nix
]; ];
nixpkgs.overlays = [outputs.overlays.modifications];
# fonts.packages if unstable? # fonts.packages if unstable?
fonts.packages = with pkgs; fonts.packages = with pkgs;
[ [
(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
] ]
++ (with inputs.nixpkgs-unstable.legacyPackages.${system}; [ ++ (with inputs.nixpkgs.legacyPackages.${system}; [
(iosevka.override { (iosevka.override {
set = "lyteterm"; set = "lyteterm";
privateBuildPlan = '' privateBuildPlan = ''
@ -114,7 +117,8 @@
two = 'curly-neck' two = 'curly-neck'
three = 'two-arcs' three = 'two-arcs'
four = 'semi-open-non-crossing' four = 'semi-open-non-crossing'
five = 'vertical-upper-left-bar' # five = 'vertical-upper-left-bar'
five = 'upright-flat'
six = 'straight-bar' six = 'straight-bar'
seven = 'curly-serifed-crossbar' seven = 'curly-serifed-crossbar'
eight = 'two-circles' eight = 'two-circles'

8
overlays/default.nix
View file

@ -6,12 +6,6 @@
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: { modifications = final: prev: {
final = {
linux_6_5 = {
patches = [];
kernelPatches = [];
};
};
linux_6_5 = prev.linux_6_5.override { linux_6_5 = prev.linux_6_5.override {
patches = []; patches = [];
kernelPatches = []; kernelPatches = [];
@ -21,7 +15,7 @@
# When applied, the unstable nixpkgs set (declared in the flake inputs) will # When applied, the unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable' # be accessible through 'pkgs.unstable'
unstable-packages = final: _prev: { unstable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable { unstable = import inputs.nixpkgs {
system = final.system; system = final.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };