mir/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mir:85e30973806b160e15dd629d8eb836b1728b40c3
Branches Tags
mir:main
..
compare: mir:2013543322275db159cb7ced884f56552a3b43a2
Branches Tags
mir:main

No commits in common. "85e30973806b160e15dd629d8eb836b1728b40c3" and "2013543322275db159cb7ced884f56552a3b43a2" have entirely different histories.
85e3097380 ... 2013543322

6 changed files with 91 additions and 108 deletions
Show Stats Expand all files Collapse all files

6
configuration.nix
View File

@ -52,7 +52,7 @@
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns4 = true; nssmdns = true;
publish = { publish = {
enable = true; enable = true;
addresses = true; addresses = true;
@ -84,8 +84,8 @@
}; };
# Enable automatic login for the user. # Enable automatic login for the user.
services.displayManager.autoLogin.enable = true; services.xserver.displayManager.autoLogin.enable = true;
services.displayManager.autoLogin.user = "mir"; services.xserver.displayManager.autoLogin.user = "mir";
# services.getty.autologinUser = "mir" # services.getty.autologinUser = "mir"
# Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 # Workaround for GNOME autologin: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229

56
flake.lock
View File

@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1716699938, "lastModified": 1714264490,
"narHash": "sha256-AzTYm22tTDJy0tSqMDf95rmCxxoGTPClu0paGPeh5a0=", "narHash": "sha256-5hKsAO7ZLwOLCXeI5+jDmDr7t4zBezk0xidVWghoBB0=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "842306255856d7f5677c113e699101eb253e2e3f", "rev": "4fac534b775aa0c40611257fa19ab8ab3243f4dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,11 +37,11 @@
"emacs-config": { "emacs-config": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717275804, "lastModified": 1711048799,
"narHash": "sha256-88kQ/EQ90uGIZCqXo6SWDN/eirWrcTcMpgBUscDsAE8=", "narHash": "sha256-GWKDJi+RMYKRW6n0P6dMbxjHzue4O/VbEsicMKiKpzs=",
"ref": "main", "ref": "main",
"rev": "3ea56aefe8e6713e63fa0d494bd05e1478fd9fd8", "rev": "946ea868eba978ab77d39597094dc5ce9534e3b2",
"revCount": 532, "revCount": 521,
"type": "git", "type": "git",
"url": "https://git.marq42.xyz/mir/emacs" "url": "https://git.marq42.xyz/mir/emacs"
}, },
@ -106,16 +106,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717527182, "lastModified": 1714043624,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "845a5c4c073f74105022533907703441e0464bc3", "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -127,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717525419, "lastModified": 1714343445,
"narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -169,11 +169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717036776, "lastModified": 1714868057,
"narHash": "sha256-joKTxvywYlKspGGKOIXho6oRbggOPyayEqAyuZCavO0=", "narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b4b38e6b5fe18da9464f291ae5fbf2ea9acb9ccb", "rev": "e31baf57680bab449ab5b40179cc4a08a99f5314",
"revCount": 86, "revCount": 62,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -184,27 +184,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717179513, "lastModified": 1701282334,
"narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "24.05", "ref": "23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1717196966, "lastModified": 1714253743,
"narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -216,11 +216,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1717532838, "lastModified": 1714340308,
"narHash": "sha256-EYWsxcHdS2YhG9BmZF2H8TSSHbOjYLAWsggA/SHuJc0=", "narHash": "sha256-2uX/VxxNTvxa0FZ5yY2BZDmMCtQVocqa6wdOC8YmzDE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d7179450e2607764fd7f6d25894acec6d1ae44f9", "rev": "53a8759e2675301db38ae5cc17aa9b954a936e9c",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
flake.nix
View File

