tstarr/dotfiles
1
0
Fork 0
mirror of https://github.com/starr-dusT/dotfiles.git synced 2025-05-19 02:46:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: tstarr:ef247e758dccb70d9b42a1f21007aae57d7719c2
Branches Tags
tstarr:master
tstarr:v23.05
...
compare: tstarr:08be9f6272d273a8f8cfaae75c1970164f702a4d
Branches Tags
tstarr:master
tstarr:v23.05

6 Commits
ef247e758d ... 08be9f6272

Author SHA1 Message Date
Tyler Starr
08be9f6272 clean up default physical a little 2024-09-26 22:45:51 -07:00
Tyler Starr
debd040e83 refactor default configs 2024-09-26 20:15:20 -07:00
Tyler Starr
5edfff621a fix multiple flake imports 2024-09-26 20:02:03 -07:00
Tyler Starr
74f2c84219 Merge branch 'master' of github.com:starr-dusT/dotfiles 2024-09-26 19:19:49 -07:00
Tyler Starr
c506ab8cec refactor flakes per host 2024-09-26 19:19:09 -07:00
Tyler Starr
79fa390d2a remove hyprland from flake 2024-09-26 15:44:37 -07:00
11 changed files with 127 additions and 403 deletions
Show Stats Expand all files Collapse all files

278
provision/flake.lock generated
View File

@ -21,39 +21,6 @@
"type": "github" "type": "github"
} }
}, },
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725199881,
"narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -117,186 +84,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprcursor": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1722623071,
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"systems": "systems_2",
"xdph": "xdph"
},
"locked": {
"lastModified": 1725829447,
"narHash": "sha256-qwjdAZwqk8kWdJ/NQq0u5RQFA3NfCLOnyoeCDDTmaNM=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "7c4c402bd7f24241c096d809cc80408a469f15cb",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-contrib": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1725551787,
"narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "contrib",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"xdph",
"nixpkgs"
],
"systems": [
"hyprland",
"xdph",
"systems"
]
},
"locked": {
"lastModified": 1721326555,
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725188252,
"narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1724966483,
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1721324119,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"jovian-nixos": { "jovian-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -331,22 +118,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
@ -366,10 +137,8 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib",
"jovian-nixos": "jovian-nixos", "jovian-nixos": "jovian-nixos",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
} }
}, },
"systems": { "systems": {
@ -386,51 +155,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1725203932,
"narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

125
provision/flake.nix
View File

@ -4,118 +4,35 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
home-manager = { home-manager.url = github:nix-community/home-manager;
url = github:nix-community/home-manager; home-manager.inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs"; jovian-nixos.url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?ref=development";
}; jovian-nixos.flake = false;
jovian-nixos = {
url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?ref=development";
flake = false;
};
hyprland.url = "github:hyprwm/Hyprland";
hyprland-contrib = {
url = "github:hyprwm/contrib";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs @ { self, nixpkgs, home-manager, jovian-nixos, agenix, hyprland, ... }: outputs = inputs @ { self, nixpkgs, home-manager, jovian-nixos, agenix, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
user = "tstarr"; user = "tstarr";
lib = nixpkgs.lib; lib = nixpkgs.lib;
pkgs = import nixpkgs {
inherit system;
};
in { in {
nixosConfigurations = { nixosConfigurations = {
kestrel = lib.nixosSystem { kestrel = lib.nixosSystem (import ./hosts/kestrel {
inherit system; inherit lib;
specialArgs = { inherit user; inherit inputs; }; inherit system user inputs agenix home-manager;
modules = [ });
./hosts/default.nix shivan = lib.nixosSystem (import ./hosts/shivan {
./hosts/kestrel/configuration.nix inherit lib;
./hosts/kestrel/hardware.nix inherit system user inputs agenix home-manager;
./modules });
agenix.nixosModules.default torus = lib.nixosSystem (import ./hosts/torus {
home-manager.nixosModules.home-manager { inherit lib;
home-manager.useGlobalPkgs = true; inherit system user inputs agenix home-manager;
home-manager.useUserPackages = true; });
home-manager.extraSpecialArgs = { inherit user; }; bulwark = lib.nixosSystem (import ./hosts/bulwark {
home-manager.users.${user} = { inherit lib;
imports = [ inherit system user inputs agenix home-manager jovian-nixos;
./home-modules });
];
};
}
];
};
shivan = lib.nixosSystem {
inherit system;
specialArgs = { inherit user; inherit inputs; };
modules = [
./hosts/default.nix
./hosts/shivan/configuration.nix
./hosts/shivan/hardware.nix
./modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
./home-modules
];
};
}
];
};
torus = lib.nixosSystem {
inherit system;
specialArgs = { inherit user; inherit inputs; };
modules = [
./hosts/default.nix
./hosts/torus/configuration.nix
./hosts/torus/hardware.nix
./modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
./home-modules
];
};
}
];
};
bulwark = lib.nixosSystem {
inherit system;
specialArgs = { inherit user; inherit inputs; inherit jovian-nixos; inherit home-manager; };
modules = [
./hosts/default.nix
./hosts/bulwark/configuration.nix
./hosts/bulwark/hardware.nix
./modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
./home-modules
];
};
}
];
};
}; };
}; };
} }

