Compare commits

..

No commits in common. 'b1dfb62b5ea461ddc85633aec7de942748d9dacd' and '9c610c086aa5bc561c95a2b004d9ba8bbe97d3c6' have entirely different histories.

  1. 10
      configuration.nix
  2. 34
      flake.lock
  3. 14
      flake.nix
  4. 8
      greeter.nix
  5. 13
      home.nix
  6. 138
      hyperland/default.nix

@ -78,7 +78,7 @@
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
services.libinput = { services.xserver.libinput = {
enable = true; enable = true;
touchpad.tapping = true; touchpad.tapping = true;
}; };
@ -99,14 +99,6 @@
configPackages = [ pkgs.xdg-desktop-portal-hyprland ]; configPackages = [ pkgs.xdg-desktop-portal-hyprland ];
}; };
environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
XCURSOR_SIZE = "24";
XCURSOR_THEME = "Yaru";
QT_QPA_PLATFORMTHEME = "qt5ct";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
};
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

@ -23,15 +23,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717097707, "lastModified": 1712386041,
"narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -73,16 +74,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716948383, "lastModified": 1713145326,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -102,12 +103,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1713248628,
"narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

@ -2,29 +2,31 @@
description = "A very basic flake"; description = "A very basic flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
home-manager = { home-manager = {
url = github:nix-community/home-manager; url = github:nix-community/home-manager/release-23.11;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, nixos-hardware, home-manager, nix-colors, ... }@inputs: outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, nix-colors, ... }@inputs:
let let
username = "chrigi"; username = "chrigi";
lib = nixpkgs.lib; lib = nixpkgs.lib;
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs { inherit system; };
pkgs-unstable = import nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
in { in {
nixosConfigurations.nix-fw16 = lib.nixosSystem { nixosConfigurations.nix-fw16 = lib.nixosSystem {
specialArgs = { specialArgs = {
inherit pkgs; inherit pkgs-unstable;
}; };
modules = [ modules = [
./configuration.nix ./configuration.nix
@ -34,7 +36,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${username} = import ./home.nix; home-manager.users.${username} = import ./home.nix;
home-manager.extraSpecialArgs = {inherit username nix-colors; }; home-manager.extraSpecialArgs = {inherit pkgs-unstable username nix-colors; };
} }
]; ];
}; };

@ -1,8 +1,8 @@
{ config, pkgs, lib, ... }: { config, pkgs, pkgs-unstable, lib, ... }:
let let
tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; tuigreet = "${pkgs-unstable.greetd.tuigreet}/bin/tuigreet";
hyprland-session = "${pkgs.hyprland}/share/wayland-sessions"; hyprland-session = "${pkgs-unstable.hyprland}/share/wayland-sessions";
# https://github.com/bytemouse/config/blob/48d9be51a9666c9b62f4b8e84322b9d892ee0aea/modules/gnome.nix#L11 # https://github.com/bytemouse/config/blob/48d9be51a9666c9b62f4b8e84322b9d892ee0aea/modules/gnome.nix#L11
gnome-script = pkgs.writeShellScriptBin "gnome-script" '' gnome-script = pkgs.writeShellScriptBin "gnome-script" ''
@ -27,6 +27,6 @@ in {
}; };
}; };
}; };
environment.systemPackages = with pkgs; [ greetd.tuigreet ]; environment.systemPackages = with pkgs-unstable; [ greetd.tuigreet ];
} }

