mirror of
https://gitlab.com/Zaney/zaneyos.git
synced 2024-11-24 15:43:17 +01:00
Remove pkgs flake.nix useless definition and run a nixfmt
This commit is contained in:
parent
fa0cfba454
commit
4dceea0296
@ -1,8 +1,4 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ pkgs, config, ... }:
|
||||
|
||||
{
|
||||
programs = {
|
||||
@ -20,7 +16,11 @@
|
||||
display-run = " Run";
|
||||
display-filebrowser = " File";
|
||||
};
|
||||
theme = let inherit (config.lib.formats.rasi) mkLiteral; in {
|
||||
theme =
|
||||
let
|
||||
inherit (config.lib.formats.rasi) mkLiteral;
|
||||
in
|
||||
{
|
||||
"*" = {
|
||||
bg = mkLiteral "#${config.stylix.base16Scheme.base00}";
|
||||
bg-alt = mkLiteral "#${config.stylix.base16Scheme.base09}";
|
||||
@ -47,7 +47,10 @@
|
||||
padding = mkLiteral "15px";
|
||||
enabled = true;
|
||||
orientation = mkLiteral "vertical";
|
||||
children = map mkLiteral [ "inputbar" "listbox" ];
|
||||
children = map mkLiteral [
|
||||
"inputbar"
|
||||
"listbox"
|
||||
];
|
||||
background-color = mkLiteral "transparent";
|
||||
};
|
||||
"inputbar" = {
|
||||
@ -57,7 +60,11 @@
|
||||
background-color = mkLiteral "transparent";
|
||||
border-radius = "25px";
|
||||
orientation = mkLiteral "horizontal";
|
||||
children = map mkLiteral ["entry" "dummy" "mode-switcher" ];
|
||||
children = map mkLiteral [
|
||||
"entry"
|
||||
"dummy"
|
||||
"mode-switcher"
|
||||
];
|
||||
background-image = mkLiteral ''url("~/Pictures/Wallpapers/zaney-wallpaper.jpg", width)'';
|
||||
};
|
||||
"entry" = {
|
||||
@ -77,7 +84,10 @@
|
||||
padding = mkLiteral "10px";
|
||||
background-color = mkLiteral "transparent";
|
||||
orientation = mkLiteral "vertical";
|
||||
children = map mkLiteral [ "message" "listview" ];
|
||||
children = map mkLiteral [
|
||||
"message"
|
||||
"listview"
|
||||
];
|
||||
};
|
||||
"listview" = {
|
||||
enabled = true;
|
||||
|
@ -1,7 +1,4 @@
|
||||
{
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ config, ... }:
|
||||
|
||||
{
|
||||
programs.wlogout = {
|
||||
|
@ -23,13 +23,6 @@
|
||||
system = "x86_64-linux";
|
||||
host = "familypc";
|
||||
username = "zaney";
|
||||
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
|
@ -96,7 +96,10 @@
|
||||
};
|
||||
thunar = {
|
||||
enable = true;
|
||||
plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
|
||||
plugins = with pkgs.xfce; [
|
||||
thunar-archive-plugin
|
||||
thunar-volman
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1,20 +1,31 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, username, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
username,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/9e36b8f0-e272-4e69-99ad-dba17949887f";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/9e36b8f0-e272-4e69-99ad-dba17949887f";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
@ -23,10 +34,13 @@
|
||||
# fsType = "nfs";
|
||||
# };
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/7CBF-413D";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/7CBF-413D";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
@ -9,11 +9,7 @@
|
||||
}:
|
||||
let
|
||||
palette = config.colorScheme.palette;
|
||||
inherit (import ./variables.nix)
|
||||
gitUsername
|
||||
gitEmail
|
||||
theme
|
||||
;
|
||||
inherit (import ./variables.nix) gitUsername gitEmail theme;
|
||||
in
|
||||
{
|
||||
# Home Manager Settings
|
||||
@ -91,7 +87,6 @@ in
|
||||
fill_shape=false
|
||||
'';
|
||||
|
||||
|
||||
# Install & Configure Git
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
@ -147,7 +147,10 @@
|
||||
};
|
||||
thunar = {
|
||||
enable = true;
|
||||
plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
|
||||
plugins = with pkgs.xfce; [
|
||||
thunar-archive-plugin
|
||||
thunar-volman
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1,32 +1,46 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, username, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
username,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/9e36b8f0-e272-4e69-99ad-dba17949887f";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/9e36b8f0-e272-4e69-99ad-dba17949887f";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/home/${username}/Documents" =
|
||||
{ device = "/dev/disk/by-uuid/5605f7ab-73df-4234-a8ed-50c1eae69ffa";
|
||||
fileSystems."/home/${username}/Documents" = {
|
||||
device = "/dev/disk/by-uuid/5605f7ab-73df-4234-a8ed-50c1eae69ffa";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/7CBF-413D";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/7CBF-413D";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
@ -10,10 +10,7 @@ let
|
||||
name = "fine-cmdline";
|
||||
src = inputs.fine-cmdline;
|
||||
};
|
||||
inherit (import ./variables.nix)
|
||||
gitUsername
|
||||
gitEmail
|
||||
;
|
||||
inherit (import ./variables.nix) gitUsername gitEmail;
|
||||
in
|
||||
{
|
||||
# Home Manager Settings
|
||||
@ -86,7 +83,6 @@ in
|
||||
fill_shape=false
|
||||
'';
|
||||
|
||||
|
||||
# Install & Configure Git
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
Loading…
Reference in New Issue
Block a user