4
provision/home-modules/desktop/kitty.nix
View File

@ -4,6 +4,10 @@ let cfg = config.modules.desktop.kitty;
in { in {
options.modules.desktop.kitty.enable = lib.mkEnableOption "kitty"; options.modules.desktop.kitty.enable = lib.mkEnableOption "kitty";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
nerdfonts
];
programs.kitty = { programs.kitty = {
enable = true; enable = true;
theme = "Gruvbox Dark"; theme = "Gruvbox Dark";

22
provision/hosts/bulwark/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
{
inherit system;
specialArgs = { inherit user inputs; };
modules = [
../default/physical/configuration.nix
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}

4
provision/hosts/default.nix
View File

@ -1,4 +0,0 @@
{ ... }:
{
imports = [ ./default ];
}

4
provision/hosts/default/default.nix
View File

@ -1,4 +0,0 @@
{ ... }:
{
imports = [ ./git.nix ./backup.nix ./configuration.nix ./home-configuration.nix ];
}

25
provision/hosts/default/configuration.nix → provision/hosts/default/physical/configuration.nix
View File

@ -1,9 +1,14 @@
{ config, pkgs, user, lib, inputs, ... }: { config, pkgs, user, lib, inputs, ... }:
{ {
imports = [
../git.nix
../backup.nix
./home-configuration.nix
];
nix = { nix = {
package = pkgs.nixFlakes; package = pkgs.nixFlakes;
extraOptions = "experimental-features = nix-command flakes"; extraOptions = "experimental-features = nix-command flakes";
settings.auto-optimise-store = true; settings.auto-optimise-store = true;
gc = { gc = {
automatic = true; automatic = true;
@ -15,14 +20,14 @@
# Add non-free packages # Add non-free packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" "openssl-1.1.1w" ]; nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" "openssl-1.1.1w" ];
nixpkgs.overlays = import ../../lib/overlays.nix; nixpkgs.overlays = import ../../../lib/overlays.nix;
# Hardware options # Hardware options
hardware.bluetooth.enable = true; #hardware.bluetooth.enable = true;
hardware.bluetooth.package = pkgs.bluez; #hardware.bluetooth.package = pkgs.bluez;
hardware.sensor.iio.enable = true; #hardware.sensor.iio.enable = true;
hardware.graphics.enable = true; #hardware.graphics.enable = true;
hardware.graphics.enable32Bit = true; #hardware.graphics.enable32Bit = true;
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -32,11 +37,6 @@
time.timeZone = "America/Los_Angeles"; time.timeZone = "America/Los_Angeles";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
# Fonts
fonts.packages = with pkgs; [
nerdfonts
];
# Define user account. # Define user account.
users.users.${user} = { users.users.${user} = {
isNormalUser = true; isNormalUser = true;
@ -45,7 +45,6 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cowsay # A program which generates ASCII pictures of a cow with a message
inputs.agenix.packages.x86_64-linux.default inputs.agenix.packages.x86_64-linux.default
]; ];

0
provision/hosts/default/home-configuration.nix → provision/hosts/default/physical/home-configuration.nix
View File

22
provision/hosts/kestrel/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, system, user, inputs, agenix, home-manager, ... }:
{
inherit system;
specialArgs = { inherit user inputs; };
modules = [
../default/physical/configuration.nix
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}

22
provision/hosts/shivan/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, system, user, inputs, agenix, home-manager, ... }:
{
inherit system;
specialArgs = { inherit user inputs; };
modules = [
../default/physical/configuration.nix
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}

22
provision/hosts/torus/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, system, user, inputs, agenix, home-manager, ... }:
{
inherit system;
specialArgs = { inherit user inputs; };
modules = [
../default/physical/configuration.nix
./configuration.nix
./hardware.nix
../../modules
agenix.nixosModules.default
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [
../../home-modules
];
};
}
];
}