Compare commits
10 Commits
ac12242060
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c66096e81 | |||
| e6b2a1d3ee | |||
| 93b4b2730f | |||
| e9988b21ff | |||
| d6e9904bfc | |||
| aea1919a44 | |||
| da7ad42da9 | |||
| 13e5c8410e | |||
| c8cfd433ae | |||
| 60dd114bcc |
8
flake.lock
generated
8
flake.lock
generated
@@ -41,11 +41,11 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772846957,
|
||||
"narHash": "sha256-BkqU3uaQCMGWnUVAfCX8JJH12Ts7nBmpsQ1CjlzS9Ag=",
|
||||
"lastModified": 1772849004,
|
||||
"narHash": "sha256-i2QztCyeyCmsbVn3QHaEMBf1gsuJJQ/tobYgWUEG7N4=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "b506d77decdd56a95abb84c9a810d7a82ef3d4f7",
|
||||
"revCount": 2,
|
||||
"rev": "8fd87dad5abbf43a599973f75545820a95345f44",
|
||||
"revCount": 5,
|
||||
"type": "git",
|
||||
"url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
|
||||
},
|
||||
|
||||
@@ -44,7 +44,6 @@
|
||||
hyprland.enable = lib.mkDefault config.homeconfig.graphical;
|
||||
hyprlock.enable = lib.mkDefault config.homeconfig.hyprland.enable;
|
||||
wal.enable = lib.mkDefault config.homeconfig.graphical;
|
||||
#hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;
|
||||
rofi.enable = lib.mkDefault config.homeconfig.hyprland.enable;
|
||||
firefox.enable = lib.mkDefault config.homeconfig.graphical;
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ general {
|
||||
col.active_border = $color1 $color5 100deg
|
||||
col.inactive_border = $color0
|
||||
|
||||
layout = master
|
||||
layout = dwindle
|
||||
}
|
||||
decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more
|
||||
|
||||
@@ -93,6 +93,10 @@ master {
|
||||
new_status = "master"
|
||||
}
|
||||
|
||||
scrolling {
|
||||
direction = "right"
|
||||
}
|
||||
|
||||
misc {
|
||||
disable_hyprland_logo = false
|
||||
disable_splash_rendering = true
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
graphical = lib.mkDefault false;
|
||||
minimal = lib.mkDefault false;
|
||||
|
||||
hyprland.enable = false;
|
||||
hyprland.enable = lib.mkDefault false;
|
||||
};
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
|
||||
builders-use-substituters = true;
|
||||
builders-use-substitutes = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Submodule machines/laptop updated: 3c3c77825f...740f36e4ee
@@ -61,7 +61,6 @@
|
||||
|
||||
programs = {
|
||||
steam.enable = mkDefault true;
|
||||
hyprpanel.enable = mkDefault true;
|
||||
hyprland.enable = mkDefault true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ ... }: {
|
||||
{ inputs, ... }: {
|
||||
|
||||
flake.nixosModules.default = { config, lib, pkgs, nixpkgs, ... }: {
|
||||
flake.nixosModules.default = { config, lib, pkgs, ... }: {
|
||||
|
||||
options.sysconfig = with lib; {
|
||||
host = mkOption {
|
||||
@@ -26,7 +26,7 @@
|
||||
networking.hostName = lib.mkDefault config.sysconfig.host;
|
||||
|
||||
nix = {
|
||||
nixPath = [ "nixpkgs=${nixpkgs}" ];
|
||||
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
||||
channel.enable = false;
|
||||
settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ ... }: {
|
||||
{ inputs, ... }: {
|
||||
|
||||
flake.nixosModules.default = { config, lib, pkgs, hyprland, ... }: {
|
||||
flake.nixosModules.default = { config, lib, pkgs, ... }: {
|
||||
|
||||
options.sysconfig.programs.hyprland.enable = lib.options.mkOption {
|
||||
type = lib.types.bool;
|
||||
@@ -22,10 +22,31 @@
|
||||
|
||||
systemd.setPath.enable = true;
|
||||
|
||||
package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
|
||||
portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
};
|
||||
|
||||
services = {
|
||||
upower.enable = true;
|
||||
gvfs.enable = true;
|
||||
power-profiles-daemon.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
bluez
|
||||
bluez-tools
|
||||
libgtop
|
||||
dart-sass
|
||||
wl-clipboard
|
||||
gtksourceview
|
||||
libsoup_3
|
||||
brightnessctl
|
||||
swww
|
||||
hyprpicker
|
||||
hyprsunset
|
||||
wf-recorder
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
{ ... }: {
|
||||
|
||||
flake.nixosModules.default = { config, lib, pkgs, ... }: {
|
||||
|
||||
options.sysconfig.programs.hyprpanel.enable = lib.options.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
};
|
||||
|
||||
config = lib.mkIf config.sysconfig.programs.hyprpanel.enable {
|
||||
services = {
|
||||
upower.enable = true;
|
||||
gvfs.enable = true;
|
||||
power-profiles-daemon.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
bluez
|
||||
bluez-tools
|
||||
libgtop
|
||||
dart-sass
|
||||
wl-clipboard
|
||||
gtksourceview
|
||||
libsoup_3
|
||||
brightnessctl
|
||||
swww
|
||||
hyprpicker
|
||||
hyprsunset
|
||||
wf-recorder
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ ... }: {
|
||||
{ inputs, ... }: {
|
||||
|
||||
flake.nixosModules.default = { config, lib, nixpkgs-us, ... }: {
|
||||
flake.nixosModules.default = { config, lib, ... }: {
|
||||
|
||||
options.sysconfig = {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
};
|
||||
|
||||
config = let
|
||||
pkgs-us = import nixpkgs-us {
|
||||
pkgs-us = import inputs.nixpkgs-us {
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
in lib.mkIf config.sysconfig.services.netbird.enable {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ ... }: {
|
||||
{ inputs, ... }: {
|
||||
|
||||
flake.nixosModules.default = { config, lib, nixpkgs-us, ... }: {
|
||||
flake.nixosModules.default = { config, lib, ... }: {
|
||||
|
||||
options = {
|
||||
sysconfig.services.ollama.enable = lib.options.mkOption {
|
||||
@@ -17,7 +17,7 @@
|
||||
OLLAMA_CONTEXT_LENGTH = lib.mkDefault "16000";
|
||||
};
|
||||
package = let
|
||||
pkgs-us = import nixpkgs-us {
|
||||
pkgs-us = import inputs.nixpkgs-us {
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user