@ -2,7 +2,7 @@
{ {
description = "NixOS configuration with Home Manager"; description = "NixOS configuration with Home Manager";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/24.05"; nixpkgs.url = "github:nixos/nixpkgs/23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
apple-silicon = { apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon"; url = "github:tpwrules/nixos-apple-silicon";
@ -19,7 +19,7 @@
}; };
nur.url = github:nix-community/NUR; 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-23.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager-unstable = { home-manager-unstable = {
@ -92,7 +92,7 @@
./hardware/galvatron-hw.nix ./hardware/galvatron-hw.nix
./modules/sound/pipewire.nix ./modules/sound/pipewire.nix
inputs.apple-silicon.nixosModules.apple-silicon-support inputs.apple-silicon.nixosModules.apple-silicon-support
inputs.home-manager.nixosModules.home-manager { inputs.home-manager-unstable.nixosModules.home-manager {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix; home-manager.users.mir = import ./home.nix;
@ -100,7 +100,7 @@
} }
]; # end of modules ]; # end of modules
in in
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}} nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
breakdown = # {{{ breakdown = # {{{
let let
system = "x86_64-linux"; system = "x86_64-linux";
@ -173,7 +173,7 @@
./modules/droidcam-obs.nix # only this machine ./modules/droidcam-obs.nix # only this machine
./hardware/knockout-hw.nix ./hardware/knockout-hw.nix
./modules/sound/pipewire.nix ./modules/sound/pipewire.nix
inputs.home-manager.nixosModules.home-manager inputs.home-manager-unstable.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
@ -182,7 +182,7 @@
} }
]; # end of modules ]; # end of modules
in in
inputs.nixpkgs.lib.nixosSystem {inherit system modules specialArgs; }; # }}} inputs.nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; }; # }}}
ravage = # {{{ ravage = # {{{
let let

13
home.nix
View File

@ -6,7 +6,6 @@ with lib.hm.gvariant;
./modules/dconf.nix ./modules/dconf.nix
./modules/shell.nix ./modules/shell.nix
./modules/firefox.nix ./modules/firefox.nix
# ./modules/emacs.nix
]; ];
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.
@ -17,7 +16,6 @@ with lib.hm.gvariant;
pkgs.killall pkgs.killall
pkgs.gdb pkgs.gdb
pkgs.neofetch pkgs.neofetch
pkgs.fastfetch
pkgs.file pkgs.file
pkgs.findutils pkgs.findutils
pkgs.wget pkgs.wget
@ -36,6 +34,13 @@ with lib.hm.gvariant;
# pyqt6 # pyqt6
# # pyqt6-qt6 # # pyqt6-qt6
# pyqt6-sip])) # pyqt6-sip]))
# (pkgs.emacsWithPackagesFromUsePackage {
# package = pkgs.emacs29-pgtk;
# config = ~/.emacs.d/init.el;
# extraEmacsPackages = epkgs: [
# epkgs.dash;
# ]
# })
# pkgs.fetchFromGitHub # pkgs.fetchFromGitHub
]; ];
@ -97,12 +102,12 @@ with lib.hm.gvariant;
programs.hyfetch = { programs.hyfetch = {
enable = true; enable = true;
settings = { settings = {
preset = "nonbinary"; preset = "genderfluid";
mode = "rgb"; mode = "rgb";
color_align = { color_align = {
mode = "horizontal"; mode = "horizontal";
}; };
backend = "fastfetch"; backend = "neofetch";
}; };
}; };

20
modules/emacs.nix
View File

@ -1,20 +0,0 @@
{ lib, config, pkgs, inputs, ... }:
{
home.packages = [
(pkgs.emacsWithPackages {
package = pkgs.emacs29;
# config = ~/.emacs.d/init.el;
extraEmacsPackages = epkgs: [
epkgs.dash
epkgs.compat
epkgs.marginalia
epkgs.page-break-lines
epkgs.rainbow-mode
epkgs.powershell
epkgs.diminish
# epkgs.general
epkgs.eldoc
];
}
)];
}

14
modules/firefox.nix
View File

@ -61,14 +61,12 @@
default = "searx"; default = "searx";
order = [ "searx" "Google" ]; order = [ "searx" "Google" ];
}; };
# userChrome = '' # extensions = with pkgs.nur.repos.rycee.firefox-addons; [
# !important @import "~/.mozilla/safari-userchrome.css"; # ublock-origin
# ''; # vimium
# mark-my-search
# ];
}; };
}; };
}; };
home.file.".mozilla/safari-userchrome.css".source = builtins.fetchurl { }
url = "https://gist.githubusercontent.com/janoamaral/5c0a6e944ca31d2a6a51712d0c453d48/raw/6e1f0d1e3e31400d467302da3198c3e9c3caa647/userChrome.css";
sha256 = "19hbf9kf93ggryabbxz5h9nsm2ymzjg369b8bld818a515cx4vhc";
};
}