Skip to content

Commit

Permalink
Move to 24.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@arunoruto
arunoruto committed Nov 23, 2024
1 parent de8dba2 commit 483874e
Show file tree
Hide file tree
Showing 15 changed files with 190 additions and 179 deletions.
262 changes: 142 additions & 120 deletions flake.lock
View file

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs = {
# Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# NixOS
disko = {
Expand All @@ -28,7 +28,7 @@
# nur.url = "github:nix-community/NUR";
# Home Manager
home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
# hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
Expand All @@ -52,9 +52,10 @@
# nixvim-flake.url = "github:arunoruto/nvim.nix";
# Styling
stylix = {
# url = "github:danth/stylix";
url = "github:danth/stylix/release-24.05";
url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs";
# url = "github:danth/stylix/release-24.05";
# inputs.nixpkgs.follows = "nixpkgs";
};
# ags.url = "github:Aylur/ags";
# poetry2nix = {
Expand Down
6 changes: 3 additions & 3 deletions modules/home-manager/pc/desktop/hyprland/lock.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ in
dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
dots_center = true;
outer_color = "rgba(0, 0, 0, 0)";
inner_color = "rgba(0, 0, 0, 0.5)";
font_color = "rgb(200, 200, 200)";
# outer_color = "rgba(0, 0, 0, 0)";
# inner_color = "rgba(0, 0, 0, 0.5)";
# font_color = "rgb(200, 200, 200)";
fade_on_empty = false;
# font_family = font;
placeholder_text = ''<i><span foreground="##cdd6f4">Input Password...</span></i>'';
Expand Down
2 changes: 1 addition & 1 deletion modules/home-manager/pc/desktop/hyprland/paper.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}:
{
imports = [
./paper-stylix.nix
# ./paper-stylix.nix
];

options.hypr.paper.enable = lib.mkEnableOption "Configure hyprpaper for wallpaper settings";
Expand Down
1 change: 1 addition & 0 deletions modules/home-manager/pc/terminal/wezterm.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
local config = {}
config.audible_bell = "Disabled"
config.enable_wayland = false
config.front_end = "WebGpu"
config.hide_tab_bar_if_only_one_tab = true
-- config.window_decorations = 'TITLE | RESIZE'
config.window_decorations = 'RESIZE'
Expand Down
6 changes: 4 additions & 2 deletions modules/home-manager/theming/cursors.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@

config = lib.mkIf config.theming.cursors.enable {
stylix.cursor = {
name = "catppuccin-macchiato-dark-cursors";
package = pkgs.catppuccin-cursors.macchiatoDark;
# name = "catppuccin-macchiato-dark-cursors";
# package = pkgs.catppuccin-cursors.macchiatoDark;
name = "Banana";
package = pkgs.banana-cursor;
size = 24;
};

Expand Down
4 changes: 2 additions & 2 deletions modules/nixos/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
./services
./system

# ./pr.nix

./user.nix

# ./pr.nix
];

desktop-environment.enable = lib.mkDefault true;
Expand Down
14 changes: 7 additions & 7 deletions modules/nixos/desktop/gnome.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@
gnome-network-displays
gthumb
nautilus-open-any-terminal
gnome.nautilus-python
gnome.gnome-software
gnome.pomodoro
gnome.gnome-remote-desktop
gnome3.gnome-tweaks
gnome.zenity
nautilus-python
gnome-software
gnome-pomodoro
gnome-remote-desktop
gnome-tweaks
zenity
];
# Excluding some GNOME applications from the default install
gnome.excludePackages =
(with pkgs; [
gnome-photos
gnome-tour
])
++ (with pkgs.gnome; [
++ (with pkgs; [
#cheese # webcam tool
gnome-music
gnome-terminal
Expand Down
3 changes: 2 additions & 1 deletion modules/nixos/display/gdm.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
};

programs = {
ssh.askPassword = lib.mkForce "${pkgs.gnome.seahorse.out}/bin/seahorse";
# ssh.askPassword = lib.mkForce "${pkgs.seahorse.out}/bin/seahorse";
ssh.askPassword = lib.mkForce "${lib.getExe pkgs.seahorse}";
dconf.profiles.gdm.databases = [
{
settings = {
Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/environment/programming/python.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let
numpy
pandas
plotly
streamlit
# streamlit
# Misc
manim
psutil
Expand Down
46 changes: 13 additions & 33 deletions modules/nixos/security/fingerprint.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,50 +38,30 @@

## https://github.com/NixOS/nixpkgs/issues/171136#issuecomment-1627779037
# similarly to how other distributions handle the fingerprinting login
# gdm-fingerprint = lib.mkIf config.services.fprintd.enable {
# text = ''
# gdm-fingerprint.text = lib.mkIf config.services.fprintd.enable (
# ''
# auth required pam_shells.so
# auth requisite pam_nologin.so
# auth requisite pam_faillock.so preauth
# auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
# auth optional pam_permit.so
# auth required pam_env.so
# auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
# auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so
# ''
# + lib.optionalString config.security.pam.services.login.enableGnomeKeyring ''
# auth [success=ok default=1] ${pkgs.gdm}/lib/security/pam_gdm.so
# auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
# ''
# + ''

# account include login

# password required pam_deny.so

# session include login
# session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
# '';
# };

gdm-fingerprint.text = lib.mkIf config.services.fprintd.enable (
''
auth required pam_shells.so
auth requisite pam_nologin.so
auth requisite pam_faillock.so preauth
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth required pam_env.so
''
+ lib.optionalString config.security.pam.services.login.enableGnomeKeyring ''
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so
''
+ ''
account include login
password required pam_deny.so
session include login
''
# + lib.optionalString config.security.pam.services.login.enableGnomeKeyring ''
# session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
# ''
);
# ''
# # + lib.optionalString config.security.pam.services.login.enableGnomeKeyring ''
# # session optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
# # ''
# );
};

## we need fwupd 1.9.7 to downgrade the fingerprint sensor firmware
Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/services/media/sound.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
};
config = lib.mkIf config.pipewire.enable {
# Enable sound with pipewire.
sound.enable = lib.mkForce false;
# sound.enable = lib.mkForce false;
hardware.pulseaudio.enable = false;
# rtkit is optional but recommended
security.rtkit.enable = true;
Expand Down
2 changes: 1 addition & 1 deletion modules/nixos/system/amd/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

hardware.opengl = {
enable = true;
driSupport = true;
# driSupport = true;
driSupport32Bit = true;
extraPackages =
(with pkgs; [
Expand Down
5 changes: 3 additions & 2 deletions modules/nixos/system/theming.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@
base16Scheme = lib.mkDefault "${pkgs.unstable.base16-schemes}/share/themes/${config.theming.scheme}.yaml";
image = inputs.wallpapers + "/${config.theming.image}";
polarity = config.home-manager.users.${username}.stylix.polarity;
cursor = lib.optionalAttrs (config.programs.enable
) config.home-manager.users.${username}.stylix.cursor;
cursor =
lib.optionalAttrs config.programs.enable
config.home-manager.users.${username}.stylix.cursor;
# if (config.programs.enable) then config.home-manager.users.${username}.stylix.cursor else { };
# fonts =
# if (config.gui.enable)
Expand Down
5 changes: 4 additions & 1 deletion modules/nixos/user.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ in
};
};

programs.zsh.enable = true;
# programs.${shell}.enable = lib.mkForce true;
programs = {
fish.enable = true;
};

environment = {
sessionVariables.FLAKE = "/home/${username}/.config/flake";
Expand Down

0 comments on commit 483874e

Please sign in to comment.