Skip to content

Commit

Permalink
treewide: snowflake -> flake-parts
Browse files Browse the repository at this point in the history
  • Loading branch information
khaneliman committed Jan 13, 2025
1 parent 06322f9 commit 595b7da
Show file tree
Hide file tree
Showing 369 changed files with 1,939 additions and 1,745 deletions.
2 changes: 0 additions & 2 deletions checks/deploy/default.nix

This file was deleted.

21 changes: 0 additions & 21 deletions checks/pre-commit-hooks/default.nix

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
lib,
config,
namespace,

...
}:
let
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;

cfg = config.${namespace}.user;
cfg = config.khanelinix.user;
in
{
khanelinix = {
Expand Down Expand Up @@ -72,5 +72,9 @@ in
};
};

nixpkgs.hostPlatform = {
system = "aarch64-darwin";
};

system.stateVersion = 5;
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
lib,
namespace,

...
}:
let
inherit (lib.${namespace}) enabled disabled;
inherit (lib.khanelinix) enabled disabled;
in
{
khanelinix = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
config,
lib,
namespace,

...
}:
let
inherit (lib) mkForce;
inherit (lib.${namespace}) enabled disabled;
inherit (lib.khanelinix) enabled disabled;
in
{
khanelinix = {
Expand All @@ -23,8 +23,8 @@ in
extraAccounts =
let
# Not super secret, just doesn't need to be scraped so easily.
outlook = lib.${namespace}.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
personal = lib.${namespace}.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
outlook = lib.khanelinix.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
personal = lib.khanelinix.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";

in
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
config,
lib,
pkgs,
namespace,

...
}:
let
inherit (lib) getExe;
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;
in
{
khanelinix = {
Expand All @@ -25,8 +25,8 @@ in
extraAccounts =
let
# Not super secret, just doesn't need to be scraped so easily.
outlook = lib.${namespace}.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
personal = lib.${namespace}.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";
outlook = lib.khanelinix.decode "a2hhbmVsaW1hbjEyQG91dGxvb2suY29t";
personal = lib.khanelinix.decode "YXVzdGluLm0uaG9yc3RtYW5AZ21haWwuY29t";

in
{
Expand Down Expand Up @@ -74,9 +74,7 @@ in

appendConfig = # bash
''
exec-once = hyprctl setcursor ${config.${namespace}.theme.gtk.cursor.name} ${
builtins.toString config.${namespace}.theme.gtk.cursor.size
}
exec-once = hyprctl setcursor ${config.khanelinix.theme.gtk.cursor.name} ${builtins.toString config.khanelinix.theme.gtk.cursor.size}
'';

prependConfig = # bash
Expand Down Expand Up @@ -190,23 +188,23 @@ in
monitors = [
{
name = "DP-3";
wallpaper = "${pkgs.${namespace}.wallpapers}/share/wallpapers/cat_pacman.png";
wallpaper = "${pkgs.khanelinix.wallpapers}/share/wallpapers/cat_pacman.png";
}
{
name = "DP-1";
wallpaper = "${pkgs.${namespace}.wallpapers}/share/wallpapers/cat-sound.png";
wallpaper = "${pkgs.khanelinix.wallpapers}/share/wallpapers/cat-sound.png";
}
];

wallpapers = [
"${pkgs.${namespace}.wallpapers}/share/wallpapers/buttons.png"
"${pkgs.${namespace}.wallpapers}/share/wallpapers/cat_pacman.png"
"${pkgs.${namespace}.wallpapers}/share/wallpapers/cat-sound.png"
"${pkgs.${namespace}.wallpapers}/share/wallpapers/flatppuccin_macchiato.png"
"${pkgs.${namespace}.wallpapers}/share/wallpapers/hashtags-black.png"
"${pkgs.${namespace}.wallpapers}/share/wallpapers/hashtags-new.png"
"${pkgs.${namespace}.wallpapers}/share/wallpapers/hearts.png"
"${pkgs.${namespace}.wallpapers}/share/wallpapers/tetris.png"
"${pkgs.khanelinix.wallpapers}/share/wallpapers/buttons.png"
"${pkgs.khanelinix.wallpapers}/share/wallpapers/cat_pacman.png"
"${pkgs.khanelinix.wallpapers}/share/wallpapers/cat-sound.png"
"${pkgs.khanelinix.wallpapers}/share/wallpapers/flatppuccin_macchiato.png"
"${pkgs.khanelinix.wallpapers}/share/wallpapers/hashtags-black.png"
"${pkgs.khanelinix.wallpapers}/share/wallpapers/hashtags-new.png"
"${pkgs.khanelinix.wallpapers}/share/wallpapers/hearts.png"
"${pkgs.khanelinix.wallpapers}/share/wallpapers/tetris.png"
];
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
config,
lib,
namespace,

...
}:
let
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;
in
{
khanelinix = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
config,
lib,
namespace,

osConfig,
...
}:
let
inherit (lib) mkForce;
inherit (lib.${namespace}) enabled disabled;
inherit (lib.khanelinix) enabled disabled;
in
{
khanelinix = {
Expand Down Expand Up @@ -71,7 +71,7 @@ in
theme.catppuccin = enabled;
};

sops.secrets = lib.mkIf osConfig.${namespace}.security.sops.enable {
sops.secrets = lib.mkIf osConfig.khanelinix.security.sops.enable {
kubernetes = {
path = "${config.home.homeDirectory}/.kube/config";
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, namespace, ... }:
{ lib, ... }:
let
inherit (lib) mkForce;
inherit (lib.${namespace}) enabled disabled;
inherit (lib.khanelinix) enabled disabled;
in
{
imports = [ ./hardware.nix ];
Expand Down Expand Up @@ -46,11 +46,9 @@ in
};
};

# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
nixpkgs.hostPlatform = {
system = "x86_64-linux";
};

system.stateVersion = "23.11"; # Did you read the comment?
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
config,
lib,
namespace,

...
}:
let
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;
in
{
imports = [
Expand Down Expand Up @@ -80,7 +80,7 @@ in
# TODO: make part of ssh config proper
extraConfig = ''
Host server
User ${config.${namespace}.user.name}
User ${config.khanelinix.user.name}
Hostname austinserver.local
'';
};
Expand Down Expand Up @@ -125,6 +125,10 @@ in
NO_POINTER_VIEWPORT = "1";
};

nixpkgs.hostPlatform = {
system = "x86_64-linux";
};

nix.settings = {
cores = 8;
max-jobs = 8;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
config,
lib,
namespace,

...
}:
let
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;
in
{
imports = [
Expand Down Expand Up @@ -151,11 +151,9 @@ in
];
};

# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
nixpkgs.hostPlatform = {
system = "x86_64-linux";
};

system.stateVersion = "21.11"; # Did you read the comment?
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{
config,
lib,
namespace,
...
}:
let
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;
in
{
imports = [
Expand Down Expand Up @@ -138,7 +137,7 @@ in
# TODO: make part of ssh config proper
extraConfig = ''
Host server
User ${config.${namespace}.user.name}
User ${config.khanelinix.user.name}
Hostname austinserver.local
'';
};
Expand All @@ -151,7 +150,7 @@ in
browseable = true;
comment = "Home Public folder";
only-owner-editable = false;
path = "/home/${config.${namespace}.user.name}/Public/";
path = "/home/${config.khanelinix.user.name}/Public/";
public = true;
read-only = false;
};
Expand Down Expand Up @@ -235,11 +234,9 @@ in
rpcbind.enable = true; # needed for NFS
};

# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
nixpkgs.hostPlatform = {
system = "x86_64-linux";
};

system.stateVersion = "21.11"; # Did you read the comment?
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, namespace, ... }:
{ lib, ... }:
let
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;
in
{
imports = [ ./hardware.nix ];
Expand Down Expand Up @@ -51,11 +51,10 @@ in
};

services.displayManager.defaultSession = "hyprland";
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).

nixpkgs.hostPlatform = {
system = "x86_64-linux";
};

system.stateVersion = "21.11"; # Did you read the comment?
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, namespace, ... }:
{ lib, ... }:
let
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;
in
{
imports = [ ./hardware.nix ];
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
pkgs,
lib,
namespace,

...
}:
let
inherit (lib) mkForce;
inherit (lib.${namespace}) enabled;
inherit (lib.khanelinix) enabled;
in
{
# `install-iso` adds wireless support that
Expand Down
Loading

0 comments on commit 595b7da

Please sign in to comment.