@ -1,7 +1,7 @@
{ config, pkgs, nix-colors, username, ... }: { config, pkgs, pkgs-unstable, nix-colors, username, ... }:
{ {
imports = [ imports = [
nix-colors.homeManagerModules.default nix-colors.homeManagerModules.default
./modules/dunst.nix ./modules/dunst.nix
./hyperland ./hyperland
@ -17,11 +17,12 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
kitty kitty
eza eza
obsidian pkgs-unstable.obsidian
jq jq
_1password pkgs-unstable._1password
_1password-gui pkgs-unstable._1password-gui
skypeforlinux pkgs-unstable.skypeforlinux
pkgs-unstable.hyprlock
]; ];
programs.ssh = { programs.ssh = {

@ -1,4 +1,4 @@
{ config, pkgs, username, ... }: { config, pkgs, pkgs-unstable, username, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -11,81 +11,77 @@
# })) # }))
]; ];
programs.hyprlock = { home.file.".config/hypr/hyprlock.conf".text =
enable = true; ''
settings = { background {
background = { monitor =
monitor = "";
# path = screenshot # path = screenshot
color = "rgba(152, 179, 166, 0.9)"; color = rgba(152, 179, 166, 0.9)
blur_passes = 1; blur_passes = 1
blur_size = 7; blur_size = 7
noise = 0.0117; noise = 0.0117
contrast = 0.8916; contrast = 0.8916
brightness = 0.8172; brightness = 0.8172
vibrancy = 0.1696; vibrancy = 0.1696
vibrancy_darkness = 0.0; vibrancy_darkness = 0.0
}; }
input-field = { input-field {
monitor = ""; monitor =
size = "200, 50"; size = 200, 50
outline_thickness = 3; outline_thickness = 3
dots_size = 0.33; # Scale of input-field height, 0.2 - 0.8 dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
dots_spacing = 0.15; # Scale of dots' absolute size, 0.0 - 1.0 dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
dots_center = true; dots_center = true
dots_rounding = -1; # -1 default circle, -2 follow input-field rounding dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
outer_color = "rgb(151515)"; outer_color = rgb(151515)
inner_color = "rgb(200, 200, 200)"; inner_color = rgb(200, 200, 200)
font_color = "rgb(10, 10, 10)"; font_color = rgb(10, 10, 10)
fade_on_empty = true; fade_on_empty = true
fade_timeout = 1000; # Milliseconds before fade_on_empty is triggered. fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
placeholder_text = ''<i>Input Password...</i>''; # Text rendered in the input box when it's empty. placeholder_text = <i>Input Password...</i> # Text rendered in the input box when it's empty.
hide_input = false; hide_input = false
rounding = -1; # -1 means complete rounding (circle/oval) rounding = -1 # -1 means complete rounding (circle/oval)
check_color = "rgb(204, 136, 34)"; check_color = rgb(204, 136, 34)
fail_color = "rgb(204, 34, 34)"; # if authentication failed, changes outer_color and fail message color fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color
fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>"; # can be set to empty fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i> # can be set to empty
fail_transition = 300; # transition time in ms between normal outer_color and fail_color fail_transition = 300 # transition time in ms between normal outer_color and fail_color
capslock_color = -1; capslock_color = -1
numlock_color = -1; numlock_color = -1
bothlock_color = -1; # when both locks are active. -1 means don't change outer color (same for above) bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
invert_numlock = false; # change color if numlock is off invert_numlock = false # change color if numlock is off
position = "0, 200"; position = 0, 200
halign = "center"; halign = center
valign = "center"; valign = center
}; }
label = [ label {
{ monitor =
monitor = ""; text = cmd[update:1000] echo "$TIME"
text = "cmd[update:1000] echo \"$TIME\""; color = rgba(200, 200, 200, 1.0)
color = "rgba(200, 200, 200, 1.0)"; font_size = 55
font_size = 55; font_family = JetBrainsMono Nerd Font
font_family = "JetBrainsMono Nerd Font"; position = 0, 150
position = "0, 150"; halign = center
halign = "center"; valign = bottom
valign = "bottom"; shadow_passes = 5
shadow_passes = 5; shadow_size = 10
shadow_size = 10; }
}
{ label {
monitor = ""; monitor =
text = "$USER"; text = $USER
color = "rgba(200, 200, 200, 1.0)"; color = rgba(200, 200, 200, 1.0)
font_size = 20; font_size = 20
font_family = "JetBrainsMono Nerd Font"; font_family = JetBrainsMono Nerd Font
position = "0, 80"; position = 0, 80
halign = "center"; halign = center
valign = "bottom"; valign = bottom
shadow_passes = 5; shadow_passes = 5
shadow_size = 10; shadow_size = 10
} }
]; '';
};
};
wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {

Loading…
Cancel
Save

Powered by TurnKey Linux.