Compare commits

..

No commits in common. "670d44fec82252ab2785049e29604a9119439b63" and "1bac00a4041ad544ddb7ea79d9067edc122126d0" have entirely different histories.

4 changed files with 27 additions and 242 deletions

View File

@ -10,8 +10,6 @@
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
programs.dconf.enable = true;
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@ -80,6 +78,24 @@
shell = pkgs.zsh; shell = pkgs.zsh;
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" ]; # Enable sudo for the user. extraGroups = [ "wheel" ]; # Enable sudo for the user.
packages = with pkgs; [
zsh # shell
kitty # terminal
tmux # multiplexer
nitrogen # wallpapers
fzf # fuzzy search
i3lock-color # locksreen
brave # browser
oh-my-zsh # prompt
picom # compositoe
ranger # file manager
superfile # file manager
obsidian # notes
arandr # manager monitor
keepassxc # passwords
devdocs-desktop # docs
spotify
];
}; };
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -88,8 +104,6 @@
# 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.shells = with pkgs; [ zsh ];
users.defaultUserShell = pkgs.zsh;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
neovim neovim
wget wget
@ -140,7 +154,7 @@
# and migrated your data accordingly. # and migrated your data accordingly.
# #
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
} }

View File

@ -1,57 +1,5 @@
{ {
"nodes": { "nodes": {
"catppuccin": {
"locked": {
"lastModified": 1721784420,
"narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=",
"owner": "catppuccin",
"repo": "nix",
"rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1721534365,
"narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1721379653, "lastModified": 1721379653,
@ -70,31 +18,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"catppuccin": "catppuccin", "nixpkgs": "nixpkgs"
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"spicetify-nix": "spicetify-nix"
}
},
"spicetify-nix": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1722053480,
"narHash": "sha256-DG1jdoSIcRLkQvCs63MSMJmssHTwm4zGOmP3hUtAzSY=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "e954f700aeaeb1b4df261c68c2391089f655fac8",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"repo": "spicetify-nix",
"type": "github"
} }
} }
}, },

View File

@ -2,37 +2,17 @@
description = "A simple flake for a nix-shell"; description = "A simple flake for a nix-shell";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
catppuccin.url = "github:catppuccin/nix";
spicetify-nix = {
url = "github:Gerg-L/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { nixpkgs, home-manager, catppuccin, spicetify-nix, ... } @ inputs: let outputs = { self, nixpkgs, ... }:
let
lib = nixpkgs.lib; lib = nixpkgs.lib;
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in { in {
nixosConfigurations = { nixosConfigurations = {
hp-laptop-lho = lib.nixosSystem { hp-laptop-lho = lib.nixosSystem {
inherit system; system = "x86_64-linux";
modules = [ ./configuration.nix ]; modules = [ ./configuration.nix ];
};
};
homeConfigurations = {
lorenz = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
};
modules = [
./home.nix
catppuccin.homeManagerModules.catppuccin
];
}; };
}; };
}; };

133
home.nix
View File

@ -1,133 +0,0 @@
{ config, pkgs, inputs, ... }:
{
imports = [
inputs.spicetify-nix.homeManagerModules.default
];
programs.spicetify =
let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
in
{
enable = true;
enabledExtensions = with spicePkgs.extensions; [
adblock
hidePodcasts
shuffle # shuffle+ (special characters are sanitized out of extension names)
];
theme = spicePkgs.themes.catppuccin;
colorScheme = "macchiato";
};
#themes
catppuccin.flavor = "macchiato";
catppuccin.enable = true;
gtk.cursorTheme.package = pkgs.bibata-cursors;
gtk.cursorTheme.name = "Bibata-Modern-Ice";
gtk = {
enable = true;
catppuccin = {
enable = true;
size = "standard";
tweaks = [ "normal" ];
};
};
# gtk.theme.package = pkgs.catppuccin-gtk;
# gtk.theme.name = "adw-gtk3-dark";
qt = {
enable = true;
platformTheme.name = "kvantum";
style.name = "kvantum";
};
# Home Manager needs a bit of information about you and the paths it should
# manage.
home.username = "lorenz";
home.homeDirectory = "/home/lorenz";
# This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
#
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
home.stateVersion = "24.05"; # Please read the comment before changing.
# The home.packages option allows you to install Nix packages into your
# environment.
nixpkgs.config.allowUnfree = true;
home.packages = [
pkgs.zsh # shell
pkgs.kitty # terminal
pkgs.tmux # multiplexer
pkgs.nitrogen # wallpapers
pkgs.fzf # fuzzy search
pkgs.i3lock-color # locksreen
pkgs.brave # browser
pkgs.oh-my-zsh # prompt
pkgs.picom # compositoe
pkgs.ranger # file manager
pkgs.superfile # file manager
pkgs.obsidian # notes
pkgs.arandr # manager monitor
pkgs.keepassxc # passwords
pkgs.devdocs-desktop # docs
pkgs.cargo
pkgs.spicetify-cli
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
# # fonts?
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
# # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your
# # environment:
# (pkgs.writeShellScriptBin "my-hello" ''
# echo "Hello, ${config.home.username}!"
# '')
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
home.file = {
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy.
# ".screenrc".source = dotfiles/screenrc;
# # You can also set the file content immediately.
# ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
};
# Home Manager can also manage your environment variables through
# 'home.sessionVariables'. These will be explicitly sourced when using a
# shell provided by Home Manager. If you don't want to manage your shell
# through Home Manager then you have to manually source 'hm-session-vars.sh'
# located at either
#
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# /etc/profiles/per-user/lorenz/etc/profile.d/hm-session-vars.sh
#
home.sessionVariables = {
# EDITOR = "emacs";
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}