cleander flakes
This commit is contained in:
parent
bc3184a8c7
commit
5aa331ed3e
@ -1 +0,0 @@
|
|||||||
99a339a3-e421-4c0c-8f9e-6fa8c82e54ab
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
[Source-applicationVersion]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[Source-locale]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[Source-places]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[Source-platform]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[Source-qtVersion]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[Source-screens]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[Source-settings]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[Source-startCount]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[Source-usageTime]
|
|
||||||
dataSourceCommonSettings\activeState=true
|
|
||||||
|
|
||||||
[UserFeedback]
|
|
||||||
ApplicationStartCount=642
|
|
||||||
ApplicationTime=1931897
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Net/CursorBlinkTime 1000
|
Net/CursorBlinkTime 1000
|
||||||
Net/CursorBlink 1
|
Net/CursorBlink 1
|
||||||
Gdk/UnscaledDPI 122880
|
Gdk/UnscaledDPI 98304
|
||||||
Gdk/WindowScalingFactor 1
|
Gdk/WindowScalingFactor 1
|
||||||
Gtk/EnableAnimations 1
|
Gtk/EnableAnimations 1
|
||||||
Gtk/DecorationLayout "icon:minimize,maximize,close"
|
Gtk/DecorationLayout "icon:minimize,maximize,close"
|
||||||
@ -8,7 +8,7 @@ Gtk/PrimaryButtonWarpsSlider 1
|
|||||||
Gtk/ToolbarStyle 3
|
Gtk/ToolbarStyle 3
|
||||||
Gtk/MenuImages 1
|
Gtk/MenuImages 1
|
||||||
Gtk/ButtonImages 1
|
Gtk/ButtonImages 1
|
||||||
Gtk/CursorThemeSize 22
|
Gtk/CursorThemeSize 24
|
||||||
Gtk/CursorThemeName "catppuccin-frappe-blue-cursors"
|
Gtk/CursorThemeName "catppuccin-frappe-blue-cursors"
|
||||||
Net/SoundThemeName "ocean"
|
Net/SoundThemeName "ocean"
|
||||||
Net/IconThemeName "breeze-dark"
|
Net/IconThemeName "breeze-dark"
|
||||||
|
|||||||
@ -4,7 +4,7 @@ gtk-button-images=true
|
|||||||
gtk-cursor-blink=true
|
gtk-cursor-blink=true
|
||||||
gtk-cursor-blink-time=1000
|
gtk-cursor-blink-time=1000
|
||||||
gtk-cursor-theme-name=catppuccin-frappe-blue-cursors
|
gtk-cursor-theme-name=catppuccin-frappe-blue-cursors
|
||||||
gtk-cursor-theme-size=18
|
gtk-cursor-theme-size=24
|
||||||
gtk-decoration-layout=icon:minimize,maximize,close
|
gtk-decoration-layout=icon:minimize,maximize,close
|
||||||
gtk-enable-animations=true
|
gtk-enable-animations=true
|
||||||
gtk-enable-event-sounds=1
|
gtk-enable-event-sounds=1
|
||||||
@ -19,6 +19,6 @@ gtk-theme-name=catppuccin-frappe-mauve-standard+default
|
|||||||
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
|
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
|
||||||
gtk-toolbar-style=3
|
gtk-toolbar-style=3
|
||||||
gtk-xft-antialias=1
|
gtk-xft-antialias=1
|
||||||
gtk-xft-dpi=122880
|
gtk-xft-dpi=98304
|
||||||
gtk-xft-hinting=1
|
gtk-xft-hinting=1
|
||||||
gtk-xft-hintstyle=hintfull
|
gtk-xft-hintstyle=hintfull
|
||||||
|
|||||||
@ -3,7 +3,7 @@ gtk-application-prefer-dark-theme=true
|
|||||||
gtk-cursor-blink=true
|
gtk-cursor-blink=true
|
||||||
gtk-cursor-blink-time=1000
|
gtk-cursor-blink-time=1000
|
||||||
gtk-cursor-theme-name=catppuccin-frappe-blue-cursors
|
gtk-cursor-theme-name=catppuccin-frappe-blue-cursors
|
||||||
gtk-cursor-theme-size=18
|
gtk-cursor-theme-size=24
|
||||||
gtk-decoration-layout=icon:minimize,maximize,close
|
gtk-decoration-layout=icon:minimize,maximize,close
|
||||||
gtk-enable-animations=true
|
gtk-enable-animations=true
|
||||||
gtk-font-name=Noto Sans, 10
|
gtk-font-name=Noto Sans, 10
|
||||||
@ -11,4 +11,4 @@ gtk-icon-theme-name=breeze-dark
|
|||||||
gtk-modules=colorreload-gtk-module
|
gtk-modules=colorreload-gtk-module
|
||||||
gtk-primary-button-warps-slider=true
|
gtk-primary-button-warps-slider=true
|
||||||
gtk-sound-theme-name=ocean
|
gtk-sound-theme-name=ocean
|
||||||
gtk-xft-dpi=122880
|
gtk-xft-dpi=98304
|
||||||
|
|||||||
@ -3,7 +3,9 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
pkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
pkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/master";
|
url = "github:nix-community/home-manager/master";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@ -13,80 +15,96 @@
|
|||||||
url = "github:hyprwm/Hyprland";
|
url = "github:hyprwm/Hyprland";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
hyprland-plugins = {
|
hyprland-plugins = {
|
||||||
url = "github:hyprwm/hyprland-plugins";
|
url = "github:hyprwm/hyprland-plugins";
|
||||||
inputs.hyprland.follows = "hyprland";
|
inputs.hyprland.follows = "hyprland";
|
||||||
};
|
};
|
||||||
|
|
||||||
hyprland-split-monitor-workspaces = {
|
hyprland-split-monitor-workspaces = {
|
||||||
url = "github:zjeffer/split-monitor-workspaces";
|
url = "github:zjeffer/split-monitor-workspaces";
|
||||||
inputs.hyprland.follows = "hyprland";
|
inputs.hyprland.follows = "hyprland";
|
||||||
};
|
};
|
||||||
#hyprland-hyprspace = {
|
|
||||||
|
# hyprland-hyprspace = {
|
||||||
# url = "github:KZDKM/Hyprspace";
|
# url = "github:KZDKM/Hyprspace";
|
||||||
# inputs.hyprland.follows = "hyprland";
|
# inputs.hyprland.follows = "hyprland";
|
||||||
#};
|
# };
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, pkgs-unstable, home-manager, hyprland-split-monitor-workspaces, ... }@inputs:
|
outputs = {
|
||||||
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
pkgs-unstable,
|
||||||
|
home-manager,
|
||||||
|
...
|
||||||
|
} @ inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
in {
|
|
||||||
nixosConfigurations.nixMain = nixpkgs.lib.nixosSystem {
|
mkHost =
|
||||||
|
{
|
||||||
|
hostname,
|
||||||
|
configuration,
|
||||||
|
hardware ? null,
|
||||||
|
home,
|
||||||
|
}:
|
||||||
|
nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
pkgs-unstable = import pkgs-unstable { inherit system; };
|
inherit inputs;
|
||||||
inputs = inputs;
|
pkgs-unstable = import pkgs-unstable {
|
||||||
|
inherit system;
|
||||||
};
|
};
|
||||||
modules = [
|
};
|
||||||
./nixMain/configuration.nix
|
|
||||||
home-manager.nixosModules.home-manager {
|
modules =
|
||||||
|
[
|
||||||
|
{
|
||||||
|
networking.hostName = hostname;
|
||||||
|
}
|
||||||
|
|
||||||
|
configuration
|
||||||
|
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
|
||||||
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.backupFileExtension = "backup";
|
home-manager.backupFileExtension = "backup";
|
||||||
|
|
||||||
home-manager.users.someone = import ./nixMain/homemanager/someone.nix;
|
home-manager.users.someone = import home;
|
||||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
nixosConfigurations.nixLap = nixpkgs.lib.nixosSystem {
|
|
||||||
inherit system;
|
|
||||||
specialArgs = {
|
|
||||||
pkgs-unstable = import pkgs-unstable { inherit system; };
|
|
||||||
inputs = inputs;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
./nixLap/configuration.nix
|
|
||||||
./nixLap/hardware-configuration.nix
|
|
||||||
home-manager.nixosModules.home-manager {
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.backupFileExtension = "backup";
|
|
||||||
|
|
||||||
home-manager.users.someone = import ./nixLap/homemanager/someone.nix;
|
home-manager.extraSpecialArgs = {
|
||||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
inherit inputs;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
];
|
]
|
||||||
|
++ nixpkgs.lib.optional (hardware != null) hardware;
|
||||||
};
|
};
|
||||||
nixosConfigurations.nixLjs = nixpkgs.lib.nixosSystem {
|
in
|
||||||
inherit system;
|
{
|
||||||
specialArgs = {
|
nixosConfigurations = {
|
||||||
pkgs-unstable = import pkgs-unstable { inherit system; };
|
nixMain = mkHost {
|
||||||
inputs = inputs;
|
hostname = "nixMain";
|
||||||
|
configuration = ./nixMain/configuration.nix;
|
||||||
|
home = ./nixMain/homemanager/someone.nix;
|
||||||
};
|
};
|
||||||
modules = [
|
|
||||||
./nixLap/configuration.nix
|
|
||||||
./nixLjs/hardware-configuration.nix
|
|
||||||
home-manager.nixosModules.home-manager {
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.backupFileExtension = "backup";
|
|
||||||
|
|
||||||
home-manager.users.someone = import ./nixLap/homemanager/someone.nix;
|
nixLap = mkHost {
|
||||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
hostname = "nixLap";
|
||||||
}
|
configuration = ./nixLap/configuration.nix;
|
||||||
];
|
hardware = ./nixLap/hardware-configuration.nix;
|
||||||
|
home = ./nixLap/homemanager/someone.nix;
|
||||||
|
};
|
||||||
|
|
||||||
|
nixLjs = mkHost {
|
||||||
|
hostname = "nixLjs";
|
||||||
|
configuration = ./nixLap/configuration.nix;
|
||||||
|
hardware = ./nixLjs/hardware-configuration.nix;
|
||||||
|
home = ./nixLap/homemanager/someone.nix;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,8 +21,6 @@ in
|
|||||||
"cryptd"
|
"cryptd"
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "nixLap";
|
|
||||||
|
|
||||||
# Start the driver at boot
|
# Start the driver at boot
|
||||||
systemd.services.fprintd = {
|
systemd.services.fprintd = {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|||||||
39
root-conf/nixos/nixLjs/hardware-configuration.nix
Normal file
39
root-conf/nixos/nixLjs/hardware-configuration.nix
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
# 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, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci_renesas" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{ device = "/dev/mapper/cryptroot";
|
||||||
|
fsType = "btrfs";
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/baf64679-742e-4700-9e12-6bc9bc15617c";
|
||||||
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{ device = "/dev/disk/by-uuid/A2AF-FD4D";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [{
|
||||||
|
device = "/dev/disk/by-label/swap";
|
||||||
|
encrypted = {
|
||||||
|
enable = true;
|
||||||
|
label = "swap";
|
||||||
|
blkDev = "/dev/disk/by-label/cryptoswap";
|
||||||
|
};
|
||||||
|
}];
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
@ -10,8 +10,6 @@ in
|
|||||||
../shared-conf.nix
|
../shared-conf.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "nixMain"; # Define your hostname.
|
|
||||||
|
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user